diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
new file mode 100644
index 0000000..6a318ad
--- /dev/null
+++ b/.nuget/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
\ No newline at end of file
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
new file mode 100644
index 0000000..3ffdd33
--- /dev/null
+++ b/.nuget/NuGet.exe
Binary files differ
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
new file mode 100644
index 0000000..100267f
--- /dev/null
+++ b/.nuget/NuGet.targets
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
+      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)"
+              Condition=" '$(OS)' != 'Windows_NT' " />
+
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>
diff --git a/ClosedXML.sln b/ClosedXML.sln
new file mode 100644
index 0000000..f87028c
--- /dev/null
+++ b/ClosedXML.sln
@@ -0,0 +1,143 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Sandbox", "ClosedXML_Sandbox\ClosedXML_Sandbox.csproj", "{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5C94E22C-85AA-48FD-B082-CF929FFC6C31}"
+	ProjectSection(SolutionItems) = preProject
+		ClosedXML.vsmdi = ClosedXML.vsmdi
+		DocumentFormat.OpenXml.dll = DocumentFormat.OpenXml.dll
+		Ionic.Zip.dll = Ionic.Zip.dll
+		Local.testsettings = Local.testsettings
+		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Examples", "ClosedXML_Examples\ClosedXML_Examples.csproj", "{03A518D0-1CB7-488E-861C-C4E782B27A46}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Net3.5", "ClosedXML_Net3.5\ClosedXML_Net3.5.csproj", "{5F43B12B-A900-40C6-9924-A0C0B032F791}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML", "ClosedXML\ClosedXML.csproj", "{BD5E6BFE-E837-4A35-BCA9-39667D873A20}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Tests", "ClosedXML_Tests\ClosedXML_Tests.csproj", "{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Package", "ClosedXML_Package\ClosedXML_Package.csproj", "{69B3BDDF-C359-447C-AEB7-EBD8867DE528}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{8018E34C-28E4-4FAF-87DC-A71D6275C567}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x64.ActiveCfg = Debug|x64
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x64.Build.0 = Debug|x64
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x86.ActiveCfg = Debug|x86
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x86.Build.0 = Debug|x86
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x64.ActiveCfg = Release|x64
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x64.Build.0 = Release|x64
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x86.Build.0 = Release|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x64.ActiveCfg = Debug|x64
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x64.Build.0 = Debug|x64
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x86.ActiveCfg = Debug|x86
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x86.Build.0 = Debug|x86
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x64.ActiveCfg = Release|x64
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x64.Build.0 = Release|x64
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x86.ActiveCfg = Release|Any CPU
+		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x86.Build.0 = Release|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x64.ActiveCfg = Debug|x64
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x64.Build.0 = Debug|x64
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x86.ActiveCfg = Debug|x86
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x86.Build.0 = Debug|x86
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x64.ActiveCfg = Release|x64
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x64.Build.0 = Release|x64
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x86.Build.0 = Release|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x64.ActiveCfg = Debug|x64
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x64.Build.0 = Debug|x64
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x86.ActiveCfg = Debug|x86
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x86.Build.0 = Debug|x86
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x64.ActiveCfg = Release|x64
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x64.Build.0 = Release|x64
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x86.Build.0 = Release|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|x64.ActiveCfg = Release|Any CPU
+		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|x86.ActiveCfg = Release|Any CPU
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Any CPU.Build.0 = Debug|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|x64.ActiveCfg = Debug|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|x86.ActiveCfg = Debug|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|x86.Build.0 = Debug|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Any CPU.ActiveCfg = Release|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Any CPU.Build.0 = Release|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Mixed Platforms.Build.0 = Release|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|x64.ActiveCfg = Release|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|x86.ActiveCfg = Release|x86
+		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = ClosedXML.vsmdi
+	EndGlobalSection
+EndGlobal
diff --git a/ClosedXML.vsmdi b/ClosedXML.vsmdi
new file mode 100644
index 0000000..b93fcdf
--- /dev/null
+++ b/ClosedXML.vsmdi
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
+    <RunConfiguration id="b06e9cbc-e7b0-43ae-b994-09522c31b4e3" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  </TestList>
+</TestLists>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML.csproj b/ClosedXML/ClosedXML.csproj
new file mode 100644
index 0000000..4012c76
--- /dev/null
+++ b/ClosedXML/ClosedXML.csproj
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ClosedXML</RootNamespace>
+    <AssemblyName>ClosedXML</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET4</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET4</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\DocumentFormat.OpenXml.2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Excel\CalcEngine\Functions\DateAndTime.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\Database.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\Is.cs" />
+    <Compile Include="Excel\Misc\XLCallbackAction.cs" />
+    <Compile Include="Excel\Misc\XLReentrantEnumerableSet.cs" />
+    <Compile Include="Excel\XLConstants.cs" />
+    <Compile Include="Utils\GraphicsUtils.cs" />
+    <Compile Include="XLHelper.cs" />
+    <Compile Include="Excel\AutoFilters\XLFilteredColumn.cs" />
+    <Compile Include="Excel\AutoFilters\XLCustomFilteredColumn.cs" />
+    <Compile Include="Excel\AutoFilters\XLFilterConnector.cs" />
+    <Compile Include="Excel\AutoFilters\XLFilter.cs" />
+    <Compile Include="Excel\AutoFilters\XLFilterColumn.cs" />
+    <Compile Include="Excel\AutoFilters\XLAutoFilter.cs" />
+    <Compile Include="Excel\AutoFilters\IXLBaseAutoFilter.cs" />
+    <Compile Include="Excel\AutoFilters\IXLFilteredColumn.cs" />
+    <Compile Include="Excel\AutoFilters\IXLCustomFilteredColumn.cs" />
+    <Compile Include="Excel\AutoFilters\IXLAutoFilter.cs" />
+    <Compile Include="Excel\AutoFilters\IXLFilterColumn.cs" />
+    <Compile Include="Excel\AutoFilters\IXLFilterConnector.cs" />
+    <Compile Include="Excel\CalcEngine\CalcEngine.cs" />
+    <Compile Include="Excel\CalcEngine\Expression.cs" />
+    <Compile Include="Excel\CalcEngine\ExpressionCache.cs" />
+    <Compile Include="Excel\CalcEngine\FunctionDefinition.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\Logical.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\MathTrig.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\Statistical.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\Tally.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\Text.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\XLMath.cs" />
+    <Compile Include="Excel\CalcEngine\Functions\XLMatrix.cs" />
+    <Compile Include="Excel\CalcEngine\Token.cs" />
+    <Compile Include="Excel\CalcEngine\XLCalcEngine.cs" />
+    <Compile Include="Excel\Cells\IXLCells.cs" />
+    <Compile Include="Excel\Cells\XLCells.cs" />
+    <Compile Include="Excel\Cells\XLCellsCollection.cs" />
+    <Compile Include="Excel\Comments\IXLComment.cs" />
+    <Compile Include="Excel\Comments\XLComment.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFIconSetConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFDataBarConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFTopConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFUniqueConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFCellIsConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFEndsWithConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFNotContainsConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFContainsConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFNotErrorConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFIsErrorConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFNotBlankConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFIsBlankConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\IXLCFConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFStartsWithConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFColorScaleConverter.cs" />
+    <Compile Include="Excel\ConditionalFormats\Save\XLCFConverters.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLConditionalFormats.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLCFDataBarMax.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLCFDataBarMin.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLCFColorScaleMax.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLCFColorScaleMax.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLCFColorScaleMid.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLCFColorScaleMin.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLCFDataBarMax.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLCFDataBarMin.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLCFIconSet.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLConditionalFormat.cs" />
+    <Compile Include="Excel\ConditionalFormats\IXLConditionalFormats.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLCFColorScaleMid.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLCFColorScaleMin.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLCFIconSet.cs" />
+    <Compile Include="Excel\ConditionalFormats\XLConditionalFormat.cs" />
+    <Compile Include="Excel\Drawings\IXLDrawingPosition.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingFont.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingFont.cs" />
+    <Compile Include="Excel\Drawings\XLDrawing.cs" />
+    <Compile Include="Excel\Charts\IXLCharts.cs" />
+    <Compile Include="Excel\Drawings\IXLDrawing.cs" />
+    <Compile Include="Excel\Charts\XLCharts.cs" />
+    <Compile Include="Excel\Charts\XLChart.cs" />
+    <Compile Include="Excel\Charts\IXLChart.cs" />
+    <Compile Include="Excel\Columns\IXLColumns.cs" />
+    <Compile Include="Excel\Columns\XLColumns.cs" />
+    <Compile Include="Excel\Columns\XLColumnCollection.cs" />
+    <Compile Include="Excel\Coordinates\XLSheetRange.cs" />
+    <Compile Include="Excel\Coordinates\XLSheetPoint.cs" />
+    <Compile Include="Excel\Drawings\XLDrawingPosition.cs" />
+    <Compile Include="Excel\Misc\XLDictionary.cs" />
+    <Compile Include="Excel\Misc\XLFormula.cs" />
+    <Compile Include="Excel\Misc\XLIdManager.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValueCombination.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValueCombination.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValueFormat.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValueFormat.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValue.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValues.cs" />
+    <Compile Include="Excel\PivotTables\XLPivotFields.cs" />
+    <Compile Include="Excel\PivotTables\XLPivotField.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValues.cs" />
+    <Compile Include="Excel\PivotTables\IXLPivotFields.cs" />
+    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValue.cs" />
+    <Compile Include="Excel\PivotTables\IXLPivotField.cs" />
+    <Compile Include="Excel\PivotTables\IXLPivotTables.cs" />
+    <Compile Include="Excel\PivotTables\XLPivotTables.cs" />
+    <Compile Include="Excel\PivotTables\XLPivotTable.cs" />
+    <Compile Include="Excel\PivotTables\IXLPivotTable.cs" />
+    <Compile Include="Excel\Ranges\IXLBaseCollection.cs" />
+    <Compile Include="Excel\RichText\XLFormattedText.cs" />
+    <Compile Include="Excel\RichText\IXLFormattedText.cs" />
+    <Compile Include="Excel\RichText\XLPhonetics.cs" />
+    <Compile Include="Excel\RichText\XLPhonetic.cs" />
+    <Compile Include="Excel\RichText\IXLPhonetics.cs" />
+    <Compile Include="Excel\RichText\IXLPhonetic.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingAlignment.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingColorsAndLines.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingMargins.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingProperties.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingProtection.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingSize.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingStyle.cs" />
+    <Compile Include="Excel\Drawings\Style\IXLDrawingWeb.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingAlignment.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingColorsAndLines.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingMargins.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingProtection.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingSize.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingStyle.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingWeb.cs" />
+    <Compile Include="Excel\Style\IXLNumberFormatBase.cs" />
+    <Compile Include="Excel\Style\XLStylizedEmpty.cs" />
+    <Compile Include="Excel\Tables\XLTableRange.cs" />
+    <Compile Include="Excel\Tables\IXLTableRange.cs" />
+    <Compile Include="Excel\XLWorkbook_Save.NestedTypes.cs" />
+    <Compile Include="Excel\CustomProperties\XLCustomProperties.cs" />
+    <Compile Include="Excel\CustomProperties\IXLCustomProperties.cs" />
+    <Compile Include="Excel\CustomProperties\XLCustomProperty.cs" />
+    <Compile Include="Excel\CustomProperties\IXLCustomProperty.cs" />
+    <Compile Include="Excel\DataValidation\XLTimeCriteria.cs" />
+    <Compile Include="Excel\DataValidation\XLTextLengthCriteria.cs" />
+    <Compile Include="Excel\DataValidation\XLDateCriteria.cs" />
+    <Compile Include="Excel\DataValidation\XLDecimalCriteria.cs" />
+    <Compile Include="Excel\DataValidation\XLWholeNumberCriteria.cs" />
+    <Compile Include="Excel\DataValidation\XLDataValidation.cs" />
+    <Compile Include="Excel\DataValidation\XLDataValidations.cs" />
+    <Compile Include="Excel\DataValidation\IXLDataValidations.cs" />
+    <Compile Include="Excel\DataValidation\XLValidationCriteria.cs" />
+    <Compile Include="Excel\DataValidation\IXLDataValidation.cs" />
+    <Compile Include="Excel\DataValidation\IXLValidationCriteria.cs" />
+    <Compile Include="Excel\EnumConverter.cs" />
+    <Compile Include="Excel\Hyperlinks\XLHyperlinks.cs" />
+    <Compile Include="Excel\Hyperlinks\IXLHyperlinks.cs" />
+    <Compile Include="Excel\Hyperlinks\XLHyperlink_Internal.cs" />
+    <Compile Include="Excel\Hyperlinks\XLHyperlink_public.cs" />
+    <Compile Include="Excel\IXLSheetProtection.cs" />
+    <Compile Include="Excel\IXLSheetView.cs" />
+    <Compile Include="Excel\IXLTheme.cs" />
+    <Compile Include="Excel\NamedRanges\XLNamedRanges.cs" />
+    <Compile Include="Excel\NamedRanges\IXLNamedRanges.cs" />
+    <Compile Include="Excel\NamedRanges\XLNamedRange.cs" />
+    <Compile Include="Excel\NamedRanges\IXLNamedRange.cs" />
+    <Compile Include="Excel\PageSetup\XLHFText.cs" />
+    <Compile Include="Excel\Ranges\Sort\XLSortElement.cs" />
+    <Compile Include="Excel\Ranges\Sort\XLSortElements.cs" />
+    <Compile Include="Excel\Ranges\Sort\IXLSortElement.cs" />
+    <Compile Include="Excel\Ranges\Sort\IXLSortElements.cs" />
+    <Compile Include="Excel\RichText\XLRichText.cs" />
+    <Compile Include="Excel\RichText\IXLRichText.cs" />
+    <Compile Include="Excel\RichText\XLRichString.cs" />
+    <Compile Include="Excel\RichText\IXLRichString.cs" />
+    <Compile Include="Excel\Style\Colors\XLColor_Static.cs" />
+    <Compile Include="Excel\Style\Colors\XLColor_Public.cs" />
+    <Compile Include="Excel\Style\Colors\XLColor_Internal.cs" />
+    <Compile Include="Excel\Style\IXLFontBase.cs" />
+    <Compile Include="Excel\Style\IXLProtection.cs" />
+    <Compile Include="Excel\Style\XLProtection.cs" />
+    <Compile Include="Excel\Style\XLStylizedContainer.cs" />
+    <Compile Include="Excel\Tables\XLTableField.cs" />
+    <Compile Include="Excel\Tables\IXLTableField.cs" />
+    <Compile Include="Excel\Tables\XLTableRows.cs" />
+    <Compile Include="Excel\Tables\IXLTableRows.cs" />
+    <Compile Include="Excel\Tables\XLTables.cs" />
+    <Compile Include="Excel\Tables\IXLTableRow.cs" />
+    <Compile Include="Excel\Tables\IXLTables.cs" />
+    <Compile Include="Excel\Tables\XLTableRow.cs" />
+    <Compile Include="Excel\Tables\XLTable.cs" />
+    <Compile Include="Excel\Tables\IXLTable.cs" />
+    <Compile Include="Excel\XLOutline.cs" />
+    <Compile Include="Excel\IXLOutline.cs" />
+    <Compile Include="Excel\PageSetup\IXLMargins.cs" />
+    <Compile Include="Excel\Ranges\IXLRangeAddress.cs" />
+    <Compile Include="Excel\Ranges\XLRangeAddress.cs" />
+    <Compile Include="Excel\Ranges\XLRangeColumn.cs" />
+    <Compile Include="Excel\Ranges\XLRangeRow.cs" />
+    <Compile Include="Excel\Ranges\XLRangeRows.cs" />
+    <Compile Include="Excel\Ranges\XLRangeColumns.cs" />
+    <Compile Include="Excel\Ranges\IXLRangeRows.cs" />
+    <Compile Include="Excel\Ranges\IXLRangeColumns.cs" />
+    <Compile Include="Excel\Ranges\IXLRangeColumn.cs" />
+    <Compile Include="Excel\Ranges\IXLRangeRow.cs" />
+    <Compile Include="Excel\Ranges\IXLRangeBase.cs" />
+    <Compile Include="Excel\Ranges\XLRangeBase.cs" />
+    <Compile Include="Excel\Rows\XLRowCollection.cs" />
+    <Compile Include="Excel\XLSheetProtection.cs" />
+    <Compile Include="Excel\XLSheetView.cs" />
+    <Compile Include="Excel\XLTheme.cs" />
+    <Compile Include="Excel\XLWorkbook_Load.cs" />
+    <Compile Include="Excel\PageSetup\IXLHeaderFooter.cs" />
+    <Compile Include="Excel\PageSetup\IXLHFItem.cs" />
+    <Compile Include="Excel\PageSetup\IXLPageSetup.cs" />
+    <Compile Include="Excel\PageSetup\IXLPrintAreas.cs" />
+    <Compile Include="Excel\PageSetup\XLPrintAreas.cs" />
+    <Compile Include="Excel\Ranges\IXLRanges.cs" />
+    <Compile Include="Excel\Ranges\XLRanges.cs" />
+    <Compile Include="Excel\Rows\IXLRow.cs" />
+    <Compile Include="Excel\PageSetup\XLHeaderFooter.cs" />
+    <Compile Include="Excel\PageSetup\XLHFItem.cs" />
+    <Compile Include="Excel\PageSetup\XLMargins.cs" />
+    <Compile Include="Excel\Rows\IXLRows.cs" />
+    <Compile Include="Excel\Rows\XLRows.cs" />
+    <Compile Include="Excel\Style\IXLAlignment.cs" />
+    <Compile Include="Excel\Style\IXLBorder.cs" />
+    <Compile Include="Excel\Style\IXLFill.cs" />
+    <Compile Include="Excel\Style\IXLNumberFormat.cs" />
+    <Compile Include="Excel\Style\XLAlignment.cs" />
+    <Compile Include="Excel\Style\XLBorder.cs" />
+    <Compile Include="Excel\Style\XLFill.cs" />
+    <Compile Include="Excel\Style\XLNumberFormat.cs" />
+    <Compile Include="Excel\Columns\XLColumnParameters.cs" />
+    <Compile Include="Excel\PageSetup\XLPageSetup.cs" />
+    <Compile Include="Excel\Ranges\XLRangeParameters.cs" />
+    <Compile Include="Excel\Rows\XLRowParameters.cs" />
+    <Compile Include="Excel\XLWorkbook_Save.cs" />
+    <Compile Include="Excel\Coordinates\IXLAddress.cs" />
+    <Compile Include="Excel\Cells\IXLCell.cs" />
+    <Compile Include="Excel\Columns\IXLColumn.cs" />
+    <Compile Include="Excel\Ranges\IXLRange.cs" />
+    <Compile Include="Excel\IXLWorksheet.cs" />
+    <Compile Include="Excel\IXLWorksheets.cs" />
+    <Compile Include="Excel\Style\IXLFont.cs" />
+    <Compile Include="Excel\Style\IXLStyle.cs" />
+    <Compile Include="Excel\Style\IXLStylized.cs" />
+    <Compile Include="Excel\Style\XLFont.cs" />
+    <Compile Include="Excel\Style\XLStyle.cs" />
+    <Compile Include="Excel\Coordinates\XLAddress.cs" />
+    <Compile Include="Excel\Cells\XLCell.cs" />
+    <Compile Include="Excel\Columns\XLColumn.cs" />
+    <Compile Include="Excel\Ranges\XLRange.cs" />
+    <Compile Include="Excel\Rows\XLRow.cs" />
+    <Compile Include="Excel\XLWorkbook.cs" />
+    <Compile Include="Excel\XLWorksheet.cs" />
+    <Compile Include="Excel\XLWorksheetInternals.cs" />
+    <Compile Include="Excel\XLWorkbookProperties.cs" />
+    <Compile Include="Excel\XLWorksheets.cs" />
+    <Compile Include="Excel\XLWSContentManager.cs" />
+    <Compile Include="Extensions.cs" />
+    <Compile Include="PathHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Excel\Drawings\Style\XLDrawingProperties.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClosedXML.snk" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>IF EXIST $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(TargetDir)</PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML.snk b/ClosedXML/ClosedXML.snk
new file mode 100644
index 0000000..a17cff7
--- /dev/null
+++ b/ClosedXML/ClosedXML.snk
Binary files differ
diff --git a/ClosedXML/ClosedXML/.nuget/NuGet.Config b/ClosedXML/ClosedXML/.nuget/NuGet.Config
deleted file mode 100644
index 6a318ad..0000000
--- a/ClosedXML/ClosedXML/.nuget/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/.nuget/NuGet.exe b/ClosedXML/ClosedXML/.nuget/NuGet.exe
deleted file mode 100644
index 3ffdd33..0000000
--- a/ClosedXML/ClosedXML/.nuget/NuGet.exe
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/.nuget/NuGet.targets b/ClosedXML/ClosedXML/.nuget/NuGet.targets
deleted file mode 100644
index 100267f..0000000
--- a/ClosedXML/ClosedXML/.nuget/NuGet.targets
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
-        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
-      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)"
-              Condition=" '$(OS)' != 'Windows_NT' " />
-
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>
diff --git a/ClosedXML/ClosedXML/ClosedXML.sln b/ClosedXML/ClosedXML/ClosedXML.sln
deleted file mode 100644
index f87028c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML.sln
+++ /dev/null
@@ -1,143 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Sandbox", "ClosedXML_Sandbox\ClosedXML_Sandbox.csproj", "{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5C94E22C-85AA-48FD-B082-CF929FFC6C31}"
-	ProjectSection(SolutionItems) = preProject
-		ClosedXML.vsmdi = ClosedXML.vsmdi
-		DocumentFormat.OpenXml.dll = DocumentFormat.OpenXml.dll
-		Ionic.Zip.dll = Ionic.Zip.dll
-		Local.testsettings = Local.testsettings
-		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Examples", "ClosedXML_Examples\ClosedXML_Examples.csproj", "{03A518D0-1CB7-488E-861C-C4E782B27A46}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Net3.5", "ClosedXML_Net3.5\ClosedXML_Net3.5.csproj", "{5F43B12B-A900-40C6-9924-A0C0B032F791}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML", "ClosedXML\ClosedXML.csproj", "{BD5E6BFE-E837-4A35-BCA9-39667D873A20}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Tests", "ClosedXML_Tests\ClosedXML_Tests.csproj", "{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Package", "ClosedXML_Package\ClosedXML_Package.csproj", "{69B3BDDF-C359-447C-AEB7-EBD8867DE528}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{8018E34C-28E4-4FAF-87DC-A71D6275C567}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x64.ActiveCfg = Debug|x64
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x64.Build.0 = Debug|x64
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x86.ActiveCfg = Debug|x86
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Debug|x86.Build.0 = Debug|x86
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x64.ActiveCfg = Release|x64
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x64.Build.0 = Release|x64
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x86.ActiveCfg = Release|Any CPU
-		{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}.Release|x86.Build.0 = Release|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x64.ActiveCfg = Debug|x64
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x64.Build.0 = Debug|x64
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x86.ActiveCfg = Debug|x86
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Debug|x86.Build.0 = Debug|x86
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x64.ActiveCfg = Release|x64
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x64.Build.0 = Release|x64
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x86.ActiveCfg = Release|Any CPU
-		{03A518D0-1CB7-488E-861C-C4E782B27A46}.Release|x86.Build.0 = Release|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x64.ActiveCfg = Debug|x64
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x64.Build.0 = Debug|x64
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x86.ActiveCfg = Debug|x86
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Debug|x86.Build.0 = Debug|x86
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x64.ActiveCfg = Release|x64
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x64.Build.0 = Release|x64
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x86.ActiveCfg = Release|Any CPU
-		{5F43B12B-A900-40C6-9924-A0C0B032F791}.Release|x86.Build.0 = Release|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x64.ActiveCfg = Debug|x64
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x64.Build.0 = Debug|x64
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x86.ActiveCfg = Debug|x86
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Debug|x86.Build.0 = Debug|x86
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x64.ActiveCfg = Release|x64
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x64.Build.0 = Release|x64
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x86.ActiveCfg = Release|Any CPU
-		{BD5E6BFE-E837-4A35-BCA9-39667D873A20}.Release|x86.Build.0 = Release|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|x64.ActiveCfg = Release|Any CPU
-		{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}.Release|x86.ActiveCfg = Release|Any CPU
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Any CPU.Build.0 = Debug|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|x64.ActiveCfg = Debug|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|x86.ActiveCfg = Debug|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Debug|x86.Build.0 = Debug|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Any CPU.ActiveCfg = Release|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Any CPU.Build.0 = Release|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|Mixed Platforms.Build.0 = Release|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|x64.ActiveCfg = Release|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|x86.ActiveCfg = Release|x86
-		{69B3BDDF-C359-447C-AEB7-EBD8867DE528}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = ClosedXML.vsmdi
-	EndGlobalSection
-EndGlobal
diff --git a/ClosedXML/ClosedXML/ClosedXML.vsmdi b/ClosedXML/ClosedXML/ClosedXML.vsmdi
deleted file mode 100644
index b93fcdf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML.vsmdi
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
-    <RunConfiguration id="b06e9cbc-e7b0-43ae-b994-09522c31b4e3" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  </TestList>
-</TestLists>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/ClosedXML.csproj b/ClosedXML/ClosedXML/ClosedXML/ClosedXML.csproj
deleted file mode 100644
index 4012c76..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/ClosedXML.csproj
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClosedXML</RootNamespace>
-    <AssemblyName>ClosedXML</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET4</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET4</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\DocumentFormat.OpenXml.2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Excel\CalcEngine\Functions\DateAndTime.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\Database.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\Is.cs" />
-    <Compile Include="Excel\Misc\XLCallbackAction.cs" />
-    <Compile Include="Excel\Misc\XLReentrantEnumerableSet.cs" />
-    <Compile Include="Excel\XLConstants.cs" />
-    <Compile Include="Utils\GraphicsUtils.cs" />
-    <Compile Include="XLHelper.cs" />
-    <Compile Include="Excel\AutoFilters\XLFilteredColumn.cs" />
-    <Compile Include="Excel\AutoFilters\XLCustomFilteredColumn.cs" />
-    <Compile Include="Excel\AutoFilters\XLFilterConnector.cs" />
-    <Compile Include="Excel\AutoFilters\XLFilter.cs" />
-    <Compile Include="Excel\AutoFilters\XLFilterColumn.cs" />
-    <Compile Include="Excel\AutoFilters\XLAutoFilter.cs" />
-    <Compile Include="Excel\AutoFilters\IXLBaseAutoFilter.cs" />
-    <Compile Include="Excel\AutoFilters\IXLFilteredColumn.cs" />
-    <Compile Include="Excel\AutoFilters\IXLCustomFilteredColumn.cs" />
-    <Compile Include="Excel\AutoFilters\IXLAutoFilter.cs" />
-    <Compile Include="Excel\AutoFilters\IXLFilterColumn.cs" />
-    <Compile Include="Excel\AutoFilters\IXLFilterConnector.cs" />
-    <Compile Include="Excel\CalcEngine\CalcEngine.cs" />
-    <Compile Include="Excel\CalcEngine\Expression.cs" />
-    <Compile Include="Excel\CalcEngine\ExpressionCache.cs" />
-    <Compile Include="Excel\CalcEngine\FunctionDefinition.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\Logical.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\MathTrig.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\Statistical.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\Tally.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\Text.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\XLMath.cs" />
-    <Compile Include="Excel\CalcEngine\Functions\XLMatrix.cs" />
-    <Compile Include="Excel\CalcEngine\Token.cs" />
-    <Compile Include="Excel\CalcEngine\XLCalcEngine.cs" />
-    <Compile Include="Excel\Cells\IXLCells.cs" />
-    <Compile Include="Excel\Cells\XLCells.cs" />
-    <Compile Include="Excel\Cells\XLCellsCollection.cs" />
-    <Compile Include="Excel\Comments\IXLComment.cs" />
-    <Compile Include="Excel\Comments\XLComment.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFIconSetConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFDataBarConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFTopConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFUniqueConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFCellIsConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFEndsWithConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFNotContainsConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFContainsConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFNotErrorConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFIsErrorConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFNotBlankConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFIsBlankConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\IXLCFConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFStartsWithConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFColorScaleConverter.cs" />
-    <Compile Include="Excel\ConditionalFormats\Save\XLCFConverters.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLConditionalFormats.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLCFDataBarMax.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLCFDataBarMin.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLCFColorScaleMax.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLCFColorScaleMax.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLCFColorScaleMid.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLCFColorScaleMin.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLCFDataBarMax.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLCFDataBarMin.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLCFIconSet.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLConditionalFormat.cs" />
-    <Compile Include="Excel\ConditionalFormats\IXLConditionalFormats.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLCFColorScaleMid.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLCFColorScaleMin.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLCFIconSet.cs" />
-    <Compile Include="Excel\ConditionalFormats\XLConditionalFormat.cs" />
-    <Compile Include="Excel\Drawings\IXLDrawingPosition.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingFont.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingFont.cs" />
-    <Compile Include="Excel\Drawings\XLDrawing.cs" />
-    <Compile Include="Excel\Charts\IXLCharts.cs" />
-    <Compile Include="Excel\Drawings\IXLDrawing.cs" />
-    <Compile Include="Excel\Charts\XLCharts.cs" />
-    <Compile Include="Excel\Charts\XLChart.cs" />
-    <Compile Include="Excel\Charts\IXLChart.cs" />
-    <Compile Include="Excel\Columns\IXLColumns.cs" />
-    <Compile Include="Excel\Columns\XLColumns.cs" />
-    <Compile Include="Excel\Columns\XLColumnCollection.cs" />
-    <Compile Include="Excel\Coordinates\XLSheetRange.cs" />
-    <Compile Include="Excel\Coordinates\XLSheetPoint.cs" />
-    <Compile Include="Excel\Drawings\XLDrawingPosition.cs" />
-    <Compile Include="Excel\Misc\XLDictionary.cs" />
-    <Compile Include="Excel\Misc\XLFormula.cs" />
-    <Compile Include="Excel\Misc\XLIdManager.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValueCombination.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValueCombination.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValueFormat.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValueFormat.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValue.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\XLPivotValues.cs" />
-    <Compile Include="Excel\PivotTables\XLPivotFields.cs" />
-    <Compile Include="Excel\PivotTables\XLPivotField.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValues.cs" />
-    <Compile Include="Excel\PivotTables\IXLPivotFields.cs" />
-    <Compile Include="Excel\PivotTables\PivotValues\IXLPivotValue.cs" />
-    <Compile Include="Excel\PivotTables\IXLPivotField.cs" />
-    <Compile Include="Excel\PivotTables\IXLPivotTables.cs" />
-    <Compile Include="Excel\PivotTables\XLPivotTables.cs" />
-    <Compile Include="Excel\PivotTables\XLPivotTable.cs" />
-    <Compile Include="Excel\PivotTables\IXLPivotTable.cs" />
-    <Compile Include="Excel\Ranges\IXLBaseCollection.cs" />
-    <Compile Include="Excel\RichText\XLFormattedText.cs" />
-    <Compile Include="Excel\RichText\IXLFormattedText.cs" />
-    <Compile Include="Excel\RichText\XLPhonetics.cs" />
-    <Compile Include="Excel\RichText\XLPhonetic.cs" />
-    <Compile Include="Excel\RichText\IXLPhonetics.cs" />
-    <Compile Include="Excel\RichText\IXLPhonetic.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingAlignment.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingColorsAndLines.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingMargins.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingProperties.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingProtection.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingSize.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingStyle.cs" />
-    <Compile Include="Excel\Drawings\Style\IXLDrawingWeb.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingAlignment.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingColorsAndLines.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingMargins.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingProtection.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingSize.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingStyle.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingWeb.cs" />
-    <Compile Include="Excel\Style\IXLNumberFormatBase.cs" />
-    <Compile Include="Excel\Style\XLStylizedEmpty.cs" />
-    <Compile Include="Excel\Tables\XLTableRange.cs" />
-    <Compile Include="Excel\Tables\IXLTableRange.cs" />
-    <Compile Include="Excel\XLWorkbook_Save.NestedTypes.cs" />
-    <Compile Include="Excel\CustomProperties\XLCustomProperties.cs" />
-    <Compile Include="Excel\CustomProperties\IXLCustomProperties.cs" />
-    <Compile Include="Excel\CustomProperties\XLCustomProperty.cs" />
-    <Compile Include="Excel\CustomProperties\IXLCustomProperty.cs" />
-    <Compile Include="Excel\DataValidation\XLTimeCriteria.cs" />
-    <Compile Include="Excel\DataValidation\XLTextLengthCriteria.cs" />
-    <Compile Include="Excel\DataValidation\XLDateCriteria.cs" />
-    <Compile Include="Excel\DataValidation\XLDecimalCriteria.cs" />
-    <Compile Include="Excel\DataValidation\XLWholeNumberCriteria.cs" />
-    <Compile Include="Excel\DataValidation\XLDataValidation.cs" />
-    <Compile Include="Excel\DataValidation\XLDataValidations.cs" />
-    <Compile Include="Excel\DataValidation\IXLDataValidations.cs" />
-    <Compile Include="Excel\DataValidation\XLValidationCriteria.cs" />
-    <Compile Include="Excel\DataValidation\IXLDataValidation.cs" />
-    <Compile Include="Excel\DataValidation\IXLValidationCriteria.cs" />
-    <Compile Include="Excel\EnumConverter.cs" />
-    <Compile Include="Excel\Hyperlinks\XLHyperlinks.cs" />
-    <Compile Include="Excel\Hyperlinks\IXLHyperlinks.cs" />
-    <Compile Include="Excel\Hyperlinks\XLHyperlink_Internal.cs" />
-    <Compile Include="Excel\Hyperlinks\XLHyperlink_public.cs" />
-    <Compile Include="Excel\IXLSheetProtection.cs" />
-    <Compile Include="Excel\IXLSheetView.cs" />
-    <Compile Include="Excel\IXLTheme.cs" />
-    <Compile Include="Excel\NamedRanges\XLNamedRanges.cs" />
-    <Compile Include="Excel\NamedRanges\IXLNamedRanges.cs" />
-    <Compile Include="Excel\NamedRanges\XLNamedRange.cs" />
-    <Compile Include="Excel\NamedRanges\IXLNamedRange.cs" />
-    <Compile Include="Excel\PageSetup\XLHFText.cs" />
-    <Compile Include="Excel\Ranges\Sort\XLSortElement.cs" />
-    <Compile Include="Excel\Ranges\Sort\XLSortElements.cs" />
-    <Compile Include="Excel\Ranges\Sort\IXLSortElement.cs" />
-    <Compile Include="Excel\Ranges\Sort\IXLSortElements.cs" />
-    <Compile Include="Excel\RichText\XLRichText.cs" />
-    <Compile Include="Excel\RichText\IXLRichText.cs" />
-    <Compile Include="Excel\RichText\XLRichString.cs" />
-    <Compile Include="Excel\RichText\IXLRichString.cs" />
-    <Compile Include="Excel\Style\Colors\XLColor_Static.cs" />
-    <Compile Include="Excel\Style\Colors\XLColor_Public.cs" />
-    <Compile Include="Excel\Style\Colors\XLColor_Internal.cs" />
-    <Compile Include="Excel\Style\IXLFontBase.cs" />
-    <Compile Include="Excel\Style\IXLProtection.cs" />
-    <Compile Include="Excel\Style\XLProtection.cs" />
-    <Compile Include="Excel\Style\XLStylizedContainer.cs" />
-    <Compile Include="Excel\Tables\XLTableField.cs" />
-    <Compile Include="Excel\Tables\IXLTableField.cs" />
-    <Compile Include="Excel\Tables\XLTableRows.cs" />
-    <Compile Include="Excel\Tables\IXLTableRows.cs" />
-    <Compile Include="Excel\Tables\XLTables.cs" />
-    <Compile Include="Excel\Tables\IXLTableRow.cs" />
-    <Compile Include="Excel\Tables\IXLTables.cs" />
-    <Compile Include="Excel\Tables\XLTableRow.cs" />
-    <Compile Include="Excel\Tables\XLTable.cs" />
-    <Compile Include="Excel\Tables\IXLTable.cs" />
-    <Compile Include="Excel\XLOutline.cs" />
-    <Compile Include="Excel\IXLOutline.cs" />
-    <Compile Include="Excel\PageSetup\IXLMargins.cs" />
-    <Compile Include="Excel\Ranges\IXLRangeAddress.cs" />
-    <Compile Include="Excel\Ranges\XLRangeAddress.cs" />
-    <Compile Include="Excel\Ranges\XLRangeColumn.cs" />
-    <Compile Include="Excel\Ranges\XLRangeRow.cs" />
-    <Compile Include="Excel\Ranges\XLRangeRows.cs" />
-    <Compile Include="Excel\Ranges\XLRangeColumns.cs" />
-    <Compile Include="Excel\Ranges\IXLRangeRows.cs" />
-    <Compile Include="Excel\Ranges\IXLRangeColumns.cs" />
-    <Compile Include="Excel\Ranges\IXLRangeColumn.cs" />
-    <Compile Include="Excel\Ranges\IXLRangeRow.cs" />
-    <Compile Include="Excel\Ranges\IXLRangeBase.cs" />
-    <Compile Include="Excel\Ranges\XLRangeBase.cs" />
-    <Compile Include="Excel\Rows\XLRowCollection.cs" />
-    <Compile Include="Excel\XLSheetProtection.cs" />
-    <Compile Include="Excel\XLSheetView.cs" />
-    <Compile Include="Excel\XLTheme.cs" />
-    <Compile Include="Excel\XLWorkbook_Load.cs" />
-    <Compile Include="Excel\PageSetup\IXLHeaderFooter.cs" />
-    <Compile Include="Excel\PageSetup\IXLHFItem.cs" />
-    <Compile Include="Excel\PageSetup\IXLPageSetup.cs" />
-    <Compile Include="Excel\PageSetup\IXLPrintAreas.cs" />
-    <Compile Include="Excel\PageSetup\XLPrintAreas.cs" />
-    <Compile Include="Excel\Ranges\IXLRanges.cs" />
-    <Compile Include="Excel\Ranges\XLRanges.cs" />
-    <Compile Include="Excel\Rows\IXLRow.cs" />
-    <Compile Include="Excel\PageSetup\XLHeaderFooter.cs" />
-    <Compile Include="Excel\PageSetup\XLHFItem.cs" />
-    <Compile Include="Excel\PageSetup\XLMargins.cs" />
-    <Compile Include="Excel\Rows\IXLRows.cs" />
-    <Compile Include="Excel\Rows\XLRows.cs" />
-    <Compile Include="Excel\Style\IXLAlignment.cs" />
-    <Compile Include="Excel\Style\IXLBorder.cs" />
-    <Compile Include="Excel\Style\IXLFill.cs" />
-    <Compile Include="Excel\Style\IXLNumberFormat.cs" />
-    <Compile Include="Excel\Style\XLAlignment.cs" />
-    <Compile Include="Excel\Style\XLBorder.cs" />
-    <Compile Include="Excel\Style\XLFill.cs" />
-    <Compile Include="Excel\Style\XLNumberFormat.cs" />
-    <Compile Include="Excel\Columns\XLColumnParameters.cs" />
-    <Compile Include="Excel\PageSetup\XLPageSetup.cs" />
-    <Compile Include="Excel\Ranges\XLRangeParameters.cs" />
-    <Compile Include="Excel\Rows\XLRowParameters.cs" />
-    <Compile Include="Excel\XLWorkbook_Save.cs" />
-    <Compile Include="Excel\Coordinates\IXLAddress.cs" />
-    <Compile Include="Excel\Cells\IXLCell.cs" />
-    <Compile Include="Excel\Columns\IXLColumn.cs" />
-    <Compile Include="Excel\Ranges\IXLRange.cs" />
-    <Compile Include="Excel\IXLWorksheet.cs" />
-    <Compile Include="Excel\IXLWorksheets.cs" />
-    <Compile Include="Excel\Style\IXLFont.cs" />
-    <Compile Include="Excel\Style\IXLStyle.cs" />
-    <Compile Include="Excel\Style\IXLStylized.cs" />
-    <Compile Include="Excel\Style\XLFont.cs" />
-    <Compile Include="Excel\Style\XLStyle.cs" />
-    <Compile Include="Excel\Coordinates\XLAddress.cs" />
-    <Compile Include="Excel\Cells\XLCell.cs" />
-    <Compile Include="Excel\Columns\XLColumn.cs" />
-    <Compile Include="Excel\Ranges\XLRange.cs" />
-    <Compile Include="Excel\Rows\XLRow.cs" />
-    <Compile Include="Excel\XLWorkbook.cs" />
-    <Compile Include="Excel\XLWorksheet.cs" />
-    <Compile Include="Excel\XLWorksheetInternals.cs" />
-    <Compile Include="Excel\XLWorkbookProperties.cs" />
-    <Compile Include="Excel\XLWorksheets.cs" />
-    <Compile Include="Excel\XLWSContentManager.cs" />
-    <Compile Include="Extensions.cs" />
-    <Compile Include="PathHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Excel\Drawings\Style\XLDrawingProperties.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ClosedXML.snk" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>IF EXIST $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(TargetDir)</PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/ClosedXML.snk b/ClosedXML/ClosedXML/ClosedXML/ClosedXML.snk
deleted file mode 100644
index a17cff7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/ClosedXML.snk
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLAutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLAutoFilter.cs
deleted file mode 100644
index 8859848..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLAutoFilter.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-namespace ClosedXML.Excel
-{
-    using System.Collections.Generic;
-
-    public interface IXLAutoFilter: IDisposable
-    {
-        IXLFilterColumn Column(String column);
-        IXLFilterColumn Column(Int32 column);
-
-        IXLAutoFilter Sort(Int32 columnToSortBy = 1, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        Boolean Sorted { get; set; }
-        XLSortOrder SortOrder { get; set; }
-        Int32 SortColumn { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLBaseAutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLBaseAutoFilter.cs
deleted file mode 100644
index b3f8d66..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLBaseAutoFilter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-namespace ClosedXML.Excel
-{
-    using System.Collections.Generic;
-    public enum XLFilterType { Regular, Custom, TopBottom, Dynamic }
-    public enum XLFilterDynamicType { AboveAverage, BelowAverage }
-    public enum XLTopBottomPart { Top, Bottom}
-    public interface IXLBaseAutoFilter
-    {
-        Boolean Enabled { get; set; }
-        IXLRange Range { get; set; }
-        IXLBaseAutoFilter Set(IXLRangeBase range);
-        IXLBaseAutoFilter Clear();
-
-        IXLFilterColumn Column(String column);
-        IXLFilterColumn Column(Int32 column);
-
-        IXLBaseAutoFilter Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        Boolean Sorted { get; set; }
-        XLSortOrder SortOrder { get; set; }
-        Int32 SortColumn { get; set; }
-
-
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLCustomFilteredColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLCustomFilteredColumn.cs
deleted file mode 100644
index 85cec03..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLCustomFilteredColumn.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-namespace ClosedXML.Excel
-{
-    public interface IXLCustomFilteredColumn
-    {
-        void EqualTo<T>(T value) where T : IComparable<T>;
-        void NotEqualTo<T>(T value) where T : IComparable<T>;
-        void GreaterThan<T>(T value) where T : IComparable<T>;
-        void LessThan<T>(T value) where T : IComparable<T>;
-        void EqualOrGreaterThan<T>(T value) where T : IComparable<T>;
-        void EqualOrLessThan<T>(T value) where T : IComparable<T>;
-        void BeginsWith(String value);
-        void NotBeginsWith(String value);
-        void EndsWith(String value);
-        void NotEndsWith(String value);
-        void Contains(String value);
-        void NotContains(String value);
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilterColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilterColumn.cs
deleted file mode 100644
index 159faf9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilterColumn.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-namespace ClosedXML.Excel
-{
-    public enum XLTopBottomType { Items, Percent }
-    public interface IXLFilterColumn
-    {
-        void Clear();
-
-        IXLFilteredColumn AddFilter<T>(T value) where T : IComparable<T>;
-
-        void Top(Int32 value, XLTopBottomType type = XLTopBottomType.Items);
-        void Bottom(Int32 value, XLTopBottomType type = XLTopBottomType.Items);
-        void AboveAverage();
-        void BelowAverage();
-
-        IXLFilterConnector EqualTo<T>(T value) where T : IComparable<T>;
-        IXLFilterConnector NotEqualTo<T>(T value) where T : IComparable<T>;
-        IXLFilterConnector GreaterThan<T>(T value) where T : IComparable<T>;
-        IXLFilterConnector LessThan<T>(T value) where T : IComparable<T>;
-        IXLFilterConnector EqualOrGreaterThan<T>(T value) where T : IComparable<T>;
-        IXLFilterConnector EqualOrLessThan<T>(T value) where T : IComparable<T>;
-        void Between<T>(T minValue, T maxValue) where T : IComparable<T>;
-        void NotBetween<T>(T minValue, T maxValue) where T : IComparable<T>;
-        IXLFilterConnector BeginsWith(String value);
-        IXLFilterConnector NotBeginsWith(String value);
-        IXLFilterConnector EndsWith(String value);
-        IXLFilterConnector NotEndsWith(String value);
-        IXLFilterConnector Contains(String value);
-        IXLFilterConnector NotContains(String value);
-
-        XLFilterType FilterType { get; set; }
-        Int32 TopBottomValue { get; set; }
-        XLTopBottomType TopBottomType { get; set; }
-        XLTopBottomPart TopBottomPart { get; set; }
-        XLFilterDynamicType DynamicType { get; set; }
-        Double DynamicValue { get; set; }
-
-        IXLFilterColumn SetFilterType(XLFilterType value);
-        IXLFilterColumn SetTopBottomValue(Int32 value);
-        IXLFilterColumn SetTopBottomType(XLTopBottomType value);
-        IXLFilterColumn SetTopBottomPart(XLTopBottomPart value);
-        IXLFilterColumn SetDynamicType(XLFilterDynamicType value);
-        IXLFilterColumn SetDynamicValue(Double value);
-
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilterConnector.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilterConnector.cs
deleted file mode 100644
index 7955869..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilterConnector.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLFilterConnector
-    {
-        IXLCustomFilteredColumn And { get; }
-        IXLCustomFilteredColumn Or { get; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilteredColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilteredColumn.cs
deleted file mode 100644
index 6491f55..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/IXLFilteredColumn.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-namespace ClosedXML.Excel
-{
-    public interface IXLFilteredColumn
-    {
-        IXLFilteredColumn AddFilter<T>(T value) where T : IComparable<T>;
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLAutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLAutoFilter.cs
deleted file mode 100644
index 79430e6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLAutoFilter.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections.Generic;
-
-    internal class XLAutoFilter : IXLBaseAutoFilter, IXLAutoFilter
-    {
-        private readonly Dictionary<Int32, XLFilterColumn> _columns = new Dictionary<int, XLFilterColumn>();
-
-        public XLAutoFilter()
-        {
-            Filters = new Dictionary<int, List<XLFilter>>();
-        }
-
-        public Dictionary<Int32, List<XLFilter>> Filters { get; private set; }
-
-        #region IXLAutoFilter Members
-
-        IXLAutoFilter IXLAutoFilter.Sort(Int32 columnToSortBy, XLSortOrder sortOrder, Boolean matchCase,
-                                         Boolean ignoreBlanks)
-        {
-            return Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks);
-        }
-
-        public void Dispose()
-        {
-            if (Range != null)
-                Range.Dispose();
-        }
-
-        #endregion
-
-        #region IXLBaseAutoFilter Members
-
-        public Boolean Enabled { get; set; }
-        public IXLRange Range { get; set; }
-
-        IXLBaseAutoFilter IXLBaseAutoFilter.Clear()
-        {
-            return Clear();
-        }
-
-        IXLBaseAutoFilter IXLBaseAutoFilter.Set(IXLRangeBase range)
-        {
-            return Set(range);
-        }
-
-        IXLBaseAutoFilter IXLBaseAutoFilter.Sort(Int32 columnToSortBy, XLSortOrder sortOrder, Boolean matchCase,
-                                                 Boolean ignoreBlanks)
-        {
-            return Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks);
-        }
-
-        public Boolean Sorted { get; set; }
-        public XLSortOrder SortOrder { get; set; }
-        public Int32 SortColumn { get; set; }
-
-        public IXLFilterColumn Column(String column)
-        {
-            return Column(XLHelper.GetColumnNumberFromLetter(column));
-        }
-
-        public IXLFilterColumn Column(Int32 column)
-        {
-            XLFilterColumn filterColumn;
-            if (!_columns.TryGetValue(column, out filterColumn))
-            {
-                filterColumn = new XLFilterColumn(this, column);
-                _columns.Add(column, filterColumn);
-            }
-
-            return filterColumn;
-        }
-
-        #endregion
-
-        public XLAutoFilter Set(IXLRangeBase range)
-        {
-            Range = range.AsRange();
-            Enabled = true;
-            return this;
-        }
-
-        public XLAutoFilter Clear()
-        {
-            Enabled = false;
-            Filters.Clear();
-            foreach (IXLRangeRow row in Range.Rows().Where(r => r.RowNumber() > 1))
-                row.WorksheetRow().Unhide();
-            return this;
-        }
-
-        public XLAutoFilter Sort(Int32 columnToSortBy, XLSortOrder sortOrder, Boolean matchCase, Boolean ignoreBlanks)
-        {
-            var ws = Range.Worksheet as XLWorksheet;
-            ws.SuspendEvents();
-            Range.Range(Range.FirstCell().CellBelow(), Range.LastCell()).Sort(columnToSortBy, sortOrder, matchCase,
-                                                                              ignoreBlanks);
-
-            Sorted = true;
-            SortOrder = sortOrder;
-            SortColumn = columnToSortBy;
-
-            if (Enabled)
-            {
-                using (var rows = Range.Rows(2, Range.RowCount()))
-                {
-                    foreach (IXLRangeRow row in rows)
-                        row.WorksheetRow().Unhide();
-                }
-
-                foreach (KeyValuePair<int, List<XLFilter>> kp in Filters)
-                {
-                    Boolean firstFilter = true;
-                    foreach (XLFilter filter in kp.Value)
-                    {
-                        Boolean isText = filter.Value is String;
-                        using (var rows = Range.Rows(2, Range.RowCount()))
-                        {
-                            foreach (IXLRangeRow row in rows)
-                            {
-                                Boolean match = isText
-                                                    ? filter.Condition(row.Cell(kp.Key).GetString())
-                                                    : row.Cell(kp.Key).DataType == XLCellValues.Number &&
-                                                      filter.Condition(row.Cell(kp.Key).GetDouble());
-                                if (firstFilter)
-                                {
-                                    if (match)
-                                        row.WorksheetRow().Unhide();
-                                    else
-                                        row.WorksheetRow().Hide();
-                                }
-                                else
-                                {
-                                    if (filter.Connector == XLConnector.And)
-                                    {
-                                        if (!row.WorksheetRow().IsHidden)
-                                        {
-                                            if (match)
-                                                row.WorksheetRow().Unhide();
-                                            else
-                                                row.WorksheetRow().Hide();
-                                        }
-                                    }
-                                    else if (match)
-                                        row.WorksheetRow().Unhide();
-                                }
-                            }
-                            firstFilter = false;
-                        }
-                    }
-                }
-            }
-            ws.ResumeEvents();
-            return this;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLCustomFilteredColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLCustomFilteredColumn.cs
deleted file mode 100644
index 26fd585..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLCustomFilteredColumn.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCustomFilteredColumn : IXLCustomFilteredColumn
-    {
-        private readonly XLAutoFilter _autoFilter;
-        private readonly Int32 _column;
-        private readonly XLConnector _connector;
-
-        public XLCustomFilteredColumn(XLAutoFilter autoFilter, Int32 column, XLConnector connector)
-        {
-            _autoFilter = autoFilter;
-            _column = column;
-            _connector = connector;
-        }
-
-        #region IXLCustomFilteredColumn Members
-
-        public void EqualTo<T>(T value) where T: IComparable<T>
-        {
-            if (typeof(T) == typeof(String))
-            {
-                ApplyCustomFilter(value, XLFilterOperator.Equal,
-                                  v =>
-                                  v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase));
-            }
-            else
-            {
-                ApplyCustomFilter(value, XLFilterOperator.Equal,
-                                  v => v.CastTo<T>().CompareTo(value) == 0);
-            }
-        }
-
-        public void NotEqualTo<T>(T value) where T: IComparable<T>
-        {
-            if (typeof(T) == typeof(String))
-            {
-                ApplyCustomFilter(value, XLFilterOperator.NotEqual,
-                                  v =>
-                                  !v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase));
-            }
-            else
-            {
-                ApplyCustomFilter(value, XLFilterOperator.NotEqual,
-                                  v => v.CastTo<T>().CompareTo(value) != 0);
-            }
-        }
-
-        public void GreaterThan<T>(T value) where T: IComparable<T>
-        {
-            ApplyCustomFilter(value, XLFilterOperator.GreaterThan,
-                              v => v.CastTo<T>().CompareTo(value) > 0);
-        }
-
-        public void LessThan<T>(T value) where T: IComparable<T>
-        {
-            ApplyCustomFilter(value, XLFilterOperator.LessThan, v => v.CastTo<T>().CompareTo(value) < 0);
-        }
-
-        public void EqualOrGreaterThan<T>(T value) where T: IComparable<T>
-        {
-            ApplyCustomFilter(value, XLFilterOperator.EqualOrGreaterThan,
-                              v => v.CastTo<T>().CompareTo(value) >= 0);
-        }
-
-        public void EqualOrLessThan<T>(T value) where T: IComparable<T>
-        {
-            ApplyCustomFilter(value, XLFilterOperator.EqualOrLessThan,
-                              v => v.CastTo<T>().CompareTo(value) <= 0);
-        }
-
-        public void BeginsWith(String value)
-        {
-            ApplyCustomFilter(value + "*", XLFilterOperator.Equal,
-                              s => ((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public void NotBeginsWith(String value)
-        {
-            ApplyCustomFilter(value + "*", XLFilterOperator.NotEqual,
-                              s =>
-                              !((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public void EndsWith(String value)
-        {
-            ApplyCustomFilter("*" + value, XLFilterOperator.Equal,
-                              s => ((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public void NotEndsWith(String value)
-        {
-            ApplyCustomFilter("*" + value, XLFilterOperator.NotEqual,
-                              s => !((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public void Contains(String value)
-        {
-            ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
-                              s => ((string)s).ToLower().Contains(value.ToLower()));
-        }
-
-        public void NotContains(String value)
-        {
-            ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
-                              s => !((string)s).ToLower().Contains(value.ToLower()));
-        }
-
-        #endregion
-
-        private void ApplyCustomFilter<T>(T value, XLFilterOperator op, Func<Object, Boolean> condition)
-            where T: IComparable<T>
-        {
-            _autoFilter.Filters[_column].Add(new XLFilter
-                                                 {
-                                                     Value = value,
-                                                     Operator = op,
-                                                     Connector = _connector,
-                                                     Condition = condition
-                                                 });
-            using (var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount()))
-            {
-                foreach (IXLRangeRow row in rows)
-                {
-                    if (_connector == XLConnector.And)
-                    {
-                        if (!row.WorksheetRow().IsHidden)
-                        {
-                            if (condition(row.Cell(_column).GetValue<T>()))
-                                row.WorksheetRow().Unhide().Dispose();
-                            else
-                                row.WorksheetRow().Hide().Dispose();
-                        }
-                    }
-                    else if (condition(row.Cell(_column).GetValue<T>()))
-                        row.WorksheetRow().Unhide().Dispose();
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilter.cs
deleted file mode 100644
index cf3d8b6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLConnector { And, Or }
-    public enum XLFilterOperator { Equal, NotEqual, GreaterThan, LessThan, EqualOrGreaterThan, EqualOrLessThan }
-    internal class XLFilter
-    {
-        public XLFilter(XLFilterOperator op = XLFilterOperator.Equal)
-        {
-            Operator = op;
-        }
-
-        public XLFilterOperator Operator { get; set; }
-        public Object Value { get; set; }
-        public XLConnector Connector { get; set; }
-        public Func<Object, Boolean> Condition { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilterColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilterColumn.cs
deleted file mode 100644
index 11eb172..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilterColumn.cs
+++ /dev/null
@@ -1,393 +0,0 @@
-using System;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections.Generic;
-
-    internal class XLFilterColumn : IXLFilterColumn
-    {
-        private readonly XLAutoFilter _autoFilter;
-        private readonly Int32 _column;
-
-        public XLFilterColumn(XLAutoFilter autoFilter, Int32 column)
-        {
-            _autoFilter = autoFilter;
-            _column = column;
-        }
-
-        #region IXLFilterColumn Members
-
-        public void Clear()
-        {
-            if (_autoFilter.Filters.ContainsKey(_column))
-                _autoFilter.Filters.Remove(_column);
-        }
-
-        public IXLFilteredColumn AddFilter<T>(T value) where T: IComparable<T>
-        {
-            if (typeof(T) == typeof(String))
-            {
-                ApplyCustomFilter(value, XLFilterOperator.Equal,
-                                  v =>
-                                  v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase),
-                                  XLFilterType.Regular);
-            }
-            else
-            {
-                ApplyCustomFilter(value, XLFilterOperator.Equal,
-                                  v => v.CastTo<T>().CompareTo(value) == 0, XLFilterType.Regular);
-            }
-            return new XLFilteredColumn(_autoFilter, _column);
-        }
-
-        public void Top(Int32 value, XLTopBottomType type = XLTopBottomType.Items)
-        {
-            _autoFilter.Column(_column).TopBottomPart = XLTopBottomPart.Top;
-            SetTopBottom(value, type);
-        }
-
-        public void Bottom(Int32 value, XLTopBottomType type = XLTopBottomType.Items)
-        {
-            _autoFilter.Column(_column).TopBottomPart = XLTopBottomPart.Bottom;
-            SetTopBottom(value, type, false);
-        }
-
-        public void AboveAverage()
-        {
-            ShowAverage(true);
-        }
-
-        public void BelowAverage()
-        {
-            ShowAverage(false);
-        }
-
-        public IXLFilterConnector EqualTo<T>(T value) where T: IComparable<T>
-        {
-            if (typeof(T) == typeof(String))
-            {
-                return ApplyCustomFilter(value, XLFilterOperator.Equal,
-                                         v =>
-                                         v.ToString().Equals(value.ToString(),
-                                                             StringComparison.InvariantCultureIgnoreCase));
-            }
-
-            return ApplyCustomFilter(value, XLFilterOperator.Equal,
-                                     v => v.CastTo<T>().CompareTo(value) == 0);
-        }
-
-        public IXLFilterConnector NotEqualTo<T>(T value) where T: IComparable<T>
-        {
-            if (typeof(T) == typeof(String))
-            {
-                return ApplyCustomFilter(value, XLFilterOperator.NotEqual,
-                                         v =>
-                                         !v.ToString().Equals(value.ToString(),
-                                                              StringComparison.InvariantCultureIgnoreCase));
-            }
-            
-            return ApplyCustomFilter(value, XLFilterOperator.NotEqual,
-                                        v => v.CastTo<T>().CompareTo(value) != 0);
-        }
-
-        public IXLFilterConnector GreaterThan<T>(T value) where T: IComparable<T>
-        {
-            return ApplyCustomFilter(value, XLFilterOperator.GreaterThan,
-                                     v => v.CastTo<T>().CompareTo(value) > 0);
-        }
-
-        public IXLFilterConnector LessThan<T>(T value) where T: IComparable<T>
-        {
-            return ApplyCustomFilter(value, XLFilterOperator.LessThan,
-                                     v => v.CastTo<T>().CompareTo(value) < 0);
-        }
-
-        public IXLFilterConnector EqualOrGreaterThan<T>(T value) where T: IComparable<T>
-        {
-            return ApplyCustomFilter(value, XLFilterOperator.EqualOrGreaterThan,
-                                     v => v.CastTo<T>().CompareTo(value) >= 0);
-        }
-
-        public IXLFilterConnector EqualOrLessThan<T>(T value) where T: IComparable<T>
-        {
-            return ApplyCustomFilter(value, XLFilterOperator.EqualOrLessThan,
-                                     v => v.CastTo<T>().CompareTo(value) <= 0);
-        }
-
-        public void Between<T>(T minValue, T maxValue) where T: IComparable<T>
-        {
-            EqualOrGreaterThan(minValue).And.EqualOrLessThan(maxValue);
-        }
-
-        public void NotBetween<T>(T minValue, T maxValue) where T: IComparable<T>
-        {
-            LessThan(minValue).Or.GreaterThan(maxValue);
-        }
-
-        public IXLFilterConnector BeginsWith(String value)
-        {
-            return ApplyCustomFilter(value + "*", XLFilterOperator.Equal,
-                                     s => ((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public IXLFilterConnector NotBeginsWith(String value)
-        {
-            return ApplyCustomFilter(value + "*", XLFilterOperator.NotEqual,
-                                     s => !((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public IXLFilterConnector EndsWith(String value)
-        {
-            return ApplyCustomFilter("*" + value, XLFilterOperator.Equal,
-                                     s => ((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public IXLFilterConnector NotEndsWith(String value)
-        {
-            return ApplyCustomFilter("*" + value, XLFilterOperator.NotEqual,
-                                     s => !((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        public IXLFilterConnector Contains(String value)
-        {
-            return ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
-                                     s => ((string)s).ToLower().Contains(value.ToLower()));
-        }
-
-        public IXLFilterConnector NotContains(String value)
-        {
-            return ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
-                                     s => !((string)s).ToLower().Contains(value.ToLower()));
-        }
-
-        public XLFilterType FilterType { get; set; }
-
-        public Int32 TopBottomValue { get; set; }
-        public XLTopBottomType TopBottomType { get; set; }
-        public XLTopBottomPart TopBottomPart { get; set; }
-
-        public XLFilterDynamicType DynamicType { get; set; }
-        public Double DynamicValue { get; set; }
-
-        #endregion
-
-        private void SetTopBottom(Int32 value, XLTopBottomType type, Boolean takeTop = true)
-        {
-            _autoFilter.Enabled = true;
-            _autoFilter.Column(_column).SetFilterType(XLFilterType.TopBottom)
-                                       .SetTopBottomValue(value)
-                                       .SetTopBottomType(type);
-
-            var values = GetValues(value, type, takeTop);
-
-            Clear();
-            _autoFilter.Filters.Add(_column, new List<XLFilter>());
-
-            Boolean addToList = true;
-            var ws = _autoFilter.Range.Worksheet as XLWorksheet;
-            ws.SuspendEvents();
-            var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount());
-                foreach (IXLRangeRow row in rows)
-                {
-                    Boolean foundOne = false;
-                    foreach (double val in values)
-                    {
-                        Func<Object, Boolean> condition = v => (v as IComparable).CompareTo(val) == 0;
-                        if (addToList)
-                        {
-                            _autoFilter.Filters[_column].Add(new XLFilter
-                                                                 {
-                                                                     Value = val,
-                                                                     Operator = XLFilterOperator.Equal,
-                                                                     Connector = XLConnector.Or,
-                                                                     Condition = condition
-                                                                 });
-                        }
-
-                        var cell = row.Cell(_column);
-                        if (cell.DataType != XLCellValues.Number || !condition(cell.GetDouble())) continue;
-                        row.WorksheetRow().Unhide();
-                        foundOne = true;
-                    }
-                    if (!foundOne)
-                        row.WorksheetRow().Hide();
-
-                    addToList = false;
-                }
-            ws.ResumeEvents();
-        }
-
-        private IEnumerable<double> GetValues(int value, XLTopBottomType type, bool takeTop)
-        {
-            using (var column = _autoFilter.Range.Column(_column))
-            {
-                using (var subColumn = column.Column(2, column.CellCount()))
-                {
-                    var cellsUsed = subColumn.CellsUsed(c => c.DataType == XLCellValues.Number);
-                    if (takeTop)
-                    {
-                        if (type == XLTopBottomType.Items)
-                        {
-                            return cellsUsed.Select(c => c.GetDouble()).OrderByDescending(d => d).Take(value).Distinct();
-                        }
-                        var numerics1 = cellsUsed.Select(c => c.GetDouble());
-                        Int32 valsToTake1 = numerics1.Count() * value / 100;
-                        return numerics1.OrderByDescending(d => d).Take(valsToTake1).Distinct();
-                    }
-
-                    if (type == XLTopBottomType.Items)
-                    {
-                        return cellsUsed.Select(c => c.GetDouble()).OrderBy(d => d).Take(value).Distinct();
-                    }
-
-                    var numerics = cellsUsed.Select(c => c.GetDouble());
-                    Int32 valsToTake = numerics.Count() * value / 100;
-                    return numerics.OrderBy(d => d).Take(valsToTake).Distinct();
-                }
-            }
-        }
-
-        private void ShowAverage(Boolean aboveAverage)
-        {
-            _autoFilter.Enabled = true;
-            _autoFilter.Column(_column).SetFilterType(XLFilterType.Dynamic)
-                .SetDynamicType(aboveAverage
-                                    ? XLFilterDynamicType.AboveAverage
-                                    : XLFilterDynamicType.BelowAverage);
-            var values = GetAverageValues(aboveAverage);
-
-
-            Clear();
-            _autoFilter.Filters.Add(_column, new List<XLFilter>());
-
-            Boolean addToList = true;
-            var ws = _autoFilter.Range.Worksheet as XLWorksheet;
-            ws.SuspendEvents();
-            var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount());
-            
-                foreach (IXLRangeRow row in rows)
-                {
-                    Boolean foundOne = false;
-                    foreach (double val in values)
-                    {
-                        Func<Object, Boolean> condition = v => (v as IComparable).CompareTo(val) == 0;
-                        if (addToList)
-                        {
-                            _autoFilter.Filters[_column].Add(new XLFilter
-                                                                 {
-                                                                     Value = val,
-                                                                     Operator = XLFilterOperator.Equal,
-                                                                     Connector = XLConnector.Or,
-                                                                     Condition = condition
-                                                                 });
-                        }
-
-                        var cell = row.Cell(_column);
-                        if (cell.DataType != XLCellValues.Number || !condition(cell.GetDouble())) continue;
-                        row.WorksheetRow().Unhide();
-                        foundOne = true;
-                    }
-
-                    if (!foundOne)
-                        row.WorksheetRow().Hide();
-
-                    addToList = false;
-                }
-            
-            ws.ResumeEvents();
-        }
-
-        private IEnumerable<double> GetAverageValues(bool aboveAverage)
-        {
-            using (var column = _autoFilter.Range.Column(_column))
-            {
-                using (var subColumn = column.Column(2, column.CellCount()))
-                {
-                    Double average = subColumn.CellsUsed(c => c.DataType == XLCellValues.Number).Select(c => c.GetDouble()).Average();
-
-                    if (aboveAverage)
-                    {
-                        return
-                            subColumn.CellsUsed(c => c.DataType == XLCellValues.Number).
-                                Select(c => c.GetDouble()).Where(c => c > average).Distinct();
-                    }
-
-                    return
-                        subColumn.CellsUsed(c => c.DataType == XLCellValues.Number).
-                            Select(c => c.GetDouble()).Where(c => c < average).Distinct();
-
-                }
-            }
-        }
-
-        private IXLFilterConnector ApplyCustomFilter<T>(T value, XLFilterOperator op, Func<Object, Boolean> condition,
-                                                        XLFilterType filterType = XLFilterType.Custom)
-            where T: IComparable<T>
-        {
-            _autoFilter.Enabled = true;
-            if (filterType == XLFilterType.Custom)
-            {
-                Clear();
-                _autoFilter.Filters.Add(_column,
-                                        new List<XLFilter>
-                                            {
-                                                new XLFilter
-                                                    {
-                                                        Value = value,
-                                                        Operator = op,
-                                                        Connector = XLConnector.Or,
-                                                        Condition = condition
-                                                    }
-                                            });
-            }
-            else
-            {
-                List<XLFilter> filterList;
-                if (_autoFilter.Filters.TryGetValue(_column, out filterList))
-                    filterList.Add(new XLFilter
-                                       {Value = value, Operator = op, Connector = XLConnector.Or, Condition = condition});
-                else
-                {
-                    _autoFilter.Filters.Add(_column,
-                                            new List<XLFilter>
-                                                {
-                                                    new XLFilter
-                                                        {
-                                                            Value = value,
-                                                            Operator = op,
-                                                            Connector = XLConnector.Or,
-                                                            Condition = condition
-                                                        }
-                                                });
-                }
-            }
-            _autoFilter.Column(_column).FilterType = filterType;
-            Boolean isText = typeof(T) == typeof(String);
-            var ws = _autoFilter.Range.Worksheet as XLWorksheet;
-            ws.SuspendEvents();
-            var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount());
-            foreach (IXLRangeRow row in rows)
-            {
-                Boolean match = isText
-                                    ? condition(row.Cell(_column).GetString())
-                                    : row.Cell(_column).DataType == XLCellValues.Number &&
-                                        condition(row.Cell(_column).GetDouble());
-                if (match)
-                    row.WorksheetRow().Unhide();
-                else
-                    row.WorksheetRow().Hide();
-            }
-            ws.ResumeEvents();
-            return new XLFilterConnector(_autoFilter, _column);
-        }
-
-        public IXLFilterColumn SetFilterType(XLFilterType value) { FilterType = value; return this; }
-        public IXLFilterColumn SetTopBottomValue(Int32 value) { TopBottomValue = value; return this; }
-        public IXLFilterColumn SetTopBottomType(XLTopBottomType value) { TopBottomType = value; return this; }
-        public IXLFilterColumn SetTopBottomPart(XLTopBottomPart value) { TopBottomPart = value; return this; }
-        public IXLFilterColumn SetDynamicType(XLFilterDynamicType value) { DynamicType = value; return this; }
-        public IXLFilterColumn SetDynamicValue(Double value) { DynamicValue = value; return this; }
-
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilterConnector.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilterConnector.cs
deleted file mode 100644
index b563fd5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilterConnector.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLFilterConnector : IXLFilterConnector
-    {
-        private readonly XLAutoFilter _autoFilter;
-        private readonly Int32 _column;
-
-        public XLFilterConnector(XLAutoFilter autoFilter, Int32 column)
-        {
-            _autoFilter = autoFilter;
-            _column = column;
-        }
-
-        #region IXLFilterConnector Members
-
-        public IXLCustomFilteredColumn And
-        {
-            get { return new XLCustomFilteredColumn(_autoFilter, _column, XLConnector.And); }
-        }
-
-        public IXLCustomFilteredColumn Or
-        {
-            get { return new XLCustomFilteredColumn(_autoFilter, _column, XLConnector.Or); }
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilteredColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilteredColumn.cs
deleted file mode 100644
index 72479d0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/AutoFilters/XLFilteredColumn.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLFilteredColumn : IXLFilteredColumn
-    {
-        private readonly XLAutoFilter _autoFilter;
-        private readonly Int32 _column;
-
-        public XLFilteredColumn(XLAutoFilter autoFilter, Int32 column)
-        {
-            _autoFilter = autoFilter;
-            _column = column;
-        }
-
-        #region IXLFilteredColumn Members
-
-        public IXLFilteredColumn AddFilter<T>(T value) where T: IComparable<T>
-        {
-            Func<Object, Boolean> condition;
-            Boolean isText;
-            if (typeof(T) == typeof(String))
-            {
-                condition = v => v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase);
-                isText = true;
-            }
-            else
-            {
-                condition = v => v.CastTo<T>().CompareTo(value) == 0;
-                isText = false;
-            }
-
-            _autoFilter.Filters[_column].Add(new XLFilter
-                                                 {
-                                                     Value = value,
-                                                     Condition = condition,
-                                                     Operator = XLFilterOperator.Equal,
-                                                     Connector = XLConnector.Or
-                                                 });
-
-            using (var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount()))
-            {
-                foreach (IXLRangeRow row in rows)
-                {
-                    if ((isText && condition(row.Cell(_column).GetString())) || (
-                                                                                    !isText &&
-                                                                                    row.Cell(_column).DataType ==
-                                                                                    XLCellValues.Number &&
-                                                                                    condition(
-                                                                                        row.Cell(_column).GetValue<T>()))
-                        )
-                        row.WorksheetRow().Unhide().Dispose();
-                }
-            }
-            return this;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/CalcEngine.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/CalcEngine.cs
deleted file mode 100644
index f646ddc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/CalcEngine.cs
+++ /dev/null
@@ -1,783 +0,0 @@
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Diagnostics;
-using System.Text;
-using System.Text.RegularExpressions;
-using ClosedXML.Excel.CalcEngine;
-using ClosedXML.Excel.CalcEngine.Functions;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    /// <summary>
-	/// CalcEngine parses strings and returns Expression objects that can 
-    /// be evaluated.
-	/// </summary>
-    /// <remarks>
-    /// <para>This class has three extensibility points:</para>
-    /// <para>Use the <b>DataContext</b> property to add an object's properties to the engine scope.</para>
-    /// <para>Use the <b>RegisterFunction</b> method to define custom functions.</para>
-    /// <para>Override the <b>GetExternalObject</b> method to add arbitrary variables to the engine scope.</para>
-    /// </remarks>
-	internal class CalcEngine
-	{
-		//---------------------------------------------------------------------------
-		#region ** fields
-
-		// members
-		string		_expr;				        // expression being parsed
-		int			_len;				        // length of the expression being parsed
-		int			_ptr;				        // current pointer into expression
-        string      _idChars;                   // valid characters in identifiers (besides alpha and digits)
-		Token		_token;				        // current token being parsed
-        Dictionary<object, Token> _tkTbl;       // table with tokens (+, -, etc)
-        Dictionary<string, FunctionDefinition>  _fnTbl;      // table with constants and functions (pi, sin, etc)
-        Dictionary<string, object> _vars;       // table with variables
-        object _dataContext;                    // object with properties
-        bool _optimize;                         // optimize expressions when parsing
-        ExpressionCache _cache;                 // cache with parsed expressions
-        CultureInfo _ci;                        // culture info used to parse numbers/dates
-        char _decimal, _listSep, _percent;                // localized decimal separator, list separator, percent sign
-
-        #endregion
-
-        //---------------------------------------------------------------------------
-        #region ** ctor
-
-        public CalcEngine()
-        {
-            CultureInfo = CultureInfo.InvariantCulture;
-            _tkTbl = GetSymbolTable();
-            _fnTbl = GetFunctionTable();
-            _vars = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-            _cache = new ExpressionCache(this);
-            _optimize = true;
-#if DEBUG
-            //this.Test();
-#endif
-        }
-        
-        #endregion
-
-        //---------------------------------------------------------------------------
-		#region ** object model
-
-		/// <summary>
-		/// Parses a string into an <see cref="Expression"/>.
-		/// </summary>
-		/// <param name="expression">String to parse.</param>
-        /// <returns>An <see cref="Expression"/> object that can be evaluated.</returns>
-		public Expression Parse(string expression)
-		{
-			// initialize
-			_expr = expression;
-			_len  = _expr.Length; 
-			_ptr  = 0;
-
-            // skip leading equals sign
-            if (_len > 0 && _expr[0] == '=')
-            {
-                _ptr++;
-            }
-
-			// parse the expression
-			var expr = ParseExpression();
-
-			// check for errors
-			if (_token.ID != TKID.END)
-			{
-                Throw();
-			}
-
-            // optimize expression
-            if (_optimize)
-            {
-                expr = expr.Optimize();
-            }
-
-            // done
-			return expr;
-		}
-        /// <summary>
-        /// Evaluates a string.
-        /// </summary>
-        /// <param name="expression">Expression to evaluate.</param>
-        /// <returns>The value of the expression.</returns>
-        /// <remarks>
-        /// If you are going to evaluate the same expression several times,
-        /// it is more efficient to parse it only once using the <see cref="Parse"/>
-        /// method and then using the Expression.Evaluate method to evaluate
-        /// the parsed expression.
-        /// </remarks>
-		public object Evaluate(string expression)
-		{
-            var x = //Parse(expression);
-                _cache != null
-                ? _cache[expression]
-                : Parse(expression);
-			return x.Evaluate();
-		}
-        /// <summary>
-        /// Gets or sets whether the calc engine should keep a cache with parsed
-        /// expressions.
-        /// </summary>
-        public bool CacheExpressions
-        {
-            get { return _cache != null; }
-            set
-            {
-                if (value != CacheExpressions)
-                {
-                    _cache = value
-                        ? new ExpressionCache(this)
-                        : null;
-                }
-            }
-        }
-        /// <summary>
-        /// Gets or sets whether the calc engine should optimize expressions when
-        /// they are parsed.
-        /// </summary>
-        public bool OptimizeExpressions
-        {
-            get { return _optimize; }
-            set { _optimize = value; }
-        }
-        /// <summary>
-        /// Gets or sets a string that specifies special characters that are valid for identifiers.
-        /// </summary>
-        /// <remarks>
-        /// Identifiers must start with a letter or an underscore, which may be followed by
-        /// additional letters, underscores, or digits. This string allows you to specify
-        /// additional valid characters such as ':' or '!' (used in Excel range references
-        /// for example).
-        /// </remarks>
-        public string IdentifierChars
-        {
-            get { return _idChars; }
-            set { _idChars = value; }
-        }
-        /// <summary>
-        /// Registers a function that can be evaluated by this <see cref="CalcEngine"/>.
-        /// </summary>
-        /// <param name="functionName">Function name.</param>
-        /// <param name="parmMin">Minimum parameter count.</param>
-        /// <param name="parmMax">Maximum parameter count.</param>
-        /// <param name="fn">Delegate that evaluates the function.</param>
-        public void RegisterFunction(string functionName, int parmMin, int parmMax, CalcEngineFunction fn)
-        {
-            _fnTbl.Add(functionName, new FunctionDefinition(parmMin, parmMax, fn));
-        }
-        /// <summary>
-        /// Registers a function that can be evaluated by this <see cref="CalcEngine"/>.
-        /// </summary>
-        /// <param name="functionName">Function name.</param>
-        /// <param name="parmCount">Parameter count.</param>
-        /// <param name="fn">Delegate that evaluates the function.</param>
-        public void RegisterFunction(string functionName, int parmCount, CalcEngineFunction fn)
-        {
-            RegisterFunction(functionName, parmCount, parmCount, fn);
-        }
-        /// <summary>
-        /// Gets an external object based on an identifier.
-        /// </summary>
-        /// <remarks>
-        /// This method is useful when the engine needs to create objects dynamically.
-        /// For example, a spreadsheet calc engine would use this method to dynamically create cell
-        /// range objects based on identifiers that cannot be enumerated at design time 
-        /// (such as "AB12", "A1:AB12", etc.)
-        /// </remarks>
-        public virtual object GetExternalObject(string identifier)
-        {
-            return null;
-        }
-        /// <summary>
-        /// Gets or sets the DataContext for this <see cref="CalcEngine"/>.
-        /// </summary>
-        /// <remarks>
-        /// Once a DataContext is set, all public properties of the object become available
-        /// to the CalcEngine, including sub-properties such as "Address.Street". These may
-        /// be used with expressions just like any other constant.
-        /// </remarks>
-        public virtual object DataContext
-        {
-            get { return _dataContext; }
-            set { _dataContext = value; }
-        }
-        /// <summary>
-        /// Gets the dictionary that contains function definitions.
-        /// </summary>
-        public Dictionary<string, FunctionDefinition> Functions
-        {
-            get { return _fnTbl; }
-        }
-        /// <summary>
-        /// Gets the dictionary that contains simple variables (not in the DataContext).
-        /// </summary>
-        public Dictionary<string, object> Variables
-        {
-            get { return _vars; }
-        }
-        /// <summary>
-        /// Gets or sets the <see cref="CultureInfo"/> to use when parsing numbers and dates.
-        /// </summary>
-        public CultureInfo CultureInfo
-        {
-            get { return _ci; }
-            set
-            {
-                _ci = value;
-                var nf = _ci.NumberFormat;
-                _decimal = nf.NumberDecimalSeparator[0];
-                _percent = nf.PercentSymbol[0];
-                _listSep = _ci.TextInfo.ListSeparator[0];
-            }
-        }
-
-		#endregion
-
-        //---------------------------------------------------------------------------
-        #region ** token/keyword tables
-
-        // build/get static token table
-        Dictionary<object, Token> GetSymbolTable()
-        {
-            if (_tkTbl == null)
-            {
-                _tkTbl = new Dictionary<object, Token>();
-                AddToken('&', TKID.CONCAT, TKTYPE.ADDSUB);
-                AddToken('+', TKID.ADD, TKTYPE.ADDSUB);
-                AddToken('-', TKID.SUB, TKTYPE.ADDSUB);
-                AddToken('(', TKID.OPEN, TKTYPE.GROUP);
-                AddToken(')', TKID.CLOSE, TKTYPE.GROUP);
-                AddToken('*', TKID.MUL, TKTYPE.MULDIV);
-                AddToken('.', TKID.PERIOD, TKTYPE.GROUP);
-                AddToken('/', TKID.DIV, TKTYPE.MULDIV);
-                AddToken('\\', TKID.DIVINT, TKTYPE.MULDIV);
-                AddToken('=', TKID.EQ, TKTYPE.COMPARE);
-                AddToken('>', TKID.GT, TKTYPE.COMPARE);
-                AddToken('<', TKID.LT, TKTYPE.COMPARE);
-                AddToken('^', TKID.POWER, TKTYPE.POWER);
-                AddToken("<>", TKID.NE, TKTYPE.COMPARE);
-                AddToken(">=", TKID.GE, TKTYPE.COMPARE);
-                AddToken("<=", TKID.LE, TKTYPE.COMPARE);
-                
-                // list separator is localized, not necessarily a comma
-                // so it can't be on the static table
-                //AddToken(',', TKID.COMMA, TKTYPE.GROUP);
-            }
-            return _tkTbl;
-        }
-        void AddToken(object symbol, TKID id, TKTYPE type)
-        {
-            var token = new Token(symbol, id, type);
-            _tkTbl.Add(symbol, token);
-        }
-
-        // build/get static keyword table
-        Dictionary<string, FunctionDefinition> GetFunctionTable()
-        {
-            if (_fnTbl == null)
-            {
-                // create table
-                _fnTbl = new Dictionary<string, FunctionDefinition>(StringComparer.InvariantCultureIgnoreCase);
-
-                // register built-in functions (and constants)
-                Is.Register(this);
-                Logical.Register(this);
-                MathTrig.Register(this);
-                Text.Register(this);
-                Statistical.Register(this);
-                DateAndTime.Register(this);
-            }
-            return _fnTbl;
-        }
-
-        #endregion
-
-        //---------------------------------------------------------------------------
-		#region ** private stuff
-
-		Expression ParseExpression()
-		{
-			GetToken();
-			return ParseCompare();
-		}
-		Expression ParseCompare()
-		{
-		    var x = ParseAddSub();
-			while (_token.Type == TKTYPE.COMPARE)
-			{
-		        var t = _token;
-				GetToken();
-				var exprArg = ParseAddSub();
-				x = new BinaryExpression(t, x, exprArg);
-			}
-			return x;
-		}
-		Expression ParseAddSub()
-		{
-			var x = ParseMulDiv();
-			while (_token.Type == TKTYPE.ADDSUB)
-			{
-		        var t = _token;
-				GetToken();
-				var exprArg = ParseMulDiv();
-				x = new BinaryExpression(t, x, exprArg);
-			}
-			return x;
-        }
-		Expression ParseMulDiv()
-		{
-			var x = ParsePower();
-			while (_token.Type == TKTYPE.MULDIV)
-			{
-		        var t = _token;
-				GetToken();
-				var a = ParsePower();
-				x = new BinaryExpression(t, x, a);
-			}
-			return x;
-        }
-		Expression ParsePower()
-		{
-			var x = ParseUnary();
-		    while (_token.Type == TKTYPE.POWER)
-			{
-		        var t = _token;
-				GetToken();
-				var a = ParseUnary();
-				x = new BinaryExpression(t, x, a);
-			}
-			return x;
-		}
- 		Expression ParseUnary()
-		{ 
-			// unary plus and minus
-			if (_token.ID == TKID.ADD || _token.ID == TKID.SUB)
-			{
-				var t = _token;
-		        GetToken();
-                var a = ParseAtom();
-                return new UnaryExpression(t, a);
-			}
-
-			// not unary, return atom
-			return ParseAtom();
-		}
-		Expression ParseAtom()
-		{
-            string id;
-            Expression x = null;
-            FunctionDefinition fnDef = null;
-
-			switch (_token.Type)
-			{
-				// literals
-				case TKTYPE.LITERAL:
-					x = new Expression(_token);
-					break;
-
-                // identifiers
-                case TKTYPE.IDENTIFIER:
-
-                    // get identifier
-                    id = (string)_token.Value;
-
-                    // look for functions
-                    if (_fnTbl.TryGetValue(id, out fnDef))
-                    {
-                        var p = GetParameters();
-                        var pCnt = p == null ? 0 : p.Count;
-                        if (fnDef.ParmMin != -1 && pCnt < fnDef.ParmMin)
-                        {
-                            Throw("Too few parameters.");
-                        }
-                        if (fnDef.ParmMax != -1 && pCnt > fnDef.ParmMax)
-                        {
-                            Throw("Too many parameters.");
-                        }
-                        x = new FunctionExpression(fnDef, p);
-                        break;
-                    }
-
-                    // look for simple variables (much faster than binding!)
-                    if (_vars.ContainsKey(id))
-                    {
-                        x = new VariableExpression(_vars, id);
-                        break;
-                    }
-
-                    // look for external objects
-                    var xObj = GetExternalObject(id);
-                    if (xObj != null)
-                    {
-                        x = new XObjectExpression(xObj);
-                        break;
-                    }
-
-                    // look for bindings
-                    if (DataContext != null)
-                    {
-                        var list = new List<BindingInfo>();
-                        for (var t = _token; t != null; t = GetMember())
-                        {
-                            list.Add(new BindingInfo((string)t.Value, GetParameters()));
-                        }
-                        x = new BindingExpression(this, list, _ci);
-                        break;
-                    }
-                    Throw("Unexpected identifier");
-                    break;
-
-		        // sub-expressions
-		        case TKTYPE.GROUP:
-
-                    // anything other than opening parenthesis is illegal here
-					if (_token.ID != TKID.OPEN)
-					{
-                        Throw("Expression expected.");
-                    }
-
-					// get expression
-					GetToken();
-					x = ParseCompare();
-
-					// check that the parenthesis was closed
-					if (_token.ID != TKID.CLOSE)
-					{
-						Throw("Unbalanced parenthesis.");
-					}
-
-					break;
-		    }
-
-            // make sure we got something...
-            if (x == null)
-            {
-                Throw();
-            }
-
-			// done
-			GetToken();
-			return x;
-		}
-
-		#endregion
-
-		//---------------------------------------------------------------------------
-		#region ** parser
-
-        void GetToken()
-        {
-			// eat white space 
-			while (_ptr < _len && _expr[_ptr] <= ' ')
-			{
-				_ptr++;
-			}
-
-			// are we done?
-			if (_ptr >= _len)
-			{
-                _token = new Token(null, TKID.END, TKTYPE.GROUP);
-				return;
-			}
-
-			// prepare to parse
-            int i;
-			var c = _expr[_ptr];
-
-			// operators
-			// this gets called a lot, so it's pretty optimized.
-			// note that operators must start with non-letter/digit characters.
-            var isLetter = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
-            var isDigit = c >= '0' && c <= '9';
-			if (!isLetter && !isDigit)
-			{
-				// if this is a number starting with a decimal, don't parse as operator
-                var nxt = _ptr + 1 < _len ? _expr[_ptr + 1] : 0;
-                bool isNumber = c == _decimal && nxt >= '0' && nxt <= '9';
-				if (!isNumber)
-				{
-                    // look up localized list separator
-                    if (c == _listSep)
-                    {
-                        _token = new Token(c, TKID.COMMA, TKTYPE.GROUP);
-                        _ptr++;
-                        return;
-                    }
-                    
-                    // look up single-char tokens on table
-                    Token tk;
-                    if (_tkTbl.TryGetValue(c, out tk))
-					{
-						// save token we found
-						_token = tk;
-						_ptr++;
-
-						// look for double-char tokens (special case)
-						if (_ptr < _len && (c == '>' || c == '<'))
-						{
-                            if (_tkTbl.TryGetValue(_expr.Substring(_ptr - 1, 2), out tk))
-							{
-								_token = tk;
-								_ptr++;
-							}
-						}
-
-                        // found token on the table
-						return;
-					}
-				}
-			}
-
-			// parse numbers
-            if (isDigit || c == _decimal)
-			{
-				var sci = false;
-                var pct = false;
-                var div = -1.0; // use double, not int (this may get really big)
-                var val = 0.0;
-                for (i = 0; i + _ptr < _len; i++)
-				{
-					c = _expr[_ptr + i];
-
-                    // digits always OK
-                    if (c >= '0' && c <= '9')
-                    {
-                        val = val * 10 + (c - '0');
-                        if (div > -1)
-                        {
-                            div *= 10;
-                        }
-                        continue;
-                    }
-
-					// one decimal is OK
-                    if (c == _decimal && div < 0)
-					{
-						div = 1;
-						continue;
-					}
-                    
-					// scientific notation?
-					if ((c == 'E' || c == 'e') && !sci) 
-					{
-						sci = true;
-						c = _expr[_ptr + i + 1];
-						if (c == '+' || c == '-') i++;
-						continue;
-					}
-
-                    // percentage?
-                    if (c == _percent)
-                    {
-                        pct = true;
-                        i++;
-                        break;
-                    }
-
-					// end of literal
-					break;
-				}
-
-                // end of number, get value
-                if (!sci)
-                {
-                    // much faster than ParseDouble
-                    if (div > 1)
-                    {
-                        val /= div;
-                    }
-                    if (pct)
-                    {
-                        val /= 100.0;
-                    }
-                }
-                else
-                {
-                    var lit = _expr.Substring(_ptr, i);
-                    val = ParseDouble(lit, _ci);
-                }
-
-                // build token
-                _token = new Token(val, TKID.ATOM, TKTYPE.LITERAL);
-
-                // advance pointer and return
-                _ptr += i;
-                return;
-			}
-
-			// parse strings
-			if (c == '\"')
-			{
-				// look for end quote, skip double quotes
-				for (i = 1; i + _ptr < _len; i++)
-				{
-					c = _expr[_ptr + i];
-					if (c != '\"') continue;
-					char cNext = i + _ptr < _len - 1 ? _expr[_ptr + i + 1]: ' ';
-					if (cNext != '\"') break;
-					i++;
-				}
-
-				// check that we got the end of the string
-				if (c != '\"')
-				{
-					Throw("Can't find final quote.");
-				}
-
-				// end of string
-				var lit = _expr.Substring(_ptr + 1, i - 1);
-				_ptr += i + 1;
-                _token = new Token(lit.Replace("\"\"", "\""), TKID.ATOM, TKTYPE.LITERAL);
-				return;
-			}
-
-			// parse dates (review)
-			if (c == '#')
-			{
-				// look for end #
-				for (i = 1; i + _ptr < _len; i++)
-				{
-					c = _expr[_ptr + i];
-					if (c == '#') break;
-				}
-
-				// check that we got the end of the date
-				if (c != '#') 
-				{
-					Throw("Can't find final date delimiter ('#').");
-				}
-
-				// end of date
-				var lit = _expr.Substring(_ptr + 1, i - 1);
-				_ptr += i + 1;
-                _token = new Token(DateTime.Parse(lit, _ci), TKID.ATOM, TKTYPE.LITERAL);
-				return;
-			}
-
-            // identifiers (functions, objects) must start with alpha or underscore
-            if (!isLetter && c != '_' && (_idChars == null || _idChars.IndexOf(c) < 0))
-            {
-                Throw("Identifier expected.");
-            }
-
-            // and must contain only letters/digits/_idChars
-            for (i = 1; i + _ptr < _len; i++)
-            {
-                c = _expr[_ptr + i];
-                isLetter = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
-                isDigit = c >= '0' && c <= '9';
-                if (!isLetter && !isDigit && c != '_' && (_idChars == null || _idChars.IndexOf(c) < 0))
-                {
-                    break;
-                }
-            }
-
-            // got identifier
-            var id = _expr.Substring(_ptr, i);
-            _ptr += i;
-            _token = new Token(id, TKID.ATOM, TKTYPE.IDENTIFIER);
-		}
-        static double ParseDouble(string str, CultureInfo ci)
-        {
-            if (str.Length > 0 && str[str.Length - 1] == ci.NumberFormat.PercentSymbol[0])
-            {
-                str = str.Substring(0, str.Length - 1);
-                return double.Parse(str, NumberStyles.Any, ci) / 100.0;
-            }
-            return double.Parse(str, NumberStyles.Any, ci);
-        }
-        List<Expression> GetParameters() // e.g. myfun(a, b, c+2)
-		{
-			// check whether next token is a (, 
-			// restore state and bail if it's not
-			var pos  = _ptr;
-			var tk = _token;
-			GetToken();
-			if (_token.ID != TKID.OPEN)
-			{
-                _ptr = pos;
-                _token = tk;
-				return null;
-			}
-
-			// check for empty Parameter list
-			pos = _ptr;
-			GetToken();
-            if (_token.ID == TKID.CLOSE)
-            {
-                return null;
-            }
-			_ptr = pos;
-
-			// get Parameters until we reach the end of the list
-            var parms = new List<Expression>();
-			var expr = ParseExpression();
-			parms.Add(expr);
-			while (_token.ID == TKID.COMMA)
-			{
-				expr = ParseExpression();
-				parms.Add(expr);
-			}
-
-			// make sure the list was closed correctly
-			if (_token.ID != TKID.CLOSE)
-			{
-                Throw();
-			}
-
-			// done
-			return parms;
-    	}
-        Token GetMember()
-        {
-            // check whether next token is a MEMBER token ('.'), 
-            // restore state and bail if it's not
-            var pos = _ptr;
-            var tk = _token;
-            GetToken();
-            if (_token.ID != TKID.PERIOD)
-            {
-                _ptr = pos;
-                _token = tk;
-                return null;
-            }
-
-            // skip member token
-            GetToken();
-            if (_token.Type != TKTYPE.IDENTIFIER)
-            {
-                Throw("Identifier expected");
-            }
-            return _token;
-        }
-
-		#endregion
-
-		//---------------------------------------------------------------------------
-		#region ** static helpers
-
-        static void Throw()
-        {
-            Throw("Syntax error.");
-        }
-        static void Throw(string msg)
-        {
-            throw new Exception(msg);
-        }
-
-        #endregion
-	}
-
-    /// <summary>
-    /// Delegate that represents CalcEngine functions.
-    /// </summary>
-    /// <param name="parms">List of <see cref="Expression"/> objects that represent the
-    /// parameters to be used in the function call.</param>
-    /// <returns>The function result.</returns>
-    internal delegate object CalcEngineFunction(List<Expression> parms);
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Expression.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Expression.cs
deleted file mode 100644
index 6f078c2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Expression.cs
+++ /dev/null
@@ -1,505 +0,0 @@
-using System;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-using ClosedXML.Excel.CalcEngine;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-	/// <summary>
-	/// Base class that represents parsed expressions.
-	/// </summary>
-	/// <remarks>
-	/// For example:
-	/// <code>
-	/// Expression expr = scriptEngine.Parse(strExpression);
-	/// object val = expr.Evaluate();
-	/// </code>
-	/// </remarks>
-	internal class Expression : IComparable<Expression>
-	{
-		//---------------------------------------------------------------------------
-		#region ** fields
-
-		internal Token _token;
-		static CultureInfo _ci = CultureInfo.InvariantCulture;
-
-		#endregion
-
-		//---------------------------------------------------------------------------
-		#region ** ctors
-
-		internal Expression()
-		{
-			_token = new Token(null, TKID.ATOM, TKTYPE.IDENTIFIER);
-		}
-		internal Expression(object value)
-		{
-			_token = new Token(value, TKID.ATOM, TKTYPE.LITERAL);
-		}
-		internal Expression(Token tk)
-		{
-			_token = tk;
-		}
-
-		#endregion
-
-		//---------------------------------------------------------------------------
-		#region ** object model
-
-		public virtual object Evaluate()
-		{
-			if (_token.Type != TKTYPE.LITERAL)
-			{
-				throw new ArgumentException("Bad expression.");
-			}
-			return _token.Value;
-		}
-		public virtual Expression Optimize()
-		{
-			return this;
-		}
-
-		#endregion
-
-		//---------------------------------------------------------------------------
-		#region ** implicit converters
-
-		public static implicit operator string(Expression x)
-		{
-			var v = x.Evaluate();
-			return v == null ? string.Empty : v.ToString();
-		}
-		public static implicit operator double(Expression x)
-		{
-			// evaluate
-			var v = x.Evaluate();
-
-			// handle doubles
-			if (v is double)
-			{
-				return (double)v;
-			}
-
-			// handle booleans
-			if (v is bool)
-			{
-				return (bool)v ? 1 : 0;
-			}
-
-			// handle dates
-			if (v is DateTime)
-			{
-				return ((DateTime)v).ToOADate();
-			}
-
-			// handle nulls
-			if (v == null || v is String)
-			{
-				return 0;
-			}
-
-			// handle everything else
-			return (double)Convert.ChangeType(v, typeof(double), _ci);
-		}
-		public static implicit operator bool(Expression x)
-		{
-			// evaluate
-			var v = x.Evaluate();
-
-			// handle booleans
-			if (v is bool)
-			{
-				return (bool)v;
-			}
-
-			// handle nulls
-			if (v == null)
-			{
-				return false;
-			}
-
-			// handle doubles
-			if (v is double)
-			{
-				return (double)v == 0 ? false : true;
-			}
-
-			// handle everything else
-			return (double)x == 0 ? false : true;
-		}
-		public static implicit operator DateTime(Expression x)
-		{
-			// evaluate
-			var v = x.Evaluate();
-
-			// handle dates
-			if (v is DateTime)
-			{
-				return (DateTime)v;
-			}
-
-			// handle doubles
-			if (v is double)
-			{
-				return DateTime.FromOADate((double)x);
-			}
-
-			// handle everything else
-			return (DateTime)Convert.ChangeType(v, typeof(DateTime), _ci);
-		}
-
-		#endregion
-
-		//---------------------------------------------------------------------------
-		#region ** IComparable<Expression>
-
-		public int CompareTo(Expression other)
-		{
-			// get both values
-			var c1 = this.Evaluate() as IComparable;
-			var c2 = other.Evaluate() as IComparable;
-
-			// handle nulls
-			if (c1 == null && c2 == null)
-			{
-				return 0;
-			}
-			if (c2 == null)
-			{
-				return -1;
-			}
-			if (c1 == null)
-			{
-				return +1;
-			}
-
-			// make sure types are the same
-			if (c1.GetType() != c2.GetType())
-			{
-				c2 = Convert.ChangeType(c2, c1.GetType()) as IComparable;
-			}
-
-			// compare
-			return c1.CompareTo(c2);
-		}
-
-		#endregion
-	}
-	/// <summary>
-	/// Unary expression, e.g. +123
-	/// </summary>
-	class UnaryExpression : Expression
-	{
-		// ** fields
-		Expression	_expr;
-
-		// ** ctor
-		public UnaryExpression(Token tk, Expression expr) : base(tk)
-		{
-			_expr = expr;
-		}
-
-		// ** object model
-		override public object Evaluate()
-		{
-			switch (_token.ID)
-			{
-				case TKID.ADD:
-					return +(double)_expr;
-				case TKID.SUB:
-					return -(double)_expr;
-			}
-			throw new ArgumentException("Bad expression.");
-		}
-		public override Expression Optimize()
-		{
-			_expr = _expr.Optimize();
-			return _expr._token.Type == TKTYPE.LITERAL
-				? new Expression(this.Evaluate())
-				: this;
-		}
-	}
-	/// <summary>
-	/// Binary expression, e.g. 1+2
-	/// </summary>
-	class BinaryExpression : Expression
-	{
-		// ** fields
-		Expression	_lft;
-		Expression	_rgt;
-
-		// ** ctor
-		public BinaryExpression(Token tk, Expression exprLeft, Expression exprRight) : base(tk)
-		{
-			_lft  = exprLeft;
-			_rgt = exprRight;
-		}
-
-		// ** object model
-		override public object Evaluate()
-		{
-			// handle comparisons
-			if (_token.Type == TKTYPE.COMPARE)
-			{
-				var cmp = _lft.CompareTo(_rgt);
-				switch (_token.ID)
-				{
-					case TKID.GT: return cmp > 0;
-					case TKID.LT: return cmp < 0;
-					case TKID.GE: return cmp >= 0;
-					case TKID.LE: return cmp <= 0;
-					case TKID.EQ: return cmp == 0;
-					case TKID.NE: return cmp != 0;
-				}
-			}
-
-			// handle everything else
-			switch (_token.ID)
-			{
-				case TKID.CONCAT:
-					return (string)_lft + (string)_rgt;
-				case TKID.ADD: 
-					return (double)_lft + (double)_rgt;
-				case TKID.SUB: 
-					return (double)_lft - (double)_rgt;
-				case TKID.MUL: 
-					return (double)_lft * (double)_rgt;
-				case TKID.DIV: 
-					return (double)_lft / (double)_rgt;
-				case TKID.DIVINT: 
-					return (double)(int)((double)_lft / (double)_rgt);
-				case TKID.MOD: 
-					return (double)(int)((double)_lft % (double)_rgt);
-				case TKID.POWER:
-					var a = (double)_lft;
-					var b = (double)_rgt;
-					if (b == 0.0) return 1.0;
-					if (b == 0.5) return Math.Sqrt(a);
-					if (b == 1.0) return a;
-					if (b == 2.0) return a * a;
-					if (b == 3.0) return a * a * a;
-					if (b == 4.0) return a * a * a * a;
-					return Math.Pow((double)_lft, (double)_rgt);
-			}
-			throw new ArgumentException("Bad expression.");
-		}
-		public override Expression Optimize()
-		{
-			_lft = _lft.Optimize();
-			_rgt = _rgt.Optimize();
-			return _lft._token.Type == TKTYPE.LITERAL && _rgt._token.Type == TKTYPE.LITERAL
-				? new Expression(this.Evaluate())
-				: this;
-		}
-	}
-	/// <summary>
-	/// Function call expression, e.g. sin(0.5)
-	/// </summary>
-	class FunctionExpression : Expression
-	{
-		// ** fields
-		FunctionDefinition _fn;
-		List<Expression> _parms;
-
-		// ** ctor
-		internal FunctionExpression()
-		{
-		}
-		public FunctionExpression(FunctionDefinition function, List<Expression> parms)
-		{
-			_fn = function;
-			_parms = parms;
-		}
-
-		// ** object model
-		override public object Evaluate()
-		{
-			return _fn.Function(_parms);
-		}
-		public override Expression Optimize()
-		{
-			bool allLits = true;
-			if (_parms != null)
-			{
-				for (int i = 0; i < _parms.Count; i++)
-				{
-					var p = _parms[i].Optimize();
-					_parms[i] = p;
-					if (p._token.Type != TKTYPE.LITERAL)
-					{
-						allLits = false;
-					}
-				}
-			}
-			return allLits
-				? new Expression(this.Evaluate())
-				: this;
-		}
-	}
-	/// <summary>
-	/// Simple variable reference.
-	/// </summary>
-	class VariableExpression : Expression
-	{
-		Dictionary<string, object> _dct;
-		string _name;
-
-		public VariableExpression(Dictionary<string, object> dct, string name)
-		{
-			_dct = dct;
-			_name = name;
-		}
-		public override object Evaluate()
-		{
-			return _dct[_name];
-		}
-	}
-	/// <summary>
-	/// Expression based on an object's properties.
-	/// </summary>
-	class BindingExpression : Expression
-	{
-		CalcEngine _ce;
-		CultureInfo _ci;
-		List<BindingInfo> _bindingPath;
-
-		// ** ctor
-		internal BindingExpression(CalcEngine engine, List<BindingInfo> bindingPath, CultureInfo ci)
-		{
-			_ce = engine;
-			_bindingPath = bindingPath;
-			_ci = ci;
-		}
-
-		// ** object model
-		override public object Evaluate()
-		{
-			return GetValue(_ce.DataContext);
-		}
-
-		// ** implementation
-		object GetValue(object obj)
-		{
-			const BindingFlags bf =
-				BindingFlags.IgnoreCase |
-				BindingFlags.Instance |
-				BindingFlags.Public |
-				BindingFlags.Static;
-
-			if (obj != null)
-			{
-				foreach (var bi in _bindingPath)
-				{
-					// get property
-					if (bi.PropertyInfo == null)
-					{
-						bi.PropertyInfo = obj.GetType().GetProperty(bi.Name, bf);
-					}
-
-					// get object
-					try
-					{
-						obj = bi.PropertyInfo.GetValue(obj, null);
-					}
-					catch
-					{
-						// REVIEW: is this needed?
-						System.Diagnostics.Debug.Assert(false, "shouldn't happen!");
-						bi.PropertyInfo = obj.GetType().GetProperty(bi.Name, bf);
-						bi.PropertyInfoItem = null;
-						obj = bi.PropertyInfo.GetValue(obj, null);
-					}
-
-					// handle indexers (lists and dictionaries)
-					if (bi.Parms != null && bi.Parms.Count > 0)
-					{
-						// get indexer property (always called "Item")
-						if (bi.PropertyInfoItem == null)
-						{
-							bi.PropertyInfoItem = obj.GetType().GetProperty("Item", bf);
-						}
-
-						// get indexer parameters
-						var pip = bi.PropertyInfoItem.GetIndexParameters();
-						var list = new List<object>();
-						for (int i = 0; i < pip.Length; i++)
-						{
-							var pv = bi.Parms[i].Evaluate();
-							pv = Convert.ChangeType(pv, pip[i].ParameterType, _ci);
-							list.Add(pv);
-						}
-
-						// get value
-						obj = bi.PropertyInfoItem.GetValue(obj, list.ToArray());
-					}
-				}
-			}
-
-			// all done
-			return obj;
-		}
-	}
-	/// <summary>
-	/// Helper used for building BindingExpression objects.
-	/// </summary>
-	class BindingInfo
-	{
-		public BindingInfo(string member, List<Expression> parms)
-		{
-			Name = member;
-			Parms = parms;
-		}
-		public string Name { get; set; }
-		public PropertyInfo PropertyInfo { get; set; }
-		public PropertyInfo PropertyInfoItem { get; set; }
-		public List<Expression> Parms { get; set; }
-	}
-	/// <summary>
-	/// Expression that represents an external object.
-	/// </summary>
-	class XObjectExpression : 
-		Expression, 
-		IEnumerable
-	{
-		object _value;
-
-		// ** ctor
-		internal XObjectExpression(object value)
-		{
-			_value = value;
-		}
-
-		public object Value { get { return _value; } }
-
-		// ** object model
-		public override object Evaluate()
-		{
-			// use IValueObject if available
-			var iv = _value as IValueObject;
-			if (iv != null)
-			{
-				return iv.GetValue();
-			}
-
-			// return raw object
-			return _value;
-		}
-		public IEnumerator GetEnumerator()
-		{
-		    return (_value as IEnumerable).GetEnumerator();
-		}
-	}
-	/// <summary>
-	/// Interface supported by external objects that have to return a value
-	/// other than themselves (e.g. a cell range object should return the 
-	/// cell content instead of the range itself).
-	/// </summary>
-	public interface IValueObject
-	{
-		object GetValue();
-	}
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/ExpressionCache.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/ExpressionCache.cs
deleted file mode 100644
index 3c7fd00..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/ExpressionCache.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    /// <summary>
-    /// Caches expressions based on their string representation.
-    /// This saves parsing time.
-    /// </summary>
-    /// <remarks>
-    /// Uses weak references to avoid accumulating unused expressions.
-    /// </remarks>
-    class ExpressionCache
-    {
-        Dictionary<string, WeakReference> _dct;
-        CalcEngine _ce;
-        int _hitCount;
-
-        public ExpressionCache(CalcEngine ce)
-        {
-            _ce = ce;
-            _dct = new Dictionary<string, WeakReference>();
-        }
-
-        // gets the parsed version of a string expression
-        public Expression this[string expression]
-        {
-            get
-            {
-                Expression x;
-                WeakReference wr;
-                if (_dct.TryGetValue(expression, out wr) && wr.IsAlive)
-                {
-                    x = wr.Target as Expression;
-                }
-                else
-                {
-                    // remove all dead references from dictionary
-                    if (wr != null && _dct.Count > 100 && _hitCount++ > 100)
-                    {
-                        RemoveDeadReferences();
-                        _hitCount = 0;
-                    }
-
-                    // store this expression
-                    x = _ce.Parse(expression);
-                    _dct[expression] = new WeakReference(x);
-                }
-                return x;
-            }
-        }
-
-        // remove all dead references from the cache
-        void RemoveDeadReferences()
-        {
-            for (bool done = false; !done; )
-            {
-                done = true;
-                foreach (var k in _dct.Keys)
-                {
-                    if (!_dct[k].IsAlive)
-                    {
-                        _dct.Remove(k);
-                        done = false;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/FunctionDefinition.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/FunctionDefinition.cs
deleted file mode 100644
index fc02182..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/FunctionDefinition.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    /// <summary>
-    /// Function definition class (keeps function name, parameter counts, and delegate).
-    /// </summary>
-    internal class FunctionDefinition
-    {
-        // ** fields
-        public int ParmMin, ParmMax;
-        public CalcEngineFunction Function;
-
-        // ** ctor
-        public FunctionDefinition(int parmMin, int parmMax, CalcEngineFunction function)
-        {
-            ParmMin = parmMin;
-            ParmMax = parmMax;
-            Function = function;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Database.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Database.cs
deleted file mode 100644
index c7aed5f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Database.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine.Functions
-{
-    internal static class Database
-    {
-        public static void Register(CalcEngine ce)
-        {
-            //ce.RegisterFunction("DAVERAGE", 3, Daverage); // Returns the average of selected database entries
-            //ce.RegisterFunction("DCOUNT", 1, Dcount); // Counts the cells that contain numbers in a database
-            //ce.RegisterFunction("DCOUNTA", 1, Dcounta); // Counts nonblank cells in a database
-            //ce.RegisterFunction("DGET", 1, Dget); // Extracts from a database a single record that matches the specified criteria
-            //ce.RegisterFunction("DMAX", 1, Dmax); // Returns the maximum value from selected database entries
-            //ce.RegisterFunction("DMIN", 1, Dmin); // Returns the minimum value from selected database entries
-            //ce.RegisterFunction("DPRODUCT", 1, Dproduct); // Multiplies the values in a particular field of records that match the criteria in a database
-            //ce.RegisterFunction("DSTDEV", 1, Dstdev); // Estimates the standard deviation based on a sample of selected database entries
-            //ce.RegisterFunction("DSTDEVP", 1, Dstdevp); // Calculates the standard deviation based on the entire population of selected database entries
-            //ce.RegisterFunction("DSUM", 1, Dsum); // Adds the numbers in the field column of records in the database that match the criteria
-            //ce.RegisterFunction("DVAR", 1, Dvar); // Estimates variance based on a sample from selected database entries
-            //ce.RegisterFunction("DVARP", 1, Dvarp); // Calculates variance based on the entire population of selected database entries
-        }
-
-        static object Daverage(List<Expression> p)
-        {
-            var b = true;
-            foreach (var v in p)
-            {
-                b = b && (bool)v;
-            }
-            return b;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/DateAndTime.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/DateAndTime.cs
deleted file mode 100644
index d1fe392..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/DateAndTime.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine.Functions
-{
-    internal static class DateAndTime
-    {
-        public static void Register(CalcEngine ce)
-        {
-            ce.RegisterFunction("DATE", 3, Date); // Returns the serial number of a particular date
-            ce.RegisterFunction("DATEVALUE", 1, Datevalue); // Converts a date in the form of text to a serial number
-            ce.RegisterFunction("DAY", 1, Day); // Converts a serial number to a day of the month
-            ce.RegisterFunction("DAYS360", 2, 3, Days360); // Calculates the number of days between two dates based on a 360-day year
-            ce.RegisterFunction("EDATE", 2, Edate); // Returns the serial number of the date that is the indicated number of months before or after the start date
-            ce.RegisterFunction("EOMONTH", 2, Eomonth); // Returns the serial number of the last day of the month before or after a specified number of months
-            ce.RegisterFunction("HOUR", 1, Hour); // Converts a serial number to an hour
-            ce.RegisterFunction("MINUTE", 1, Minute); // Converts a serial number to a minute
-            ce.RegisterFunction("MONTH", 1, Month); // Converts a serial number to a month
-            ce.RegisterFunction("NETWORKDAYS", 2, 3, Networkdays); // Returns the number of whole workdays between two dates
-            ce.RegisterFunction("NOW", 0, Now); // Returns the serial number of the current date and time
-            ce.RegisterFunction("SECOND", 1, Second); // Converts a serial number to a second
-            ce.RegisterFunction("TIME", 3, Time); // Returns the serial number of a particular time
-            ce.RegisterFunction("TIMEVALUE", 1, Timevalue); // Converts a time in the form of text to a serial number
-            ce.RegisterFunction("TODAY", 0, Today); // Returns the serial number of today's date
-            ce.RegisterFunction("WEEKDAY", 1, 2, Weekday); // Converts a serial number to a day of the week
-            ce.RegisterFunction("WEEKNUM", 1, 2, Weeknum); // Converts a serial number to a number representing where the week falls numerically with a year
-            ce.RegisterFunction("WORKDAY", 2, 3, Workday); // Returns the serial number of the date before or after a specified number of workdays
-            ce.RegisterFunction("YEAR", 1, Year); // Converts a serial number to a year
-            ce.RegisterFunction("YEARFRAC", 2, 3, Yearfrac); // Returns the year fraction representing the number of whole days between start_date and end_date
-
-        }
-
-        private static object Date(List<Expression> p)
-        {
-            var year = (int) p[0];
-            var month = (int) p[1];
-            var day = (int) p[2];
-
-            return (int) Math.Floor(new DateTime(year, month, day).ToOADate());
-        }
-
-        private static object Datevalue(List<Expression> p)
-        {
-            var date = (string) p[0];
-
-            return (int) Math.Floor(DateTime.Parse(date).ToOADate());
-        }
-
-        private static object Day(List<Expression> p)
-        {
-            var date = (DateTime) p[0];
-
-            return date.Day;
-        }
-
-        private static object Month(List<Expression> p)
-        {
-            var date = (DateTime) p[0];
-
-            return date.Month;
-        }
-
-        private static object Year(List<Expression> p)
-        {
-            var date = (DateTime) p[0];
-
-            return date.Year;
-        }
-
-        private static object Minute(List<Expression> p)
-        {
-            var date = (DateTime) p[0];
-
-            return date.Minute;
-        }
-
-        private static object Hour(List<Expression> p)
-        {
-            var date = (DateTime) p[0];
-
-            return date.Hour;
-        }
-
-        private static object Second(List<Expression> p)
-        {
-            var date = (DateTime) p[0];
-
-            return date.Second;
-        }
-
-        private static object Now(List<Expression> p)
-        {
-            return DateTime.Now;
-        }
-
-        private static object Time(List<Expression> p)
-        {
-            var hour = (int) p[0];
-            var minute = (int) p[1];
-            var second = (int) p[2];
-
-            return new TimeSpan(0, hour, minute, second);
-        }
-
-        private static object Timevalue(List<Expression> p)
-        {
-            var date = (DateTime) p[0];
-
-            return (DateTime.MinValue + date.TimeOfDay).ToOADate();
-        }
-
-        private static object Today(List<Expression> p)
-        {
-            return DateTime.Now.Date;
-        }
-
-        private static object Days360(List<Expression> p)
-        {
-            var date1 = (DateTime) p[0];
-            var date2 = (DateTime) p[1];
-            var isEuropean = p.Count == 3 ? p[2] : false;
-
-            return Days360(date1, date2, isEuropean);
-        }
-
-        private static Int32 Days360(DateTime date1, DateTime date2, Boolean isEuropean)
-        {
-            var d1 = date1.Day;
-            var m1 = date1.Month;
-            var y1 = date1.Year;
-            var d2 = date2.Day;
-            var m2 = date2.Month;
-            var y2 = date2.Year;
-
-            if (isEuropean)
-            {
-                if (d1 == 31) d1 = 30;
-                if (d2 == 31) d2 = 30;
-            }
-            else
-            {
-                if (d1 == 31) d1 = 30;
-                if (d2 == 31 && d1 == 30) d2 = 30;
-            }
-
-            return 360 * (y2 - y1) + 30 * (m2 - m1) + (d2 - d1);
-
-        }
-
-        private static object Edate(List<Expression> p)
-        {
-            var date = (DateTime)p[0];
-            var mod = (int)p[1];
-
-            var retDate = date.AddMonths(mod);
-            return retDate;
-        }
-
-        private static object Eomonth(List<Expression> p)
-        {
-            var date = (DateTime)p[0];
-            var mod = (int)p[1];
-
-            var retDate = date.AddMonths(mod);
-            return new DateTime(retDate.Year, retDate.Month, 1).AddMonths(1).AddDays(-1);
-        }
-
-        private static object Networkdays(List<Expression> p)
-        {
-            var date1 = (DateTime)p[0];
-            var date2 = (DateTime)p[1];
-            var bankHolidays = new List<DateTime>();
-            if (p.Count == 3)
-            {
-                var t = new Tally {p[2]};
-
-                bankHolidays.AddRange(t.Select(XLHelper.GetDate));
-            }
-
-            return BusinessDaysUntil(date1, date2, bankHolidays);
-        }
-
-        /// <summary>
-        /// Calculates number of business days, taking into account:
-        ///  - weekends (Saturdays and Sundays)
-        ///  - bank holidays in the middle of the week
-        /// </summary>
-        /// <param name="firstDay">First day in the time interval</param>
-        /// <param name="lastDay">Last day in the time interval</param>
-        /// <param name="bankHolidays">List of bank holidays excluding weekends</param>
-        /// <returns>Number of business days during the 'span'</returns>
-        private static int BusinessDaysUntil(DateTime firstDay, DateTime lastDay, IEnumerable<DateTime> bankHolidays)
-        {
-            firstDay = firstDay.Date;
-            lastDay = lastDay.Date;
-            if (firstDay > lastDay)
-                throw new ArgumentException("Incorrect last day " + lastDay);
-
-            TimeSpan span = lastDay - firstDay;
-            int businessDays = span.Days + 1;
-            int fullWeekCount = businessDays / 7;
-            // find out if there are weekends during the time exceedng the full weeks
-            if (businessDays > fullWeekCount * 7)
-            {
-                // we are here to find out if there is a 1-day or 2-days weekend
-                // in the time interval remaining after subtracting the complete weeks
-                var firstDayOfWeek = (int)firstDay.DayOfWeek;
-                var lastDayOfWeek = (int)lastDay.DayOfWeek;
-                if (lastDayOfWeek < firstDayOfWeek)
-                    lastDayOfWeek += 7;
-                if (firstDayOfWeek <= 6)
-                {
-                    if (lastDayOfWeek >= 7)// Both Saturday and Sunday are in the remaining time interval
-                        businessDays -= 2;
-                    else if (lastDayOfWeek >= 6)// Only Saturday is in the remaining time interval
-                        businessDays -= 1;
-                }
-                else if (firstDayOfWeek <= 7 && lastDayOfWeek >= 7)// Only Sunday is in the remaining time interval
-                    businessDays -= 1;
-            }
-
-            // subtract the weekends during the full weeks in the interval
-            businessDays -= fullWeekCount + fullWeekCount;
-
-            // subtract the number of bank holidays during the time interval
-            foreach (var bh in bankHolidays)
-            {
-                if (firstDay <= bh && bh <= lastDay)
-                    --businessDays;
-            }
-
-            return businessDays;
-        }
-
-        private static object Weekday(List<Expression> p)
-        {
-            var dayOfWeek = (int)((DateTime)p[0]).DayOfWeek;
-            var retType = p.Count == 2 ? (int)p[1] : 1;
-
-            if (retType == 2) return dayOfWeek;
-            if (retType == 1) return dayOfWeek + 1;
-
-            return dayOfWeek - 1;
-        }
-
-        private static object Weeknum(List<Expression> p)
-        {
-            var date = (DateTime)p[0];
-            var retType = p.Count == 2 ? (int)p[1] : 1;
-
-            DayOfWeek dayOfWeek = retType == 1 ? DayOfWeek.Sunday : DayOfWeek.Monday;
-            var cal = new GregorianCalendar(GregorianCalendarTypes.Localized);
-            var val = cal.GetWeekOfYear(date, CalendarWeekRule.FirstDay, dayOfWeek);
-
-            return val;
-        }
-
-        private static object Workday(List<Expression> p)
-        {
-            var startDate = (DateTime)p[0];
-            var daysRequired = (int)p[1];
-
-            if (daysRequired == 0) return startDate;
-            if (daysRequired <  0) throw new ArgumentOutOfRangeException("DaysRequired must be >= 0.");
-
-            var bankHolidays = new List<DateTime>();
-            if (p.Count == 3)
-            {
-                var t = new Tally { p[2] };
-
-                bankHolidays.AddRange(t.Select(XLHelper.GetDate));
-            }
-            var testDate = startDate.AddDays(((daysRequired / 7) + 2) * 7);
-            return Workday(startDate, testDate, daysRequired, bankHolidays).NextWorkday(bankHolidays);
-        }
-
-        private static DateTime Workday(DateTime startDate, DateTime testDate, int daysRequired, IEnumerable<DateTime> bankHolidays)
-        {
-            
-            var businessDays = BusinessDaysUntil(startDate, testDate, bankHolidays);
-            if (businessDays == daysRequired)
-                return testDate;
-
-            int days = businessDays > daysRequired ? -1 : 1;
-
-            return Workday(startDate, testDate.AddDays(days), daysRequired, bankHolidays);
-        }
-
-        private static object Yearfrac(List<Expression> p)
-        {
-            var date1 = (DateTime) p[0];
-            var date2 = (DateTime) p[1];
-            var option = p.Count == 3 ? (int)p[2] : 0;
-
-            if (option == 0)
-                return Days360(date1, date2, false) / 360.0;
-            if (option == 1)
-                return Math.Floor((date2 - date1).TotalDays) / GetYearAverage(date1, date2);
-            if (option == 2)
-                return Math.Floor((date2 - date1).TotalDays) / 360.0;
-            if (option == 3)
-                return Math.Floor((date2 - date1).TotalDays) / 365.0;
-
-            return Days360(date1, date2, true) / 360.0;
-        }
-
-        private static Double GetYearAverage(DateTime date1, DateTime date2)
-        {
-            var daysInYears = new List<Int32>();
-            for (int year = date1.Year; year <= date2.Year; year++)
-                daysInYears.Add(DateTime.IsLeapYear(year) ? 366 : 365);
-            return daysInYears.Average();
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Is.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Is.cs
deleted file mode 100644
index 544f92e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Is.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    internal static class Is
-    {
-        public static void Register(CalcEngine ce)
-        {
-            ce.RegisterFunction("ISBLANK", 1, IsBlank);
-        }
-
-        static object IsBlank(List<Expression> p)
-        {
-            var v = (string)p[0];
-            return String.IsNullOrEmpty(v);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Logical.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Logical.cs
deleted file mode 100644
index 1b6695e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Logical.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    internal static class Logical
-    {
-        public static void Register(CalcEngine ce)
-        {
-            ce.RegisterFunction("AND", 1, int.MaxValue, And);
-            ce.RegisterFunction("OR", 1, int.MaxValue, Or);
-            ce.RegisterFunction("NOT", 1, Not);
-            ce.RegisterFunction("IF", 2, 3, If);
-            ce.RegisterFunction("TRUE", 0, True);
-            ce.RegisterFunction("FALSE", 0, False);
-        }
-
-        static object And(List<Expression> p)
-        {
-            var b = true;
-            foreach (var v in p)
-            {
-                b = b && (bool)v;
-            }
-            return b;
-        }
-        static object Or(List<Expression> p)
-        {
-            var b = false;
-            foreach (var v in p)
-            {
-                b = b || (bool)v;
-            }
-            return b;
-        }
-        static object Not(List<Expression> p)
-        {
-            return !(bool)p[0];
-        }
-        static object If(List<Expression> p)
-        {
-            if ((bool)p[0] )
-            {
-                return p[1].Evaluate();
-            }
-            else
-            {
-                return p.Count > 2 ? p[2].Evaluate() : false;
-            }
-        }
-        static object True(List<Expression> p)
-        {
-            return true;
-        }
-        static object False(List<Expression> p)
-        {
-            return false;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs
deleted file mode 100644
index 4c33e64..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs
+++ /dev/null
@@ -1,703 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-using System.Text.RegularExpressions;
-using ClosedXML.Excel.CalcEngine.Functions;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    internal static class MathTrig
-    {
-        private static readonly Random _rnd = new Random();
-
-        public static void Register(CalcEngine ce)
-        {
-            ce.RegisterFunction("ABS", 1, Abs);
-            ce.RegisterFunction("ACOS", 1, Acos);
-            ce.RegisterFunction("ACOSH", 1, Acosh);
-            ce.RegisterFunction("ASIN", 1, Asin);
-            ce.RegisterFunction("ASINH", 1, Asinh);
-            ce.RegisterFunction("ATAN", 1, Atan);
-            ce.RegisterFunction("ATAN2", 2, Atan2);
-            ce.RegisterFunction("ATANH", 1, Atanh);
-            ce.RegisterFunction("CEILING", 1, Ceiling);
-            ce.RegisterFunction("COMBIN", 2, Combin);
-            ce.RegisterFunction("COS", 1, Cos);
-            ce.RegisterFunction("COSH", 1, Cosh);
-            ce.RegisterFunction("DEGREES", 1, Degrees);
-            ce.RegisterFunction("EVEN", 1, Even);
-            ce.RegisterFunction("EXP", 1, Exp);
-            ce.RegisterFunction("FACT", 1, Fact);
-            ce.RegisterFunction("FACTDOUBLE", 1, FactDouble);
-            ce.RegisterFunction("FLOOR", 1, Floor);
-            ce.RegisterFunction("GCD", 1, 255, Gcd);
-            ce.RegisterFunction("INT", 1, Int);
-            ce.RegisterFunction("LCM", 1, 255, Lcm);
-            ce.RegisterFunction("LN", 1, Ln);
-            ce.RegisterFunction("LOG", 1, 2, Log);
-            ce.RegisterFunction("LOG10", 1, Log10);
-            ce.RegisterFunction("MDETERM", 1, MDeterm);
-            ce.RegisterFunction("MINVERSE", 1, MInverse);
-            ce.RegisterFunction("MMULT", 2, MMult);
-            ce.RegisterFunction("MOD", 2, Mod);
-            ce.RegisterFunction("MROUND", 2, MRound);
-            ce.RegisterFunction("MULTINOMIAL", 1, 255, Multinomial);
-            ce.RegisterFunction("ODD", 1, Odd);
-            ce.RegisterFunction("PI", 0, Pi);
-            ce.RegisterFunction("POWER", 2, Power);
-            ce.RegisterFunction("PRODUCT", 1, 255, Product);
-            ce.RegisterFunction("QUOTIENT", 2, Quotient);
-            ce.RegisterFunction("RADIANS", 1, Radians);
-            ce.RegisterFunction("RAND", 0, Rand);
-            ce.RegisterFunction("RANDBETWEEN", 2, RandBetween);
-            ce.RegisterFunction("ROMAN", 1, 2, Roman);
-            ce.RegisterFunction("ROUND", 2, Round);
-            ce.RegisterFunction("ROUNDDOWN", 2, RoundDown);
-            ce.RegisterFunction("ROUNDUP", 1, 2, RoundUp);
-            ce.RegisterFunction("SERIESSUM", 4, SeriesSum);
-            ce.RegisterFunction("SIGN", 1, Sign);
-            ce.RegisterFunction("SIN", 1, Sin);
-            ce.RegisterFunction("SINH", 1, Sinh);
-            ce.RegisterFunction("SQRT", 1, Sqrt);
-            ce.RegisterFunction("SQRTPI", 1, SqrtPi);
-            ce.RegisterFunction("SUBTOTAL", 2, 255, Subtotal);
-            ce.RegisterFunction("SUM", 1, int.MaxValue, Sum);
-            ce.RegisterFunction("SUMIF", 2, 3, SumIf);
-            //ce.RegisterFunction("SUMPRODUCT", 1, SumProduct);
-            ce.RegisterFunction("SUMSQ", 1, 255, SumSq);
-            //ce.RegisterFunction("SUMX2MY2", SumX2MY2, 1);
-            //ce.RegisterFunction("SUMX2PY2", SumX2PY2, 1);
-            //ce.RegisterFunction("SUMXMY2", SumXMY2, 1);
-            ce.RegisterFunction("TAN", 1, Tan);
-            ce.RegisterFunction("TANH", 1, Tanh);
-            ce.RegisterFunction("TRUNC", 1, Trunc);
-        }
-
-        private static object Abs(List<Expression> p)
-        {
-            return Math.Abs(p[0]);
-        }
-
-        private static object Acos(List<Expression> p)
-        {
-            return Math.Acos(p[0]);
-        }
-
-        private static object Asin(List<Expression> p)
-        {
-            return Math.Asin(p[0]);
-        }
-
-        private static object Atan(List<Expression> p)
-        {
-            return Math.Atan(p[0]);
-        }
-
-        private static object Atan2(List<Expression> p)
-        {
-            return Math.Atan2(p[0], p[1]);
-        }
-
-        private static object Ceiling(List<Expression> p)
-        {
-            return Math.Ceiling(p[0]);
-        }
-
-        private static object Cos(List<Expression> p)
-        {
-            return Math.Cos(p[0]);
-        }
-
-        private static object Cosh(List<Expression> p)
-        {
-            return Math.Cosh(p[0]);
-        }
-
-        private static object Exp(List<Expression> p)
-        {
-            return Math.Exp(p[0]);
-        }
-
-        private static object Floor(List<Expression> p)
-        {
-            return Math.Floor(p[0]);
-        }
-
-        private static object Int(List<Expression> p)
-        {
-            return (int) ((double) p[0]);
-        }
-
-        private static object Ln(List<Expression> p)
-        {
-            return Math.Log(p[0]);
-        }
-
-        private static object Log(List<Expression> p)
-        {
-            var lbase = p.Count > 1 ? (double) p[1] : 10;
-            return Math.Log(p[0], lbase);
-        }
-
-        private static object Log10(List<Expression> p)
-        {
-            return Math.Log10(p[0]);
-        }
-
-        private static object Pi(List<Expression> p)
-        {
-            return Math.PI;
-        }
-
-        private static object Power(List<Expression> p)
-        {
-            return Math.Pow(p[0], p[1]);
-        }
-
-        private static object Rand(List<Expression> p)
-        {
-            return _rnd.NextDouble();
-        }
-
-        private static object RandBetween(List<Expression> p)
-        {
-            return _rnd.Next((int) (double) p[0], (int) (double) p[1]);
-        }
-
-        private static object Sign(List<Expression> p)
-        {
-            return Math.Sign(p[0]);
-        }
-
-        private static object Sin(List<Expression> p)
-        {
-            return Math.Sin(p[0]);
-        }
-
-        private static object Sinh(List<Expression> p)
-        {
-            return Math.Sinh(p[0]);
-        }
-
-        private static object Sqrt(List<Expression> p)
-        {
-            return Math.Sqrt(p[0]);
-        }
-
-        private static object Sum(List<Expression> p)
-        {
-            var tally = new Tally();
-            foreach (var e in p)
-            {
-                tally.Add(e);
-            }
-            return tally.Sum();
-        }
-
-        private static object SumIf(List<Expression> p)
-        {
-            // get parameters
-            var range = p[0] as IEnumerable;
-            var sumRange = p.Count < 3 ? range : p[2] as IEnumerable;
-            var criteria = p[1].Evaluate();
-
-            // build list of values in range and sumRange
-            var rangeValues = new List<object>();
-            foreach (var value in range)
-            {
-                rangeValues.Add(value);
-            }
-            var sumRangeValues = new List<object>();
-            foreach (var value in sumRange)
-            {
-                sumRangeValues.Add(value);
-            }
-
-            // compute total
-            var ce = new CalcEngine();
-            var tally = new Tally();
-            for (var i = 0; i < Math.Min(rangeValues.Count, sumRangeValues.Count); i++)
-            {
-                if (ValueSatisfiesCriteria(rangeValues[i], criteria, ce))
-                {
-                    tally.AddValue(sumRangeValues[i]);
-                }
-            }
-
-            // done
-            return tally.Sum();
-        }
-
-        private static bool ValueSatisfiesCriteria(object value, object criteria, CalcEngine ce)
-        {
-            // safety...
-            if (value == null)
-            {
-                return false;
-            }
-
-            // if criteria is a number, straight comparison
-            if (criteria is double)
-            {
-                if (value is Double)
-                    return (double) value == (double) criteria;
-                Double dValue;
-                return Double.TryParse(value.ToString(), out dValue) && dValue == (double) criteria;
-            }
-
-            // convert criteria to string
-            var cs = criteria as string;
-            if (!string.IsNullOrEmpty(cs))
-            {
-                // if criteria is an expression (e.g. ">20"), use calc engine
-                if (cs[0] == '=' || cs[0] == '<' || cs[0] == '>')
-                {
-                    // build expression
-                    var expression = string.Format("{0}{1}", value, cs);
-
-                    // add quotes if necessary
-                    var pattern = @"(\w+)(\W+)(\w+)";
-                    var m = Regex.Match(expression, pattern);
-                    if (m.Groups.Count == 4)
-                    {
-                        double d;
-                        if (!double.TryParse(m.Groups[1].Value, out d) ||
-                            !double.TryParse(m.Groups[3].Value, out d))
-                        {
-                            expression = string.Format("\"{0}\"{1}\"{2}\"",
-                                                       m.Groups[1].Value,
-                                                       m.Groups[2].Value,
-                                                       m.Groups[3].Value);
-                        }
-                    }
-
-                    // evaluate
-                    return (bool) ce.Evaluate(expression);
-                }
-
-                // if criteria is a regular expression, use regex
-                if (cs.IndexOf('*') > -1)
-                {
-                    var pattern = cs.Replace(@"\", @"\\");
-                    pattern = pattern.Replace(".", @"\");
-                    pattern = pattern.Replace("*", ".*");
-                    return Regex.IsMatch(value.ToString(), pattern, RegexOptions.IgnoreCase);
-                }
-
-                // straight string comparison 
-                return string.Equals(value.ToString(), cs, StringComparison.OrdinalIgnoreCase);
-            }
-
-            // should never get here?
-            Debug.Assert(false, "failed to evaluate criteria in SumIf");
-            return false;
-        }
-
-        private static object Tan(List<Expression> p)
-        {
-            return Math.Tan(p[0]);
-        }
-
-        private static object Tanh(List<Expression> p)
-        {
-            return Math.Tanh(p[0]);
-        }
-
-        private static object Trunc(List<Expression> p)
-        {
-            return (double) (int) ((double) p[0]);
-        }
-
-        public static double DegreesToRadians(double degrees)
-        {
-            return (Math.PI/180.0)*degrees;
-        }
-
-        public static double RadiansToDegrees(double radians)
-        {
-            return (180.0/Math.PI)*radians;
-        }
-
-        public static double GradsToRadians(double grads)
-        {
-            return (grads/200.0)*Math.PI;
-        }
-
-        public static double RadiansToGrads(double radians)
-        {
-            return (radians/Math.PI)*200.0;
-        }
-
-        public static double DegreesToGrads(double degrees)
-        {
-            return (degrees/9.0)*10.0;
-        }
-
-        public static double GradsToDegrees(double grads)
-        {
-            return (grads/10.0)*9.0;
-        }
-
-        public static double ASinh(double x)
-        {
-            return (Math.Log(x + Math.Sqrt(x*x + 1.0)));
-        }
-
-        private static object Acosh(List<Expression> p)
-        {
-            return XLMath.ACosh(p[0]);
-        }
-
-        private static object Asinh(List<Expression> p)
-        {
-            return XLMath.ASinh(p[0]);
-        }
-
-        private static object Atanh(List<Expression> p)
-        {
-            return XLMath.ATanh(p[0]);
-        }
-
-        private static object Combin(List<Expression> p)
-        {
-            Int32 n = (int) p[0];
-            Int32 k = (int) p[1];
-            return XLMath.Combin(n, k);
-        }
-
-        private static object Degrees(List<Expression> p)
-        {
-            return p[0] * (180.0 / Math.PI);
-        }
-
-
-
-        private static object Fact(List<Expression> p)
-        {
-            var num = Math.Floor(p[0]);
-            double fact = 1.0;
-            if (num > 1)
-                for (int i = 2; i <= num; i++)
-                    fact *= i;
-            return fact;
-        }
-
-        private static object FactDouble(List<Expression> p)
-        {
-            var num = Math.Floor(p[0]);
-            double fact = 1.0;
-            if (num > 1)
-            {
-                var start = Math.Abs(num % 2) < XLHelper.Epsilon ? 2 : 1;
-                for (int i = start; i <= num; i = i + 2)
-                    fact *= i;
-            }
-            return fact;
-        }
-
-        private static object Gcd(List<Expression> p)
-        {
-            return p.Select(v => (int)v).Aggregate(Gcd);
-        }
-
-        private static int Gcd(int a, int b)
-        {
-            return b == 0 ? a : Gcd(b, a % b);
-        }
-
-        private static object Lcm(List<Expression> p)
-        {
-            return p.Select(v => (int)v).Aggregate(Lcm);
-        }
-
-        private static int Lcm(int a, int b)
-        {
-            if (a == 0 || b == 0) return 0;
-            return a * ( b / Gcd(a, b));
-        }
-
-        private static object Mod(List<Expression> p)
-        {
-            Int32 n = (int)Math.Abs(p[0]);
-            Int32 d = (int)p[1];
-            var ret = n % d;
-            return d < 0 ? ret * -1 : ret;
-        }
-
-        private static object MRound(List<Expression> p)
-        {
-            var n = (Decimal)(Double)p[0];
-            var k = (Decimal)(Double)p[1];
-
-            var mod = n % k;
-            var mult = Math.Floor(n / k);
-            var div = k / 2;
-
-            if (Math.Abs(mod - div) <= (Decimal)XLHelper.Epsilon) return (k * mult) + k;
-
-            return k * mult;
-        }
-
-        private static object Multinomial(List<Expression> p)
-        {
-            return Multinomial(p.Select(v => (double)v).ToList());
-        }
-
-        private static double Multinomial(List<double> numbers)
-        {
-            double numbersSum = 0;
-            foreach (var number in numbers)
-                numbersSum += number;
-
-            double maxNumber = numbers.Max();
-            var denomFactorPowers = new double[(uint)numbers.Max() + 1];
-            foreach (var number in numbers)
-                for (int i = 2; i <= number; i++)
-                    denomFactorPowers[i]++;
-            for (int i = 2; i < denomFactorPowers.Length; i++)
-                denomFactorPowers[i]--; // reduce with nominator;
-
-            int currentFactor = 2;
-            double currentPower = 1;
-            double result = 1;
-            for (double i = maxNumber + 1; i <= numbersSum; i++)
-            {
-                double tempDenom = 1;
-                while (tempDenom < result && currentFactor < denomFactorPowers.Length)
-                {
-                    if (currentPower > denomFactorPowers[currentFactor])
-                    {
-                        currentFactor++;
-                        currentPower = 1;
-                    }
-                    else
-                    {
-                        tempDenom *= currentFactor;
-                        currentPower++;
-                    }
-                }
-                result = result / tempDenom * i;
-            }
-
-            return result;
-        }
-
-        private static object Odd(List<Expression> p)
-        {
-            var num = (int)Math.Ceiling(p[0]);
-            var addValue = num >= 0 ? 1 : -1;
-            return XLMath.IsOdd(num) ? num : num + addValue;
-        }
-
-        private static object Even(List<Expression> p)
-        {
-            var num = (int)Math.Ceiling(p[0]);
-            var addValue = num >= 0 ? 1 : -1;
-            return XLMath.IsEven(num) ? num : num + addValue;
-        }
-
-        private static object Product(List<Expression> p)
-        {
-            if (p.Count == 0) return 0;
-            Double total = 1;
-            p.ForEach(v => total *= v);
-            return total;
-        }
-
-        private static object Quotient(List<Expression> p)
-        {
-            Double n = p[0];
-            Double k = p[1];
-
-            return (int)(n / k);
-        }
-
-        private static object Radians(List<Expression> p)
-        {
-            return p[0] * Math.PI / 180.0;
-        }
-
-        private static object Roman(List<Expression> p)
-        {
-            Int32 intTemp;
-            Boolean boolTemp;
-            if (p.Count == 1
-                || (Boolean.TryParse(p[1]._token.Value.ToString(), out boolTemp) && boolTemp)
-                || (Int32.TryParse(p[1]._token.Value.ToString(), out intTemp) && intTemp == 1))
-                return XLMath.ToRoman((int)p[0]);
-
-            throw new ArgumentException("Can only support classic roman types.");
-        }
-
-        private static object Round(List<Expression> p)
-        {
-            var value = (Double)p[0];
-            var digits = (Int32)(Double)p[1];
-            if (digits >= 0)
-            {
-                return Math.Round(value, digits);
-            }
-            else
-            {
-                digits = Math.Abs(digits);
-                double temp = value / Math.Pow(10, digits);
-                temp = Math.Round(temp, 0);
-                return temp * Math.Pow(10, digits);
-            }
-
-        }
-
-        private static object RoundDown(List<Expression> p)
-        {
-            var value = (Double)p[0];
-            var digits = (Int32)(Double)p[1];
-
-            if (value >= 0)
-                return Math.Floor(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
-
-            return Math.Ceiling(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
-        }
-
-        private static object RoundUp(List<Expression> p)
-        {
-            var value = (Double)p[0];
-            var digits = (Int32)(Double)p[1];
-
-            if (value >= 0)
-                return Math.Ceiling(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
-
-            return Math.Floor(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
-        }
-
-        private static object SeriesSum(List<Expression> p)
-        {
-            var x = (Double)p[0];
-            var n = (Double)p[1];
-            var m = (Double)p[2];
-            var obj = p[3] as XObjectExpression;
-
-            if (obj == null)
-                return p[3] * Math.Pow(x , n);
-
-            Double total = 0;
-            Int32 i = 0;
-            foreach (var e in obj)
-            {
-                total += (double)e * Math.Pow(x, n + i * m);
-                i++;
-            }
-
-            return total;
-        }
-
-        private static object SqrtPi(List<Expression> p)
-        {
-            var num = (Double)p[0];
-            return Math.Sqrt(Math.PI * num);
-        }
-
-        private static object Subtotal(List<Expression> p)
-        {
-            var fId = (int)(Double)p[0];
-            var tally = new Tally(p.Skip(1));
-
-            switch (fId)
-            {
-                case 1:
-                    return tally.Average();
-                case 2:
-                    return tally.Count();
-                case 3:
-                    return tally.CountA();
-                case 4:
-                    return tally.Max();
-                case 5:
-                    return tally.Min();
-                case 6:
-                    return tally.Product();
-                case 7:
-                    return tally.Std();
-                case 8:
-                    return tally.StdP();
-                case 9:
-                    return tally.Sum();
-                case 10:
-                    return tally.Var();
-                case 11:
-                    return tally.VarP();
-                default:
-                    throw new ArgumentException("Function not supported.");
-            }
-        }
-
-        private static object SumSq(List<Expression> p)
-        {
-            var t = new Tally(p);
-            return t.Numerics().Sum(v => Math.Pow(v, 2));
-        }
-
-        private static object MMult(List<Expression> p)
-        {
-            Double[,] A = GetArray(p[0]);
-            Double[,] B = GetArray(p[1]);
-
-            if (A.GetLength(0) != B.GetLength(0) || A.GetLength(1) != B.GetLength(1))
-                throw new ArgumentException("Ranges must have the same number of rows and columns.");
-
-            var C = new double[A.GetLength(0), A.GetLength(1)];
-            for (int i = 0; i < A.GetLength(0); i++)
-            {
-                for (int j = 0; j < B.GetLength(1); j++)
-                {
-                    for (int k = 0; k < A.GetLength(1); k++)
-                    {
-                        C[i, j] += A[i, k] * B[k, j];
-                    }
-                }
-            }
-
-
-            return C;
-        }
-
-        private static double[,] GetArray(Expression expression)
-        {
-            var oExp1 = expression as XObjectExpression;
-            if (oExp1 == null) return new [,]{{(Double)expression}};
-
-            var range = (oExp1.Value as CellRangeReference).Range;
-            var rowCount = range.RowCount();
-            var columnCount = range.ColumnCount();
-            var arr = new double[rowCount,columnCount];
-
-            for (int row = 0; row < rowCount; row++)
-            {
-                for (int column = 0; column < columnCount; column++)
-                {
-                    arr[row, column] = range.Cell(row + 1, column + 1).GetDouble();
-                }
-            }
-
-            return arr;
-        }
-
-        private static object MDeterm(List<Expression> p)
-        {
-            var arr = GetArray(p[0]);
-            var m = new XLMatrix(arr);
-
-            return m.Determinant();
-        }
-
-        private static object MInverse(List<Expression> p)
-        {
-            var arr = GetArray(p[0]);
-            var m = new XLMatrix(arr);
-
-            return m.Invert().mat;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Statistical.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Statistical.cs
deleted file mode 100644
index 973bb90..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Statistical.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-using System;
-using System.Net;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    internal static class Statistical
-    {
-        public static void Register(CalcEngine ce)
-        {
-            //ce.RegisterFunction("AVEDEV", AveDev, 1, int.MaxValue);
-            ce.RegisterFunction("AVERAGE", 1, int.MaxValue, Average);
-            ce.RegisterFunction("AVERAGEA", 1, int.MaxValue, AverageA);
-            //BETADIST	Returns the beta cumulative distribution function
-            //BETAINV	Returns the inverse of the cumulative distribution function for a specified beta distribution
-            //BINOMDIST	Returns the individual term binomial distribution probability
-            //CHIDIST	Returns the one-tailed probability of the chi-squared distribution
-            //CHIINV	Returns the inverse of the one-tailed probability of the chi-squared distribution
-            //CHITEST	Returns the test for independence
-            //CONFIDENCE	Returns the confidence interval for a population mean
-            //CORREL	Returns the correlation coefficient between two data sets
-            ce.RegisterFunction("COUNT", 1, int.MaxValue, Count);
-            ce.RegisterFunction("COUNTA", 1, int.MaxValue, CountA);
-            ce.RegisterFunction("COUNTBLANK", 1, int.MaxValue, CountBlank);
-            ce.RegisterFunction("COUNTIF", 2, CountIf);
-            //COVAR	Returns covariance, the average of the products of paired deviations
-            //CRITBINOM	Returns the smallest value for which the cumulative binomial distribution is less than or equal to a criterion value
-            //DEVSQ	Returns the sum of squares of deviations
-            //EXPONDIST	Returns the exponential distribution
-            //FDIST	Returns the F probability distribution
-            //FINV	Returns the inverse of the F probability distribution
-            //FISHER	Returns the Fisher transformation
-            //FISHERINV	Returns the inverse of the Fisher transformation
-            //FORECAST	Returns a value along a linear trend
-            //FREQUENCY	Returns a frequency distribution as a vertical array
-            //FTEST	Returns the result of an F-test
-            //GAMMADIST	Returns the gamma distribution
-            //GAMMAINV	Returns the inverse of the gamma cumulative distribution
-            //GAMMALN	Returns the natural logarithm of the gamma function, Γ(x)
-            //GEOMEAN	Returns the geometric mean
-            //GROWTH	Returns values along an exponential trend
-            //HARMEAN	Returns the harmonic mean
-            //HYPGEOMDIST	Returns the hypergeometric distribution
-            //INTERCEPT	Returns the intercept of the linear regression line
-            //KURT	Returns the kurtosis of a data set
-            //LARGE	Returns the k-th largest value in a data set
-            //LINEST	Returns the parameters of a linear trend
-            //LOGEST	Returns the parameters of an exponential trend
-            //LOGINV	Returns the inverse of the lognormal distribution
-            //LOGNORMDIST	Returns the cumulative lognormal distribution
-            ce.RegisterFunction("MAX", 1, int.MaxValue, Max);
-            ce.RegisterFunction("MAXA", 1, int.MaxValue, MaxA);
-            //MEDIAN	Returns the median of the given numbers
-            ce.RegisterFunction("MIN", 1, int.MaxValue, Min);
-            ce.RegisterFunction("MINA", 1, int.MaxValue, MinA);
-            //MODE	Returns the most common value in a data set
-            //NEGBINOMDIST	Returns the negative binomial distribution
-            //NORMDIST	Returns the normal cumulative distribution
-            //NORMINV	Returns the inverse of the normal cumulative distribution
-            //NORMSDIST	Returns the standard normal cumulative distribution
-            //NORMSINV	Returns the inverse of the standard normal cumulative distribution
-            //PEARSON	Returns the Pearson product moment correlation coefficient
-            //PERCENTILE	Returns the k-th percentile of values in a range
-            //PERCENTRANK	Returns the percentage rank of a value in a data set
-            //PERMUT	Returns the number of permutations for a given number of objects
-            //POISSON	Returns the Poisson distribution
-            //PROB	Returns the probability that values in a range are between two limits
-            //QUARTILE	Returns the quartile of a data set
-            //RANK	Returns the rank of a number in a list of numbers
-            //RSQ	Returns the square of the Pearson product moment correlation coefficient
-            //SKEW	Returns the skewness of a distribution
-            //SLOPE	Returns the slope of the linear regression line
-            //SMALL	Returns the k-th smallest value in a data set
-            //STANDARDIZE	Returns a normalized value
-            ce.RegisterFunction("STDEV", 1, int.MaxValue, StDev);
-            ce.RegisterFunction("STDEVA", 1, int.MaxValue, StDevA);
-            ce.RegisterFunction("STDEVP", 1, int.MaxValue, StDevP);
-            ce.RegisterFunction("STDEVPA", 1, int.MaxValue, StDevPA);
-            //STEYX	Returns the standard error of the predicted y-value for each x in the regression
-            //TDIST	Returns the Student's t-distribution
-            //TINV	Returns the inverse of the Student's t-distribution
-            //TREND	Returns values along a linear trend
-            //TRIMMEAN	Returns the mean of the interior of a data set
-            //TTEST	Returns the probability associated with a Student's t-test
-            ce.RegisterFunction("VAR", 1, int.MaxValue, Var);
-            ce.RegisterFunction("VARA", 1, int.MaxValue, VarA);
-            ce.RegisterFunction("VARP", 1, int.MaxValue, VarP);
-            ce.RegisterFunction("VARPA", 1, int.MaxValue, VarPA);
-            //WEIBULL	Returns the Weibull distribution
-            //ZTEST	Returns the one-tailed probability-value of a z-test
-        }
-
-
-
-        static object Average(List<Expression> p)
-        {
-            return GetTally(p, true).Average();
-        }
-        static object AverageA(List<Expression> p)
-        {
-            return GetTally(p, false).Average();
-        }
-        static object Count(List<Expression> p)
-        {
-            return GetTally(p, true).Count();
-        }
-        static object CountA(List<Expression> p)
-        {
-            return GetTally(p, false).Count();
-        }
-        static object CountBlank(List<Expression> p)
-        {
-            var cnt = 0.0;
-            foreach (Expression e in p)
-            {
-                var ienum = e as IEnumerable;
-                if (ienum != null)
-                {
-                    foreach (var value in ienum)
-                    {
-                        if (IsBlank(value))
-                            cnt++;
-                    }
-                }
-                else
-                {
-                    if (IsBlank(e.Evaluate()))
-                        cnt++;
-                }
-            }
-            return cnt;
-        }
-        static bool IsBlank(object value)
-        {
-            return 
-                value == null || 
-                value is string && ((string)value).Length == 0;
-        }
-        static object CountIf(List<Expression> p)
-        {
-            CalcEngine ce = new CalcEngine();
-            var cnt = 0.0;
-            var ienum = p[0] as IEnumerable;
-            if (ienum != null)
-            {
-                var crit = (string)p[1].Evaluate();
-                foreach (var value in ienum)
-                {
-                    if (!IsBlank(value))
-                    {
-                        var exp = string.Format("{0}{1}", value, crit);
-                        if ((bool)ce.Evaluate(exp))
-                            cnt++;
-                    }
-                }
-            }
-            return cnt;
-        }
-        static object Max(List<Expression> p)
-        {
-            return GetTally(p, true).Max();
-        }
-        static object MaxA(List<Expression> p)
-        {
-            return GetTally(p, false).Max();
-        }
-        static object Min(List<Expression> p)
-        {
-            return GetTally(p, true).Min();
-        }
-        static object MinA(List<Expression> p)
-        {
-            return GetTally(p, false).Min();
-        }
-        static object StDev(List<Expression> p)
-        {
-            return GetTally(p, true).Std();
-        }
-        static object StDevA(List<Expression> p)
-        {
-            return GetTally(p, false).Std();
-        }
-        static object StDevP(List<Expression> p)
-        {
-            return GetTally(p, true).StdP();
-        }
-        static object StDevPA(List<Expression> p)
-        {
-            return GetTally(p, false).StdP();
-        }
-        static object Var(List<Expression> p)
-        {
-            return GetTally(p, true).Var();
-        }
-        static object VarA(List<Expression> p)
-        {
-            return GetTally(p, false).Var();
-        }
-        static object VarP(List<Expression> p)
-        {
-            return GetTally(p, true).VarP();
-        }
-        static object VarPA(List<Expression> p)
-        {
-            return GetTally(p, false).VarP();
-        }
-
-        // utility for tallying statistics
-        static Tally GetTally(List<Expression> p, bool numbersOnly)
-        {
-            return new Tally(p);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Tally.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Tally.cs
deleted file mode 100644
index f7d76fc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Tally.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Net;
-using System.Collections;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    internal class Tally: IEnumerable<Object>
-    {
-        private readonly List<object> _list = new List<object>();
-
-        public Tally(){}
-        public Tally(IEnumerable<Expression> p)
-        {
-            foreach (var e in p)
-            {
-                Add(e);
-            }
-        }
-
-        public void Add(Expression e)
-        {
-            // handle enumerables
-            var ienum = e as IEnumerable;
-            if (ienum != null)
-            {
-                foreach (var value in ienum)
-                {
-                    _list.Add(value);
-                }
-                return;
-            }
-
-            // handle expressions
-            var val = e.Evaluate();
-            var valEnumerable = val as IEnumerable;
-            if (valEnumerable == null || val is string)
-                _list.Add(val);
-            else
-                foreach (var v in valEnumerable)
-                    _list.Add(v);
-        }
-
-        public void AddValue(Object v)
-        {
-            _list.Add(v);
-        }
-
-        public double Count() { return _list.Count; }
-        public double CountA()
-        {
-            Double cntA = 0;
-            foreach (var value in _list)
-            {
-                var vEnumerable = value as IEnumerable;
-                if (vEnumerable == null)
-                    cntA += AddCount(value);
-                else
-                {
-                    foreach (var v in vEnumerable)
-                    {
-                        cntA += AddCount(v);
-                        break;
-                    }
-                }
-            }
-            return cntA;
-        }
-
-        private static double AddCount(object value)
-        {
-            var strVal = value as String;
-            if (value != null && (strVal == null || !XLHelper.IsNullOrWhiteSpace(strVal)))
-                return 1;
-            return 0;
-        }
-
-        public List<Double> Numerics()
-        {
-            List<Double> retVal = new List<double>();
-            foreach (var value in _list)
-            {
-                var vEnumerable = value as IEnumerable;
-                if (vEnumerable == null)
-                    AddNumericValue(value, retVal);
-                else
-                {
-                    foreach (var v in vEnumerable)
-                    {
-                        AddNumericValue(v, retVal);
-                        break;
-                    }
-                }
-            }
-            return retVal;
-        }
-
-        private static void AddNumericValue(object value, List<double> retVal)
-        {
-            Double tmp;
-            if (Double.TryParse(value.ToString(), out tmp))
-            {
-                retVal.Add(tmp);
-            }
-        }
-
-        public double Product()
-        {
-            var nums = Numerics();
-            if (nums.Count == 0) return 0;
-
-            Double retVal = 1;
-            nums.ForEach(n => retVal *= n);
-
-            return retVal;
-        }
-        public double Sum() { return Numerics().Sum(); }
-        public double Average()
-        {
-            return Numerics().Count == 0 ? 0 : Numerics().Average();
-        }
-
-        public double Min()
-        {
-            return Numerics().Count == 0 ? 0 : Numerics().Min();
-        }
-
-        public double Max()
-        {
-            return Numerics().Count == 0 ? 0 : Numerics().Max();
-        }
-
-        public double Range()
-        {
-            var nums = Numerics();
-            return nums.Max() - nums.Min();
-        }
-
-        private double Sum2(List<Double> nums)
-        {
-            return nums.Sum(d => d * d);
-        }
-
-        public double VarP()
-        {
-            var nums = Numerics();
-            var avg = nums.Average();
-            var sum2 = nums.Sum(d => d * d);
-            return nums.Count <= 1 ? 0 : sum2 / nums.Count - avg * avg;
-        }
-        public double StdP()
-        {
-            var nums = Numerics();
-            var avg = nums.Average();
-            var sum2 = nums.Sum(d => d * d);
-            return nums.Count <= 1 ? 0 : Math.Sqrt(sum2 / nums.Count - avg * avg);
-        }
-        public double Var()
-        {
-            var nums = Numerics();
-            var avg = nums.Average();
-            var sum2 = nums.Sum(d => d * d);
-            return nums.Count <= 1 ? 0 : (sum2 / nums.Count - avg * avg) * nums.Count / (nums.Count - 1);
-        }
-        public double Std()
-        {
-            var values = Numerics();
-            double ret = 0;
-            if (values.Count > 0)
-            {
-                //Compute the Average      
-                double avg = values.Average();
-                //Perform the Sum of (value-avg)_2_2      
-                double sum = values.Sum(d => Math.Pow(d - avg, 2));
-                //Put it all together      
-                ret = Math.Sqrt((sum) / (values.Count() - 1));
-            }
-            return ret;
-
-        }
-
-        public IEnumerator<object> GetEnumerator()
-        {
-            return _list.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Text.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Text.cs
deleted file mode 100644
index 0da3a1a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/Text.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    internal static class Text
-    {
-        public static void Register(CalcEngine ce)
-        {
-            ce.RegisterFunction("ASC", 1, Asc); // Changes full-width (double-byte) English letters or katakana within a character string to half-width (single-byte) characters
-            //ce.RegisterFunction("BAHTTEXT	Converts a number to text, using the ß (baht) currency format
-            ce.RegisterFunction("CHAR", 1, _Char); // Returns the character specified by the code number
-            ce.RegisterFunction("CLEAN", 1, Clean); //	Removes all nonprintable characters from text
-            ce.RegisterFunction("CODE", 1, Code); // Returns a numeric code for the first character in a text string
-            ce.RegisterFunction("CONCATENATE", 1, int.MaxValue, Concat); //	Joins several text items into one text item
-            ce.RegisterFunction("DOLLAR", 1, 2, Dollar); // Converts a number to text, using the $ (dollar) currency format
-            ce.RegisterFunction("EXACT", 2, Exact); // Checks to see if two text values are identical
-            ce.RegisterFunction("FIND", 2, 3, Find); //Finds one text value within another (case-sensitive)
-            ce.RegisterFunction("FIXED", 1, 3, Fixed); // Formats a number as text with a fixed number of decimals
-            //ce.RegisterFunction("JIS	Changes half-width (single-byte) English letters or katakana within a character string to full-width (double-byte) characters
-            ce.RegisterFunction("LEFT", 1, 2, Left); // LEFTB	Returns the leftmost characters from a text value
-            ce.RegisterFunction("LEN", 1, Len); //, Returns the number of characters in a text string
-            ce.RegisterFunction("LOWER", 1, Lower); //	Converts text to lowercase
-            ce.RegisterFunction("MID", 3, Mid); // Returns a specific number of characters from a text string starting at the position you specify
-            //ce.RegisterFunction("PHONETIC	Extracts the phonetic (furigana) characters from a text string
-            ce.RegisterFunction("PROPER", 1, Proper); // Capitalizes the first letter in each word of a text value
-            ce.RegisterFunction("REPLACE", 4, Replace); // Replaces characters within text
-            ce.RegisterFunction("REPT", 2, Rept); // Repeats text a given number of times
-            ce.RegisterFunction("RIGHT", 1, 2, Right); // Returns the rightmost characters from a text value
-            ce.RegisterFunction("SEARCH", 2, Search); // Finds one text value within another (not case-sensitive)
-            ce.RegisterFunction("SUBSTITUTE", 3, 4, Substitute); // Substitutes new text for old text in a text string
-            ce.RegisterFunction("T", 1, T); // Converts its arguments to text
-            ce.RegisterFunction("TEXT", 2, _Text); // Formats a number and converts it to text
-            ce.RegisterFunction("TRIM", 1, Trim); // Removes spaces from text
-            ce.RegisterFunction("UPPER", 1, Upper); // Converts text to uppercase
-            ce.RegisterFunction("VALUE", 1, Value); // Converts a text argument to a number
-            ce.RegisterFunction("HYPERLINK", 1, Hyperlink);
-        }
-
-        static object _Char(List<Expression> p)
-        {
-            var c = (char)(int)p[0];
-            return c.ToString();
-        }
-        static object Code(List<Expression> p)
-        {
-            var s = (string)p[0];
-            return (int)s[0];
-        }
-        static object Concat(List<Expression> p)
-        {
-            var sb = new StringBuilder();
-            foreach (var x in p)
-            {
-                sb.Append((string)x);
-            }
-            return sb.ToString();
-        }
-        static object Find(List<Expression> p)
-        {
-            return IndexOf(p, StringComparison.Ordinal);
-        }
-        static int IndexOf(List<Expression> p, StringComparison cmp)
-        {
-            var srch = (string)p[0];
-            var text = (string)p[1];
-            var start = 0;
-            if (p.Count > 2)
-            {
-                start = (int)p[2] - 1;
-            }
-            var index = text.IndexOf(srch, start, cmp);
-            return index > -1 ? index + 1 : index;
-        }
-        static object Left(List<Expression> p)
-        {
-            var str = (string)p[0];
-            var n = 1;
-            if (p.Count > 1)
-            {
-                n = (int)p[1];
-            }
-            if (n >= str.Length) return str;
-
-            return str.Substring(0, n);
-        }
-        static object Len(List<Expression> p)
-        {
-            return ((string)p[0]).Length;
-        }
-        static object Lower(List<Expression> p)
-        {
-            return ((string)p[0]).ToLower();
-        }
-        static object Mid(List<Expression> p)
-        {
-            var str = (string)p[0];
-            var start = (int)p[1] - 1;
-            var length = (int)p[2];
-            if (start > str.Length - 1)
-                return String.Empty;
-            if (start + length > str.Length - 1)
-                return str.Substring(start);
-            return str.Substring(start, length);
-        }
-        static object Proper(List<Expression> p)
-        {
-            var s = (string)p[0];
-            return s.Substring(0, 1).ToUpper() + s.Substring(1).ToLower();
-        }
-        static object Replace(List<Expression> p)
-        {
-            // old start len new
-            var s = (string)p[0];
-            var start = (int)p[1] - 1;
-            var len = (int)p[2];
-            var rep = (string)p[3];
-
-            var sb = new StringBuilder();
-            sb.Append(s.Substring(0, start));
-            sb.Append(rep);
-            sb.Append(s.Substring(start + len));
-
-            return sb.ToString();
-        }
-        static object Rept(List<Expression> p)
-        {
-            var sb = new StringBuilder();
-            var s = (string)p[0];
-            for (int i = 0; i < (int)p[1]; i++)
-            {
-                sb.Append(s);
-            }
-            return sb.ToString();
-        }
-        static object Right(List<Expression> p)
-        {
-            var str = (string)p[0];
-            var n = 1;
-            if (p.Count > 1)
-            {
-                n = (int)p[1];
-            }
-            
-            if (n >= str.Length) return str;
-
-            return str.Substring(str.Length - n);
-        }
-        static object Search(List<Expression> p)
-        {
-            return IndexOf(p, StringComparison.OrdinalIgnoreCase);
-        }
-        static object Substitute(List<Expression> p)
-        {
-            // get parameters
-            var text = (string)p[0];
-            var oldText = (string)p[1];
-            var newText = (string)p[2];
-
-            // if index not supplied, replace all
-            if (p.Count == 3)
-            {
-                return text.Replace(oldText, newText);
-            }
-
-            // replace specific instance
-            int index = (int)p[3];
-            if (index < 1)
-            {
-                throw new Exception("Invalid index in Substitute.");
-            }
-            int pos = text.IndexOf(oldText);
-            while (pos > -1 && index > 1)
-            {
-                pos = text.IndexOf(oldText, pos + 1);
-                index--;
-            }
-            return pos > -1
-                ? text.Substring(0, pos) + newText + text.Substring(pos + oldText.Length)
-                : text;
-        }
-        static object T(List<Expression> p)
-        {
-            return (string)p[0];
-        }
-        static object _Text(List<Expression> p)
-        {
-            return ((double)p[0]).ToString((string)p[1], CultureInfo.CurrentCulture);
-        }
-        static object Trim(List<Expression> p)
-        {
-            //Should not trim non breaking space
-            //See http://office.microsoft.com/en-us/excel-help/trim-function-HP010062581.aspx
-            return ((string)p[0]).Trim(' ');
-        }
-        static object Upper(List<Expression> p)
-        {
-            return ((string)p[0]).ToUpper();
-        }
-        static object Value(List<Expression> p)
-        {
-            return double.Parse((string)p[0], NumberStyles.Any, CultureInfo.InvariantCulture);
-        }
-
-        static object Asc(List<Expression> p)
-        {
-            return (string)p[0];
-        }
-
-        static object Hyperlink(List<Expression> p)
-        {
-            String address = p[0];
-            String toolTip = p.Count == 2 ? p[1] : String.Empty;
-            return new XLHyperlink(address, toolTip);
-        }
-
-        static object Clean(List<Expression> p)
-        {
-            var s = (string)p[0];
-
-            var result = new StringBuilder();
-            foreach (var c in from c in s let b = (byte)c where b >= 32 select c)
-            {
-                result.Append(c);
-            }
-            return result.ToString();
-        }
-        static object Dollar(List<Expression> p)
-        {
-            Double value = p[0];
-            int dec = p.Count == 2 ? (int)p[1] : 2;
-
-            return value.ToString("C" + dec);
-        }
-
-        static object Exact(List<Expression> p)
-        {
-            var t1 = (string)p[0];
-            var t2 = (string)p[1];
-
-            return t1 == t2;
-        }
-
-        static object Fixed(List<Expression> p)
-        {
-            Double value = p[0];
-            int dec = p.Count >= 2 ? (int)p[1] : 2;
-            Boolean com = p.Count != 3 || p[2];
-
-            var retVal = value.ToString("N" + dec);
-            if (com)
-                return retVal;
-
-            return retVal.Replace(",", String.Empty);
-        }
-    }    
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs
deleted file mode 100644
index 63c052c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine.Functions
-{
-    public static class XLMath
-    {
-        public static double DegreesToRadians(double degrees)
-        {
-            return (Math.PI / 180.0) * degrees;
-        }
-
-        public static double RadiansToDegrees(double radians)
-        {
-            return (180.0 / Math.PI) * radians;
-        }
-
-        public static double GradsToRadians(double grads)
-        {
-            return (grads / 200.0) * Math.PI;
-        }
-
-        public static double RadiansToGrads(double radians)
-        {
-            return (radians / Math.PI) * 200.0;
-        }
-
-        public static double DegreesToGrads(double degrees)
-        {
-            return (degrees / 9.0) * 10.0;
-        }
-
-        public static double GradsToDegrees(double grads)
-        {
-            return (grads / 10.0) * 9.0;
-        }
-
-        public static double ASinh(double x)
-        {
-            return (Math.Log(x + Math.Sqrt(x * x + 1.0)));
-        }
-
-        public static double ACosh(double x)
-        {
-            return (Math.Log(x + Math.Sqrt((x * x) - 1.0)));
-        }
-
-        public static double ATanh(double x)
-        {
-            return (Math.Log((1.0 + x) / (1.0 - x)) / 2.0);
-        }
-
-        public static double ACoth(double x)
-        {
-            //return (Math.Log((x + 1.0) / (x - 1.0)) / 2.0);
-            return (ATanh(1.0 / x));
-        }
-
-        public static double ASech(double x)
-        {
-            return (ACosh(1.0 / x));
-        }
-
-        public static double ACsch(double x)
-        {
-            return (ASinh(1.0 / x));
-        }
-
-        public static double Sech(double x)
-        {
-            return (1.0 / Math.Cosh(x));
-        }
-
-        public static double Csch(double x)
-        {
-            return (1.0 / Math.Sinh(x));
-        }
-
-        public static double Coth(double x)
-        {
-            return (Math.Cosh(x) / Math.Sinh(x));
-        }
-
-        public static double Combin(Int32 n, Int32 k)
-        {
-            if (k == 0) return 1;
-            return n * Combin(n - 1, k - 1) / k;
-        }
-
-        public static Boolean IsEven(Int32 value)
-        {
-            return Math.Abs(value % 2) < XLHelper.Epsilon;
-        }
-        public static Boolean IsOdd(Int32 value)
-        {
-            return Math.Abs(value % 2) > XLHelper.Epsilon;
-        }
-
-        public static string ToRoman(int number)
-        {
-            if ((number < 0) || (number > 3999)) throw new ArgumentOutOfRangeException("insert value betwheen 1 and 3999");
-            if (number < 1) return string.Empty;
-            if (number >= 1000) return "M" + ToRoman(number - 1000);
-            if (number >= 900) return "CM" + ToRoman(number - 900); 
-            if (number >= 500) return "D" + ToRoman(number - 500);
-            if (number >= 400) return "CD" + ToRoman(number - 400);
-            if (number >= 100) return "C" + ToRoman(number - 100);
-            if (number >= 90) return "XC" + ToRoman(number - 90);
-            if (number >= 50) return "L" + ToRoman(number - 50);
-            if (number >= 40) return "XL" + ToRoman(number - 40);
-            if (number >= 10) return "X" + ToRoman(number - 10);
-            if (number >= 9) return "IX" + ToRoman(number - 9);
-            if (number >= 5) return "V" + ToRoman(number - 5);
-            if (number >= 4) return "IV" + ToRoman(number - 4);
-            if (number >= 1) return "I" + ToRoman(number - 1);
-            throw new ArgumentOutOfRangeException("something bad happened");
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/XLMatrix.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/XLMatrix.cs
deleted file mode 100644
index 000f20c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Functions/XLMatrix.cs
+++ /dev/null
@@ -1,594 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace ClosedXML.Excel.CalcEngine.Functions
-{
-    internal class XLMatrix
-    {
-        public XLMatrix L;
-        public XLMatrix U;
-        public int cols;
-        private double detOfP = 1;
-        public double[,] mat;
-        private int[] pi;
-        public int rows;
-
-        public XLMatrix(int iRows, int iCols) // XLMatrix Class constructor
-        {
-            rows = iRows;
-            cols = iCols;
-            mat = new double[rows,cols];
-        }
-        public XLMatrix(Double[,] arr)
-            :this(arr.GetLength(0), arr.GetLength(1))
-        {
-            var roCount = arr.GetLength(0);
-            var coCount = arr.GetLength(1);
-            for (int ro = 0; ro < roCount; ro++)
-            {
-                for (int co = 0; co < coCount; co++)
-                {
-                    mat[ro, co] = arr[ro, co];
-                }
-            }
-        }
-
-        public double this[int iRow, int iCol] // Access this matrix as a 2D array
-        {
-            get { return mat[iRow, iCol]; }
-            set { mat[iRow, iCol] = value; }
-        }
-
-        public Boolean IsSquare()
-        {
-            return (rows == cols);
-        }
-
-        public XLMatrix GetCol(int k)
-        {
-            var m = new XLMatrix(rows, 1);
-            for (var i = 0; i < rows; i++) m[i, 0] = mat[i, k];
-            return m;
-        }
-
-        public void SetCol(XLMatrix v, int k)
-        {
-            for (var i = 0; i < rows; i++) mat[i, k] = v[i, 0];
-        }
-
-        public void MakeLU() // Function for LU decomposition
-        {
-            if (!IsSquare()) throw new Exception("The matrix is not square!");
-            L = IdentityMatrix(rows, cols);
-            U = Duplicate();
-
-            pi = new int[rows];
-            for (var i = 0; i < rows; i++) pi[i] = i;
-
-            var k0 = 0;
-
-            for (var k = 0; k < cols - 1; k++)
-            {
-                double p = 0;
-                for (var i = k; i < rows; i++) // find the row with the biggest pivot
-                {
-                    if (Math.Abs(U[i, k]) > p)
-                    {
-                        p = Math.Abs(U[i, k]);
-                        k0 = i;
-                    }
-                }
-                if (p == 0) 
-                    throw new Exception("The matrix is singular!");
-
-                var pom1 = pi[k];
-                pi[k] = pi[k0];
-                pi[k0] = pom1; // switch two rows in permutation matrix
-
-                double pom2;
-                for (var i = 0; i < k; i++)
-                {
-                    pom2 = L[k, i];
-                    L[k, i] = L[k0, i];
-                    L[k0, i] = pom2;
-                }
-
-                if (k != k0) detOfP *= -1;
-
-                for (var i = 0; i < cols; i++) // Switch rows in U
-                {
-                    pom2 = U[k, i];
-                    U[k, i] = U[k0, i];
-                    U[k0, i] = pom2;
-                }
-
-                for (var i = k + 1; i < rows; i++)
-                {
-                    L[i, k] = U[i, k]/U[k, k];
-                    for (var j = k; j < cols; j++)
-                        U[i, j] = U[i, j] - L[i, k]*U[k, j];
-                }
-            }
-        }
-
-
-        public XLMatrix SolveWith(XLMatrix v) // Function solves Ax = v in confirmity with solution vector "v"
-        {
-            if (rows != cols) throw new Exception("The matrix is not square!");
-            if (rows != v.rows) throw new Exception("Wrong number of results in solution vector!");
-            if (L == null) MakeLU();
-
-            var b = new XLMatrix(rows, 1);
-            for (var i = 0; i < rows; i++) b[i, 0] = v[pi[i], 0]; // switch two items in "v" due to permutation matrix
-
-            var z = SubsForth(L, b);
-            var x = SubsBack(U, z);
-
-            return x;
-        }
-
-        public XLMatrix Invert() // Function returns the inverted matrix
-        {
-            if (L == null) MakeLU();
-
-            var inv = new XLMatrix(rows, cols);
-
-            for (var i = 0; i < rows; i++)
-            {
-                var Ei = ZeroMatrix(rows, 1);
-                Ei[i, 0] = 1;
-                var col = SolveWith(Ei);
-                inv.SetCol(col, i);
-            }
-            return inv;
-        }
-
-
-        public double Determinant() // Function for determinant
-        {
-            if (L == null) MakeLU();
-            var det = detOfP;
-            for (var i = 0; i < rows; i++) det *= U[i, i];
-            return det;
-        }
-
-        public XLMatrix GetP() // Function returns permutation matrix "P" due to permutation vector "pi"
-        {
-            if (L == null) MakeLU();
-
-            var matrix = ZeroMatrix(rows, cols);
-            for (var i = 0; i < rows; i++) matrix[pi[i], i] = 1;
-            return matrix;
-        }
-
-        public XLMatrix Duplicate() // Function returns the copy of this matrix
-        {
-            var matrix = new XLMatrix(rows, cols);
-            for (var i = 0; i < rows; i++)
-                for (var j = 0; j < cols; j++)
-                    matrix[i, j] = mat[i, j];
-            return matrix;
-        }
-
-        public static XLMatrix SubsForth(XLMatrix A, XLMatrix b) // Function solves Ax = b for A as a lower triangular matrix
-        {
-            if (A.L == null) A.MakeLU();
-            var n = A.rows;
-            var x = new XLMatrix(n, 1);
-
-            for (var i = 0; i < n; i++)
-            {
-                x[i, 0] = b[i, 0];
-                for (var j = 0; j < i; j++) x[i, 0] -= A[i, j]*x[j, 0];
-                x[i, 0] = x[i, 0]/A[i, i];
-            }
-            return x;
-        }
-
-        public static XLMatrix SubsBack(XLMatrix A, XLMatrix b) // Function solves Ax = b for A as an upper triangular matrix
-        {
-            if (A.L == null) A.MakeLU();
-            var n = A.rows;
-            var x = new XLMatrix(n, 1);
-
-            for (var i = n - 1; i > -1; i--)
-            {
-                x[i, 0] = b[i, 0];
-                for (var j = n - 1; j > i; j--) x[i, 0] -= A[i, j]*x[j, 0];
-                x[i, 0] = x[i, 0]/A[i, i];
-            }
-            return x;
-        }
-
-        public static XLMatrix ZeroMatrix(int iRows, int iCols) // Function generates the zero matrix
-        {
-            var matrix = new XLMatrix(iRows, iCols);
-            for (var i = 0; i < iRows; i++)
-                for (var j = 0; j < iCols; j++)
-                    matrix[i, j] = 0;
-            return matrix;
-        }
-
-        public static XLMatrix IdentityMatrix(int iRows, int iCols) // Function generates the identity matrix
-        {
-            var matrix = ZeroMatrix(iRows, iCols);
-            for (var i = 0; i < Math.Min(iRows, iCols); i++)
-                matrix[i, i] = 1;
-            return matrix;
-        }
-
-        public static XLMatrix RandomMatrix(int iRows, int iCols, int dispersion) // Function generates the zero matrix
-        {
-            var random = new Random();
-            var matrix = new XLMatrix(iRows, iCols);
-            for (var i = 0; i < iRows; i++)
-                for (var j = 0; j < iCols; j++)
-                    matrix[i, j] = random.Next(-dispersion, dispersion);
-            return matrix;
-        }
-
-        public static XLMatrix Parse(string ps) // Function parses the matrix from string
-        {
-            var s = NormalizeMatrixString(ps);
-            var rows = Regex.Split(s, "\r\n");
-            var nums = rows[0].Split(' ');
-            var matrix = new XLMatrix(rows.Length, nums.Length);
-            try
-            {
-                for (var i = 0; i < rows.Length; i++)
-                {
-                    nums = rows[i].Split(' ');
-                    for (var j = 0; j < nums.Length; j++) matrix[i, j] = double.Parse(nums[j]);
-                }
-            }
-            catch (FormatException)
-            {
-                throw new Exception("Wrong input format!");
-            }
-            return matrix;
-        }
-
-        public override string ToString() // Function returns matrix as a string
-        {
-            var s = "";
-            for (var i = 0; i < rows; i++)
-            {
-                for (var j = 0; j < cols; j++) s += String.Format("{0,5:0.00}", mat[i, j]) + " ";
-                s += "\r\n";
-            }
-            return s;
-        }
-
-        public static XLMatrix Transpose(XLMatrix m) // XLMatrix transpose, for any rectangular matrix
-        {
-            var t = new XLMatrix(m.cols, m.rows);
-            for (var i = 0; i < m.rows; i++)
-                for (var j = 0; j < m.cols; j++)
-                    t[j, i] = m[i, j];
-            return t;
-        }
-
-        public static XLMatrix Power(XLMatrix m, int pow) // Power matrix to exponent
-        {
-            if (pow == 0) return IdentityMatrix(m.rows, m.cols);
-            if (pow == 1) return m.Duplicate();
-            if (pow == -1) return m.Invert();
-
-            XLMatrix x;
-            if (pow < 0)
-            {
-                x = m.Invert();
-                pow *= -1;
-            }
-            else x = m.Duplicate();
-
-            var ret = IdentityMatrix(m.rows, m.cols);
-            while (pow != 0)
-            {
-                if ((pow & 1) == 1) ret *= x;
-                x *= x;
-                pow >>= 1;
-            }
-            return ret;
-        }
-
-        private static void SafeAplusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
-        {
-            for (var i = 0; i < size; i++) // rows
-                for (var j = 0; j < size; j++) // cols
-                {
-                    C[i, j] = 0;
-                    if (xa + j < A.cols && ya + i < A.rows) C[i, j] += A[ya + i, xa + j];
-                    if (xb + j < B.cols && yb + i < B.rows) C[i, j] += B[yb + i, xb + j];
-                }
-        }
-
-        private static void SafeAminusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
-        {
-            for (var i = 0; i < size; i++) // rows
-                for (var j = 0; j < size; j++) // cols
-                {
-                    C[i, j] = 0;
-                    if (xa + j < A.cols && ya + i < A.rows) C[i, j] += A[ya + i, xa + j];
-                    if (xb + j < B.cols && yb + i < B.rows) C[i, j] -= B[yb + i, xb + j];
-                }
-        }
-
-        private static void SafeACopytoC(XLMatrix A, int xa, int ya, XLMatrix C, int size)
-        {
-            for (var i = 0; i < size; i++) // rows
-                for (var j = 0; j < size; j++) // cols
-                {
-                    C[i, j] = 0;
-                    if (xa + j < A.cols && ya + i < A.rows) C[i, j] += A[ya + i, xa + j];
-                }
-        }
-
-        private static void AplusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
-        {
-            for (var i = 0; i < size; i++) // rows
-                for (var j = 0; j < size; j++) C[i, j] = A[ya + i, xa + j] + B[yb + i, xb + j];
-        }
-
-        private static void AminusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
-        {
-            for (var i = 0; i < size; i++) // rows
-                for (var j = 0; j < size; j++) C[i, j] = A[ya + i, xa + j] - B[yb + i, xb + j];
-        }
-
-        private static void ACopytoC(XLMatrix A, int xa, int ya, XLMatrix C, int size)
-        {
-            for (var i = 0; i < size; i++) // rows
-                for (var j = 0; j < size; j++) C[i, j] = A[ya + i, xa + j];
-        }
-
-        private static XLMatrix StrassenMultiply(XLMatrix A, XLMatrix B) // Smart matrix multiplication
-        {
-            if (A.cols != B.rows) throw new Exception("Wrong dimension of matrix!");
-
-            XLMatrix R;
-
-            var msize = Math.Max(Math.Max(A.rows, A.cols), Math.Max(B.rows, B.cols));
-
-            if (msize < 32)
-            {
-                R = ZeroMatrix(A.rows, B.cols);
-                for (var i = 0; i < R.rows; i++)
-                    for (var j = 0; j < R.cols; j++)
-                        for (var k = 0; k < A.cols; k++)
-                            R[i, j] += A[i, k]*B[k, j];
-                return R;
-            }
-
-            var size = 1;
-            var n = 0;
-            while (msize > size)
-            {
-                size *= 2;
-                n++;
-            }
-            
-            var h = size/2;
-
-
-            var mField = new XLMatrix[n,9];
-
-            /*
-             *  8x8, 8x8, 8x8, ...
-             *  4x4, 4x4, 4x4, ...
-             *  2x2, 2x2, 2x2, ...
-             *  . . .
-             */
-
-            for (var i = 0; i < n - 4; i++) // rows
-            {
-                var z = (int) Math.Pow(2, n - i - 1);
-                for (var j = 0; j < 9; j++) mField[i, j] = new XLMatrix(z, z);
-            }
-
-            SafeAplusBintoC(A, 0, 0, A, h, h, mField[0, 0], h);
-            SafeAplusBintoC(B, 0, 0, B, h, h, mField[0, 1], h);
-            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 1], 1, mField); // (A11 + A22) * (B11 + B22);
-
-            SafeAplusBintoC(A, 0, h, A, h, h, mField[0, 0], h);
-            SafeACopytoC(B, 0, 0, mField[0, 1], h);
-            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 2], 1, mField); // (A21 + A22) * B11;
-
-            SafeACopytoC(A, 0, 0, mField[0, 0], h);
-            SafeAminusBintoC(B, h, 0, B, h, h, mField[0, 1], h);
-            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 3], 1, mField); //A11 * (B12 - B22);
-
-            SafeACopytoC(A, h, h, mField[0, 0], h);
-            SafeAminusBintoC(B, 0, h, B, 0, 0, mField[0, 1], h);
-            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 4], 1, mField); //A22 * (B21 - B11);
-
-            SafeAplusBintoC(A, 0, 0, A, h, 0, mField[0, 0], h);
-            SafeACopytoC(B, h, h, mField[0, 1], h);
-            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 5], 1, mField); //(A11 + A12) * B22;
-
-            SafeAminusBintoC(A, 0, h, A, 0, 0, mField[0, 0], h);
-            SafeAplusBintoC(B, 0, 0, B, h, 0, mField[0, 1], h);
-            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 6], 1, mField); //(A21 - A11) * (B11 + B12);
-
-            SafeAminusBintoC(A, h, 0, A, h, h, mField[0, 0], h);
-            SafeAplusBintoC(B, 0, h, B, h, h, mField[0, 1], h);
-            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 7], 1, mField); // (A12 - A22) * (B21 + B22);
-
-            R = new XLMatrix(A.rows, B.cols); // result
-
-            // C11
-            for (var i = 0; i < Math.Min(h, R.rows); i++) // rows
-                for (var j = 0; j < Math.Min(h, R.cols); j++) // cols
-                    R[i, j] = mField[0, 1 + 1][i, j] + mField[0, 1 + 4][i, j] - mField[0, 1 + 5][i, j] +
-                              mField[0, 1 + 7][i, j];
-
-            // C12
-            for (var i = 0; i < Math.Min(h, R.rows); i++) // rows
-                for (var j = h; j < Math.Min(2*h, R.cols); j++) // cols
-                    R[i, j] = mField[0, 1 + 3][i, j - h] + mField[0, 1 + 5][i, j - h];
-
-            // C21
-            for (var i = h; i < Math.Min(2*h, R.rows); i++) // rows
-                for (var j = 0; j < Math.Min(h, R.cols); j++) // cols
-                    R[i, j] = mField[0, 1 + 2][i - h, j] + mField[0, 1 + 4][i - h, j];
-
-            // C22
-            for (var i = h; i < Math.Min(2*h, R.rows); i++) // rows
-                for (var j = h; j < Math.Min(2*h, R.cols); j++) // cols
-                    R[i, j] = mField[0, 1 + 1][i - h, j - h] - mField[0, 1 + 2][i - h, j - h] +
-                              mField[0, 1 + 3][i - h, j - h] + mField[0, 1 + 6][i - h, j - h];
-
-            return R;
-        }
-
-        // function for square matrix 2^N x 2^N
-
-        private static void StrassenMultiplyRun(XLMatrix A, XLMatrix B, XLMatrix C, int l, XLMatrix[,] f)
-            // A * B into C, level of recursion, matrix field
-        {
-            var size = A.rows;
-            var h = size/2;
-
-            if (size < 32)
-            {
-                for (var i = 0; i < C.rows; i++)
-                    for (var j = 0; j < C.cols; j++)
-                    {
-                        C[i, j] = 0;
-                        for (var k = 0; k < A.cols; k++) C[i, j] += A[i, k]*B[k, j];
-                    }
-                return;
-            }
-
-            AplusBintoC(A, 0, 0, A, h, h, f[l, 0], h);
-            AplusBintoC(B, 0, 0, B, h, h, f[l, 1], h);
-            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 1], l + 1, f); // (A11 + A22) * (B11 + B22);
-
-            AplusBintoC(A, 0, h, A, h, h, f[l, 0], h);
-            ACopytoC(B, 0, 0, f[l, 1], h);
-            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 2], l + 1, f); // (A21 + A22) * B11;
-
-            ACopytoC(A, 0, 0, f[l, 0], h);
-            AminusBintoC(B, h, 0, B, h, h, f[l, 1], h);
-            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 3], l + 1, f); //A11 * (B12 - B22);
-
-            ACopytoC(A, h, h, f[l, 0], h);
-            AminusBintoC(B, 0, h, B, 0, 0, f[l, 1], h);
-            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 4], l + 1, f); //A22 * (B21 - B11);
-
-            AplusBintoC(A, 0, 0, A, h, 0, f[l, 0], h);
-            ACopytoC(B, h, h, f[l, 1], h);
-            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 5], l + 1, f); //(A11 + A12) * B22;
-
-            AminusBintoC(A, 0, h, A, 0, 0, f[l, 0], h);
-            AplusBintoC(B, 0, 0, B, h, 0, f[l, 1], h);
-            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 6], l + 1, f); //(A21 - A11) * (B11 + B12);
-
-            AminusBintoC(A, h, 0, A, h, h, f[l, 0], h);
-            AplusBintoC(B, 0, h, B, h, h, f[l, 1], h);
-            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 7], l + 1, f); // (A12 - A22) * (B21 + B22);
-
-            // C11
-            for (var i = 0; i < h; i++) // rows
-                for (var j = 0; j < h; j++) // cols
-                    C[i, j] = f[l, 1 + 1][i, j] + f[l, 1 + 4][i, j] - f[l, 1 + 5][i, j] + f[l, 1 + 7][i, j];
-
-            // C12
-            for (var i = 0; i < h; i++) // rows
-                for (var j = h; j < size; j++) // cols
-                    C[i, j] = f[l, 1 + 3][i, j - h] + f[l, 1 + 5][i, j - h];
-
-            // C21
-            for (var i = h; i < size; i++) // rows
-                for (var j = 0; j < h; j++) // cols
-                    C[i, j] = f[l, 1 + 2][i - h, j] + f[l, 1 + 4][i - h, j];
-
-            // C22
-            for (var i = h; i < size; i++) // rows
-                for (var j = h; j < size; j++) // cols
-                    C[i, j] = f[l, 1 + 1][i - h, j - h] - f[l, 1 + 2][i - h, j - h] + f[l, 1 + 3][i - h, j - h] +
-                              f[l, 1 + 6][i - h, j - h];
-        }
-
-        public static XLMatrix StupidMultiply(XLMatrix m1, XLMatrix m2) // Stupid matrix multiplication
-        {
-            if (m1.cols != m2.rows) throw new Exception("Wrong dimensions of matrix!");
-
-            var result = ZeroMatrix(m1.rows, m2.cols);
-            for (var i = 0; i < result.rows; i++)
-                for (var j = 0; j < result.cols; j++)
-                    for (var k = 0; k < m1.cols; k++)
-                        result[i, j] += m1[i, k]*m2[k, j];
-            return result;
-        }
-
-        private static XLMatrix Multiply(double n, XLMatrix m) // Multiplication by constant n
-        {
-            var r = new XLMatrix(m.rows, m.cols);
-            for (var i = 0; i < m.rows; i++)
-                for (var j = 0; j < m.cols; j++)
-                    r[i, j] = m[i, j]*n;
-            return r;
-        }
-
-        private static XLMatrix Add(XLMatrix m1, XLMatrix m2) 
-        {
-            if (m1.rows != m2.rows || m1.cols != m2.cols)
-                throw new Exception("Matrices must have the same dimensions!");
-            var r = new XLMatrix(m1.rows, m1.cols);
-            for (var i = 0; i < r.rows; i++)
-                for (var j = 0; j < r.cols; j++)
-                    r[i, j] = m1[i, j] + m2[i, j];
-            return r;
-        }
-
-        public static string NormalizeMatrixString(string matStr) // From Andy - thank you! :)
-        {
-            // Remove any multiple spaces
-            while (matStr.IndexOf("  ") != -1)
-                matStr = matStr.Replace("  ", " ");
-
-            // Remove any spaces before or after newlines
-            matStr = matStr.Replace(" \r\n", "\r\n");
-            matStr = matStr.Replace("\r\n ", "\r\n");
-
-            // If the data ends in a newline, remove the trailing newline.
-            // Make it easier by first replacing \r\n’s with |’s then
-            // restore the |’s with \r\n’s
-            matStr = matStr.Replace("\r\n", "|");
-            while (matStr.LastIndexOf("|") == (matStr.Length - 1))
-                matStr = matStr.Substring(0, matStr.Length - 1);
-
-            matStr = matStr.Replace("|", "\r\n");
-            return matStr;
-        }
-
-        //   O P E R A T O R S
-
-        public static XLMatrix operator -(XLMatrix m)
-        {
-            return Multiply(-1, m);
-        }
-
-        public static XLMatrix operator +(XLMatrix m1, XLMatrix m2)
-        {
-            return Add(m1, m2);
-        }
-
-        public static XLMatrix operator -(XLMatrix m1, XLMatrix m2)
-        {
-            return Add(m1, -m2);
-        }
-
-        public static XLMatrix operator *(XLMatrix m1, XLMatrix m2)
-        {
-            return StrassenMultiply(m1, m2);
-        }
-
-        public static XLMatrix operator *(double n, XLMatrix m)
-        {
-            return Multiply(n, m);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Token.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Token.cs
deleted file mode 100644
index 2095806..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/Token.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace ClosedXML.Excel.CalcEngine
-{
-    /// <summary>
-	/// Represents a node in the expression tree.
-    /// </summary>
-    internal class Token
-	{
-        // ** fields
-		public TKID ID;
-        public TKTYPE Type;
-        public object Value;
-
-        // ** ctor
-        public Token(object value, TKID id, TKTYPE type)
-        {
-            Value = value;
-            ID = id;
-			Type = type;
-		}
-    }
-    /// <summary>
-    /// Token types (used when building expressions, sequence defines operator priority)
-    /// </summary>
-    internal enum TKTYPE
-    {
-        COMPARE,	// < > = <= >=
-        ADDSUB,		// + -
-        MULDIV,		// * /
-        POWER,		// ^
-        GROUP,		// ( ) , .
-        LITERAL,	// 123.32, "Hello", etc.
-        IDENTIFIER  // functions, external objects, bindings
-    }
-    /// <summary>
-    /// Token ID (used when evaluating expressions)
-    /// </summary>
-    internal enum TKID
-    {
-        GT, LT, GE, LE, EQ, NE, // COMPARE
-        ADD, SUB, // ADDSUB
-        MUL, DIV, DIVINT, MOD, // MULDIV
-        POWER, // POWER
-        OPEN, CLOSE, END, COMMA, PERIOD, // GROUP
-        ATOM, // LITERAL, IDENTIFIER
-        CONCAT
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/XLCalcEngine.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/XLCalcEngine.cs
deleted file mode 100644
index eb359ac..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CalcEngine/XLCalcEngine.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel.CalcEngine
-{
-    internal class XLCalcEngine : CalcEngine
-    {
-        private readonly IXLWorksheet _ws;
-        private readonly XLWorkbook _wb;
-        public XLCalcEngine()
-        {}
-        public XLCalcEngine(XLWorkbook wb)
-        {
-            _wb = wb;
-            IdentifierChars = "$:!";
-        }
-        public XLCalcEngine(IXLWorksheet ws): this(ws.Workbook)
-        {
-            _ws = ws;
-        }
-
-        public override object GetExternalObject(string identifier)
-        {
-            if (identifier.Contains("!") && _wb != null)
-            {
-                var wsName = identifier.Substring(0, identifier.IndexOf("!"));
-                return new CellRangeReference(_wb.Worksheet(wsName).Range(identifier.Substring(identifier.IndexOf("!") + 1)), this);
-            }
-
-            if (_ws != null)
-                return new CellRangeReference(_ws.Range(identifier), this);
-
-            return identifier;
-        }
-
-
-    }
-
-    internal class CellRangeReference : IValueObject, IEnumerable
-    {
-        private IXLRange _range;
-        private XLCalcEngine _ce;
-        public CellRangeReference(IXLRange range, XLCalcEngine ce)
-        {
-            _range = range;
-            _ce = ce;
-        }
-
-        public IXLRange Range { get { return _range; } }
-
-        // ** IValueObject
-        public object GetValue()
-        {
-            return GetValue(_range.FirstCell());
-        }
-
-        // ** IEnumerable
-        public IEnumerator GetEnumerator()
-        {
-            return _range.Cells().Select(GetValue).GetEnumerator();
-        }
-
-        private Boolean _evaluating;
-
-        // ** implementation
-        object GetValue(IXLCell cell)
-        {
-            if (_evaluating)
-            {
-                throw new Exception("Circular Reference");
-            }
-            try
-            {
-                _evaluating = true;
-                var f = cell.FormulaA1;
-                if (XLHelper.IsNullOrWhiteSpace(f))
-                    return cell.Value;
-                else
-                    return new XLCalcEngine(cell.Worksheet).Evaluate(f);
-
-            }
-            finally
-            {
-                _evaluating = false;
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/IXLCell.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/IXLCell.cs
deleted file mode 100644
index 157017f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/IXLCell.cs
+++ /dev/null
@@ -1,328 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-
-namespace ClosedXML.Excel
-{
-    public enum XLCellValues { Text, Number, Boolean, DateTime, TimeSpan }
-
-    public enum XLClearOptions
-    {
-        ContentsAndFormats,
-        Contents,
-        Formats
-    }
-
-    public interface IXLCell
-    {
-        /// <summary>
-        /// Gets or sets the cell's value. To get a strongly typed object use the method GetValue&lt;T&gt;.
-        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from this cell.</para>
-        /// <para>If the object is a range ClosedXML will copy the range starting from this cell.</para>
-        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
-        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
-        /// </summary>
-        /// <value>
-        /// The object containing the value(s) to set.
-        /// </value>
-        Object Value { get; set; }
-
-        /// <summary>Gets this cell's address, relative to the worksheet.</summary>
-        /// <value>The cell's address.</value>
-        IXLAddress Address { get;  }
-
-        /// <summary>
-        /// Gets or sets the type of this cell's data.
-        /// <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
-        /// </summary>
-        /// <value>
-        /// The type of the cell's data.
-        /// </value>
-        /// <exception cref="ArgumentException"></exception>
-        XLCellValues DataType { get; set; }
-
-        /// <summary>
-        /// Sets the type of this cell's data.
-        /// <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
-        /// </summary>
-        /// <param name="dataType">Type of the data.</param>
-        /// <returns></returns>
-        IXLCell SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Sets the cell's value.
-        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from this cell.</para>
-        /// <para>If the object is a range ClosedXML will copy the range starting from this cell.</para>
-        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
-        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
-        /// </summary>
-        /// <value>
-        /// The object containing the value(s) to set.
-        /// </value>
-        IXLCell SetValue<T>(T value);
-
-        /// <summary>
-        /// Gets the cell's value converted to the T type.
-        /// <para>ClosedXML will try to covert the current value to the T type.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to the T type.</para>
-        /// </summary>
-        /// <typeparam name="T">The return type.</typeparam>
-        /// <exception cref="ArgumentException"></exception>
-        T GetValue<T>();
-
-        /// <summary>
-        /// Gets the cell's value converted to a String.
-        /// </summary>
-        String GetString();
-
-        /// <summary>
-        /// Gets the cell's value formatted depending on the cell's data type and style.
-        /// </summary>
-        String GetFormattedString();
-
-        /// <summary>
-        /// Gets the cell's value converted to Double.
-        /// <para>ClosedXML will try to covert the current value to Double.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to Double.</para>
-        /// </summary>
-        Double GetDouble();
-
-        /// <summary>
-        /// Gets the cell's value converted to Boolean.
-        /// <para>ClosedXML will try to covert the current value to Boolean.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to Boolean.</para>
-        /// </summary>
-        Boolean GetBoolean();
-
-        /// <summary>
-        /// Gets the cell's value converted to DateTime.
-        /// <para>ClosedXML will try to covert the current value to DateTime.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to DateTime.</para>
-        /// </summary>
-        DateTime GetDateTime();
-
-        /// <summary>
-        /// Gets the cell's value converted to TimeSpan.
-        /// <para>ClosedXML will try to covert the current value to TimeSpan.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to TimeSpan.</para>
-        /// </summary>
-        TimeSpan GetTimeSpan();
-
-        XLHyperlink GetHyperlink();
-
-        Boolean TryGetValue<T>(out T value);
-
-
-
-        Boolean HasHyperlink { get; }
-
-        /// <summary>
-        /// Clears the contents of this cell.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLCell Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        /// <summary>
-        /// Deletes the current cell and shifts the surrounding cells according to the shiftDeleteCells parameter.
-        /// </summary>
-        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
-        void Delete(XLShiftDeletedCells shiftDeleteCells);
-
-        /// <summary>
-        /// Gets or sets the cell's formula with A1 references.
-        /// </summary>
-        /// <value>The formula with A1 references.</value>
-        String FormulaA1 { get; set; }
-
-        IXLCell SetFormulaA1(String formula);
-
-        /// <summary>
-        /// Gets or sets the cell's formula with R1C1 references.
-        /// </summary>
-        /// <value>The formula with R1C1 references.</value>
-        String FormulaR1C1 { get; set; }
-
-        IXLCell SetFormulaR1C1(String formula);
-
-        /// <summary>
-        /// Returns this cell as an IXLRange.
-        /// </summary>
-        IXLRange AsRange();
-
-
-        /// <summary>
-        /// Gets or sets the cell's style.
-        /// </summary>
-        IXLStyle Style { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this cell's text should be shared or not.
-        /// </summary>
-        /// <value>
-        ///   If false the cell's text will not be shared and stored as an inline value.
-        /// </value>
-        Boolean ShareString { get; set; }
-
-        /// <summary>
-        /// Inserts the IEnumerable data elements and returns the range it occupies.
-        /// </summary>
-        /// <param name="data">The IEnumerable data.</param>
-        IXLRange InsertData(IEnumerable data);
-
-        /// <summary>
-        /// Inserts the IEnumerable data elements as a table and returns it.
-        /// <para>The new table will receive a generic name: Table#</para>
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        IXLTable InsertTable<T>(IEnumerable<T> data);
-
-        /// <summary>
-        /// Inserts the IEnumerable data elements as a table and returns it.
-        /// <para>The new table will receive a generic name: Table#</para>
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        /// <param name="createTable">
-        /// if set to <c>true</c> it will create an Excel table.
-        /// <para>if set to <c>false</c> the table will be created in memory.</para>
-        /// </param>
-        IXLTable InsertTable<T>(IEnumerable<T> data, Boolean createTable);
-
-        /// <summary>
-        /// Creates an Excel table from the given IEnumerable data elements.
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        /// <param name="tableName">Name of the table.</param>
-        IXLTable InsertTable<T>(IEnumerable<T> data, String tableName);
-
-        /// <summary>
-        /// Inserts the IEnumerable data elements as a table and returns it.
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        /// <param name="tableName">Name of the table.</param>
-        /// <param name="createTable">
-        /// if set to <c>true</c> it will create an Excel table.
-        /// <para>if set to <c>false</c> the table will be created in memory.</para>
-        /// </param>
-        IXLTable InsertTable<T>(IEnumerable<T> data, String tableName, Boolean createTable);
-
-
-        /// <summary>
-        /// Inserts the DataTable data elements as a table and returns it.
-        /// <para>The new table will receive a generic name: Table#</para>
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        IXLTable InsertTable(DataTable data);
-
-        /// <summary>
-        /// Inserts the DataTable data elements as a table and returns it.
-        /// <para>The new table will receive a generic name: Table#</para>
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        /// <param name="createTable">
-        /// if set to <c>true</c> it will create an Excel table.
-        /// <para>if set to <c>false</c> the table will be created in memory.</para>
-        /// </param>
-        IXLTable InsertTable(DataTable data, Boolean createTable);
-
-        /// <summary>
-        /// Creates an Excel table from the given DataTable data elements.
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        /// <param name="tableName">Name of the table.</param>
-        IXLTable InsertTable(DataTable data, String tableName);
-
-        /// <summary>
-        /// Inserts the DataTable data elements as a table and returns it.
-        /// </summary>
-        /// <param name="data">The table data.</param>
-        /// <param name="tableName">Name of the table.</param>
-        /// <param name="createTable">
-        /// if set to <c>true</c> it will create an Excel table.
-        /// <para>if set to <c>false</c> the table will be created in memory.</para>
-        /// </param>
-        IXLTable InsertTable(DataTable data, String tableName, Boolean createTable);
-
-
-        XLHyperlink Hyperlink { get; set; }
-        IXLWorksheet Worksheet { get; }
-
-        IXLDataValidation DataValidation { get; }
-        IXLDataValidation NewDataValidation { get; }
-        IXLDataValidation SetDataValidation();
-
-
-        IXLCells InsertCellsAbove(int numberOfRows);
-        IXLCells InsertCellsBelow(int numberOfRows);
-        IXLCells InsertCellsAfter(int numberOfColumns);
-        IXLCells InsertCellsBefore(int numberOfColumns);
-
-        /// <summary>
-        /// Creates a named range out of this cell. 
-        /// <para>If the named range exists, it will add this range to that named range.</para>
-        /// <para>The default scope for the named range is Workbook.</para>
-        /// </summary>
-        /// <param name="rangeName">Name of the range.</param>
-        IXLCell AddToNamed(String rangeName);
-
-        /// <summary>
-        /// Creates a named range out of this cell. 
-        /// <para>If the named range exists, it will add this range to that named range.</para>
-        /// <param name="rangeName">Name of the range.</param>
-        /// <param name="scope">The scope for the named range.</param>
-        /// </summary>
-        IXLCell AddToNamed(String rangeName, XLScope scope);
-
-        /// <summary>
-        /// Creates a named range out of this cell. 
-        /// <para>If the named range exists, it will add this range to that named range.</para>
-        /// <param name="rangeName">Name of the range.</param>
-        /// <param name="scope">The scope for the named range.</param>
-        /// <param name="comment">The comments for the named range.</param>
-        /// </summary>
-        IXLCell AddToNamed(String rangeName, XLScope scope, String comment);
-
-        IXLCell CopyFrom(IXLCell otherCell);
-        IXLCell CopyFrom(String otherCell);
-        IXLCell CopyTo(IXLCell target);
-        IXLCell CopyTo(String target);
-
-        String ValueCached { get; }
-
-        IXLRichText RichText { get; }
-        Boolean HasRichText { get; }
-        IXLComment Comment { get; }
-        Boolean HasComment { get; }
-
-        Boolean IsMerged();
-        Boolean IsEmpty();
-        Boolean IsEmpty(Boolean includeFormats);
-
-        IXLCell CellAbove();
-        IXLCell CellAbove(Int32 step);
-        IXLCell CellBelow();
-        IXLCell CellBelow(Int32 step);
-        IXLCell CellLeft();
-        IXLCell CellLeft(Int32 step);
-        IXLCell CellRight();
-        IXLCell CellRight(Int32 step);
-
-        IXLColumn WorksheetColumn();
-        IXLRow WorksheetRow();
-
-        Boolean HasDataValidation { get; }
-
-        IXLConditionalFormat AddConditionalFormat();
-
-        void Select();
-
-        Boolean Active { get; set; }
-        IXLCell SetActive(Boolean value = true);
-
-        Boolean HasFormula { get; }
-
-        IXLRangeAddress FormulaReference { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/IXLCells.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/IXLCells.cs
deleted file mode 100644
index d2eefe9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/IXLCells.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLCells : IEnumerable<IXLCell>
-    {
-        /// <summary>
-        /// Sets the cells' value.
-        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
-        /// <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
-        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
-        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
-        /// </summary>
-        /// <value>
-        /// The object containing the value(s) to set.
-        /// </value>
-        Object Value { set; }
-
-        /// <summary>
-        /// Sets the type of the cells' data.
-        /// <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
-        /// <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
-        /// </summary>
-        /// <value>
-        /// The type of the cell's data.
-        /// </value>
-        /// <exception cref="ArgumentException"></exception>
-        XLCellValues DataType { set; }
-
-        IXLCells SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of these cells.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLCells Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        /// <summary>
-        /// Delete the comments of these cells.
-        /// </summary>
-        void DeleteComments();
-
-        /// <summary>
-        /// Sets the cells' formula with A1 references.
-        /// </summary>
-        /// <value>The formula with A1 references.</value>
-        String FormulaA1 { set; }
-
-        /// <summary>
-        /// Sets the cells' formula with R1C1 references.
-        /// </summary>
-        /// <value>The formula with R1C1 references.</value>
-        String FormulaR1C1 { set; }
-
-        IXLStyle Style { get; set; }
-
-        void Select();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCell.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCell.cs
deleted file mode 100644
index f9312ee..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCell.cs
+++ /dev/null
@@ -1,2597 +0,0 @@
-namespace ClosedXML.Excel
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.Globalization;
-    using System.Linq;
-    using System.Reflection;
-    using System.Text;
-    using System.Text.RegularExpressions;
-#if NET4
-    using System.ComponentModel.DataAnnotations;
-
-#endif
-
-    internal class XLCell : IXLCell, IXLStylized
-    {
-        public static readonly DateTime BaseDate = new DateTime(1899, 12, 30);
-        private static Dictionary<int, string> _formatCodes;
-
-        private static readonly Regex A1Regex = new Regex(
-            @"(?<=\W)(\$?[a-zA-Z]{1,3}\$?\d{1,7})(?=\W)" // A1
-            + @"|(?<=\W)(\$?\d{1,7}:\$?\d{1,7})(?=\W)" // 1:1
-            + @"|(?<=\W)(\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})(?=\W)", RegexOptions.Compiled); // A:A
-
-        public static readonly Regex A1SimpleRegex = new Regex(
-            //  @"(?<=\W)" // Start with non word
-            @"(?<Reference>" // Start Group to pick
-            + @"(?<Sheet>" // Start Sheet Name, optional
-            + @"("
-            + @"\'([^\[\]\*/\\\?:\']+|\'\')\'"
-            // Sheet name with special characters, surrounding apostrophes are required
-            + @"|"
-            + @"\'?\w+\'?" // Sheet name with letters and numbers, surrounding apostrophes are optional
-            + @")"
-            + @"!)?" // End Sheet Name, optional
-            + @"(?<Range>" // Start range
-            + @"\$?[a-zA-Z]{1,3}\$?\d{1,7}" // A1 Address 1
-            + @"(?<RangeEnd>:\$?[a-zA-Z]{1,3}\$?\d{1,7})?" // A1 Address 2, optional
-            + @"|"
-            + @"(?<ColumnNumbers>\$?\d{1,7}:\$?\d{1,7})" // 1:1
-            + @"|"
-            + @"(?<ColumnLetters>\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})" // A:A
-            + @")" // End Range
-            + @")" // End Group to pick
-            //+ @"(?=\W)" // End with non word
-            , RegexOptions.Compiled);
-
-        private static readonly Regex A1RowRegex = new Regex(
-            @"(\$?\d{1,7}:\$?\d{1,7})" // 1:1
-            , RegexOptions.Compiled);
-
-        private static readonly Regex A1ColumnRegex = new Regex(
-            @"(\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})" // A:A
-            , RegexOptions.Compiled);
-
-        private static readonly Regex R1C1Regex = new Regex(
-            @"(?<=\W)([Rr]\[?-?\d{0,7}\]?[Cc]\[?-?\d{0,7}\]?)(?=\W)" // R1C1
-            + @"|(?<=\W)([Rr]\[?-?\d{0,7}\]?:[Rr]\[?-?\d{0,7}\]?)(?=\W)" // R:R
-            + @"|(?<=\W)([Cc]\[?-?\d{0,5}\]?:[Cc]\[?-?\d{0,5}\]?)(?=\W)", RegexOptions.Compiled); // C:C
-
-        private static readonly Regex utfPattern = new Regex(@"(?<!_x005F)_x(?!005F)([0-9A-F]{4})_", RegexOptions.Compiled);
-
-        #region Fields
-
-        private readonly XLWorksheet _worksheet;
-
-        internal string _cellValue = String.Empty;
-
-        private XLComment _comment;
-        internal XLCellValues _dataType;
-        private XLHyperlink _hyperlink;
-        private XLRichText _richText;
-
-        #endregion
-
-        #region Constructor
-
-        private Int32 _styleCacheId;
-
-        public XLCell(XLWorksheet worksheet, XLAddress address, Int32 styleId)
-        {
-            Address = address;
-            ShareString = true;
-            _worksheet = worksheet;
-            SetStyle(styleId);
-        }
-
-        private IXLStyle GetStyleForRead()
-        {
-            return Worksheet.Workbook.GetStyleById(GetStyleId());
-        }
-
-        public Int32 GetStyleId()
-        {
-            if (StyleChanged)
-                SetStyle(Style);
-
-            return _styleCacheId;
-        }
-
-        private void SetStyle(IXLStyle styleToUse)
-        {
-            _styleCacheId = Worksheet.Workbook.GetStyleId(styleToUse);
-            _style = null;
-            StyleChanged = false;
-        }
-
-        private void SetStyle(Int32 styleId)
-        {
-            _styleCacheId = styleId;
-            _style = null;
-            StyleChanged = false;
-        }
-
-        #endregion
-
-        public bool SettingHyperlink;
-        public int SharedStringId;
-        private string _formulaA1;
-        private string _formulaR1C1;
-        private IXLStyle _style;
-
-        public XLWorksheet Worksheet
-        {
-            get { return _worksheet; }
-        }
-
-        public XLAddress Address { get; internal set; }
-
-        public string InnerText
-        {
-            get
-            {
-                if (HasRichText)
-                    return _richText.ToString();
-
-                return XLHelper.IsNullOrWhiteSpace(_cellValue) ? FormulaA1 : _cellValue;
-            }
-        }
-
-        public IXLDataValidation NewDataValidation
-        {
-            get
-            {
-                using (var asRange = AsRange())
-                {
-                    return asRange.NewDataValidation; // Call the data validation without breaking it into pieces
-                }
-            }
-        }
-
-        public XLDataValidation DataValidation
-        {
-            get
-            {
-                using (var asRange = AsRange())
-                {
-                    var dv = asRange.DataValidation; // Call the data validation to break it into pieces
-                    foreach (var d in Worksheet.DataValidations)
-                    {
-                        var rs = d.Ranges;
-                        if (rs.Count == 1)
-                        {
-                            var r = rs.Single();
-                            var ra1 = r.RangeAddress.ToStringRelative();
-                            var ra2 = asRange.RangeAddress.ToStringRelative();
-                            if (ra1.Equals(ra2))
-                                return d as XLDataValidation;
-                        }
-                    }
-                }
-                return null;
-            }
-        }
-
-        internal XLComment Comment
-        {
-            get
-            {
-                if (_comment == null)
-                {
-                    // MS Excel uses Tahoma 8 Swiss no matter what current style font
-                    // var style = GetStyleForRead();
-                    var defaultFont = new XLFont
-                        {
-                            FontName = "Tahoma",
-                            FontSize = 8,
-                            FontFamilyNumbering = XLFontFamilyNumberingValues.Swiss
-                        };
-                    _comment = new XLComment(this, defaultFont);
-                }
-
-                return _comment;
-            }
-        }
-
-        #region IXLCell Members
-
-        IXLDataValidation IXLCell.DataValidation
-        {
-            get { return DataValidation; }
-        }
-
-        IXLWorksheet IXLCell.Worksheet
-        {
-            get { return Worksheet; }
-        }
-
-        IXLAddress IXLCell.Address
-        {
-            get { return Address; }
-        }
-
-        IXLRange IXLCell.AsRange()
-        {
-            return AsRange();
-        }
-
-        public IXLCell SetValue<T>(T value)
-        {
-            FormulaA1 = String.Empty;
-            _richText = null;
-            if (value is String || value is char)
-            {
-                _cellValue = value.ToString();
-                _dataType = XLCellValues.Text;
-                if (_cellValue.Contains(Environment.NewLine) && !GetStyleForRead().Alignment.WrapText)
-                    Style.Alignment.WrapText = true;
-            }
-            else if (value is TimeSpan)
-            {
-                _cellValue = value.ToString();
-                _dataType = XLCellValues.TimeSpan;
-                Style.NumberFormat.NumberFormatId = 46;
-            }
-            else if (value is DateTime)
-            {
-                _dataType = XLCellValues.DateTime;
-                var dtTest = (DateTime)Convert.ChangeType(value, typeof (DateTime));
-                Style.NumberFormat.NumberFormatId = dtTest.Date == dtTest ? 14 : 22;
-
-                _cellValue = dtTest.ToOADate().ToString();
-            }
-            else if (
-                value is sbyte
-                || value is byte
-                || value is short
-                || value is ushort
-                || value is int
-                || value is uint
-                || value is long
-                || value is ulong
-                || value is float
-                || value is double
-                || value is decimal
-                )
-            {
-                if ((value is double || value is float) && (Double.IsNaN((Double)Convert.ChangeType(value, typeof (Double)))
-                    || Double.IsInfinity((Double)Convert.ChangeType(value, typeof (Double)))))
-                {
-                    _cellValue = value.ToString();
-                    _dataType = XLCellValues.Text;
-                }
-                else
-                {
-                    _dataType = XLCellValues.Number;
-                    _cellValue = value.ToString();
-                }
-            }
-            else if (value is Boolean)
-            {
-                _dataType = XLCellValues.Boolean;
-                _cellValue = (Boolean)Convert.ChangeType(value, typeof(Boolean)) ? "1" : "0";
-            }
-            else
-            {
-                _cellValue = Convert.ToString(value);
-                _dataType = XLCellValues.Text;
-            }
-
-            return this;
-        }
-
-        public T GetValue<T>()
-        {
-            T retVal;
-            if(TryGetValue(out retVal))
-                return retVal;
-
-            throw new Exception("Cannot convert cell value to " + typeof(T));
-        }
-
-        public string GetString()
-        {
-            return GetValue<string>();
-        }
-
-        public double GetDouble()
-        {
-            return GetValue<double>();
-        }
-
-        public bool GetBoolean()
-        {
-            return GetValue<bool>();
-        }
-
-        public DateTime GetDateTime()
-        {
-            return GetValue<DateTime>();
-        }
-
-        public TimeSpan GetTimeSpan()
-        {
-            return GetValue<TimeSpan>();
-        }
-
-        public string GetFormattedString()
-        {
-            String cValue;
-            if (FormulaA1.Length > 0)
-            {
-                try
-                {
-                    cValue = GetString();
-                }
-                catch 
-                {
-                    cValue = String.Empty;
-                }
-            }
-            else
-            {
-                cValue = _cellValue;
-            }
-
-            if (_dataType == XLCellValues.Boolean)
-                return (cValue != "0").ToString();
-            if (_dataType == XLCellValues.TimeSpan)
-                return cValue;
-            if (_dataType == XLCellValues.DateTime || IsDateFormat())
-            {
-                double dTest;
-                if (Double.TryParse(cValue, out dTest))
-                {
-                    var format = GetFormat();
-                    return DateTime.FromOADate(dTest).ToString(format);
-                }
-
-                return cValue;
-            }
-
-            if (_dataType == XLCellValues.Number)
-            {
-                double dTest;
-                if (Double.TryParse(cValue, out dTest))
-                {
-                    var format = GetFormat();
-                    return dTest.ToString(format);
-                }
-
-                return cValue;
-            }
-
-            return cValue;
-        }
-
-
-        public object Value
-        {
-            get
-            {
-                var fA1 = FormulaA1;
-                if (!XLHelper.IsNullOrWhiteSpace(fA1))
-                {
-                    if (fA1[0] == '{')
-                        fA1 = fA1.Substring(1, fA1.Length - 2);
-
-                    string sName;
-                    string cAddress;
-                    if (fA1.Contains('!'))
-                    {
-                        sName = fA1.Substring(0, fA1.IndexOf('!'));
-                        if (sName[0] == '\'')
-                            sName = sName.Substring(1, sName.Length - 2);
-
-                        cAddress = fA1.Substring(fA1.IndexOf('!') + 1);
-                    }
-                    else
-                    {
-                        sName = Worksheet.Name;
-                        cAddress = fA1;
-                    }
-
-                    if (_worksheet.Workbook.WorksheetsInternal.Any<XLWorksheet>(
-                        w => String.Compare(w.Name, sName, true) == 0)
-                        && XLHelper.IsValidA1Address(cAddress)
-                        )
-                        return _worksheet.Workbook.Worksheet(sName).Cell(cAddress).Value;
-
-                    var retVal = Worksheet.Evaluate(fA1);
-                    var retValEnumerable = retVal as IEnumerable;
-
-                    if (retValEnumerable != null && !(retVal is String))
-                        foreach (var v in retValEnumerable)
-                            return v;
-
-
-                    return retVal;
-                }
-
-                var cellValue = HasRichText ? _richText.ToString() : _cellValue;
-
-
-                if (_dataType == XLCellValues.Boolean)
-                    return cellValue != "0";
-
-                if (_dataType == XLCellValues.DateTime)
-                    return DateTime.FromOADate(Double.Parse(cellValue));
-
-                if (_dataType == XLCellValues.Number)
-                    return Double.Parse(cellValue);
-
-                if (_dataType == XLCellValues.TimeSpan)
-                {
-                    // return (DateTime.FromOADate(Double.Parse(cellValue)) - baseDate);
-                    return TimeSpan.Parse(cellValue);
-                }
-
-                return cellValue;
-            }
-
-            set
-            {
-                FormulaA1 = String.Empty;
-
-                if (value as XLCells != null) throw new ArgumentException("Cannot assign IXLCells object to the cell value.");
-
-                if (SetRangeRows(value)) return;
-
-                if (SetRangeColumns(value)) return;
-
-                if (SetEnumerable(value)) return;
-
-                if (SetRange(value)) return;
-
-                if (!SetRichText(value))
-                    SetValue(value);
-
-                if (_cellValue.Length > 32767) throw new ArgumentException("Cells can only hold 32,767 characters.");
-            }
-        }
-
-        public IXLTable InsertTable<T>(IEnumerable<T> data)
-        {
-            return InsertTable(data, null, true);
-        }
-
-        public IXLTable InsertTable<T>(IEnumerable<T> data, bool createTable)
-        {
-            return InsertTable(data, null, createTable);
-        }
-
-        public IXLTable InsertTable<T>(IEnumerable<T> data, string tableName)
-        {
-            return InsertTable(data, tableName, true);
-        }
-
-        public IXLTable InsertTable<T>(IEnumerable<T> data, string tableName, bool createTable)
-        {
-            if (data != null && data.GetType() != typeof (String))
-            {
-                var ro = Address.RowNumber + 1;
-                var fRo = Address.RowNumber;
-                var hasTitles = false;
-                var maxCo = 0;
-                var isDataTable = false;
-                var isDataReader = false;
-                if (!data.Any())
-                {
-                    var t = data.GetItemType();
-                    if (t.IsPrimitive || t == typeof (string) || t == typeof (DateTime) || t == typeof (Decimal))
-                        maxCo = Address.ColumnNumber + 1;
-                    else
-                        maxCo = Address.ColumnNumber + t.GetFields().Length + t.GetProperties().Length;
-                }
-                else
-                {
-                    foreach (object m in data)
-                    {
-                        var co = Address.ColumnNumber;
-
-                        if (m.GetType().IsPrimitive || m is string || m is DateTime || m is Decimal)
-                        {
-                            if (!hasTitles)
-                            {
-                                var fieldName = GetFieldName(m.GetType().GetCustomAttributes(true));
-                                if (XLHelper.IsNullOrWhiteSpace(fieldName))
-                                    fieldName = m.GetType().Name;
-
-                                SetValue(fieldName, fRo, co);
-                                hasTitles = true;
-                                co = Address.ColumnNumber;
-                            }
-
-                            SetValue(m, ro, co);
-                            co++;
-                        }
-                        else if (m.GetType().IsArray)
-                        {
-                            foreach (var item in (Array)m)
-                            {
-                                SetValue(item, ro, co);
-                                co++;
-                            }
-                        }
-                        else if (isDataTable || m is DataRow)
-                        {
-                            if (!isDataTable)
-                                isDataTable = true;
-
-                            if (!hasTitles)
-                            {
-                                foreach (var fieldName in from DataColumn column in ((DataRow)m).Table.Columns
-                                                          select XLHelper.IsNullOrWhiteSpace(column.Caption)
-                                                                     ? column.ColumnName
-                                                                     : column.Caption)
-                                {
-                                    SetValue(fieldName, fRo, co);
-                                    co++;
-                                }
-
-                                co = Address.ColumnNumber;
-                                hasTitles = true;
-                            }
-
-                            foreach (var item in ((DataRow)m).ItemArray)
-                            {
-                                SetValue(item, ro, co);
-                                co++;
-                            }
-                        }
-                        else if (isDataReader || m is IDataRecord)
-                        {
-                            if (!isDataReader)
-                                isDataReader = true;
-
-                            var record = m as IDataRecord;
-
-                            var fieldCount = record.FieldCount;
-                            if (!hasTitles)
-                            {
-                                for (var i = 0; i < fieldCount; i++)
-                                {
-                                    SetValue(record.GetName(i), fRo, co);
-                                    co++;
-                                }
-
-                                co = Address.ColumnNumber;
-                                hasTitles = true;
-                            }
-
-                            for (var i = 0; i < fieldCount; i++)
-                            {
-                                SetValue(record[i], ro, co);
-                                co++;
-                            }
-                        }
-                        else
-                        {
-                            var fieldInfo = m.GetType().GetFields();
-                            var propertyInfo = m.GetType().GetProperties();
-                            if (!hasTitles)
-                            {
-                                foreach (var info in fieldInfo)
-                                {
-                                    if ((info as IEnumerable) == null)
-                                    {
-                                        var fieldName = GetFieldName(info.GetCustomAttributes(true));
-                                        if (XLHelper.IsNullOrWhiteSpace(fieldName))
-                                            fieldName = info.Name;
-
-                                        SetValue(fieldName, fRo, co);
-                                    }
-
-                                    co++;
-                                }
-
-                                foreach (var info in propertyInfo)
-                                {
-                                    if ((info as IEnumerable) == null)
-                                    {
-                                        var fieldName = GetFieldName(info.GetCustomAttributes(true));
-                                        if (XLHelper.IsNullOrWhiteSpace(fieldName))
-                                            fieldName = info.Name;
-
-                                        SetValue(fieldName, fRo, co);
-                                    }
-
-                                    co++;
-                                }
-
-                                co = Address.ColumnNumber;
-                                hasTitles = true;
-                            }
-
-                            foreach (var info in fieldInfo)
-                            {
-                                SetValue(info.GetValue(m), ro, co);
-                                co++;
-                            }
-
-                            foreach (var info in propertyInfo)
-                            {
-                                if ((info as IEnumerable) == null)
-                                    SetValue(info.GetValue(m, null), ro, co);
-                                co++;
-                            }
-                        }
-
-                        if (co > maxCo)
-                            maxCo = co;
-
-                        ro++;
-                    }
-                }
-
-                ClearMerged();
-                var range = _worksheet.Range(
-                    Address.RowNumber,
-                    Address.ColumnNumber,
-                    ro - 1,
-                    maxCo - 1);
-
-                if (createTable)
-                    return tableName == null ? range.CreateTable() : range.CreateTable(tableName);
-                return tableName == null ? range.AsTable() : range.AsTable(tableName);
-            }
-
-            return null;
-        }
-
-
-        public IXLTable InsertTable(DataTable data)
-        {
-            return InsertTable(data, null, true);
-        }
-
-        public IXLTable InsertTable(DataTable data, bool createTable)
-        {
-            return InsertTable(data, null, createTable);
-        }
-
-        public IXLTable InsertTable(DataTable data, string tableName)
-        {
-            return InsertTable(data, tableName, true);
-        }
-
-        public IXLTable InsertTable(DataTable data, string tableName, bool createTable)
-        {
-            if (data == null) return null;
-
-            if (data.Rows.Count > 0) return InsertTable(data.AsEnumerable(), tableName, createTable);
-
-            var ro = Address.RowNumber;
-            var co = Address.ColumnNumber;
-
-            foreach (DataColumn col in data.Columns)
-            {
-                SetValue(col.ColumnName, ro, co);
-                co++;
-            }
-
-            ClearMerged();
-            var range = _worksheet.Range(
-                Address.RowNumber,
-                Address.ColumnNumber,
-                ro,
-                co - 1);
-
-            if (createTable) return tableName == null ? range.CreateTable() : range.CreateTable(tableName);
-
-            return tableName == null ? range.AsTable() : range.AsTable(tableName);
-        }
-
-        public IXLRange InsertData(IEnumerable data)
-        {
-            if (data != null && data.GetType() != typeof (String))
-            {
-                var ro = Address.RowNumber;
-                var maxCo = 0;
-                var isDataTable = false;
-                var isDataReader = false;
-                foreach (var m in data)
-                {
-                    var co = Address.ColumnNumber;
-
-                    if (m.GetType().IsPrimitive || m is string || m is DateTime || m is Decimal)
-                    {
-                        SetValue(m, ro, co);
-                        co++;
-                    }
-                    else if (m.GetType().IsArray)
-                    {
-                        // dynamic arr = m;
-                        foreach (var item in (Array)m)
-                        {
-                            SetValue(item, ro, co);
-                            co++;
-                        }
-                    }
-                    else if (isDataTable || m is DataRow)
-                    {
-                        if (!isDataTable)
-                            isDataTable = true;
-
-                        foreach (var item in (m as DataRow).ItemArray)
-                        {
-                            SetValue(item, ro, co);
-                            co++;
-                        }
-                    }
-                    else if (isDataReader || m is IDataRecord)
-                    {
-                        if (!isDataReader)
-                            isDataReader = true;
-
-                        var record = m as IDataRecord;
-
-                        var fieldCount = record.FieldCount;
-                        for (var i = 0; i < fieldCount; i++)
-                        {
-                            SetValue(record[i], ro, co);
-                            co++;
-                        }
-                    }
-                    else
-                    {
-                        var fieldInfo = m.GetType().GetFields();
-                        foreach (var info in fieldInfo)
-                        {
-                            SetValue(info.GetValue(m), ro, co);
-                            co++;
-                        }
-
-                        var propertyInfo = m.GetType().GetProperties();
-                        foreach (var info in propertyInfo)
-                        {
-                            if ((info as IEnumerable) == null)
-                                SetValue(info.GetValue(m, null), ro, co);
-                            co++;
-                        }
-                    }
-
-                    if (co > maxCo)
-                        maxCo = co;
-
-                    ro++;
-                }
-
-                ClearMerged();
-                return _worksheet.Range(
-                    Address.RowNumber,
-                    Address.ColumnNumber,
-                    ro - 1,
-                    maxCo - 1);
-            }
-
-            return null;
-        }
-
-        public IXLStyle Style
-        {
-            get { return GetStyle(); }
-
-            set { SetStyle(value); }
-        }
-
-        public IXLCell SetDataType(XLCellValues dataType)
-        {
-            DataType = dataType;
-            return this;
-        }
-
-
-        public XLCellValues DataType
-        {
-            get { return _dataType; }
-            set
-            {
-                if (_dataType == value) return;
-
-                if (_richText != null)
-                {
-                    _cellValue = _richText.ToString();
-                    _richText = null;
-                }
-
-                if (_cellValue.Length > 0)
-                {
-                    if (value == XLCellValues.Boolean)
-                    {
-                        bool bTest;
-                        if (Boolean.TryParse(_cellValue, out bTest))
-                            _cellValue = bTest ? "1" : "0";
-                        else
-                            _cellValue = _cellValue == "0" || String.IsNullOrEmpty(_cellValue) ? "0" : "1";
-                    }
-                    else if (value == XLCellValues.DateTime)
-                    {
-                        DateTime dtTest;
-                        double dblTest;
-                        if (DateTime.TryParse(_cellValue, out dtTest))
-                            _cellValue = dtTest.ToOADate().ToString();
-                        else if (Double.TryParse(_cellValue, out dblTest))
-                            _cellValue = dblTest.ToString();
-                        else
-                        {
-                            throw new ArgumentException(
-                                string.Format(
-                                    "Cannot set data type to DateTime because '{0}' is not recognized as a date.",
-                                    _cellValue));
-                        }
-                        var style = GetStyleForRead();
-                        if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
-                            Style.NumberFormat.NumberFormatId = _cellValue.Contains('.') ? 22 : 14;
-                    }
-                    else if (value == XLCellValues.TimeSpan)
-                    {
-                        TimeSpan tsTest;
-                        if (TimeSpan.TryParse(_cellValue, out tsTest))
-                        {
-                            _cellValue = tsTest.ToString();
-                            var style = GetStyleForRead();
-                            if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
-                                Style.NumberFormat.NumberFormatId = 46;
-                        }
-                        else
-                        {
-                            try
-                            {
-                                _cellValue = (DateTime.FromOADate(Double.Parse(_cellValue)) - BaseDate).ToString();
-                            }
-                            catch
-                            {
-                                throw new ArgumentException(
-                                    string.Format(
-                                        "Cannot set data type to TimeSpan because '{0}' is not recognized as a TimeSpan.",
-                                        _cellValue));
-                            }
-                        }
-                    }
-                    else if (value == XLCellValues.Number)
-                    {
-                        double dTest;
-                        if (Double.TryParse(_cellValue, out dTest))
-                            _cellValue = Double.Parse(_cellValue).ToString();
-                        else
-                        {
-                            throw new ArgumentException(
-                                string.Format(
-                                    "Cannot set data type to Number because '{0}' is not recognized as a number.",
-                                    _cellValue));
-                        }
-                    }
-                    else
-                    {
-                        if (_dataType == XLCellValues.Boolean)
-                            _cellValue = (_cellValue != "0").ToString();
-                        else if (_dataType == XLCellValues.TimeSpan)
-                            _cellValue = BaseDate.Add(GetTimeSpan()).ToOADate().ToString(CultureInfo.InvariantCulture);
-                    }
-                }
-
-                _dataType = value;
-            }
-        }
-
-        public IXLCell Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            return Clear(clearOptions, false);
-        }
-
-        internal IXLCell Clear(XLClearOptions clearOptions, bool calledFromRange)
-        {
-            //Note: We have to check if the cell is part of a merged range. If so we have to clear the whole range
-            //Checking if called from range to avoid stack overflow
-            if (IsMerged() && !calledFromRange)
-            {
-                using (var asRange = AsRange())
-                {
-                    var firstOrDefault = Worksheet.Internals.MergedRanges.FirstOrDefault(asRange.Intersects);
-                    if (firstOrDefault != null)
-                        firstOrDefault.Clear(clearOptions);
-                }
-            }
-            else
-            {
-                if (clearOptions == XLClearOptions.Contents || clearOptions == XLClearOptions.ContentsAndFormats)
-                {
-                    Hyperlink = null;
-                    _richText = null;
-                    //_comment = null;
-                    _cellValue = String.Empty;
-                    FormulaA1 = String.Empty;
-                }
-
-                if (clearOptions == XLClearOptions.Formats || clearOptions == XLClearOptions.ContentsAndFormats)
-                {
-                    if (HasDataValidation)
-                        DataValidation.Clear();
-
-
-                    SetStyle(Worksheet.Style);
-                }
-            }
-
-            return this;
-        }
-
-
-        public void Delete(XLShiftDeletedCells shiftDeleteCells)
-        {
-            _worksheet.Range(Address, Address).Delete(shiftDeleteCells);
-        }
-
-        public string FormulaA1
-        {
-            get
-            {
-                if (XLHelper.IsNullOrWhiteSpace(_formulaA1))
-                {
-                    if (!XLHelper.IsNullOrWhiteSpace(_formulaR1C1))
-                    {
-                        _formulaA1 = GetFormulaA1(_formulaR1C1);
-                        return FormulaA1;
-                    }
-
-                    return String.Empty;
-                }
-
-                if (_formulaA1.Trim()[0] == '=')
-                    return _formulaA1.Substring(1);
-
-                if (_formulaA1.Trim().StartsWith("{="))
-                    return "{" + _formulaA1.Substring(2);
-
-                return _formulaA1;
-            }
-
-            set
-            {
-                _formulaA1 = XLHelper.IsNullOrWhiteSpace(value) ? null : value;
-
-                _formulaR1C1 = null;
-            }
-        }
-
-        public string FormulaR1C1
-        {
-            get
-            {
-                if (XLHelper.IsNullOrWhiteSpace(_formulaR1C1))
-                    _formulaR1C1 = GetFormulaR1C1(FormulaA1);
-
-                return _formulaR1C1;
-            }
-
-            set
-            {
-                _formulaR1C1 = XLHelper.IsNullOrWhiteSpace(value) ? null : value;
-
-// FormulaA1 = GetFormulaA1(value);
-            }
-        }
-
-        public bool ShareString { get; set; }
-
-        public XLHyperlink Hyperlink
-        {
-            get
-            {
-                if (_hyperlink == null)
-                    Hyperlink = new XLHyperlink();
-
-                return _hyperlink;
-            }
-
-            set
-            {
-                if (_worksheet.Hyperlinks.Any(hl => Address.Equals(hl.Cell.Address)))
-                    _worksheet.Hyperlinks.Delete(Address);
-
-                _hyperlink = value;
-
-                if (_hyperlink == null) return;
-
-                _hyperlink.Worksheet = _worksheet;
-                _hyperlink.Cell = this;
-
-                _worksheet.Hyperlinks.Add(_hyperlink);
-
-                if (SettingHyperlink) return;
-
-                if (GetStyleForRead().Font.FontColor.Equals(_worksheet.Style.Font.FontColor))
-                    Style.Font.FontColor = XLColor.FromTheme(XLThemeColor.Hyperlink);
-
-                if (GetStyleForRead().Font.Underline == _worksheet.Style.Font.Underline)
-                    Style.Font.Underline = XLFontUnderlineValues.Single;
-            }
-        }
-
-
-        public IXLCells InsertCellsAbove(int numberOfRows)
-        {
-            return AsRange().InsertRowsAbove(numberOfRows).Cells();
-        }
-
-        public IXLCells InsertCellsBelow(int numberOfRows)
-        {
-            return AsRange().InsertRowsBelow(numberOfRows).Cells();
-        }
-
-        public IXLCells InsertCellsAfter(int numberOfColumns)
-        {
-            return AsRange().InsertColumnsAfter(numberOfColumns).Cells();
-        }
-
-        public IXLCells InsertCellsBefore(int numberOfColumns)
-        {
-            return AsRange().InsertColumnsBefore(numberOfColumns).Cells();
-        }
-
-        public IXLCell AddToNamed(string rangeName)
-        {
-            AsRange().AddToNamed(rangeName);
-            return this;
-        }
-
-        public IXLCell AddToNamed(string rangeName, XLScope scope)
-        {
-            AsRange().AddToNamed(rangeName, scope);
-            return this;
-        }
-
-        public IXLCell AddToNamed(string rangeName, XLScope scope, string comment)
-        {
-            AsRange().AddToNamed(rangeName, scope, comment);
-            return this;
-        }
-
-        public string ValueCached { get; internal set; }
-
-        public IXLRichText RichText
-        {
-            get
-            {
-                if (_richText == null)
-                {
-                    var style = GetStyleForRead();
-                    _richText = _cellValue.Length == 0
-                                    ? new XLRichText(style.Font)
-                                    : new XLRichText(GetFormattedString(), style.Font);
-                }
-
-                return _richText;
-            }
-        }
-
-        public bool HasRichText
-        {
-            get { return _richText != null; }
-        }
-
-        IXLComment IXLCell.Comment
-        {
-            get { return Comment; }
-        }
-
-        public bool HasComment
-        {
-            get { return _comment != null; }
-        }
-
-        public Boolean IsMerged()
-        {
-            return Worksheet.Internals.MergedRanges.Any(r => r.Contains(this));
-        }
-
-        public Boolean IsEmpty()
-        {
-            return IsEmpty(false);
-        }
-
-        public Boolean IsEmpty(Boolean includeFormats)
-        {
-            if (InnerText.Length > 0)
-                return false;
-
-            if (includeFormats)
-            {
-                if (!Style.Equals(Worksheet.Style) || IsMerged() || HasComment || HasDataValidation)
-                    return false;
-
-                if (_style == null)
-                {
-                    XLRow row;
-                    if (Worksheet.Internals.RowsCollection.TryGetValue(Address.RowNumber, out row) && !row.Style.Equals(Worksheet.Style))
-                        return false;
-
-                    XLColumn column;
-                    if (Worksheet.Internals.ColumnsCollection.TryGetValue(Address.ColumnNumber, out column) && !column.Style.Equals(Worksheet.Style))
-                        return false;
-                }
-
-                if (Worksheet.ConditionalFormats.Any(cf => cf.Range.Contains(this)))
-                    return false;
-            }
-            return true;
-        }
-
-        public IXLColumn WorksheetColumn()
-        {
-            return Worksheet.Column(Address.ColumnNumber);
-        }
-
-        public IXLRow WorksheetRow()
-        {
-            return Worksheet.Row(Address.RowNumber);
-        }
-
-        public IXLCell CopyTo(IXLCell target)
-        {
-            (target as XLCell).CopyFrom(this, true);
-            return target;
-        }
-
-        public IXLCell CopyTo(String target)
-        {
-            return CopyTo(GetTargetCell(target, Worksheet));
-        }
-
-
-        public IXLCell CopyFrom(IXLCell otherCell)
-        {
-            return CopyFrom(otherCell as XLCell, true);
-        }
-
-        public IXLCell CopyFrom(String otherCell)
-        {
-            return CopyFrom(GetTargetCell(otherCell, Worksheet));
-        }
-
-        public IXLCell SetFormulaA1(String formula)
-        {
-            FormulaA1 = formula;
-            return this;
-        }
-
-        public IXLCell SetFormulaR1C1(String formula)
-        {
-            FormulaR1C1 = formula;
-            return this;
-        }
-
-        public Boolean HasDataValidation
-        {
-            get
-            {
-                using (var asRange = AsRange())
-                    return Worksheet.DataValidations.Any(dv => dv.Ranges.Contains(asRange) && dv.IsDirty());
-            }
-        }
-
-        public IXLDataValidation SetDataValidation()
-        {
-            return DataValidation;
-        }
-
-        public void Select()
-        {
-            AsRange().Select();
-        }
-
-        public IXLConditionalFormat AddConditionalFormat()
-        {
-            using (var r = AsRange())
-                return r.AddConditionalFormat();
-        }
-
-        public Boolean Active
-        {
-            get { return Worksheet.ActiveCell == this; }
-            set
-            {
-                if (value)
-                    Worksheet.ActiveCell = this;
-                else if (Active)
-                    Worksheet.ActiveCell = null;
-            }
-        }
-
-        public IXLCell SetActive(Boolean value = true)
-        {
-            Active = value;
-            return this;
-        }
-
-        public Boolean HasHyperlink
-        {
-            get { return _hyperlink != null; }
-        }
-
-        public XLHyperlink GetHyperlink()
-        {
-            if (HasHyperlink)
-                return Hyperlink;
-
-            return Value as XLHyperlink;
-        }
-
-        public Boolean TryGetValue<T>(out T value)
-        {
-            var currValue = Value;
-
-            if (currValue == null)
-            {
-                value = default(T);
-                return true;
-            }
-
-            bool b;
-            if (TryGetTimeSpanValue(out value, currValue, out b)) return b;
-
-            if (TryGetRichStringValue(out value)) return true;
-
-            if (TryGetStringValue(out value, currValue)) return true;
-
-            var strValue = currValue.ToString();
-            if (typeof(T) == typeof(bool)) return TryGetBasicValue<T, bool>(out value, strValue, bool.TryParse);
-            if (typeof(T) == typeof(sbyte)) return TryGetBasicValue<T, sbyte>(out value, strValue, sbyte.TryParse);
-            if (typeof(T) == typeof(byte)) return TryGetBasicValue<T, byte>(out value, strValue, byte.TryParse);
-            if (typeof(T) == typeof(short)) return TryGetBasicValue<T, short>(out value, strValue, short.TryParse);
-            if (typeof(T) == typeof(ushort)) return TryGetBasicValue<T, ushort>(out value, strValue, ushort.TryParse);
-            if (typeof(T) == typeof(int)) return TryGetBasicValue<T, int>(out value, strValue, int.TryParse);
-            if (typeof(T) == typeof(uint)) return TryGetBasicValue<T, uint>(out value, strValue, uint.TryParse);
-            if (typeof(T) == typeof(long)) return TryGetBasicValue<T, long>(out value, strValue, long.TryParse);
-            if (typeof(T) == typeof(ulong)) return TryGetBasicValue<T, ulong>(out value, strValue, ulong.TryParse);
-            if (typeof(T) == typeof(float)) return TryGetBasicValue<T, float>(out value, strValue, float.TryParse);
-            if (typeof(T) == typeof(double)) return TryGetBasicValue<T, double>(out value, strValue, double.TryParse);
-            if (typeof(T) == typeof(decimal)) return TryGetBasicValue<T, decimal>(out value, strValue, decimal.TryParse);
-
-            if (typeof(T) == typeof(XLHyperlink))
-            {
-                XLHyperlink tmp = GetHyperlink();
-                if (tmp != null)
-                {
-                    value = (T)Convert.ChangeType(tmp, typeof(T));
-                    return true;
-                }
-
-                value = default(T);
-                return false;
-            }
-
-            try
-            {
-                value = (T)Convert.ChangeType(currValue, typeof(T));
-                return true;
-            }
-            catch
-            {
-                value = default(T);
-                return false;
-            }
-        }
-
-        private static bool TryGetTimeSpanValue<T>(out T value, object currValue, out bool b)
-        {
-            if (typeof (T) == typeof (TimeSpan))
-            {
-                TimeSpan tmp;
-                Boolean retVal = true;
-
-                if (currValue is TimeSpan)
-                {
-                    tmp = (TimeSpan) currValue;
-                }
-                else if (!TimeSpan.TryParse(currValue.ToString(), out tmp))
-                {
-                    retVal = false;
-                }
-
-                value = (T) Convert.ChangeType(tmp, typeof (T));
-                {
-                    b = retVal;
-                    return true;
-                }
-            }
-            value = default(T);
-            b = false;
-            return false;
-        }
-
-        private bool TryGetRichStringValue<T>(out T value)
-        {
-            if (typeof (T) == typeof (IXLRichText))
-            {
-                value = (T) RichText;
-                return true;
-            }
-            value = default(T);
-            return false;
-        }
-
-        private static bool TryGetStringValue<T>(out T value, object currValue)
-        {
-            if (typeof (T) == typeof (String))
-            {
-                var valToUse = currValue.ToString();
-                if (!utfPattern.Match(valToUse).Success)
-                {
-                    value = (T) Convert.ChangeType(valToUse, typeof (T));
-                    return true;
-                }
-
-                var sb = new StringBuilder();
-                var lastIndex = 0;
-                foreach (Match match in utfPattern.Matches(valToUse))
-                {
-                    var matchString = match.Value;
-                    var matchIndex = match.Index;
-                    sb.Append(valToUse.Substring(lastIndex, matchIndex - lastIndex));
-
-                    sb.Append((char) int.Parse(match.Groups[1].Value, NumberStyles.AllowHexSpecifier));
-
-                    lastIndex = matchIndex + matchString.Length;
-                }
-                if (lastIndex < valToUse.Length)
-                    sb.Append(valToUse.Substring(lastIndex));
-
-                value = (T) Convert.ChangeType(sb.ToString(), typeof (T));
-                return true;
-            }
-            value = default(T);
-            return false;
-        }
-
-        private static Boolean TryGetBooleanValue<T>(out T value, object currValue)
-        {
-            if (typeof (T) == typeof (Boolean))
-            {
-                Boolean tmp;
-                if (Boolean.TryParse(currValue.ToString(), out tmp))
-                {
-                    value = (T) Convert.ChangeType(tmp, typeof (T));
-                    {
-                        return true;
-                    }
-                }
-            }
-            value = default(T);
-            return false;
-        }
-
-        delegate Boolean Func<T>(String input, out T output);
-
-        private static Boolean TryGetBasicValue<T, U>(out T value, String currValue, Func<U> func )
-        {
-                U tmp;
-                if (func(currValue, out tmp))
-                {
-                    value = (T)Convert.ChangeType(tmp, typeof(T));
-                    {
-                        return true;
-                    }
-                }
-            value = default(T);
-            return false;
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public Boolean StyleChanged { get; set; }
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return Style;
-                UpdatingStyle = false;
-            }
-        }
-
-        public bool UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return Style; }
-            set { Style = value; }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges {AsRange()};
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        private bool SetRangeColumns(object value)
-        {
-            var columns = value as XLRangeColumns;
-            if (columns == null)
-                return SetColumns(value);
-
-            var cell = this;
-            foreach (var column in columns)
-            {
-                cell.SetRange(column);
-                cell = cell.CellRight();
-            }
-            return true;
-        }
-
-        private bool SetColumns(object value)
-        {
-            var columns = value as XLColumns;
-            if (columns == null)
-                return false;
-
-            var cell = this;
-            foreach (var column in columns)
-            {
-                cell.SetRange(column);
-                cell = cell.CellRight();
-            }
-            return true;
-        }
-
-        private bool SetRangeRows(object value)
-        {
-            var rows = value as XLRangeRows;
-            if (rows == null)
-                return SetRows(value);
-
-            var cell = this;
-            foreach (var row in rows)
-            {
-                cell.SetRange(row);
-                cell = cell.CellBelow();
-            }
-            return true;
-        }
-
-        private bool SetRows(object value)
-        {
-            var rows = value as XLRows;
-            if (rows == null)
-                return false;
-
-            var cell = this;
-            foreach (var row in rows)
-            {
-                cell.SetRange(row);
-                cell = cell.CellBelow();
-            }
-            return true;
-        }
-
-        public XLRange AsRange()
-        {
-            return _worksheet.Range(Address, Address);
-        }
-
-        private IXLStyle GetStyle()
-        {
-            //return _style ?? (_style = new XLStyle(this, Worksheet.Workbook.GetStyleById(_styleCacheId)));
-            if (_style != null)
-                return _style;
-
-            return _style = new XLStyle(this, Worksheet.Workbook.GetStyleById(_styleCacheId));
-        }
-
-        public void DeleteComment()
-        {
-            _comment = null;
-        }
-
-        private bool IsDateFormat()
-        {
-            var style = GetStyleForRead();
-            return _dataType == XLCellValues.Number
-                   && XLHelper.IsNullOrWhiteSpace(style.NumberFormat.Format)
-                   && ((style.NumberFormat.NumberFormatId >= 14
-                        && style.NumberFormat.NumberFormatId <= 22)
-                       || (style.NumberFormat.NumberFormatId >= 45
-                           && style.NumberFormat.NumberFormatId <= 47));
-        }
-
-        private string GetFormat()
-        {
-            var format = String.Empty;
-            var style = GetStyleForRead();
-            if (XLHelper.IsNullOrWhiteSpace(style.NumberFormat.Format))
-            {
-                var formatCodes = GetFormatCodes();
-                if (formatCodes.ContainsKey(style.NumberFormat.NumberFormatId))
-                    format = formatCodes[style.NumberFormat.NumberFormatId];
-            }
-            else
-                format = style.NumberFormat.Format;
-            return format;
-        }
-
-        private bool SetRichText(object value)
-        {
-            var asRichString = value as XLRichText;
-
-            if (asRichString == null)
-                return false;
-
-            _richText = asRichString;
-            _dataType = XLCellValues.Text;
-            return true;
-        }
-
-        private Boolean SetRange(Object rangeObject)
-        {
-            var asRange = rangeObject as XLRangeBase;
-            if (asRange == null)
-            {
-                var tmp = rangeObject as XLCell;
-                if (tmp != null)
-                    asRange = tmp.AsRange();
-            }
-
-            if (asRange != null)
-            {
-                if (!(asRange is XLRow || asRange is XLColumn))
-                {
-                    var maxRows = asRange.RowCount();
-                    var maxColumns = asRange.ColumnCount();
-                    Worksheet.Range(Address.RowNumber, Address.ColumnNumber, maxRows, maxColumns).Clear();
-                }
-
-                var minRow = asRange.RangeAddress.FirstAddress.RowNumber;
-                var minColumn = asRange.RangeAddress.FirstAddress.ColumnNumber;
-                foreach (var sourceCell in asRange.CellsUsed(true))
-                {
-                    Worksheet.Cell(
-                        Address.RowNumber + sourceCell.Address.RowNumber - minRow,
-                        Address.ColumnNumber + sourceCell.Address.ColumnNumber - minColumn
-                        ).CopyFrom(sourceCell, true);
-                }
-
-                var rangesToMerge = (from mergedRange in (asRange.Worksheet).Internals.MergedRanges
-                                     where asRange.Contains(mergedRange)
-                                     let initialRo =
-                                         Address.RowNumber +
-                                         (mergedRange.RangeAddress.FirstAddress.RowNumber -
-                                          asRange.RangeAddress.FirstAddress.RowNumber)
-                                     let initialCo =
-                                         Address.ColumnNumber +
-                                         (mergedRange.RangeAddress.FirstAddress.ColumnNumber -
-                                          asRange.RangeAddress.FirstAddress.ColumnNumber)
-                                     select
-                                         Worksheet.Range(initialRo, initialCo, initialRo + mergedRange.RowCount() - 1,
-                                                         initialCo + mergedRange.ColumnCount() - 1)).Cast<IXLRange>().
-                    ToList();
-                rangesToMerge.ForEach(r => r.Merge());
-
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool SetEnumerable(object collectionObject)
-        {
-            var asEnumerable = collectionObject as IEnumerable;
-            return InsertData(asEnumerable) != null;
-        }
-
-        private void ClearMerged()
-        {
-            List<IXLRange> mergeToDelete;
-            using (var asRange = AsRange())
-                mergeToDelete = Worksheet.Internals.MergedRanges.Where(merge => merge.Intersects(asRange)).ToList();
-
-            mergeToDelete.ForEach(m => Worksheet.Internals.MergedRanges.Remove(m));
-        }
-
-        private void SetValue<T>(T value, int ro, int co) where T : class
-        {
-            if (value == null)
-                _worksheet.Cell(ro, co).SetValue(String.Empty);
-            else
-            {
-                if (value is IConvertible)
-                    _worksheet.Cell(ro, co).SetValue((T)Convert.ChangeType(value, typeof (T)));
-                else
-                    _worksheet.Cell(ro, co).SetValue(value);
-            }
-        }
-
-        private void SetValue(object value)
-        {
-            FormulaA1 = String.Empty;
-            var val = value == null ? String.Empty : value.ToString();
-            _richText = null;
-            if (val.Length == 0)
-                _dataType = XLCellValues.Text;
-            else
-            {
-                double dTest;
-                DateTime dtTest;
-                bool bTest;
-                TimeSpan tsTest;
-                var style = GetStyleForRead();
-                if (style.NumberFormat.Format == "@")
-                {
-                    _dataType = XLCellValues.Text;
-                    if (val.Contains(Environment.NewLine) && !style.Alignment.WrapText)
-                        Style.Alignment.WrapText = true;
-                }
-                else if (val[0] == '\'')
-                {
-                    val = val.Substring(1, val.Length - 1);
-                    _dataType = XLCellValues.Text;
-                    if (val.Contains(Environment.NewLine) && !style.Alignment.WrapText)
-                        Style.Alignment.WrapText = true;
-                }
-                else if (value is TimeSpan || (!Double.TryParse(val, out dTest) && TimeSpan.TryParse(val, out tsTest)))
-                {
-                    if (!(value is TimeSpan) && TimeSpan.TryParse(val, out tsTest))
-                        val = tsTest.ToString();
-
-                    _dataType = XLCellValues.TimeSpan;
-                    if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
-                        Style.NumberFormat.NumberFormatId = 46;
-                }
-                else if (val.Trim() != "NaN" &&  Double.TryParse(val, out dTest))
-                    _dataType = XLCellValues.Number;
-                else if (DateTime.TryParse(val, out dtTest) && dtTest >= BaseDate)
-                {
-
-                    _dataType = XLCellValues.DateTime;
-
-                    if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
-                        Style.NumberFormat.NumberFormatId = dtTest.Date == dtTest ? 14 : 22;
-                    {
-                        DateTime forMillis;
-                        if (value is DateTime && (forMillis = (DateTime)value).Millisecond > 0)
-                        {
-                            val = forMillis.ToOADate().ToString();
-                        }
-                        else
-                        {
-                            val = dtTest.ToOADate().ToString();
-                        }
-                    }
-                    
-                }
-                else if (Boolean.TryParse(val, out bTest))
-                {
-                    _dataType = XLCellValues.Boolean;
-                    val = bTest ? "1" : "0";
-                }
-                else
-                {
-                    _dataType = XLCellValues.Text;
-                    if (val.Contains(Environment.NewLine) && !style.Alignment.WrapText)
-                        Style.Alignment.WrapText = true;
-                }
-            }
-            if (val.Length > 32767) throw new ArgumentException("Cells can only hold 32,767 characters.");
-            _cellValue = val;
-        }
-
-        private static Dictionary<int, string> GetFormatCodes()
-        {
-            if (_formatCodes == null)
-            {
-                var fCodes = new Dictionary<int, string>
-                    {
-                        {0, string.Empty},
-                        {1, "0"},
-                        {2, "0.00"},
-                        {3, "#,##0"},
-                        {4, "#,##0.00"},
-                        {7, "$#,##0.00_);($#,##0.00)"},
-                        {9, "0%"},
-                        {10, "0.00%"},
-                        {11, "0.00E+00"},
-                        {12, "# ?/?"},
-                        {13, "# ??/??"},
-                        {14, "M/d/yyyy"},
-                        {15, "d-MMM-yy"},
-                        {16, "d-MMM"},
-                        {17, "MMM-yy"},
-                        {18, "h:mm tt"},
-                        {19, "h:mm:ss tt"},
-                        {20, "H:mm"},
-                        {21, "H:mm:ss"},
-                        {22, "M/d/yyyy H:mm"},
-                        {37, "#,##0 ;(#,##0)"},
-                        {38, "#,##0 ;[Red](#,##0)"},
-                        {39, "#,##0.00;(#,##0.00)"},
-                        {40, "#,##0.00;[Red](#,##0.00)"},
-                        {45, "mm:ss"},
-                        {46, "[h]:mm:ss"},
-                        {47, "mmss.0"},
-                        {48, "##0.0E+0"},
-                        {49, "@"}
-                    };
-                _formatCodes = fCodes;
-            }
-
-            return _formatCodes;
-        }
-
-        private string GetFormulaR1C1(string value)
-        {
-            return GetFormula(value, FormulaConversionType.A1ToR1C1, 0, 0);
-        }
-
-        private string GetFormulaA1(string value)
-        {
-            return GetFormula(value, FormulaConversionType.R1C1ToA1, 0, 0);
-        }
-
-        private string GetFormula(string strValue, FormulaConversionType conversionType, int rowsToShift,
-                                  int columnsToShift)
-        {
-            if (XLHelper.IsNullOrWhiteSpace(strValue))
-                return String.Empty;
-
-            var value = ">" + strValue + "<";
-
-            var regex = conversionType == FormulaConversionType.A1ToR1C1 ? A1Regex : R1C1Regex;
-
-            var sb = new StringBuilder();
-            var lastIndex = 0;
-
-            foreach (var match in regex.Matches(value).Cast<Match>())
-            {
-                var matchString = match.Value;
-                var matchIndex = match.Index;
-                if (value.Substring(0, matchIndex).CharCount('"') % 2 == 0)
-                {
-// Check if the match is in between quotes
-                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex));
-                    sb.Append(conversionType == FormulaConversionType.A1ToR1C1
-                                  ? GetR1C1Address(matchString, rowsToShift, columnsToShift)
-                                  : GetA1Address(matchString, rowsToShift, columnsToShift));
-                }
-                else
-                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex + matchString.Length));
-                lastIndex = matchIndex + matchString.Length;
-            }
-
-            if (lastIndex < value.Length)
-                sb.Append(value.Substring(lastIndex));
-
-            var retVal = sb.ToString();
-            return retVal.Substring(1, retVal.Length - 2);
-        }
-
-        private string GetA1Address(string r1C1Address, int rowsToShift, int columnsToShift)
-        {
-            var addressToUse = r1C1Address.ToUpper();
-
-            if (addressToUse.Contains(':'))
-            {
-                var parts = addressToUse.Split(':');
-                var p1 = parts[0];
-                var p2 = parts[1];
-                string leftPart;
-                string rightPart;
-                if (p1.StartsWith("R"))
-                {
-                    leftPart = GetA1Row(p1, rowsToShift);
-                    rightPart = GetA1Row(p2, rowsToShift);
-                }
-                else
-                {
-                    leftPart = GetA1Column(p1, columnsToShift);
-                    rightPart = GetA1Column(p2, columnsToShift);
-                }
-
-                return leftPart + ":" + rightPart;
-            }
-
-            var rowPart = addressToUse.Substring(0, addressToUse.IndexOf("C"));
-            var rowToReturn = GetA1Row(rowPart, rowsToShift);
-
-            var columnPart = addressToUse.Substring(addressToUse.IndexOf("C"));
-            var columnToReturn = GetA1Column(columnPart, columnsToShift);
-
-            var retAddress = columnToReturn + rowToReturn;
-            return retAddress;
-        }
-
-        private string GetA1Column(string columnPart, int columnsToShift)
-        {
-            string columnToReturn;
-            if (columnPart == "C")
-                columnToReturn = XLHelper.GetColumnLetterFromNumber(Address.ColumnNumber + columnsToShift);
-            else
-            {
-                var bIndex = columnPart.IndexOf("[");
-                var mIndex = columnPart.IndexOf("-");
-                if (bIndex >= 0)
-                {
-                    columnToReturn = XLHelper.GetColumnLetterFromNumber(
-                        Address.ColumnNumber +
-                        Int32.Parse(columnPart.Substring(bIndex + 1, columnPart.Length - bIndex - 2)) + columnsToShift
-                        );
-                }
-                else if (mIndex >= 0)
-                {
-                    columnToReturn = XLHelper.GetColumnLetterFromNumber(
-                        Address.ColumnNumber + Int32.Parse(columnPart.Substring(mIndex)) + columnsToShift
-                        );
-                }
-                else
-                {
-                    columnToReturn = "$" +
-                                     XLHelper.GetColumnLetterFromNumber(Int32.Parse(columnPart.Substring(1)) +
-                                                                        columnsToShift);
-                }
-            }
-
-            return columnToReturn;
-        }
-
-        private string GetA1Row(string rowPart, int rowsToShift)
-        {
-            string rowToReturn;
-            if (rowPart == "R")
-                rowToReturn = (Address.RowNumber + rowsToShift).ToString();
-            else
-            {
-                var bIndex = rowPart.IndexOf("[");
-                if (bIndex >= 0)
-                {
-                    rowToReturn =
-                        (Address.RowNumber + Int32.Parse(rowPart.Substring(bIndex + 1, rowPart.Length - bIndex - 2)) +
-                         rowsToShift).ToString();
-                }
-                else
-                    rowToReturn = "$" + (Int32.Parse(rowPart.Substring(1)) + rowsToShift);
-            }
-
-            return rowToReturn;
-        }
-
-        private string GetR1C1Address(string a1Address, int rowsToShift, int columnsToShift)
-        {
-            if (a1Address.Contains(':'))
-            {
-                var parts = a1Address.Split(':');
-                var p1 = parts[0];
-                var p2 = parts[1];
-                int row1;
-                if (Int32.TryParse(p1.Replace("$", string.Empty), out row1))
-                {
-                    var row2 = Int32.Parse(p2.Replace("$", string.Empty));
-                    var leftPart = GetR1C1Row(row1, p1.Contains('$'), rowsToShift);
-                    var rightPart = GetR1C1Row(row2, p2.Contains('$'), rowsToShift);
-                    return leftPart + ":" + rightPart;
-                }
-                else
-                {
-                    var column1 = XLHelper.GetColumnNumberFromLetter(p1.Replace("$", string.Empty));
-                    var column2 = XLHelper.GetColumnNumberFromLetter(p2.Replace("$", string.Empty));
-                    var leftPart = GetR1C1Column(column1, p1.Contains('$'), columnsToShift);
-                    var rightPart = GetR1C1Column(column2, p2.Contains('$'), columnsToShift);
-                    return leftPart + ":" + rightPart;
-                }
-            }
-
-            var address = XLAddress.Create(_worksheet, a1Address);
-
-            var rowPart = GetR1C1Row(address.RowNumber, address.FixedRow, rowsToShift);
-            var columnPart = GetR1C1Column(address.ColumnNumber, address.FixedColumn, columnsToShift);
-
-            return rowPart + columnPart;
-        }
-
-        private string GetR1C1Row(int rowNumber, bool fixedRow, int rowsToShift)
-        {
-            string rowPart;
-            rowNumber += rowsToShift;
-            var rowDiff = rowNumber - Address.RowNumber;
-            if (rowDiff != 0 || fixedRow)
-                rowPart = fixedRow ? String.Format("R{0}", rowNumber) : String.Format("R[{0}]", rowDiff);
-            else
-                rowPart = "R";
-
-            return rowPart;
-        }
-
-        private string GetR1C1Column(int columnNumber, bool fixedColumn, int columnsToShift)
-        {
-            string columnPart;
-            columnNumber += columnsToShift;
-            var columnDiff = columnNumber - Address.ColumnNumber;
-            if (columnDiff != 0 || fixedColumn)
-                columnPart = fixedColumn ? String.Format("C{0}", columnNumber) : String.Format("C[{0}]", columnDiff);
-            else
-                columnPart = "C";
-
-            return columnPart;
-        }
-
-        internal void CopyValues(XLCell source)
-        {
-            _cellValue = source._cellValue;
-            _dataType = source._dataType;
-            FormulaR1C1 = source.FormulaR1C1;
-            _richText = source._richText == null ? null : new XLRichText(source._richText, source.Style.Font);
-            _comment = source._comment == null ? null : new XLComment(this, source._comment, source.Style.Font);
-
-            if (source._hyperlink != null)
-            {
-                SettingHyperlink = true;
-                Hyperlink = new XLHyperlink(source.Hyperlink);
-                SettingHyperlink = false;
-            }
-        }
-
-        private IXLCell GetTargetCell(String target, XLWorksheet defaultWorksheet)
-        {
-            var pair = target.Split('!');
-            if (pair.Length == 1)
-                return defaultWorksheet.Cell(target);
-
-            var wsName = pair[0];
-            if (wsName.StartsWith("'"))
-                wsName = wsName.Substring(1, wsName.Length - 2);
-            return defaultWorksheet.Workbook.Worksheet(wsName).Cell(pair[1]);
-        }
-
-
-        public IXLCell CopyFrom(XLCell otherCell, Boolean copyDataValidations)
-        {
-            var source = otherCell;
-            CopyValues(otherCell);
-
-            SetStyle(source._style ?? source.Worksheet.Workbook.GetStyleById(source._styleCacheId));
-
-            var conditionalFormats = otherCell.Worksheet.ConditionalFormats.Where(c => c.Range.Contains(otherCell)).ToList();
-            foreach (var cf in conditionalFormats)
-            {
-                var c = new XLConditionalFormat(cf as XLConditionalFormat) {Range = AsRange()};
-                var oldValues = c.Values.Values.ToList();
-                c.Values.Clear();
-                foreach (var v in oldValues)
-                {
-                    var f = v.Value;
-                    if (v.IsFormula)
-                    {
-                        var r1c1 = otherCell.GetFormulaR1C1(f);
-                        f = GetFormulaA1(r1c1);
-                    }
-
-
-                    c.Values.Add(new XLFormula {_value = f, IsFormula = v.IsFormula});
-                }
-
-                _worksheet.ConditionalFormats.Add(c);
-            }
-
-            if (copyDataValidations)
-            {
-                var eventTracking = Worksheet.EventTrackingEnabled;
-                Worksheet.EventTrackingEnabled = false;
-                if (otherCell.HasDataValidation)
-                    CopyDataValidation(otherCell, otherCell.DataValidation);
-                else if (HasDataValidation)
-                {
-                    using (var asRange = AsRange())
-                        Worksheet.DataValidations.Delete(asRange);
-                }
-                Worksheet.EventTrackingEnabled = eventTracking;
-            }
-
-            return this;
-        }
-
-        internal void CopyDataValidation(XLCell otherCell, XLDataValidation otherDv)
-        {
-            var thisDv = DataValidation;
-            thisDv.CopyFrom(otherDv);
-            thisDv.Value = GetFormulaA1(otherCell.GetFormulaR1C1(otherDv.Value));
-            thisDv.MinValue = GetFormulaA1(otherCell.GetFormulaR1C1(otherDv.MinValue));
-            thisDv.MaxValue = GetFormulaA1(otherCell.GetFormulaR1C1(otherDv.MaxValue));
-        }
-
-        internal void ShiftFormulaRows(XLRange shiftedRange, int rowsShifted)
-        {
-            _formulaA1 = ShiftFormulaRows(FormulaA1, Worksheet, shiftedRange, rowsShifted);
-        }
-
-        internal static String ShiftFormulaRows(String formulaA1, XLWorksheet worksheetInAction, XLRange shiftedRange,
-                                                int rowsShifted)
-        {
-            if (XLHelper.IsNullOrWhiteSpace(formulaA1)) return String.Empty;
-
-            var value = formulaA1; // ">" + formulaA1 + "<";
-
-            var regex = A1SimpleRegex;
-
-            var sb = new StringBuilder();
-            var lastIndex = 0;
-
-            var shiftedWsName = shiftedRange.Worksheet.Name;
-            foreach (var match in regex.Matches(value).Cast<Match>())
-            {
-                var matchString = match.Value;
-                var matchIndex = match.Index;
-                if (value.Substring(0, matchIndex).CharCount('"') % 2 == 0)
-                {
-                    // Check that the match is not between quotes
-                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex));
-                    string sheetName;
-                    var useSheetName = false;
-                    if (matchString.Contains('!'))
-                    {
-                        sheetName = matchString.Substring(0, matchString.IndexOf('!'));
-                        if (sheetName[0] == '\'')
-                            sheetName = sheetName.Substring(1, sheetName.Length - 2);
-                        useSheetName = true;
-                    }
-                    else
-                        sheetName = worksheetInAction.Name;
-
-                    if (String.Compare(sheetName, shiftedWsName, true) == 0)
-                    {
-                        var rangeAddress = matchString.Substring(matchString.IndexOf('!') + 1);
-                        if (!A1ColumnRegex.IsMatch(rangeAddress))
-                        {
-                            var matchRange = worksheetInAction.Workbook.Worksheet(sheetName).Range(rangeAddress);
-                            if (shiftedRange.RangeAddress.FirstAddress.RowNumber <= matchRange.RangeAddress.LastAddress.RowNumber
-                                && shiftedRange.RangeAddress.FirstAddress.ColumnNumber <= matchRange.RangeAddress.FirstAddress.ColumnNumber
-                                && shiftedRange.RangeAddress.LastAddress.ColumnNumber >= matchRange.RangeAddress.LastAddress.ColumnNumber)
-                            {
-                                if (A1RowRegex.IsMatch(rangeAddress))
-                                {
-                                    var rows = rangeAddress.Split(':');
-                                    var row1String = rows[0];
-                                    var row2String = rows[1];
-                                    string row1;
-                                    if (row1String[0] == '$')
-                                    {
-                                        row1 = "$" +
-                                               (Int32.Parse(row1String.Substring(1)) + rowsShifted).ToInvariantString();
-                                    }
-                                    else
-                                        row1 = (Int32.Parse(row1String) + rowsShifted).ToInvariantString();
-
-                                    string row2;
-                                    if (row2String[0] == '$')
-                                    {
-                                        row2 = "$" +
-                                               (Int32.Parse(row2String.Substring(1)) + rowsShifted).ToInvariantString();
-                                    }
-                                    else
-                                        row2 = (Int32.Parse(row2String) + rowsShifted).ToInvariantString();
-
-                                    sb.Append(useSheetName
-                                                  ? String.Format("'{0}'!{1}:{2}", sheetName, row1, row2)
-                                                  : String.Format("{0}:{1}", row1, row2));
-                                }
-                                else if (shiftedRange.RangeAddress.FirstAddress.RowNumber <=
-                                         matchRange.RangeAddress.FirstAddress.RowNumber)
-                                {
-                                    if (rangeAddress.Contains(':'))
-                                    {
-                                        if (useSheetName)
-                                        {
-                                            sb.Append(String.Format("'{0}'!{1}:{2}",
-                                                                    sheetName,
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber +
-                                                                                  rowsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnLetter,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn),
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.RowNumber +
-                                                                                  rowsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.ColumnLetter,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedColumn)));
-                                        }
-                                        else
-                                        {
-                                            sb.Append(String.Format("{0}:{1}",
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber +
-                                                                                  rowsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnLetter,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn),
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.RowNumber +
-                                                                                  rowsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.ColumnLetter,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedColumn)));
-                                        }
-                                    }
-                                    else
-                                    {
-                                        if (useSheetName)
-                                        {
-                                            sb.Append(String.Format("'{0}'!{1}",
-                                                                    sheetName,
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber +
-                                                                                  rowsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnLetter,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn)));
-                                        }
-                                        else
-                                        {
-                                            sb.Append(String.Format("{0}",
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber +
-                                                                                  rowsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnLetter,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn)));
-                                        }
-                                    }
-                                }
-                                else
-                                {
-                                    if (useSheetName)
-                                    {
-                                        sb.Append(String.Format("'{0}'!{1}:{2}",
-                                                                sheetName,
-                                                                matchRange.RangeAddress.FirstAddress,
-                                                                new XLAddress(worksheetInAction,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.RowNumber +
-                                                                              rowsShifted,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.ColumnLetter,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedRow,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedColumn)));
-                                    }
-                                    else
-                                    {
-                                        sb.Append(String.Format("{0}:{1}",
-                                                                matchRange.RangeAddress.FirstAddress,
-                                                                new XLAddress(worksheetInAction,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.RowNumber +
-                                                                              rowsShifted,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.ColumnLetter,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedRow,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedColumn)));
-                                    }
-                                }
-                            }
-                            else
-                                sb.Append(matchString);
-                        }
-                        else
-                            sb.Append(matchString);
-                    }
-                    else
-                        sb.Append(matchString);
-                }
-                else
-                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex + matchString.Length));
-                lastIndex = matchIndex + matchString.Length;
-            }
-
-            if (lastIndex < value.Length)
-                sb.Append(value.Substring(lastIndex));
-
-            return sb.ToString();
-
-            //string retVal = sb.ToString();
-            //return retVal.Substring(1, retVal.Length - 2);
-        }
-
-        internal void ShiftFormulaColumns(XLRange shiftedRange, int columnsShifted)
-        {
-            _formulaA1 = ShiftFormulaColumns(FormulaA1, Worksheet, shiftedRange, columnsShifted);
-        }
-
-        internal static String ShiftFormulaColumns(String formulaA1, XLWorksheet worksheetInAction, XLRange shiftedRange,
-                                                   int columnsShifted)
-        {
-            if (XLHelper.IsNullOrWhiteSpace(formulaA1)) return String.Empty;
-
-            var value = formulaA1; // ">" + formulaA1 + "<";
-
-            var regex = A1SimpleRegex;
-
-            var sb = new StringBuilder();
-            var lastIndex = 0;
-
-            foreach (var match in regex.Matches(value).Cast<Match>())
-            {
-                var matchString = match.Value;
-                var matchIndex = match.Index;
-                if (value.Substring(0, matchIndex).CharCount('"') % 2 == 0)
-                {
-// Check that the match is not between quotes
-                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex));
-                    string sheetName;
-                    var useSheetName = false;
-                    if (matchString.Contains('!'))
-                    {
-                        sheetName = matchString.Substring(0, matchString.IndexOf('!'));
-                        if (sheetName[0] == '\'')
-                            sheetName = sheetName.Substring(1, sheetName.Length - 2);
-                        useSheetName = true;
-                    }
-                    else
-                        sheetName = worksheetInAction.Name;
-
-                    if (String.Compare(sheetName, shiftedRange.Worksheet.Name, true) == 0)
-                    {
-                        var rangeAddress = matchString.Substring(matchString.IndexOf('!') + 1);
-                        if (!A1RowRegex.IsMatch(rangeAddress))
-                        {
-                            var matchRange = worksheetInAction.Workbook.Worksheet(sheetName).Range(rangeAddress);
-                            if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
-                                matchRange.RangeAddress.LastAddress.ColumnNumber
-                                &&
-                                shiftedRange.RangeAddress.FirstAddress.RowNumber <=
-                                matchRange.RangeAddress.FirstAddress.RowNumber
-                                &&
-                                shiftedRange.RangeAddress.LastAddress.RowNumber >=
-                                matchRange.RangeAddress.LastAddress.RowNumber)
-                            {
-                                if (A1ColumnRegex.IsMatch(rangeAddress))
-                                {
-                                    var columns = rangeAddress.Split(':');
-                                    var column1String = columns[0];
-                                    var column2String = columns[1];
-                                    string column1;
-                                    if (column1String[0] == '$')
-                                    {
-                                        column1 = "$" +
-                                                  XLHelper.GetColumnLetterFromNumber(
-                                                      XLHelper.GetColumnNumberFromLetter(
-                                                          column1String.Substring(1)) + columnsShifted);
-                                    }
-                                    else
-                                    {
-                                        column1 =
-                                            XLHelper.GetColumnLetterFromNumber(
-                                                XLHelper.GetColumnNumberFromLetter(column1String) +
-                                                columnsShifted);
-                                    }
-
-                                    string column2;
-                                    if (column2String[0] == '$')
-                                    {
-                                        column2 = "$" +
-                                                  XLHelper.GetColumnLetterFromNumber(
-                                                      XLHelper.GetColumnNumberFromLetter(
-                                                          column2String.Substring(1)) + columnsShifted);
-                                    }
-                                    else
-                                    {
-                                        column2 =
-                                            XLHelper.GetColumnLetterFromNumber(
-                                                XLHelper.GetColumnNumberFromLetter(column2String) +
-                                                columnsShifted);
-                                    }
-
-                                    sb.Append(useSheetName
-                                                  ? String.Format("'{0}'!{1}:{2}", sheetName, column1, column2)
-                                                  : String.Format("{0}:{1}", column1, column2));
-                                }
-                                else if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
-                                         matchRange.RangeAddress.FirstAddress.ColumnNumber)
-                                {
-                                    if (rangeAddress.Contains(':'))
-                                    {
-                                        if (useSheetName)
-                                        {
-                                            sb.Append(String.Format("'{0}'!{1}:{2}",
-                                                                    sheetName,
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnNumber +
-                                                                                  columnsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn),
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.RowNumber,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.ColumnNumber +
-                                                                                  columnsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedColumn)));
-                                        }
-                                        else
-                                        {
-                                            sb.Append(String.Format("{0}:{1}",
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnNumber +
-                                                                                  columnsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn),
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.RowNumber,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.ColumnNumber +
-                                                                                  columnsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      LastAddress.FixedColumn)));
-                                        }
-                                    }
-                                    else
-                                    {
-                                        if (useSheetName)
-                                        {
-                                            sb.Append(String.Format("'{0}'!{1}",
-                                                                    sheetName,
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnNumber +
-                                                                                  columnsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn)));
-                                        }
-                                        else
-                                        {
-                                            sb.Append(String.Format("{0}",
-                                                                    new XLAddress(worksheetInAction,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.RowNumber,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.ColumnNumber +
-                                                                                  columnsShifted,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedRow,
-                                                                                  matchRange.RangeAddress.
-                                                                                      FirstAddress.FixedColumn)));
-                                        }
-                                    }
-                                }
-                                else
-                                {
-                                    if (useSheetName)
-                                    {
-                                        sb.Append(String.Format("'{0}'!{1}:{2}",
-                                                                sheetName,
-                                                                matchRange.RangeAddress.FirstAddress,
-                                                                new XLAddress(worksheetInAction,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.RowNumber,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.ColumnNumber +
-                                                                              columnsShifted,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedRow,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedColumn)));
-                                    }
-                                    else
-                                    {
-                                        sb.Append(String.Format("{0}:{1}",
-                                                                matchRange.RangeAddress.FirstAddress,
-                                                                new XLAddress(worksheetInAction,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.RowNumber,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.ColumnNumber +
-                                                                              columnsShifted,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedRow,
-                                                                              matchRange.RangeAddress.
-                                                                                  LastAddress.FixedColumn)));
-                                    }
-                                }
-                            }
-                            else
-                                sb.Append(matchString);
-                        }
-                        else
-                            sb.Append(matchString);
-                    }
-                    else
-                        sb.Append(matchString);
-                }
-                else
-                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex + matchString.Length));
-                lastIndex = matchIndex + matchString.Length;
-            }
-
-            if (lastIndex < value.Length)
-                sb.Append(value.Substring(lastIndex));
-
-            return sb.ToString();
-
-            //string retVal = sb.ToString();
-            //return retVal.Substring(1, retVal.Length - 2);
-        }
-
-        // --
-
-        private XLCell CellShift(Int32 rowsToShift, Int32 columnsToShift)
-        {
-            return Worksheet.Cell(Address.RowNumber + rowsToShift, Address.ColumnNumber + columnsToShift);
-        }
-
-        private static String GetFieldName(Object[] customAttributes)
-        {
-#if NET4
-            var attribute = customAttributes.FirstOrDefault(a => a is DisplayAttribute);
-            return attribute != null ? (attribute as DisplayAttribute).Name : null;
-#else
-            return null;
-#endif
-        }
-
-        #region Nested type: FormulaConversionType
-
-        private enum FormulaConversionType
-        {
-            A1ToR1C1,
-            R1C1ToA1
-        };
-
-        #endregion
-
-        #region XLCell Above
-
-        IXLCell IXLCell.CellAbove()
-        {
-            return CellAbove();
-        }
-
-        IXLCell IXLCell.CellAbove(Int32 step)
-        {
-            return CellAbove(step);
-        }
-
-        public XLCell CellAbove()
-        {
-            return CellAbove(1);
-        }
-
-        public XLCell CellAbove(Int32 step)
-        {
-            return CellShift(step * -1, 0);
-        }
-
-        #endregion
-
-        #region XLCell Below
-
-        IXLCell IXLCell.CellBelow()
-        {
-            return CellBelow();
-        }
-
-        IXLCell IXLCell.CellBelow(Int32 step)
-        {
-            return CellBelow(step);
-        }
-
-        public XLCell CellBelow()
-        {
-            return CellBelow(1);
-        }
-
-        public XLCell CellBelow(Int32 step)
-        {
-            return CellShift(step, 0);
-        }
-
-        #endregion
-
-        #region XLCell Left
-
-        IXLCell IXLCell.CellLeft()
-        {
-            return CellLeft();
-        }
-
-        IXLCell IXLCell.CellLeft(Int32 step)
-        {
-            return CellLeft(step);
-        }
-
-        public XLCell CellLeft()
-        {
-            return CellLeft(1);
-        }
-
-        public XLCell CellLeft(Int32 step)
-        {
-            return CellShift(0, step * -1);
-        }
-
-        #endregion
-
-        #region XLCell Right
-
-        IXLCell IXLCell.CellRight()
-        {
-            return CellRight();
-        }
-
-        IXLCell IXLCell.CellRight(Int32 step)
-        {
-            return CellRight(step);
-        }
-
-        public XLCell CellRight()
-        {
-            return CellRight(1);
-        }
-
-        public XLCell CellRight(Int32 step)
-        {
-            return CellShift(0, step);
-        }
-
-        #endregion
-
-        public Boolean HasFormula { get { return !XLHelper.IsNullOrWhiteSpace(FormulaA1); } }
-
-        public IXLRangeAddress FormulaReference { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCells.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCells.cs
deleted file mode 100644
index 7b7eb6e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCells.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Linq;
-
-    internal class XLCells : IXLCells, IXLStylized, IEnumerable<XLCell>
-    {
-        public Boolean StyleChanged { get; set; }
-        #region Fields
-
-        private readonly bool _includeFormats;
-        private readonly List<XLRangeAddress> _rangeAddresses = new List<XLRangeAddress>();
-        private readonly bool _usedCellsOnly;
-        private IXLStyle _style;
-        private readonly Func<IXLCell, Boolean> _predicate;
-        #endregion
-
-        #region Constructor
-
-        public XLCells(bool usedCellsOnly, bool includeFormats, Func<IXLCell, Boolean> predicate = null)
-        {
-            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
-            _usedCellsOnly = usedCellsOnly;
-            _includeFormats = includeFormats;
-            _predicate = predicate;
-        }
-
-        #endregion
-
-        #region IEnumerable<XLCell> Members
-
-        public IEnumerator<XLCell> GetEnumerator()
-        {
-            var cellsInRanges = new Dictionary<XLWorksheet, HashSet<XLSheetPoint>>();
-            Boolean oneRange = _rangeAddresses.Count == 1;
-            foreach (XLRangeAddress range in _rangeAddresses)
-            {
-                HashSet<XLSheetPoint> hash;
-                if (cellsInRanges.ContainsKey(range.Worksheet))
-                    hash = cellsInRanges[range.Worksheet];
-                else
-                {
-                    hash = new HashSet<XLSheetPoint>();
-                    cellsInRanges.Add(range.Worksheet, hash);
-                }
-
-                if (_usedCellsOnly)
-                {
-                    if (oneRange)
-                    {
-                        var cellRange = range.Worksheet.Internals.CellsCollection
-                                                .GetCells(
-                                                range.FirstAddress.RowNumber,
-                                                range.FirstAddress.ColumnNumber,
-                                                range.LastAddress.RowNumber,
-                                                range.LastAddress.ColumnNumber)
-                                                .Where(c => 
-                                                            !c.IsEmpty(_includeFormats) 
-                                                            && (_predicate == null || _predicate(c))
-                                                            );
-
-                        foreach(var cell in cellRange)
-                        {
-                            yield return cell;
-                        }
-                    }
-                    else
-                    {
-                        var tmpRange = range;
-                        var addressList = range.Worksheet.Internals.CellsCollection
-                            .GetSheetPoints(
-                            tmpRange.FirstAddress.RowNumber,
-                            tmpRange.FirstAddress.ColumnNumber,
-                            tmpRange.LastAddress.RowNumber,
-                            tmpRange.LastAddress.ColumnNumber);
-
-                        foreach (XLSheetPoint a in addressList.Where(a => !hash.Contains(a)))
-                        {
-                            hash.Add(a);
-                        }
-                    }
-                }
-                else
-                {
-                    var mm = new MinMax
-                                 {
-                                     MinRow = range.FirstAddress.RowNumber,
-                                     MaxRow = range.LastAddress.RowNumber,
-                                     MinColumn = range.FirstAddress.ColumnNumber,
-                                     MaxColumn = range.LastAddress.ColumnNumber
-                                 };
-                    if (mm.MaxRow > 0 && mm.MaxColumn > 0)
-                    {
-                        for (Int32 ro = mm.MinRow; ro <= mm.MaxRow; ro++)
-                        {
-                            for (Int32 co = mm.MinColumn; co <= mm.MaxColumn; co++)
-                            {
-                                if (oneRange)
-                                {
-                                    var c = range.Worksheet.Cell(ro, co);
-                                    if (_predicate == null || _predicate(c))
-                                        yield return c;
-                                }
-                                else
-                                {
-                                    var address = new XLSheetPoint(ro, co);
-                                    if (!hash.Contains(address))
-                                        hash.Add(address);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (!oneRange)
-            {
-                if (_usedCellsOnly)
-                {
-                    var cellRange = cellsInRanges.SelectMany(
-                                cir =>
-                                cir.Value.Select(a => cir.Key.Internals.CellsCollection.GetCell(a)).Where(
-                                    cell => cell != null && (
-                                                                !cell.IsEmpty(_includeFormats) 
-                                                                && (_predicate == null || _predicate(cell))
-                                                                )));
-
-                    foreach (var cell in cellRange)
-                    {
-                        yield return cell;
-                    }
-                }
-                else
-                {
-                    foreach (var cir in cellsInRanges)
-                    {
-                        foreach (XLSheetPoint a in cir.Value)
-                        {
-                            var c = cir.Key.Cell(a.Row, a.Column);
-                            if (_predicate == null || _predicate(c))
-                                yield return c;
-                        }
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        #region IXLCells Members
-
-        IEnumerator<IXLCell> IEnumerable<IXLCell>.GetEnumerator()
-        {
-            foreach (XLCell cell in this)
-                yield return cell;
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLStyle Style
-        {
-            get { return _style; }
-            set
-            {
-                _style = new XLStyle(this, value);
-                this.ForEach<XLCell>(c => c.Style = _style);
-            }
-        }
-
-        public Object Value
-        {
-            set { this.ForEach<XLCell>(c => c.Value = value); }
-        }
-
-        public IXLCells SetDataType(XLCellValues dataType)
-        {
-            this.ForEach<XLCell>(c => c.DataType = dataType);
-            return this;
-        }
-
-        public XLCellValues DataType
-        {
-            set { this.ForEach<XLCell>(c => c.DataType = value); }
-        }
-
-
-        public IXLCells Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            this.ForEach<XLCell>(c => c.Clear(clearOptions));
-            return this;
-        }
-
-        public void DeleteComments() {
-            this.ForEach<XLCell>(c => c.DeleteComment());
-        }
-
-        public String FormulaA1
-        {
-            set { this.ForEach<XLCell>(c => c.FormulaA1 = value); }
-        }
-
-        public String FormulaR1C1
-        {
-            set { this.ForEach<XLCell>(c => c.FormulaR1C1 = value); }
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return _style;
-                foreach (XLCell c in this)
-                    yield return c.Style;
-                UpdatingStyle = false;
-            }
-        }
-
-        public Boolean UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return _style; }
-            set { _style = new XLStyle(this, value); }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges();
-                this.ForEach<XLCell>(c => retVal.Add(c.AsRange()));
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        public void Add(XLRangeAddress rangeAddress)
-        {
-            _rangeAddresses.Add(rangeAddress);
-        }
-
-        public void Add(XLCell cell)
-        {
-            _rangeAddresses.Add(new XLRangeAddress(cell.Address, cell.Address));
-        }
-
-        //--
-
-        #region Nested type: MinMax
-
-        private struct MinMax
-        {
-            public Int32 MaxColumn;
-            public Int32 MaxRow;
-            public Int32 MinColumn;
-            public Int32 MinRow;
-        }
-
-        #endregion
-
-        public void Select()
-        {
-            foreach (var cell in this)
-                cell.Select();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCellsCollection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCellsCollection.cs
deleted file mode 100644
index 6d91072..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Cells/XLCellsCollection.cs
+++ /dev/null
@@ -1,497 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCellsCollection
-    {
-
-        private readonly Dictionary<int, Dictionary<int, XLCell>> rowsCollection = new Dictionary<int, Dictionary<int, XLCell>>();
-        public readonly Dictionary<Int32, Int32> ColumnsUsed = new Dictionary<int, int>();
-        public readonly Dictionary<Int32, HashSet<Int32>> deleted = new Dictionary<int, HashSet<int>>();
-
-        internal Dictionary<int, Dictionary<int, XLCell>> RowsCollection
-        {
-            get { return rowsCollection; }
-        }
-
-        public Int32 MaxColumnUsed;
-        public Int32 MaxRowUsed;
-        public Dictionary<Int32, Int32> RowsUsed = new Dictionary<int, int>();
-
-        public XLCellsCollection()
-        {
-            Clear();
-        }
-
-        public Int32 Count { get; private set; }
-
-
-        public void Add(XLSheetPoint sheetPoint, XLCell cell)
-        {
-            Add(sheetPoint.Row, sheetPoint.Column, cell);
-        }
-
-        public void Add(Int32 row, Int32 column, XLCell cell)
-        {
-            Count++;
-
-            IncrementUsage(RowsUsed, row);
-            IncrementUsage(ColumnsUsed, column);
-
-            Dictionary<int, XLCell> columnsCollection;
-            if (!rowsCollection.TryGetValue(row, out columnsCollection))
-            {
-                columnsCollection = new Dictionary<int, XLCell>();
-                rowsCollection.Add(row, columnsCollection);
-            }
-            columnsCollection.Add(column, cell);
-            if (row > MaxRowUsed) MaxRowUsed = row;
-            if (column > MaxColumnUsed) MaxColumnUsed = column;
-
-            HashSet<Int32> delHash;
-            if (deleted.TryGetValue(row, out delHash))
-                delHash.Remove(column);
-        }
-
-        private static void IncrementUsage(Dictionary<int, int> dictionary, Int32 key)
-        {
-            if (dictionary.ContainsKey(key))
-                dictionary[key]++;
-            else
-                dictionary.Add(key, 1);
-        }
-
-        private static void DecrementUsage(Dictionary<int, int> dictionary, Int32 key)
-        {
-            Int32 count;
-            if (!dictionary.TryGetValue(key, out count)) return;
-
-            if (count > 0)
-                dictionary[key]--;
-            else
-                dictionary.Remove(key);
-        }
-
-        public void Clear()
-        {
-            Count = 0;
-            RowsUsed.Clear();
-            ColumnsUsed.Clear();
-
-            rowsCollection.Clear();
-            MaxRowUsed = 0;
-            MaxColumnUsed = 0;
-        }
-
-        public void Remove(XLSheetPoint sheetPoint)
-        {
-            Remove(sheetPoint.Row, sheetPoint.Column);
-        }
-
-        public void Remove(Int32 row, Int32 column)
-        {
-            Count--;
-            DecrementUsage(RowsUsed, row);
-            DecrementUsage(ColumnsUsed, row);
-            
-            HashSet<Int32> delHash;
-            if (deleted.TryGetValue(row, out delHash))
-            {
-                if (!delHash.Contains(column))
-                    delHash.Add(column);
-            }
-            else
-            {
-                delHash = new HashSet<int>();
-                delHash.Add(column);
-                deleted.Add(row, delHash);
-            }
-
-            Dictionary<int, XLCell> columnsCollection;
-            if (rowsCollection.TryGetValue(row, out columnsCollection))
-            {
-                columnsCollection.Remove(column);
-                if (columnsCollection.Count == 0)
-                {
-                    rowsCollection.Remove(row);
-                }
-            }
-
-            
-        }
-
-        internal IEnumerable<XLCell> GetCells(Int32 rowStart, Int32 columnStart,
-                                            Int32 rowEnd, Int32 columnEnd,
-                                            Func<IXLCell, Boolean> predicate = null)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = rowStart; ro <= finalRow; ro++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = columnStart; co <= finalColumn; co++)
-                    {
-                        XLCell cell;
-                        if (columnsCollection.TryGetValue(co, out cell)
-                            && (predicate == null || predicate(cell)))
-                            yield return cell;
-                    }
-                }
-            }
-        }
-
-        internal HashSet<Int32> GetStyleIds(Int32 initial)
-        {
-            HashSet<Int32> ids = new HashSet<int>();
-            ids.Add(initial);
-            foreach (var row in rowsCollection)
-            {
-                foreach (var column in row.Value)
-                {
-                    var id = column.Value.GetStyleId();
-                    if (!ids.Contains(id))
-                    {
-                        ids.Add(id);
-                    }
-                }
-            }
-            return ids;
-        }
-
-
-        internal IEnumerable<XLCell> GetCellsUsed(Int32 rowStart, Int32 columnStart,
-                                    Int32 rowEnd, Int32 columnEnd,
-                                    Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = rowStart; ro <= finalRow; ro++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = columnStart; co <= finalColumn; co++)
-                    {
-                        XLCell cell;
-                        if (columnsCollection.TryGetValue(co, out cell)
-                        && !cell.IsEmpty(includeFormats)
-                        && (predicate == null || predicate(cell)))
-                            yield return cell;
-                    }
-                }
-            }
-
-        }
-
-        public XLSheetPoint FirstPointUsed(Int32 rowStart, Int32 columnStart,
-                                    Int32 rowEnd, Int32 columnEnd, Boolean includeFormats = false, Func<IXLCell, Boolean> predicate = null)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-
-            var firstRow = FirstRowUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
-            if (firstRow == 0) return new XLSheetPoint(0, 0);
-
-            var firstColumn = FirstColumnUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
-            if (firstColumn == 0) return new XLSheetPoint(0, 0);
-
-            return new XLSheetPoint(firstRow, firstColumn);
-        }
-
-        public XLSheetPoint LastPointUsed(Int32 rowStart, Int32 columnStart,
-                            Int32 rowEnd, Int32 columnEnd, Boolean includeFormats = false, Func<IXLCell, Boolean> predicate = null)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-
-            var firstRow = LastRowUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
-            if (firstRow == 0) return new XLSheetPoint(0, 0);
-
-            var firstColumn = LastColumnUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
-            if (firstColumn == 0) return new XLSheetPoint(0, 0);
-
-            return new XLSheetPoint(firstRow, firstColumn);
-        }
-
-        public int FirstRowUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats,
-            Func<IXLCell, Boolean> predicate = null)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = rowStart; ro <= finalRow; ro++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = columnStart; co <= finalColumn; co++)
-                    {
-                        XLCell cell;
-                        if (columnsCollection.TryGetValue(co, out cell)
-                        && !cell.IsEmpty(includeFormats)
-                        && (predicate == null || predicate(cell)))
-                            return ro;
-                    }
-                }
-            }
-
-            return 0;
-        }
-
-        public int FirstColumnUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = rowStart; ro <= finalRow; ro++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = columnStart; co <= finalColumn; co++)
-                    {
-                        XLCell cell;
-                        if (columnsCollection.TryGetValue(co, out cell)
-                        && !cell.IsEmpty(includeFormats)
-                        && (predicate == null || predicate(cell)))
-                            return co;
-                    }
-                }
-            }
-
-            return 0;
-        }
-
-
-        public int LastRowUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = finalRow; ro >= rowStart; ro--)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = finalColumn; co >= columnStart; co--)
-                    {
-                        XLCell cell;
-                        if (columnsCollection.TryGetValue(co, out cell)
-                         && !cell.IsEmpty(includeFormats)
-                        && (predicate == null || predicate(cell)))
-                            return ro;
-                    }
-                }
-            }
-            return 0;
-        }
-
-        public int LastColumnUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
-        {
-            int maxCo = 0;
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = finalRow; ro >= rowStart; ro--)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = finalColumn; co >= columnStart && co > maxCo; co--)
-                    {
-                        XLCell cell;
-                        if (columnsCollection.TryGetValue(co, out cell)
-                         && !cell.IsEmpty(includeFormats)
-                        && (predicate == null || predicate(cell)))
-                            maxCo = co;
-                    }
-                }
-            }
-            return maxCo;
-        }
-
-        public void RemoveAll(Int32 rowStart, Int32 columnStart,
-                              Int32 rowEnd, Int32 columnEnd)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = rowStart; ro <= finalRow; ro++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = columnStart; co <= finalColumn; co++)
-                    {
-                        if (columnsCollection.ContainsKey(co))
-                            Remove(ro, co);
-                    }
-                }
-            }
-        }
-
-        public IEnumerable<XLSheetPoint> GetSheetPoints(Int32 rowStart, Int32 columnStart,
-                                                        Int32 rowEnd, Int32 columnEnd)
-        {
-            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
-            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
-            for (int ro = rowStart; ro <= finalRow; ro++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = columnStart; co <= finalColumn; co++)
-                    {
-                        if (columnsCollection.ContainsKey(co))
-                            yield return new XLSheetPoint(ro, co);
-                    }
-                }
-            }
-        }
-
-        public XLCell GetCell(Int32 row, Int32 column)
-        {
-            if (row > MaxRowUsed || column > MaxColumnUsed)
-                return null;
-            Dictionary<int, XLCell> columnsCollection;
-            if (rowsCollection.TryGetValue(row, out columnsCollection))
-            {
-                XLCell cell;
-                return columnsCollection.TryGetValue(column, out cell) ? cell : null;
-            }
-            return null;
-        }
-
-        public XLCell GetCell(XLSheetPoint sp)
-        {
-            return GetCell(sp.Row, sp.Column);
-        }
-
-        internal void SwapRanges(XLSheetRange sheetRange1, XLSheetRange sheetRange2, XLWorksheet worksheet)
-        {
-            Int32 rowCount = sheetRange1.LastPoint.Row - sheetRange1.FirstPoint.Row + 1;
-            Int32 columnCount = sheetRange1.LastPoint.Column - sheetRange1.FirstPoint.Column + 1;
-            for (int row = 0; row < rowCount; row++)
-            {
-                for (int column = 0; column < columnCount; column++)
-                {
-                    var sp1 = new XLSheetPoint(sheetRange1.FirstPoint.Row + row, sheetRange1.FirstPoint.Column + column);
-                    var sp2 = new XLSheetPoint(sheetRange2.FirstPoint.Row + row, sheetRange2.FirstPoint.Column + column);
-                    var cell1 = GetCell(sp1);
-                    var cell2 = GetCell(sp2);
-
-                    if (cell1 == null) cell1 = worksheet.Cell(sp1.Row, sp1.Column);
-                    if (cell2 == null) cell2 = worksheet.Cell(sp2.Row, sp2.Column);
-
-                    //if (cell1 != null)
-                    //{
-                    cell1.Address = new XLAddress(cell1.Worksheet, sp2.Row, sp2.Column, false, false);
-                    Remove(sp1);
-                    //if (cell2 != null)
-                    Add(sp1, cell2);
-                    //}
-
-                    //if (cell2 == null) continue;
-
-                    cell2.Address = new XLAddress(cell2.Worksheet, sp1.Row, sp1.Column, false, false);
-                    Remove(sp2);
-                    //if (cell1 != null)
-                    Add(sp2, cell1);
-                }
-            }
-        }
-
-        internal IEnumerable<XLCell> GetCells()
-        {
-            return GetCells(1, 1, MaxRowUsed, MaxColumnUsed);
-        }
-
-        internal IEnumerable<XLCell> GetCells(Func<IXLCell, Boolean> predicate)
-        {
-            for (int ro = 1; ro <= MaxRowUsed; ro++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(ro, out columnsCollection))
-                {
-                    for (int co = 1; co <= MaxColumnUsed; co++)
-                    {
-                        XLCell cell;
-                        if (columnsCollection.TryGetValue(co, out cell)
-                            && (predicate == null || predicate(cell)))
-                            yield return cell;
-                    }
-                }
-            }
-
-        }
-
-        public Boolean Contains(Int32 row, Int32 column)
-        {
-            Dictionary<int, XLCell> columnsCollection;
-            return rowsCollection.TryGetValue(row, out columnsCollection) && columnsCollection.ContainsKey(column);
-        }
-
-        public Int32 MinRowInColumn(Int32 column)
-        {
-            for (int row = 1; row <= MaxRowUsed; row++)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(row, out columnsCollection))
-                {
-                    if (columnsCollection.ContainsKey(column))
-                        return row;
-                }
-            }
-
-            return 0;
-        }
-
-        public Int32 MaxRowInColumn(Int32 column)
-        {
-            for (int row = MaxRowUsed; row >= 1; row--)
-            {
-                Dictionary<int, XLCell> columnsCollection;
-                if (rowsCollection.TryGetValue(row, out columnsCollection))
-                {
-                    if (columnsCollection.ContainsKey(column))
-                        return row;
-                }
-            }
-
-            return 0;
-        }
-
-        public Int32 MinColumnInRow(Int32 row)
-        {
-            Dictionary<int, XLCell> columnsCollection;
-            if (rowsCollection.TryGetValue(row, out columnsCollection))
-            {
-                if (columnsCollection.Count > 0)
-                    return columnsCollection.Keys.Min();
-            }
-
-            return 0;
-        }
-
-        public Int32 MaxColumnInRow(Int32 row)
-        {
-            Dictionary<int, XLCell> columnsCollection;
-            if (rowsCollection.TryGetValue(row, out columnsCollection))
-            {
-                if (columnsCollection.Count > 0)
-                    return columnsCollection.Keys.Max();
-            }
-
-            return 0;
-        }
-
-        public IEnumerable<XLCell> GetCellsInColumn(Int32 column)
-        {
-            return GetCells(1, column, MaxRowUsed, column);
-        }
-
-        public IEnumerable<XLCell> GetCellsInRow(Int32 row)
-        {
-            return GetCells(row, 1, row, MaxColumnUsed);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/IXLChart.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/IXLChart.cs
deleted file mode 100644
index 63af704..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/IXLChart.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLChartType {
-        Area,
-        Area3D,
-        AreaStacked,
-        AreaStacked100Percent,
-        AreaStacked100Percent3D,
-        AreaStacked3D,
-        BarClustered,
-        BarClustered3D,
-        BarStacked,
-        BarStacked100Percent,
-        BarStacked100Percent3D,
-        BarStacked3D,
-        Bubble,
-        Bubble3D,
-        Column3D,
-        ColumnClustered,
-        ColumnClustered3D,
-        ColumnStacked,
-        ColumnStacked100Percent,
-        ColumnStacked100Percent3D,
-        ColumnStacked3D,
-        Cone,
-        ConeClustered,
-        ConeHorizontalClustered,
-        ConeHorizontalStacked,
-        ConeHorizontalStacked100Percent,
-        ConeStacked,
-        ConeStacked100Percent,
-        Cylinder,
-        CylinderClustered,
-        CylinderHorizontalClustered,
-        CylinderHorizontalStacked,
-        CylinderHorizontalStacked100Percent,
-        CylinderStacked,
-        CylinderStacked100Percent,
-        Doughnut,
-        DoughnutExploded,
-        Line,
-        Line3D,
-        LineStacked,
-        LineStacked100Percent,
-        LineWithMarkers,
-        LineWithMarkersStacked,
-        LineWithMarkersStacked100Percent,
-        Pie,
-        Pie3D,
-        PieExploded,
-        PieExploded3D,
-        PieToBar,
-        PieToPie,
-        Pyramid,
-        PyramidClustered,
-        PyramidHorizontalClustered,
-        PyramidHorizontalStacked,
-        PyramidHorizontalStacked100Percent,
-        PyramidStacked,
-        PyramidStacked100Percent,
-        Radar,
-        RadarFilled,
-        RadarWithMarkers,
-        StockHighLowClose,
-        StockOpenHighLowClose,
-        StockVolumeHighLowClose,
-        StockVolumeOpenHighLowClose,
-        Surface,
-        SurfaceContour,
-        SurfaceContourWireframe,
-        SurfaceWireframe,
-        XYScatterMarkers,
-        XYScatterSmoothLinesNoMarkers,
-        XYScatterSmoothLinesWithMarkers,
-        XYScatterStraightLinesNoMarkers,
-        XYScatterStraightLinesWithMarkers
-    }
-    public interface IXLChart: IXLDrawing<IXLChart>
-    {
-        Boolean RightAngleAxes { get; set; }
-        IXLChart SetRightAngleAxes();
-        IXLChart SetRightAngleAxes(Boolean rightAngleAxes);
-
-        XLChartType ChartType { get; set; }
-        IXLChart SetChartType(XLChartType chartType);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/IXLCharts.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/IXLCharts.cs
deleted file mode 100644
index 2e21d09..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/IXLCharts.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLCharts: IEnumerable<IXLChart>
-    {
-        void Add(IXLChart chart);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/XLChart.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/XLChart.cs
deleted file mode 100644
index 75de711..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/XLChart.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal enum XLChartTypeCategory { Bar3D }
-    internal enum XLBarOrientation { Vertical, Horizontal }
-    internal enum XLBarGrouping { Clustered, Percent, Stacked, Standard }
-    internal class XLChart: XLDrawing<IXLChart>, IXLChart
-    {
-        internal IXLWorksheet worksheet;
-        public XLChart(XLWorksheet worksheet)
-        {
-            Container = this;
-            this.worksheet = worksheet;
-            Int32 zOrder;
-            if (worksheet.Charts.Any())
-                zOrder = worksheet.Charts.Max(c => c.ZOrder) + 1;
-            else
-                zOrder = 1;
-            ZOrder = zOrder;
-            ShapeId = worksheet.Workbook.ShapeIdManager.GetNext();
-            RightAngleAxes = true;
-        }
-
-        public Boolean RightAngleAxes { get; set; }
-        public IXLChart SetRightAngleAxes()
-        {
-            RightAngleAxes = true;
-            return this;
-        }
-        public IXLChart SetRightAngleAxes(Boolean rightAngleAxes)
-        {
-            RightAngleAxes = rightAngleAxes;
-            return this;
-        }
-
-        public XLChartType ChartType { get; set; }
-        public IXLChart SetChartType(XLChartType chartType)
-        {
-            ChartType = chartType;
-            return this;
-        }
-
-        public XLChartTypeCategory ChartTypeCategory
-        {
-            get
-            {
-                if (Bar3DCharts.Contains(ChartType))
-                    return XLChartTypeCategory.Bar3D;
-                else
-                    throw new NotImplementedException();
-
-            }
-        }
-
-        private HashSet<XLChartType> Bar3DCharts = new HashSet<XLChartType> { 
-            XLChartType.BarClustered3D, 
-            XLChartType.BarStacked100Percent3D, 
-            XLChartType.BarStacked3D, 
-            XLChartType.Column3D, 
-            XLChartType.ColumnClustered3D, 
-            XLChartType.ColumnStacked100Percent3D, 
-            XLChartType.ColumnStacked3D
-        };
-
-        public XLBarOrientation BarOrientation
-        {
-            get
-            {
-                if (HorizontalCharts.Contains(ChartType))
-                    return XLBarOrientation.Horizontal;
-                else
-                    return XLBarOrientation.Vertical;
-            }
-        }
-
-        private HashSet<XLChartType> HorizontalCharts = new HashSet<XLChartType>{
-            XLChartType.BarClustered, 
-            XLChartType.BarClustered3D, 
-            XLChartType.BarStacked, 
-            XLChartType.BarStacked100Percent, 
-            XLChartType.BarStacked100Percent3D, 
-            XLChartType.BarStacked3D, 
-            XLChartType.ConeHorizontalClustered, 
-            XLChartType.ConeHorizontalStacked, 
-            XLChartType.ConeHorizontalStacked100Percent, 
-            XLChartType.CylinderHorizontalClustered, 
-            XLChartType.CylinderHorizontalStacked, 
-            XLChartType.CylinderHorizontalStacked100Percent, 
-            XLChartType.PyramidHorizontalClustered, 
-            XLChartType.PyramidHorizontalStacked, 
-            XLChartType.PyramidHorizontalStacked100Percent
-        };
-
-        public XLBarGrouping BarGrouping
-        {
-            get
-            {
-                if (ClusteredCharts.Contains(ChartType))
-                    return XLBarGrouping.Clustered;
-                else if (PercentCharts.Contains(ChartType))
-                    return XLBarGrouping.Percent;
-                else if (StackedCharts.Contains(ChartType))
-                    return XLBarGrouping.Stacked;
-                else
-                    return XLBarGrouping.Standard;
-            }
-        }
-
-        public HashSet<XLChartType> ClusteredCharts = new HashSet<XLChartType>()
-        {
-            XLChartType.BarClustered,
-            XLChartType.BarClustered3D,
-            XLChartType.ColumnClustered,
-            XLChartType.ColumnClustered3D,
-            XLChartType.ConeClustered,
-            XLChartType.ConeHorizontalClustered,
-            XLChartType.CylinderClustered,
-            XLChartType.CylinderHorizontalClustered,
-            XLChartType.PyramidClustered,
-            XLChartType.PyramidHorizontalClustered
-        };
-
-        public HashSet<XLChartType> PercentCharts = new HashSet<XLChartType>() { 
-            XLChartType.AreaStacked100Percent,
-            XLChartType.AreaStacked100Percent3D,
-            XLChartType.BarStacked100Percent,
-            XLChartType.BarStacked100Percent3D,
-            XLChartType.ColumnStacked100Percent,
-            XLChartType.ColumnStacked100Percent3D,
-            XLChartType.ConeHorizontalStacked100Percent,
-            XLChartType.ConeStacked100Percent,
-            XLChartType.CylinderHorizontalStacked100Percent,
-            XLChartType.CylinderStacked100Percent,
-            XLChartType.LineStacked100Percent,
-            XLChartType.LineWithMarkersStacked100Percent,
-            XLChartType.PyramidHorizontalStacked100Percent,
-            XLChartType.PyramidStacked100Percent
-        };
-
-        public HashSet<XLChartType> StackedCharts = new HashSet<XLChartType>()
-        {
-            XLChartType.AreaStacked,
-            XLChartType.AreaStacked3D,
-            XLChartType.BarStacked,
-            XLChartType.BarStacked3D,
-            XLChartType.ColumnStacked,
-            XLChartType.ColumnStacked3D,
-            XLChartType.ConeHorizontalStacked,
-            XLChartType.ConeStacked,
-            XLChartType.CylinderHorizontalStacked,
-            XLChartType.CylinderStacked,
-            XLChartType.LineStacked,
-            XLChartType.LineWithMarkersStacked,
-            XLChartType.PyramidHorizontalStacked,
-            XLChartType.PyramidStacked
-        };
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/XLCharts.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/XLCharts.cs
deleted file mode 100644
index 46ff4e0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Charts/XLCharts.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCharts: IXLCharts
-    {
-        private List<IXLChart> charts = new List<IXLChart>();
-        public IEnumerator<IXLChart> GetEnumerator()
-        {
-            return charts.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Add(IXLChart chart)
-        {
-            charts.Add(chart);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/IXLColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/IXLColumn.cs
deleted file mode 100644
index 990ed2d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/IXLColumn.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLColumn : IXLRangeBase
-    {
-
-        /// <summary>
-        /// Gets or sets the width of this column.
-        /// </summary>
-        /// <value>
-        /// The width of this column.
-        /// </value>
-        Double Width { get; set; }
-
-        /// <summary>
-        /// Deletes this column and shifts the columns at the right of this one accordingly.
-        /// </summary>
-        void Delete();
-
-        /// <summary>
-        /// Gets this column's number
-        /// </summary>
-        Int32 ColumnNumber();
-
-        /// <summary>
-        /// Gets this column's letter
-        /// </summary>
-        String ColumnLetter();
-
-        /// <summary>
-        /// Inserts X number of columns at the right of this one.
-        /// <para>All columns at the right will be shifted accordingly.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">The number of columns to insert.</param>
-        IXLColumns InsertColumnsAfter(Int32 numberOfColumns);
-
-        /// <summary>
-        /// Inserts X number of columns at the left of this one.
-        /// <para>This column and all at the right will be shifted accordingly.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">The number of columns to insert.</param>
-        IXLColumns InsertColumnsBefore(Int32 numberOfColumns);
-
-        /// <summary>
-        /// Gets the cell in the specified row.
-        /// </summary>
-        /// <param name="rowNumber">The cell's row.</param>
-        IXLCell Cell(Int32 rowNumber);
-
-        /// <summary>
-        /// Returns the specified group of cells, separated by commas.
-        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1,3:5")</para>
-        /// </summary>
-        /// <param name="cellsInColumn">The column cells to return.</param>
-        new IXLCells Cells(String cellsInColumn);
-
-        /// <summary>
-        /// Returns the specified group of cells.
-        /// </summary>
-        /// <param name="firstRow">The first row in the group of cells to return.</param>
-        /// <param name="lastRow">The last row in the group of cells to return.</param>
-        IXLCells Cells(Int32 firstRow, Int32 lastRow);
-
-        /// <summary>
-        /// Adjusts the width of the column based on its contents.
-        /// </summary>
-        IXLColumn AdjustToContents();
-        /// <summary>
-        /// Adjusts the width of the column based on its contents, starting from the startRow.
-        /// </summary>
-        /// <param name="startRow">The row to start calculating the column width.</param>
-        IXLColumn AdjustToContents(Int32 startRow);
-        /// <summary>
-        /// Adjusts the width of the column based on its contents, starting from the startRow and ending at endRow.
-        /// </summary>
-        /// <param name="startRow">The row to start calculating the column width.</param>
-        /// <param name="endRow">The row to end calculating the column width.</param>
-        IXLColumn AdjustToContents(Int32 startRow, Int32 endRow);
-
-        IXLColumn AdjustToContents(Double minWidth, Double maxWidth);
-        IXLColumn AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth);
-        IXLColumn AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth);
-
-        /// <summary>
-        /// Hides this column.
-        /// </summary>
-        IXLColumn Hide();
-
-        /// <summary>Unhides this column.</summary>
-        IXLColumn Unhide();
-
-        /// <summary>
-        /// Gets a value indicating whether this column is hidden or not.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if this column is hidden; otherwise, <c>false</c>.
-        /// </value>
-        Boolean IsHidden { get; }
-
-        /// <summary>
-        /// Gets or sets the outline level of this column.
-        /// </summary>
-        /// <value>
-        /// The outline level of this column.
-        /// </value>
-        Int32 OutlineLevel { get; set; }
-
-        /// <summary>
-        /// Adds this column to the next outline level (Increments the outline level for this column by 1).
-        /// </summary>
-        IXLColumn Group();
-
-        /// <summary>
-        /// Adds this column to the next outline level (Increments the outline level for this column by 1).
-        /// </summary>
-        /// <param name="collapse">If set to <c>true</c> the column will be shown collapsed.</param>
-        IXLColumn Group(Boolean collapse);
-
-        /// <summary>
-        /// Sets outline level for this column.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        IXLColumn Group(Int32 outlineLevel);
-
-        /// <summary>
-        /// Sets outline level for this column.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        /// <param name="collapse">If set to <c>true</c> the column will be shown collapsed.</param>
-        IXLColumn Group(Int32 outlineLevel, Boolean collapse);
-
-        /// <summary>
-        /// Adds this column to the previous outline level (decrements the outline level for this column by 1).
-        /// </summary>
-        IXLColumn Ungroup();
-
-        /// <summary>
-        /// Adds this column to the previous outline level (decrements the outline level for this column by 1).
-        /// </summary>
-        /// <param name="fromAll">If set to <c>true</c> it will remove this column from all outline levels.</param>
-        IXLColumn Ungroup(Boolean fromAll);
-
-        /// <summary>
-        /// Show this column as collapsed.
-        /// </summary>
-        IXLColumn Collapse();
-
-        /// <summary>Expands this column (if it's collapsed).</summary>
-        IXLColumn Expand();
-
-        Int32 CellCount();
-
-        IXLRangeColumn CopyTo(IXLCell cell);
-        IXLRangeColumn CopyTo(IXLRangeBase range);
-        IXLColumn CopyTo(IXLColumn column);
-
-        IXLColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-
-        IXLRangeColumn Column(Int32 start, Int32 end);
-        IXLRangeColumn Column(IXLCell start, IXLCell end);
-        IXLRangeColumns Columns(String columns);
-
-        /// <summary>
-        /// Adds a vertical page break after this column.
-        /// </summary>
-        IXLColumn AddVerticalPageBreak();
-
-        IXLColumn SetDataType(XLCellValues dataType);
-
-        IXLColumn ColumnLeft();
-        IXLColumn ColumnLeft(Int32 step);
-        IXLColumn ColumnRight();
-        IXLColumn ColumnRight(Int32 step);
-
-        /// <summary>
-        /// Clears the contents of this column.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        new IXLColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        IXLRangeColumn ColumnUsed(Boolean includeFormats = false);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/IXLColumns.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/IXLColumns.cs
deleted file mode 100644
index bb23287..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/IXLColumns.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLColumns: IEnumerable<IXLColumn>, IDisposable
-    {
-        /// <summary>
-        /// Sets the width of all columns.
-        /// </summary>
-        /// <value>
-        /// The width of all columns.
-        /// </value>
-        Double Width { set; }
-
-        /// <summary>
-        /// Deletes all columns and shifts the columns at the right of them accordingly.
-        /// </summary>
-        void Delete();
-
-        /// <summary>
-        /// Adjusts the width of all columns based on its contents.
-        /// </summary>
-        IXLColumns AdjustToContents();
-        /// <summary>
-        /// Adjusts the width of all columns based on its contents, starting from the startRow.
-        /// </summary>
-        /// <param name="startRow">The row to start calculating the column width.</param>
-        IXLColumns AdjustToContents(Int32 startRow);
-        /// <summary>
-        /// Adjusts the width of all columns based on its contents, starting from the startRow and ending at endRow.
-        /// </summary>
-        /// <param name="startRow">The row to start calculating the column width.</param>
-        /// <param name="endRow">The row to end calculating the column width.</param>
-        IXLColumns AdjustToContents(Int32 startRow, Int32 endRow);
-
-        IXLColumns AdjustToContents(Double minWidth, Double maxWidth);
-        IXLColumns AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth);
-        IXLColumns AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth);
-
-        /// <summary>
-        /// Hides all columns.
-        /// </summary>
-        void Hide();
-
-        /// <summary>Unhides all columns.</summary>
-        void Unhide();
-
-        /// <summary>
-        /// Increments the outline level of all columns by 1.
-        /// </summary>
-        void Group();
-
-        /// <summary>
-        /// Increments the outline level of all columns by 1.
-        /// </summary>
-        /// <param name="collapse">If set to <c>true</c> the columns will be shown collapsed.</param>
-        void Group(Boolean collapse);
-
-        /// <summary>
-        /// Sets outline level for all columns.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        void Group(Int32 outlineLevel);
-
-        /// <summary>
-        /// Sets outline level for all columns.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        /// <param name="collapse">If set to <c>true</c> the columns will be shown collapsed.</param>
-        void Group(Int32 outlineLevel, Boolean collapse);
-
-        /// <summary>
-        /// Decrements the outline level of all columns by 1.
-        /// </summary>
-        void Ungroup();
-
-        /// <summary>
-        /// Decrements the outline level of all columns by 1.
-        /// </summary>
-        /// <param name="fromAll">If set to <c>true</c> it will remove the columns from all outline levels.</param>
-        void Ungroup(Boolean fromAll);
-
-        /// <summary>
-        /// Show all columns as collapsed.
-        /// </summary>
-        void Collapse();
-
-        /// <summary>Expands all columns (if they're collapsed).</summary>
-        void Expand();
-
-        /// <summary>
-        /// Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-        
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        IXLStyle Style { get; set; }
-
-        /// <summary>
-        /// Adds a vertical page break after these columns.
-        /// </summary>
-        IXLColumns AddVerticalPageBreaks();
-
-        IXLColumns SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of these columns.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        void Select();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumn.cs
deleted file mode 100644
index c713895..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumn.cs
+++ /dev/null
@@ -1,766 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Drawing;
-
-
-namespace ClosedXML.Excel
-{
-    internal class XLColumn : XLRangeBase, IXLColumn
-    {
-        #region Private fields
-
-        private bool _collapsed;
-        private bool _isHidden;
-        private int _outlineLevel;
-
-        private Double _width;
-
-        #endregion
-
-        #region Constructor
-
-        public XLColumn(Int32 column, XLColumnParameters xlColumnParameters)
-            : base(
-                new XLRangeAddress(new XLAddress(xlColumnParameters.Worksheet, 1, column, false, false),
-                                   new XLAddress(xlColumnParameters.Worksheet, XLHelper.MaxRowNumber, column, false,
-                                                 false)))
-        {
-            SetColumnNumber(column);
-
-            IsReference = xlColumnParameters.IsReference;
-            if (IsReference)
-                SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
-            else
-            {
-                SetStyle(xlColumnParameters.DefaultStyleId);
-                _width = xlColumnParameters.Worksheet.ColumnWidth;
-            }
-        }
-
-        public XLColumn(XLColumn column)
-            : base(
-                new XLRangeAddress(new XLAddress(column.Worksheet, 1, column.ColumnNumber(), false, false),
-                                   new XLAddress(column.Worksheet, XLHelper.MaxRowNumber, column.ColumnNumber(),
-                                                 false, false)))
-        {
-            _width = column._width;
-            IsReference = column.IsReference;
-            if (IsReference)
-				SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
-			_collapsed = column._collapsed;
-            _isHidden = column._isHidden;
-            _outlineLevel = column._outlineLevel;
-            SetStyle(column.GetStyleId());
-        }
-
-        #endregion
-
-        public Boolean IsReference { get; private set; }
-
-        public override IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-
-                yield return Style;
-
-                int column = ColumnNumber();
-
-                foreach (XLCell cell in Worksheet.Internals.CellsCollection.GetCellsInColumn(column))
-                    yield return cell.Style;
-
-                UpdatingStyle = false;
-            }
-        }
-
-        public override Boolean UpdatingStyle { get; set; }
-
-        public override IXLStyle InnerStyle
-        {
-            get
-            {
-                return IsReference
-                           ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].InnerStyle
-                           : GetStyle();
-            }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].InnerStyle = value;
-                else
-                    SetStyle(value);
-            }
-        }
-
-        public Boolean Collapsed
-        {
-            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].Collapsed : _collapsed; }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].Collapsed = value;
-                else
-                    _collapsed = value;
-            }
-        }
-
-        #region IXLColumn Members
-
-        public Double Width
-        {
-            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].Width : _width; }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].Width = value;
-                else
-                    _width = value;
-            }
-        }
-
-        public void Delete()
-        {
-            int columnNumber = ColumnNumber();
-            using (var asRange = AsRange())
-            {
-                asRange.Delete(XLShiftDeletedCells.ShiftCellsLeft);
-            }
-            
-            Worksheet.Internals.ColumnsCollection.Remove(columnNumber);
-            var columnsToMove = new List<Int32>();
-            columnsToMove.AddRange(
-                Worksheet.Internals.ColumnsCollection.Where(c => c.Key > columnNumber).Select(c => c.Key));
-            foreach (int column in columnsToMove.OrderBy(c => c))
-            {
-                Worksheet.Internals.ColumnsCollection.Add(column - 1, Worksheet.Internals.ColumnsCollection[column]);
-                Worksheet.Internals.ColumnsCollection.Remove(column);
-            }
-        }
-
-        public new IXLColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            base.Clear(clearOptions);
-            return this;
-        }
-
-        public IXLCell Cell(Int32 rowNumber)
-        {
-            return Cell(rowNumber, 1);
-        }
-
-        public new IXLCells Cells(String cellsInColumn)
-        {
-            var retVal = new XLCells(false, false);
-            var rangePairs = cellsInColumn.Split(',');
-            foreach (string pair in rangePairs)
-                retVal.Add(Range(pair.Trim()).RangeAddress);
-            return retVal;
-        }
-
-        public new IXLCells Cells()
-        {
-            return CellsUsed(true);
-        }
-
-        public IXLCells Cells(Int32 firstRow, Int32 lastRow)
-        {
-            return Cells(firstRow + ":" + lastRow);
-        }
-
-        public override IXLStyle Style
-        {
-            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].Style : GetStyle(); }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].Style = value;
-                else
-                {
-                    SetStyle(value);
-
-                    Int32 minRow = 1;
-                    Int32 maxRow = 0;
-                    int column = ColumnNumber();
-                    if (Worksheet.Internals.CellsCollection.ColumnsUsed.ContainsKey(column))
-                    {
-                        minRow = Worksheet.Internals.CellsCollection.MinRowInColumn(column);
-                        maxRow = Worksheet.Internals.CellsCollection.MaxRowInColumn(column);
-                    }
-
-                    if (Worksheet.Internals.RowsCollection.Count > 0)
-                    {
-                        Int32 minInCollection = Worksheet.Internals.RowsCollection.Keys.Min();
-                        Int32 maxInCollection = Worksheet.Internals.RowsCollection.Keys.Max();
-                        if (minInCollection < minRow)
-                            minRow = minInCollection;
-                        if (maxInCollection > maxRow)
-                            maxRow = maxInCollection;
-                    }
-
-                    if (minRow > 0 && maxRow > 0)
-                    {
-                        for (Int32 ro = minRow; ro <= maxRow; ro++)
-                            Worksheet.Cell(ro, column).Style = value;
-                    }
-                }
-            }
-        }
-
-        public new IXLColumns InsertColumnsAfter(Int32 numberOfColumns)
-        {
-            int columnNum = ColumnNumber();
-            Worksheet.Internals.ColumnsCollection.ShiftColumnsRight(columnNum + 1, numberOfColumns);
-            using (var column = Worksheet.Column(columnNum))
-            {
-                using (var asRange = column.AsRange())
-                {
-                    asRange.InsertColumnsAfterVoid(true, numberOfColumns);
-                }
-            }
-
-            var newColumns = Worksheet.Columns(columnNum + 1, columnNum + numberOfColumns);
-            CopyColumns(newColumns);
-            return newColumns;
-        }
-
-        public new IXLColumns InsertColumnsBefore(Int32 numberOfColumns)
-        {
-            int columnNum = ColumnNumber();
-            if (columnNum > 1)
-            {
-                using (var column = Worksheet.Column(columnNum - 1))
-                {
-                    return column.InsertColumnsAfter(numberOfColumns);
-                }
-            }
-
-            Worksheet.Internals.ColumnsCollection.ShiftColumnsRight(columnNum, numberOfColumns);
-
-            using (var column = Worksheet.Column(columnNum))
-            {
-                using (var asRange = column.AsRange())
-                {
-                    asRange.InsertColumnsBeforeVoid(true, numberOfColumns);
-                }
-            }
-
-            return Worksheet.Columns(columnNum, columnNum + numberOfColumns - 1);
-        }
-
-        private void CopyColumns(IXLColumns newColumns)
-        {
-            foreach (var newColumn in newColumns)
-            {
-                var internalColumn = Worksheet.Internals.ColumnsCollection[newColumn.ColumnNumber()];
-                internalColumn._width = Width;
-                internalColumn.SetStyle(Style);
-                internalColumn._collapsed = Collapsed;
-                internalColumn._isHidden = IsHidden;
-                internalColumn._outlineLevel = OutlineLevel;
-            }
-        }
-
-        public IXLColumn AdjustToContents()
-        {
-            return AdjustToContents(1);
-        }
-
-        public IXLColumn AdjustToContents(Int32 startRow)
-        {
-            return AdjustToContents(startRow, XLHelper.MaxRowNumber);
-        }
-
-        public IXLColumn AdjustToContents(Int32 startRow, Int32 endRow)
-        {
-            return AdjustToContents(startRow, endRow, 0, Double.MaxValue);
-        }
-
-        public IXLColumn AdjustToContents(Double minWidth, Double maxWidth)
-        {
-            return AdjustToContents(1, XLHelper.MaxRowNumber, minWidth, maxWidth);
-        }
-
-        public IXLColumn AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth)
-        {
-            return AdjustToContents(startRow, XLHelper.MaxRowNumber, minWidth, maxWidth);
-        }
-
-        public IXLColumn AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth)
-        {
-            var fontCache = new Dictionary<IXLFontBase, Font>();
-            Double colMaxWidth = minWidth;
-            foreach (XLCell c in Column(startRow, endRow).CellsUsed())
-            {
-                if (c.IsMerged()) continue;
-
-                Double thisWidthMax = 0;
-                Int32 textRotation = c.Style.Alignment.TextRotation;
-                if (c.HasRichText || textRotation != 0 || c.InnerText.Contains(Environment.NewLine))
-                {
-                    var kpList = new List<KeyValuePair<IXLFontBase, string>>();
-
-                    #region if (c.HasRichText)
-
-                    if (c.HasRichText)
-                    {
-                        foreach (IXLRichString rt in c.RichText)
-                        {
-                            String formattedString = rt.Text;
-                            var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
-                            Int32 arrCount = arr.Count();
-                            for (Int32 i = 0; i < arrCount; i++)
-                            {
-                                String s = arr[i];
-                                if (i < arrCount - 1)
-                                    s += Environment.NewLine;
-                                kpList.Add(new KeyValuePair<IXLFontBase, String>(rt, s));
-                            }
-                        }
-                    }
-                    else
-                    {
-                        String formattedString = c.GetFormattedString();
-                        var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
-                        Int32 arrCount = arr.Count();
-                        for (Int32 i = 0; i < arrCount; i++)
-                        {
-                            String s = arr[i];
-                            if (i < arrCount - 1)
-                                s += Environment.NewLine;
-                            kpList.Add(new KeyValuePair<IXLFontBase, String>(c.Style.Font, s));
-                        }
-                    }
-
-                    #endregion
-
-                    #region foreach (var kp in kpList)
-
-                    Double runningWidth = 0;
-                    Boolean rotated = false;
-                    Double maxLineWidth = 0;
-                    Int32 lineCount = 1;
-                    foreach (KeyValuePair<IXLFontBase, string> kp in kpList)
-                    {
-                        var f = kp.Key;
-                        String formattedString = kp.Value;
-
-                        Int32 newLinePosition = formattedString.IndexOf(Environment.NewLine);
-                        if (textRotation == 0)
-                        {
-                            #region if (newLinePosition >= 0)
-
-                            if (newLinePosition >= 0)
-                            {
-                                if (newLinePosition > 0)
-                                    runningWidth += f.GetWidth(formattedString.Substring(0, newLinePosition), fontCache);
-
-                                if (runningWidth > thisWidthMax)
-                                    thisWidthMax = runningWidth;
-
-                                runningWidth = newLinePosition < formattedString.Length - 2
-                                                   ? f.GetWidth(formattedString.Substring(newLinePosition + 2), fontCache)
-                                                   : 0;
-                            }
-                            else
-                                runningWidth += f.GetWidth(formattedString, fontCache);
-
-                            #endregion
-                        }
-                        else
-                        {
-                            #region if (textRotation == 255)
-
-                            if (textRotation == 255)
-                            {
-                                if (runningWidth <= 0)
-                                    runningWidth = f.GetWidth("X", fontCache);
-
-                                if (newLinePosition >= 0)
-                                    runningWidth += f.GetWidth("X", fontCache);
-                            }
-                            else
-                            {
-                                rotated = true;
-                                Double vWidth = f.GetWidth("X", fontCache);
-                                if (vWidth > maxLineWidth)
-                                    maxLineWidth = vWidth;
-
-                                if (newLinePosition >= 0)
-                                {
-                                    lineCount++;
-
-                                    if (newLinePosition > 0)
-                                        runningWidth += f.GetWidth(formattedString.Substring(0, newLinePosition), fontCache);
-
-                                    if (runningWidth > thisWidthMax)
-                                        thisWidthMax = runningWidth;
-
-                                    runningWidth = newLinePosition < formattedString.Length - 2
-                                                       ? f.GetWidth(formattedString.Substring(newLinePosition + 2), fontCache)
-                                                       : 0;
-                                }
-                                else
-                                    runningWidth += f.GetWidth(formattedString, fontCache);
-                            }
-
-                            #endregion
-                        }
-                    }
-
-                    #endregion
-
-                    if (runningWidth > thisWidthMax)
-                        thisWidthMax = runningWidth;
-
-                    #region if (rotated)
-
-                    if (rotated)
-                    {
-                        Int32 rotation;
-                        if (textRotation == 90 || textRotation == 180 || textRotation == 255)
-                            rotation = 90;
-                        else
-                            rotation = textRotation % 90;
-
-                        Double r = DegreeToRadian(rotation);
-
-                        thisWidthMax = (thisWidthMax * Math.Cos(r)) + (maxLineWidth * lineCount);
-                    }
-
-                    #endregion
-                }
-                else
-                    thisWidthMax = c.Style.Font.GetWidth(c.GetFormattedString(), fontCache);
-                if (thisWidthMax >= maxWidth)
-                {
-                    colMaxWidth = maxWidth;
-                    break;
-                }
-
-                if (thisWidthMax > colMaxWidth)
-                    colMaxWidth = thisWidthMax + 1;
-            }
-
-            if (colMaxWidth <= 0)
-                colMaxWidth = Worksheet.ColumnWidth;
-
-            Width = colMaxWidth;
-
-            foreach (IDisposable font in fontCache.Values)
-            {
-                font.Dispose();
-            }
-            return this;
-        }
-
-
-        public IXLColumn Hide()
-        {
-            IsHidden = true;
-            return this;
-        }
-
-        public IXLColumn Unhide()
-        {
-            IsHidden = false;
-            return this;
-        }
-
-        public Boolean IsHidden
-        {
-            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].IsHidden : _isHidden; }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].IsHidden = value;
-                else
-                    _isHidden = value;
-            }
-        }
-
-        public Int32 OutlineLevel
-        {
-            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].OutlineLevel : _outlineLevel; }
-            set
-            {
-                if (value < 0 || value > 8)
-                    throw new ArgumentOutOfRangeException("value", "Outline level must be between 0 and 8.");
-
-                if (IsReference)
-                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].OutlineLevel = value;
-                else
-                {
-                    Worksheet.IncrementColumnOutline(value);
-                    Worksheet.DecrementColumnOutline(_outlineLevel);
-                    _outlineLevel = value;
-                }
-            }
-        }
-
-        public IXLColumn Group()
-        {
-            return Group(false);
-        }
-
-        public IXLColumn Group(Boolean collapse)
-        {
-            if (OutlineLevel < 8)
-                OutlineLevel += 1;
-
-            Collapsed = collapse;
-            return this;
-        }
-
-        public IXLColumn Group(Int32 outlineLevel)
-        {
-            return Group(outlineLevel, false);
-        }
-
-        public IXLColumn Group(Int32 outlineLevel, Boolean collapse)
-        {
-            OutlineLevel = outlineLevel;
-            Collapsed = collapse;
-            return this;
-        }
-
-        public IXLColumn Ungroup()
-        {
-            return Ungroup(false);
-        }
-
-        public IXLColumn Ungroup(Boolean ungroupFromAll)
-        {
-            if (ungroupFromAll)
-                OutlineLevel = 0;
-            else
-            {
-                if (OutlineLevel > 0)
-                    OutlineLevel -= 1;
-            }
-            return this;
-        }
-
-        public IXLColumn Collapse()
-        {
-            Collapsed = true;
-            return Hide();
-        }
-
-        public IXLColumn Expand()
-        {
-            Collapsed = false;
-            return Unhide();
-        }
-
-        public Int32 CellCount()
-        {
-            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
-        }
-
-        public IXLColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false,
-                              Boolean ignoreBlanks = true)
-        {
-            Sort(1, sortOrder, matchCase, ignoreBlanks);
-            return this;
-        }
-
-
-        IXLRangeColumn IXLColumn.CopyTo(IXLCell target)
-        {
-            using (var asRange = AsRange())
-                using (var copy = asRange.CopyTo(target))
-                    return copy.Column(1);
-        }
-
-        IXLRangeColumn IXLColumn.CopyTo(IXLRangeBase target)
-        {
-            using (var asRange = AsRange())
-                using (var copy = asRange.CopyTo(target))
-                    return copy.Column(1);
-        }
-
-        public IXLColumn CopyTo(IXLColumn column)
-        {
-            column.Clear();
-            var newColumn = (XLColumn)column;
-            newColumn._width = _width;
-            newColumn.Style = GetStyle();
-
-            using (var asRange = AsRange())
-                asRange.CopyTo(column).Dispose();
-
-            return newColumn;
-        }
-
-        public IXLRangeColumn Column(Int32 start, Int32 end)
-        {
-            return Range(start, 1, end, 1).Column(1);
-        }
-
-        public IXLRangeColumn Column(IXLCell start, IXLCell end)
-        {
-            return Column(start.Address.RowNumber, end.Address.RowNumber);
-        }
-
-        public IXLRangeColumns Columns(String columns)
-        {
-            var retVal = new XLRangeColumns();
-            var columnPairs = columns.Split(',');
-            foreach (string pair in columnPairs)
-                using (var asRange = AsRange())
-                    asRange.Columns(pair.Trim()).ForEach(retVal.Add);
-            return retVal;
-        }
-
-        /// <summary>
-        ///   Adds a vertical page break after this column.
-        /// </summary>
-        public IXLColumn AddVerticalPageBreak()
-        {
-            Worksheet.PageSetup.AddVerticalPageBreak(ColumnNumber());
-            return this;
-        }
-
-        public IXLColumn SetDataType(XLCellValues dataType)
-        {
-            DataType = dataType;
-            return this;
-        }
-
-        public IXLRangeColumn ColumnUsed(Boolean includeFormats = false)
-        {
-            return Column(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
-        }
-
-        #endregion
-
-        public override XLRange AsRange()
-        {
-            return Range(1, 1, XLHelper.MaxRowNumber, 1);
-        }
-
-        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
-        {
-            if (range.RangeAddress.FirstAddress.ColumnNumber <= ColumnNumber())
-                SetColumnNumber(ColumnNumber() + columnsShifted);
-        }
-
-        private void SetColumnNumber(int column)
-        {
-            if (column <= 0)
-                RangeAddress.IsInvalid = false;
-            else
-            {
-                RangeAddress.FirstAddress = new XLAddress(Worksheet,
-                                                          1,
-                                                          column,
-                                                          RangeAddress.FirstAddress.FixedRow,
-                                                          RangeAddress.FirstAddress.FixedColumn);
-                RangeAddress.LastAddress = new XLAddress(Worksheet,
-                                                         XLHelper.MaxRowNumber,
-                                                         column,
-                                                         RangeAddress.LastAddress.FixedRow,
-                                                         RangeAddress.LastAddress.FixedColumn);
-            }
-        }
-
-        public override XLRange Range(String rangeAddressStr)
-        {
-            String rangeAddressToUse;
-            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
-            {
-                if (rangeAddressStr.Contains('-'))
-                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
-
-                var arrRange = rangeAddressStr.Split(':');
-                string firstPart = arrRange[0];
-                string secondPart = arrRange[1];
-                rangeAddressToUse = FixColumnAddress(firstPart) + ":" + FixColumnAddress(secondPart);
-            }
-            else
-                rangeAddressToUse = FixColumnAddress(rangeAddressStr);
-
-            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
-            return Range(rangeAddress);
-        }
-
-        public IXLRangeColumn Range(int firstRow, int lastRow)
-        {
-            return Range(firstRow, 1, lastRow, 1).Column(1);
-        }
-
-        private static double DegreeToRadian(double angle)
-        {
-            return Math.PI * angle / 180.0;
-        }
-
-
-        private XLColumn ColumnShift(Int32 columnsToShift)
-        {
-            return Worksheet.Column(ColumnNumber() + columnsToShift);
-        }
-
-        #region XLColumn Left
-
-        IXLColumn IXLColumn.ColumnLeft()
-        {
-            return ColumnLeft();
-        }
-
-        IXLColumn IXLColumn.ColumnLeft(Int32 step)
-        {
-            return ColumnLeft(step);
-        }
-
-        public XLColumn ColumnLeft()
-        {
-            return ColumnLeft(1);
-        }
-
-        public XLColumn ColumnLeft(Int32 step)
-        {
-            return ColumnShift(step * -1);
-        }
-
-        #endregion
-
-        #region XLColumn Right
-
-        IXLColumn IXLColumn.ColumnRight()
-        {
-            return ColumnRight();
-        }
-
-        IXLColumn IXLColumn.ColumnRight(Int32 step)
-        {
-            return ColumnRight(step);
-        }
-
-        public XLColumn ColumnRight()
-        {
-            return ColumnRight(1);
-        }
-
-        public XLColumn ColumnRight(Int32 step)
-        {
-            return ColumnShift(step);
-        }
-
-        #endregion
-
-        public new Boolean IsEmpty()
-        {
-            return IsEmpty(false);
-        }
-
-        public new Boolean IsEmpty(Boolean includeFormats)
-        {
-            if (includeFormats && !Style.Equals(Worksheet.Style))
-                return false;
-
-            return base.IsEmpty(includeFormats);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumnCollection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumnCollection.cs
deleted file mode 100644
index 9d5f440..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumnCollection.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLColumnsCollection : IDictionary<Int32, XLColumn>, IDisposable
-    {
-        public void ShiftColumnsRight(Int32 startingColumn, Int32 columnsToShift)
-        {
-            foreach (var ro in _dictionary.Keys.Where(k => k >= startingColumn).OrderByDescending(k => k))
-            {
-                var columnToMove = _dictionary[ro];
-                Int32 newColumnNum = ro + columnsToShift;
-                if (newColumnNum <= XLHelper.MaxColumnNumber)
-                {
-                    var newColumn = new XLColumn(columnToMove)
-                                        {
-                                            RangeAddress =
-                                            {
-                                                FirstAddress = new XLAddress(1, newColumnNum, false, false),
-                                                LastAddress =
-                                                    new XLAddress(XLHelper.MaxRowNumber, newColumnNum, false, false)
-                                            }
-                                        };
-                                        
-                    _dictionary.Add(newColumnNum, newColumn);
-                }
-                _dictionary.Remove(ro);
-            }
-
-        }
-
-        private readonly Dictionary<Int32, XLColumn> _dictionary = new Dictionary<Int32, XLColumn>();
-
-        public void Add(int key, XLColumn value)
-        {
-            _dictionary.Add(key, value);
-        }
-
-        public bool ContainsKey(int key)
-        {
-            return _dictionary.ContainsKey(key);
-        }
-
-        public ICollection<int> Keys
-        {
-            get { return _dictionary.Keys; }
-        }
-
-        public bool Remove(int key)
-        {
-            return _dictionary.Remove(key);
-        }
-
-        public bool TryGetValue(int key, out XLColumn value)
-        {
-            return _dictionary.TryGetValue(key, out value);
-        }
-
-        public ICollection<XLColumn> Values
-        {
-            get { return _dictionary.Values; }
-        }
-
-        public XLColumn this[int key]
-        {
-            get
-            {
-                return _dictionary[key];
-            }
-            set
-            {
-                _dictionary[key] = value;
-            }
-        }
-
-        public void Add(KeyValuePair<int, XLColumn> item)
-        {
-            _dictionary.Add(item.Key, item.Value);
-        }
-
-        public void Clear()
-        {
-            _dictionary.Clear();
-        }
-
-        public bool Contains(KeyValuePair<int, XLColumn> item)
-        {
-            return _dictionary.Contains(item);
-        }
-
-        public void CopyTo(KeyValuePair<int, XLColumn>[] array, int arrayIndex)
-        {
-            throw new NotImplementedException();
-        }
-
-        public int Count
-        {
-            get { return _dictionary.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        public bool Remove(KeyValuePair<int, XLColumn> item)
-        {
-            return _dictionary.Remove(item.Key);
-        }
-
-        public IEnumerator<KeyValuePair<int, XLColumn>> GetEnumerator()
-        {
-            return _dictionary.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return _dictionary.GetEnumerator();
-        }
-
-        public void RemoveAll(Func<XLColumn, Boolean> predicate)
-        {
-            _dictionary.RemoveAll(predicate);
-        }
-
-        public void Dispose()
-        {
-            _dictionary.Values.ForEach(c=>c.Dispose());
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumnParameters.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumnParameters.cs
deleted file mode 100644
index 4353f20..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumnParameters.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-
-namespace ClosedXML.Excel
-{
-    internal class XLColumnParameters
-    {
-        public XLColumnParameters(XLWorksheet worksheet, Int32 defaultStyleId, Boolean isReference)
-        {
-            Worksheet = worksheet;
-            DefaultStyleId = defaultStyleId;
-            IsReference = isReference;
-        }
-        public Int32 DefaultStyleId { get; set; }
-        public XLWorksheet Worksheet { get; private set; }
-        public Boolean IsReference { get; private set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumns.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumns.cs
deleted file mode 100644
index f62761c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Columns/XLColumns.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    internal class XLColumns : IXLColumns, IXLStylized
-    {
-        public Boolean StyleChanged { get; set; }
-        private readonly List<XLColumn> _columns = new List<XLColumn>();
-        private readonly XLWorksheet _worksheet;
-        internal IXLStyle style;
-
-        public XLColumns(XLWorksheet worksheet)
-        {
-            _worksheet = worksheet;
-            style = new XLStyle(this, XLWorkbook.DefaultStyle);
-        }
-
-        #region IXLColumns Members
-
-        public IEnumerator<IXLColumn> GetEnumerator()
-        {
-            return _columns.Cast<IXLColumn>().OrderBy(r => r.ColumnNumber()).GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLStyle Style
-        {
-            get { return style; }
-            set
-            {
-                style = new XLStyle(this, value);
-
-                if (_worksheet != null)
-                    _worksheet.Style = value;
-                else
-                {
-                    foreach (XLColumn column in _columns)
-                        column.Style = value;
-                }
-            }
-        }
-
-        public Double Width
-        {
-            set
-            {
-                _columns.ForEach(c => c.Width = value);
-
-                if (_worksheet == null) return;
-
-                _worksheet.ColumnWidth = value;
-                _worksheet.Internals.ColumnsCollection.ForEach(c => c.Value.Width = value);
-            }
-        }
-
-        public void Delete()
-        {
-            if (_worksheet != null)
-            {
-                _worksheet.Internals.ColumnsCollection.Clear();
-                _worksheet.Internals.CellsCollection.Clear();
-            }
-            else
-            {
-                var toDelete = new Dictionary<IXLWorksheet, List<Int32>>();
-                foreach (XLColumn c in _columns)
-                {
-                    if (!toDelete.ContainsKey(c.Worksheet))
-                        toDelete.Add(c.Worksheet, new List<Int32>());
-
-                    toDelete[c.Worksheet].Add(c.ColumnNumber());
-                }
-
-                foreach (KeyValuePair<IXLWorksheet, List<int>> kp in toDelete)
-                {
-                    foreach (int c in kp.Value.OrderByDescending(c => c))
-                        kp.Key.Column(c).Delete();
-                }
-            }
-        }
-
-        public IXLColumns AdjustToContents()
-        {
-            _columns.ForEach(c => c.AdjustToContents());
-            return this;
-        }
-
-        public IXLColumns AdjustToContents(Int32 startRow)
-        {
-            _columns.ForEach(c => c.AdjustToContents(startRow));
-            return this;
-        }
-
-        public IXLColumns AdjustToContents(Int32 startRow, Int32 endRow)
-        {
-            _columns.ForEach(c => c.AdjustToContents(startRow, endRow));
-            return this;
-        }
-
-        public IXLColumns AdjustToContents(Double minWidth, Double maxWidth)
-        {
-            _columns.ForEach(c => c.AdjustToContents(minWidth, maxWidth));
-            return this;
-        }
-
-        public IXLColumns AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth)
-        {
-            _columns.ForEach(c => c.AdjustToContents(startRow, minWidth, maxWidth));
-            return this;
-        }
-
-        public IXLColumns AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth)
-        {
-            _columns.ForEach(c => c.AdjustToContents(startRow, endRow, minWidth, maxWidth));
-            return this;
-        }
-
-        public void Hide()
-        {
-            _columns.ForEach(c => c.Hide());
-        }
-
-        public void Unhide()
-        {
-            _columns.ForEach(c => c.Unhide());
-        }
-
-        public void Group()
-        {
-            Group(false);
-        }
-
-        public void Group(Int32 outlineLevel)
-        {
-            Group(outlineLevel, false);
-        }
-
-        public void Ungroup()
-        {
-            Ungroup(false);
-        }
-
-        public void Group(Boolean collapse)
-        {
-            _columns.ForEach(c => c.Group(collapse));
-        }
-
-        public void Group(Int32 outlineLevel, Boolean collapse)
-        {
-            _columns.ForEach(c => c.Group(outlineLevel, collapse));
-        }
-
-        public void Ungroup(Boolean ungroupFromAll)
-        {
-            _columns.ForEach(c => c.Ungroup(ungroupFromAll));
-        }
-
-        public void Collapse()
-        {
-            _columns.ForEach(c => c.Collapse());
-        }
-
-        public void Expand()
-        {
-            _columns.ForEach(c => c.Expand());
-        }
-
-        public IXLCells Cells()
-        {
-            var cells = new XLCells(false, false);
-            foreach (XLColumn container in _columns)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed()
-        {
-            var cells = new XLCells(true, false);
-            foreach (XLColumn container in _columns)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Boolean includeFormats)
-        {
-            var cells = new XLCells(true, includeFormats);
-            foreach (XLColumn container in _columns)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        /// <summary>
-        ///   Adds a vertical page break after this column.
-        /// </summary>
-        public IXLColumns AddVerticalPageBreaks()
-        {
-            foreach (XLColumn col in _columns)
-                col.Worksheet.PageSetup.AddVerticalPageBreak(col.ColumnNumber());
-            return this;
-        }
-
-        public IXLColumns SetDataType(XLCellValues dataType)
-        {
-            _columns.ForEach(c => c.DataType = dataType);
-            return this;
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return style;
-                if (_worksheet != null)
-                    yield return _worksheet.Style;
-                else
-                {
-                    foreach (IXLStyle s in _columns.SelectMany(col => col.Styles))
-                    {
-                        yield return s;
-                    }
-                }
-                UpdatingStyle = false;
-            }
-        }
-
-        public Boolean UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return style; }
-            set { style = new XLStyle(this, value); }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges();
-                this.ForEach(c => retVal.Add(c.AsRange()));
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        public void Add(XLColumn column)
-        {
-            _columns.Add(column);
-        }
-
-        public void CollapseOnly()
-        {
-            _columns.ForEach(c => c.Collapsed = true);
-        }
-
-        public IXLColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            _columns.ForEach(c=>c.Clear(clearOptions));
-            return this;
-        }
-
-        public void Dispose()
-        {
-            if (_columns != null)
-                _columns.ForEach(c => c.Dispose());
-        }
-
-        public void Select()
-        {
-            foreach (var range in this)
-                range.Select();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Comments/IXLComment.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Comments/IXLComment.cs
deleted file mode 100644
index cddc435..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Comments/IXLComment.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLComment : IXLFormattedText<IXLComment>, IXLDrawing<IXLComment>
-    {
-        /// <summary>
-        /// Gets or sets this comment's author's name
-        /// </summary>
-        String Author { get; set; }
-        /// <summary>
-        /// Sets the name of the comment's author
-        /// </summary>
-        /// <param name="value">Author's name</param>
-        IXLComment SetAuthor(String value);
-
-        /// <summary>
-        /// Adds a bolded line with the author's name
-        /// </summary>
-        IXLRichString AddSignature();
-
-        void Delete();
-    }
-
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Comments/XLComment.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Comments/XLComment.cs
deleted file mode 100644
index 83f5846..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Comments/XLComment.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLComment : XLFormattedText<IXLComment>, IXLComment
-    {
-        private XLCell _cell;
-
-        public XLComment(XLCell cell, IXLFontBase defaultFont)
-            : base(defaultFont)
-        {
-            Initialize(cell);
-        }
-
-        public XLComment(XLCell cell, XLFormattedText<IXLComment> defaultComment, IXLFontBase defaultFont)
-            : base(defaultComment, defaultFont)
-        {
-            Initialize(cell);
-        }
-
-        public XLComment(XLCell cell, String text, IXLFontBase defaultFont)
-            : base(text, defaultFont)
-        {
-            Initialize(cell);
-        }
-
-        #region IXLComment Members
-
-        public String Author { get; set; }
-
-        public IXLComment SetAuthor(String value)
-        {
-            Author = value;
-            return this;
-        }
-
-        public IXLRichString AddSignature()
-        {
-            AddText(Author + ":").SetBold();
-            return AddText(Environment.NewLine);
-        }
-
-        public void Delete()
-        {
-            _cell.DeleteComment();
-        }
-
-        #endregion
-
-        #region IXLDrawing
-
-        public String Name { get; set; }
-        public String Description { get; set; }
-        public XLDrawingAnchor Anchor { get; set; }
-        public Boolean HorizontalFlip { get; set; }
-        public Boolean VerticalFlip { get; set; }
-        public Int32 Rotation { get; set; }
-        public Int32 ExtentLength { get; set; }
-        public Int32 ExtentWidth { get; set; }
-        public Int32 ShapeId { get; internal set; }
-
-        private Boolean _visible;
-
-        public Boolean Visible
-        {
-            get
-            {
-                return _visible;
-            }
-            set
-            {
-                _visible = value;
-            }
-        }
-
-        public IXLComment SetVisible()
-        {
-            Visible = true;
-            return Container;
-        }
-
-        public IXLComment SetVisible(Boolean hidden)
-        {
-            Visible = hidden;
-            return Container;
-        }
-
-        public IXLDrawingPosition Position { get; private set; }
-
-        public Int32 ZOrder { get; set; }
-
-        public IXLComment SetZOrder(Int32 zOrder)
-        {
-            ZOrder = zOrder;
-            return Container;
-        }
-
-        public IXLDrawingStyle Style { get; private set; }
-
-        public IXLComment SetName(String name)
-        {
-            Name = name;
-            return Container;
-        }
-
-        public IXLComment SetDescription(String description)
-        {
-            Description = description;
-            return Container;
-        }
-
-        public IXLComment SetHorizontalFlip()
-        {
-            HorizontalFlip = true;
-            return Container;
-        }
-
-        public IXLComment SetHorizontalFlip(Boolean horizontalFlip)
-        {
-            HorizontalFlip = horizontalFlip;
-            return Container;
-        }
-
-        public IXLComment SetVerticalFlip()
-        {
-            VerticalFlip = true;
-            return Container;
-        }
-
-        public IXLComment SetVerticalFlip(Boolean verticalFlip)
-        {
-            VerticalFlip = verticalFlip;
-            return Container;
-        }
-
-        public IXLComment SetRotation(Int32 rotation)
-        {
-            Rotation = rotation;
-            return Container;
-        }
-
-        public IXLComment SetExtentLength(Int32 extentLength)
-        {
-            ExtentLength = extentLength;
-            return Container;
-        }
-
-        public IXLComment SetExtentWidth(Int32 extentWidth)
-        {
-            ExtentWidth = extentWidth;
-            return Container;
-        }
-
-        #endregion
-
-        private void Initialize(XLCell cell)
-        {
-            Author = cell.Worksheet.Author;
-            Container = this;
-            Anchor = XLDrawingAnchor.MoveAndSizeWithCells;
-            Style = new XLDrawingStyle();
-            Int32 pRow = cell.Address.RowNumber;
-            Double pRowOffset = 0;
-            if (pRow > 1)
-            {
-                pRow--;
-                double prevHeight = cell.CellAbove().WorksheetRow().Height;
-                if (prevHeight > 7)
-                    pRowOffset = prevHeight - 7;
-            }
-            Position = new XLDrawingPosition
-                           {
-                               Column = cell.Address.ColumnNumber + 1,
-                               ColumnOffset = 2,
-                               Row = pRow,
-                               RowOffset = pRowOffset
-                           };
-
-            ZOrder = cell.Worksheet.ZOrder++;
-            Style
-                .Margins.SetLeft(0.1)
-                .Margins.SetRight(0.1)
-                .Margins.SetTop(0.05)
-                .Margins.SetBottom(0.05)
-                .Margins.SetAutomatic()
-                .Size.SetHeight(59.25)
-                .Size.SetWidth(19.2)
-                .ColorsAndLines.SetLineColor(XLColor.Black)
-                .ColorsAndLines.SetFillColor(XLColor.FromArgb(255, 255, 225))
-                .ColorsAndLines.SetLineDash(XLDashStyle.Solid)
-                .ColorsAndLines.SetLineStyle(XLLineStyle.Single)
-                .ColorsAndLines.SetLineWeight(0.75)
-                .ColorsAndLines.SetFillTransparency(1)
-                .ColorsAndLines.SetLineTransparency(1)
-                .Alignment.SetHorizontal(XLDrawingHorizontalAlignment.Left)
-                .Alignment.SetVertical(XLDrawingVerticalAlignment.Top)
-                .Alignment.SetDirection(XLDrawingTextDirection.Context)
-                .Alignment.SetOrientation(XLDrawingTextOrientation.LeftToRight)
-                .Properties.SetPositioning(XLDrawingAnchor.Absolute)
-                .Protection.SetLocked()
-                .Protection.SetLockText();
-
-            _cell = cell;
-            ShapeId = cell.Worksheet.Workbook.ShapeIdManager.GetNext();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMax.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMax.cs
deleted file mode 100644
index c147515..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMax.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLCFColorScaleMax
-    {
-        void Maximum(XLCFContentType type, String value, XLColor color);
-        void Maximum(XLCFContentType type, Double value, XLColor color);
-        void HighestValue(XLColor color);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMid.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMid.cs
deleted file mode 100644
index f36fdae..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMid.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLCFColorScaleMid
-    {
-        IXLCFColorScaleMax Midpoint(XLCFContentType type, String value, XLColor color);
-        IXLCFColorScaleMax Midpoint(XLCFContentType type, Double value, XLColor color);
-        void Maximum(XLCFContentType type, String value, XLColor color);
-        void Maximum(XLCFContentType type, Double value, XLColor color);
-        void HighestValue(XLColor color);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMin.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMin.cs
deleted file mode 100644
index 6e942a3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMin.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLCFContentType { Number, Percent, Formula, Percentile, Minimum, Maximum }
-    public interface IXLCFColorScaleMin
-    {
-        IXLCFColorScaleMid Minimum(XLCFContentType type, String value, XLColor color);
-        IXLCFColorScaleMid Minimum(XLCFContentType type, Double value, XLColor color);
-        IXLCFColorScaleMid LowestValue(XLColor color);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMax.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMax.cs
deleted file mode 100644
index 16341e3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMax.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLCFDataBarMax
-    {
-        void Maximum(XLCFContentType type, String value);
-        void Maximum(XLCFContentType type, Double value);
-        void HighestValue();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMin.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMin.cs
deleted file mode 100644
index a3d5e73..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMin.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLCFDataBarMin
-    {
-        IXLCFDataBarMax Minimum(XLCFContentType type, String value);
-        IXLCFDataBarMax Minimum(XLCFContentType type, Double value);
-        IXLCFDataBarMax LowestValue();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFIconSet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFIconSet.cs
deleted file mode 100644
index a5a361f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLCFIconSet.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLCFIconSetOperator {GreaterThan, EqualOrGreaterThan}
-    public interface IXLCFIconSet
-    {
-        IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, String value, XLCFContentType type);
-        IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, Double value, XLCFContentType type);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormat.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormat.cs
deleted file mode 100644
index c211f7a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormat.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLTimePeriod
-    {
-        Yesterday,
-        Today,
-        Tomorrow,
-        InTheLast7Days,
-        LastWeek,
-        ThisWeek,
-        NextWeek,
-        LastMonth,
-        ThisMonth,
-        NextMonth
-    }
-    public enum XLIconSetStyle
-    {
-        ThreeArrows,
-        ThreeArrowsGray,
-        ThreeFlags,
-        ThreeTrafficLights1,
-        ThreeTrafficLights2,
-        ThreeSigns,
-        ThreeSymbols,
-        ThreeSymbols2,
-        FourArrows,
-        FourArrowsGray,
-        FourRedToBlack,
-        FourRating,
-        FourTrafficLights,
-        FiveArrows,
-        FiveArrowsGray,
-        FiveRating,
-        FiveQuarters
-    }
-    public enum XLConditionalFormatType
-    {
-        Expression,
-        CellIs,
-        ColorScale,
-        DataBar,
-        IconSet,
-        Top10,
-        IsUnique,
-        IsDuplicate,
-        ContainsText,
-        NotContainsText,
-        StartsWith,
-        EndsWith,
-        IsBlank,
-        NotBlank,
-        IsError,
-        NotError,
-        TimePeriod,
-        AboveAverage
-    }
-    public enum XLCFOperator { Equal, NotEqual, GreaterThan, LessThan, EqualOrGreaterThan, EqualOrLessThan, Between, NotBetween, Contains, NotContains, StartsWith, EndsWith }
-    public interface IXLConditionalFormat
-    {
-        IXLStyle Style { get; set; }
-
-        IXLStyle WhenIsBlank();
-        IXLStyle WhenNotBlank();
-        IXLStyle WhenIsError();
-        IXLStyle WhenNotError();
-        IXLStyle WhenDateIs(XLTimePeriod timePeriod );
-        IXLStyle WhenContains(String value);
-        IXLStyle WhenNotContains(String value);
-        IXLStyle WhenStartsWith(String value);
-        IXLStyle WhenEndsWith(String value);
-        IXLStyle WhenEquals(String value);
-        IXLStyle WhenNotEquals(String value);
-        IXLStyle WhenGreaterThan(String value);
-        IXLStyle WhenLessThan(String value);
-        IXLStyle WhenEqualOrGreaterThan(String value);
-        IXLStyle WhenEqualOrLessThan(String value);
-        IXLStyle WhenBetween(String minValue, String maxValue);
-        IXLStyle WhenNotBetween(String minValue, String maxValue);
-
-        IXLStyle WhenEquals(Double value);
-        IXLStyle WhenNotEquals(Double value);
-        IXLStyle WhenGreaterThan(Double value);
-        IXLStyle WhenLessThan(Double value);
-        IXLStyle WhenEqualOrGreaterThan(Double value);
-        IXLStyle WhenEqualOrLessThan(Double value);
-        IXLStyle WhenBetween(Double minValue, Double maxValue);
-        IXLStyle WhenNotBetween(Double minValue, Double maxValue);
-
-        IXLStyle WhenIsDuplicate();
-        IXLStyle WhenIsUnique();
-        IXLStyle WhenIsTrue(String formula);
-        IXLStyle WhenIsTop(Int32 value, XLTopBottomType topBottomType = XLTopBottomType.Items);
-        IXLStyle WhenIsBottom(Int32 value, XLTopBottomType topBottomType);
-
-        IXLCFColorScaleMin ColorScale();
-        IXLCFDataBarMin DataBar(XLColor color, Boolean showBarOnly = false);
-        IXLCFIconSet IconSet(XLIconSetStyle iconSetStyle, Boolean reverseIconOrder = false, Boolean showIconOnly = false);
-
-        XLConditionalFormatType ConditionalFormatType { get; }
-        XLIconSetStyle IconSetStyle { get; }
-        XLTimePeriod TimePeriod { get; }
-        Boolean ReverseIconOrder { get; }
-        Boolean ShowIconOnly { get; }
-        Boolean ShowBarOnly { get; }
-        IXLRange Range { get; set; }
-
-        XLDictionary<XLFormula> Values { get; }
-        XLDictionary<XLColor> Colors { get; }
-        XLDictionary<XLCFContentType> ContentTypes { get; }
-        XLDictionary<XLCFIconSetOperator> IconSetOperators { get; }
-        
-        XLCFOperator Operator { get; }
-        Boolean Bottom { get;  }
-        Boolean Percent { get; }
-        
-        
-    }
-}
-    
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormats.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormats.cs
deleted file mode 100644
index 94fe02a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormats.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLConditionalFormats: IEnumerable<IXLConditionalFormat>
-    {
-        void Add(IXLConditionalFormat conditionalFormat);
-        void RemoveAll();
-        void Remove(Predicate<IXLConditionalFormat> predicate);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/IXLCFConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/IXLCFConverter.cs
deleted file mode 100644
index d885fea..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/IXLCFConverter.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal interface IXLCFConverter
-    {
-        ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFCellIsConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFCellIsConverter.cs
deleted file mode 100644
index a39690d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFCellIsConverter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFCellIsConverter : IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            String val = GetQuoted(cf.Values[1]);
-
-
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula();
-            if (cf.Operator == XLCFOperator.Equal || cf.Operator == XLCFOperator.NotEqual)
-                formula.Text = val;
-            else
-                formula.Text = val;
-            conditionalFormattingRule.Append(formula);
-
-            if(cf.Operator == XLCFOperator.Between || cf.Operator == XLCFOperator.NotBetween)
-            {
-                var formula2 = new Formula { Text = GetQuoted(cf.Values[2]) };
-                conditionalFormattingRule.Append(formula2);    
-            }
-
-            return conditionalFormattingRule;
-        }
-
-        private String GetQuoted(XLFormula formula)
-        {
-            String value = formula.Value;
-            Double num;
-            if ((!Double.TryParse(value, out num) && !formula.IsFormula) && value[0] != '\"' && !value.EndsWith("\""))
-                return String.Format("\"{0}\"", value.Replace("\"", "\"\""));
-
-            return value;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFColorScaleConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFColorScaleConverter.cs
deleted file mode 100644
index 5d970d5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFColorScaleConverter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFColorScaleConverter:IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-            
-            var colorScale = new ColorScale();
-            for(Int32 i = 1; i <= cf.Values.Count; i++)
-            {
-                var conditionalFormatValueObject = new ConditionalFormatValueObject { Type = cf.ContentTypes[i].ToOpenXml(), Val = cf.Values[i].Value };
-                colorScale.Append(conditionalFormatValueObject);
-            }
-
-            for (Int32 i = 1; i <= cf.Values.Count; i++)
-            {
-                Color color = new Color { Rgb = cf.Colors[i].Color.ToHex() };
-                colorScale.Append(color);
-            }
-
-            conditionalFormattingRule.Append(colorScale);
-
-            return conditionalFormattingRule;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFContainsConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFContainsConverter.cs
deleted file mode 100644
index 3abf4c3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFContainsConverter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFContainsConverter : IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            String val = cf.Values[1].Value;
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "NOT(ISERROR(SEARCH(\"" + val + "\"," + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + ")))" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFConverters.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFConverters.cs
deleted file mode 100644
index e4ed8bb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFConverters.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFConverters
-    {
-        private static readonly Dictionary<XLConditionalFormatType, IXLCFConverter> Converters;
-        static XLCFConverters()
-        {
-            Converters = new Dictionary<XLConditionalFormatType, IXLCFConverter>();
-            Converters.Add(XLConditionalFormatType.ColorScale, new XLCFColorScaleConverter());
-            Converters.Add(XLConditionalFormatType.StartsWith, new XLCFStartsWithConverter());
-            Converters.Add(XLConditionalFormatType.EndsWith, new XLCFEndsWithConverter());
-            Converters.Add(XLConditionalFormatType.IsBlank, new XLCFIsBlankConverter());
-            Converters.Add(XLConditionalFormatType.NotBlank, new XLCFNotBlankConverter());
-            Converters.Add(XLConditionalFormatType.IsError, new XLCFIsErrorConverter());
-            Converters.Add(XLConditionalFormatType.NotError, new XLCFNotErrorConverter());
-            Converters.Add(XLConditionalFormatType.ContainsText, new XLCFContainsConverter());
-            Converters.Add(XLConditionalFormatType.NotContainsText, new XLCFNotContainsConverter());
-            Converters.Add(XLConditionalFormatType.CellIs, new XLCFCellIsConverter());
-            Converters.Add(XLConditionalFormatType.IsUnique, new XLCFUniqueConverter());
-            Converters.Add(XLConditionalFormatType.IsDuplicate, new XLCFUniqueConverter());
-            Converters.Add(XLConditionalFormatType.Expression, new XLCFCellIsConverter());
-            Converters.Add(XLConditionalFormatType.Top10, new XLCFTopConverter());
-            Converters.Add(XLConditionalFormatType.DataBar, new XLCFDataBarConverter());
-            Converters.Add(XLConditionalFormatType.IconSet, new XLCFIconSetConverter());
-        }
-        public static ConditionalFormattingRule Convert(IXLConditionalFormat conditionalFormat, Int32 priority, XLWorkbook.SaveContext context)
-        {
-            return Converters[conditionalFormat.ConditionalFormatType].Convert(conditionalFormat, priority, context);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFDataBarConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFDataBarConverter.cs
deleted file mode 100644
index 1b2f0be..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFDataBarConverter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFDataBarConverter:IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var dataBar = new DataBar {ShowValue = !cf.ShowBarOnly};
-            var conditionalFormatValueObject1 = new ConditionalFormatValueObject { Type = cf.ContentTypes[1].ToOpenXml()};
-            if (cf.Values.Count >= 1) conditionalFormatValueObject1.Val = cf.Values[1].Value;
-
-            var conditionalFormatValueObject2 = new ConditionalFormatValueObject { Type = cf.ContentTypes[2].ToOpenXml()};
-            if (cf.Values.Count >= 2) conditionalFormatValueObject2.Val = cf.Values[2].Value;
-
-            var color = new Color { Rgb = cf.Colors[1].Color.ToHex() };
-
-            dataBar.Append(conditionalFormatValueObject1);
-            dataBar.Append(conditionalFormatValueObject2);
-            dataBar.Append(color);
-
-            conditionalFormattingRule.Append(dataBar);
-
-            return conditionalFormattingRule;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFEndsWithConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFEndsWithConverter.cs
deleted file mode 100644
index 1fa1532..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFEndsWithConverter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFEndsWithConverter : IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            String val = cf.Values[1].Value;
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "RIGHT(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "," + val.Length.ToString() + ")=\"" + val + "\"" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIconSetConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIconSetConverter.cs
deleted file mode 100644
index b5922ec..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIconSetConverter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFIconSetConverter:IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var iconSet = new IconSet {ShowValue = !cf.ShowIconOnly, Reverse = cf.ReverseIconOrder, IconSetValue = cf.IconSetStyle.ToOpenXml()};
-            Int32 count = cf.Values.Count;
-            for(Int32 i=1;i<= count; i++ )
-            {
-                var conditionalFormatValueObject = new ConditionalFormatValueObject { Type = cf.ContentTypes[i].ToOpenXml(), Val = cf.Values[i].Value, GreaterThanOrEqual = cf.IconSetOperators[i] == XLCFIconSetOperator.EqualOrGreaterThan};    
-                iconSet.Append(conditionalFormatValueObject);
-                
-            }
-            conditionalFormattingRule.Append(iconSet);
-            return conditionalFormattingRule;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsBlankConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsBlankConverter.cs
deleted file mode 100644
index 21e5e65..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsBlankConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFIsBlankConverter : IXLCFConverter
-    {
-
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "LEN(TRIM(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))=0" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsErrorConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsErrorConverter.cs
deleted file mode 100644
index 7fc1d7a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsErrorConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFIsErrorConverter : IXLCFConverter
-    {
-
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "ISERROR(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + ")" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotBlankConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotBlankConverter.cs
deleted file mode 100644
index aaeef02..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotBlankConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFNotBlankConverter : IXLCFConverter
-    {
-
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "LEN(TRIM(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))>0" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotContainsConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotContainsConverter.cs
deleted file mode 100644
index 86dcee8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotContainsConverter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFNotContainsConverter : IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            String val = cf.Values[1].Value;
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "ISERROR(SEARCH(\"" + val + "\"," + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotErrorConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotErrorConverter.cs
deleted file mode 100644
index 2510a0a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotErrorConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFNotErrorConverter : IXLCFConverter
-    {
-
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "NOT(ISERROR(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFStartsWithConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFStartsWithConverter.cs
deleted file mode 100644
index 82cfb88..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFStartsWithConverter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFStartsWithConverter : IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            String val = cf.Values[1].Value;
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-
-            var formula = new Formula { Text = "LEFT(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "," + val.Length.ToString() + ")=\"" + val + "\"" };
-
-            conditionalFormattingRule.Append(formula);
-
-            return conditionalFormattingRule;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFTopConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFTopConverter.cs
deleted file mode 100644
index 57b90f3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFTopConverter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFTopConverter : IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            UInt32 val = UInt32.Parse(cf.Values[1].Value);
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Percent = cf.Percent, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority, Rank = val, Bottom = cf.Bottom};
-            return conditionalFormattingRule;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFUniqueConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFUniqueConverter.cs
deleted file mode 100644
index c6b4ef9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/Save/XLCFUniqueConverter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFUniqueConverter : IXLCFConverter
-    {
-        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
-        {
-            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
-            return conditionalFormattingRule;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMax.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMax.cs
deleted file mode 100644
index 64614d8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMax.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFColorScaleMax : IXLCFColorScaleMax
-    {
-        private readonly XLConditionalFormat _conditionalFormat;
-        public XLCFColorScaleMax(XLConditionalFormat conditionalFormat)
-        {
-            _conditionalFormat = conditionalFormat;
-        }
-
-        public void Maximum(XLCFContentType type, String value, XLColor color)
-        {
-            _conditionalFormat.Values.Add(new XLFormula { Value = value });
-            _conditionalFormat.Colors.Add(color);
-            _conditionalFormat.ContentTypes.Add(type);
-        }
-        public void Maximum(XLCFContentType type, Double value, XLColor color)
-        {
-            Maximum(type, value.ToInvariantString(), color);
-        }
-        public void HighestValue(XLColor color)
-        {
-            Maximum(XLCFContentType.Maximum, "0", color);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMid.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMid.cs
deleted file mode 100644
index 13c31ec..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMid.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFColorScaleMid : IXLCFColorScaleMid
-    {
-        private readonly XLConditionalFormat _conditionalFormat;
-        public XLCFColorScaleMid(XLConditionalFormat conditionalFormat)
-        {
-            _conditionalFormat = conditionalFormat;
-        }
-        public IXLCFColorScaleMax Midpoint(XLCFContentType type, String value, XLColor color)
-        {
-            _conditionalFormat.Values.Add(new XLFormula { Value = value });
-            _conditionalFormat.Colors.Add(color);
-            _conditionalFormat.ContentTypes.Add(type);
-            return new XLCFColorScaleMax(_conditionalFormat);
-        }
-        public IXLCFColorScaleMax Midpoint(XLCFContentType type, Double value, XLColor color)
-        {
-            return Midpoint(type, value.ToInvariantString(), color);
-        }
-        public void Maximum(XLCFContentType type, String value, XLColor color)
-        {
-            Midpoint(type, value, color);
-        }
-        public void Maximum(XLCFContentType type, Double value, XLColor color)
-        {
-            Maximum(type, value.ToInvariantString(), color);
-        }
-        public void HighestValue(XLColor color)
-        {
-            Midpoint(XLCFContentType.Maximum, "0", color);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMin.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMin.cs
deleted file mode 100644
index 0c33c04..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMin.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFColorScaleMin : IXLCFColorScaleMin
-    {
-        private readonly XLConditionalFormat _conditionalFormat;
-        public XLCFColorScaleMin(XLConditionalFormat conditionalFormat)
-        {
-            _conditionalFormat = conditionalFormat;
-        }
-
-        public IXLCFColorScaleMid Minimum(XLCFContentType type, String value, XLColor color)
-        {
-            _conditionalFormat.Values.Initialize(new XLFormula { Value = value });
-            _conditionalFormat.Colors.Initialize(color);
-            _conditionalFormat.ContentTypes.Initialize(type);
-            return new XLCFColorScaleMid(_conditionalFormat);
-        }
-        public IXLCFColorScaleMid Minimum(XLCFContentType type, Double value, XLColor color)
-        {
-            return Minimum(type, value.ToInvariantString(), color);
-        }
-
-        public IXLCFColorScaleMid LowestValue(XLColor color)
-        {
-            return Minimum(XLCFContentType.Minimum, "0", color);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMax.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMax.cs
deleted file mode 100644
index cfedb03..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMax.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFDataBarMax : IXLCFDataBarMax
-    {
-        private readonly XLConditionalFormat _conditionalFormat;
-        public XLCFDataBarMax(XLConditionalFormat conditionalFormat)
-        {
-            _conditionalFormat = conditionalFormat;
-        }
-
-        public void Maximum(XLCFContentType type, String value)
-        {
-            _conditionalFormat.ContentTypes.Add(type);
-            _conditionalFormat.Values.Add(new XLFormula { Value = value });
-        }
-        public void Maximum(XLCFContentType type, Double value)
-        {
-            Maximum(type, value.ToInvariantString());
-        }
-
-        public void HighestValue()
-        {
-            Maximum(XLCFContentType.Maximum, "0");
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMin.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMin.cs
deleted file mode 100644
index 11770f8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMin.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFDataBarMin : IXLCFDataBarMin
-    {
-        private readonly XLConditionalFormat _conditionalFormat;
-        public XLCFDataBarMin(XLConditionalFormat conditionalFormat)
-        {
-            _conditionalFormat = conditionalFormat;
-        }
-
-        public IXLCFDataBarMax Minimum(XLCFContentType type, String value)
-        {
-            _conditionalFormat.ContentTypes.Initialize(type);
-            _conditionalFormat.Values.Initialize(new XLFormula { Value = value });
-            return new XLCFDataBarMax(_conditionalFormat);
-        }
-        public IXLCFDataBarMax Minimum(XLCFContentType type, Double value)
-        {
-            return Minimum(type, value.ToInvariantString());
-        }
-
-        public IXLCFDataBarMax LowestValue()
-        {
-            return Minimum(XLCFContentType.Minimum, "0");
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFIconSet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFIconSet.cs
deleted file mode 100644
index 6210197..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLCFIconSet.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCFIconSet : IXLCFIconSet
-    {
-        private readonly XLConditionalFormat _conditionalFormat;
-        public XLCFIconSet(XLConditionalFormat conditionalFormat)
-        {
-            _conditionalFormat = conditionalFormat;
-        }
-        public IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, String value, XLCFContentType type)
-        {
-            _conditionalFormat.IconSetOperators.Add(setOperator);
-            _conditionalFormat.Values.Add(new XLFormula { Value = value });
-            _conditionalFormat.ContentTypes.Add(type);
-            return new XLCFIconSet(_conditionalFormat);
-        }
-        public IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, Double value, XLCFContentType type)
-        {
-            return AddValue(setOperator, value.ToInvariantString(), type);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLConditionalFormat.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLConditionalFormat.cs
deleted file mode 100644
index d42b9fc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLConditionalFormat.cs
+++ /dev/null
@@ -1,357 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLConditionalFormat: IXLConditionalFormat, IXLStylized
-    {
-        
-        public XLConditionalFormat(XLRange range, Boolean copyDefaultModify = false)
-        {
-            Range = range;
-            Style = new XLStyle(this, range.Worksheet.Style);
-            Values = new XLDictionary<XLFormula>();
-            Colors = new XLDictionary<XLColor>();
-            ContentTypes = new XLDictionary<XLCFContentType>();
-            IconSetOperators = new XLDictionary<XLCFIconSetOperator>();
-            CopyDefaultModify = copyDefaultModify;
-        }
-        public XLConditionalFormat(XLConditionalFormat other)
-        {
-            Range = other.Range;
-            Style = new XLStyle(this, other.Style);
-            Values = new XLDictionary<XLFormula>(other.Values);
-            Colors = new XLDictionary<XLColor>(other.Colors);
-            ContentTypes = new XLDictionary<XLCFContentType>(other.ContentTypes);
-            IconSetOperators = new XLDictionary<XLCFIconSetOperator>(other.IconSetOperators);
-
-
-            ConditionalFormatType = other.ConditionalFormatType;
-            TimePeriod = other.TimePeriod;
-            IconSetStyle = other.IconSetStyle;
-            Operator = other.Operator;
-            Bottom = other.Bottom;
-            Percent = other.Percent;
-            ReverseIconOrder = other.ReverseIconOrder;
-            ShowIconOnly = other.ShowIconOnly;
-            ShowBarOnly = other.ShowBarOnly;
-        }
-
-        public Boolean CopyDefaultModify { get; set; }
-        private IXLStyle _style;
-        private Int32 _styleCacheId;
-        public IXLStyle Style{ get { return GetStyle(); } set { SetStyle(value); } }
-        private IXLStyle GetStyle()
-        {
-            //return _style;
-            if (_style != null)
-                return _style;
-
-            return _style = new XLStyle(this, Range.Worksheet.Workbook.GetStyleById(_styleCacheId), CopyDefaultModify);
-        }
-        private void SetStyle(IXLStyle styleToUse)
-        {
-            //_style = new XLStyle(this, styleToUse);
-            _styleCacheId = Range.Worksheet.Workbook.GetStyleId(styleToUse);
-            _style = null;
-            StyleChanged = false;
-        }
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return Style;
-                UpdatingStyle = false;
-            }
-        }
-
-        public bool UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle { get; set; }
-
-        public IXLRanges RangesUsed
-        {
-            get { return new XLRanges(); }
-        }
-
-        public bool StyleChanged { get; set; }
-        public XLDictionary<XLFormula> Values { get; private set; }
-        public XLDictionary<XLColor> Colors { get; private set; }
-        public XLDictionary<XLCFContentType> ContentTypes { get; private set; }
-        public XLDictionary<XLCFIconSetOperator> IconSetOperators { get; private set; }
-
-        public IXLRange Range { get; set; }
-        public XLConditionalFormatType ConditionalFormatType { get; set; }
-        public XLTimePeriod TimePeriod { get; set; }
-        public XLIconSetStyle IconSetStyle { get; set; }
-        public XLCFOperator Operator { get;  set; }
-        public Boolean Bottom { get;  set; }
-        public Boolean Percent { get;  set; }
-        public Boolean ReverseIconOrder { get;  set; }
-        public Boolean ShowIconOnly { get;  set; }
-        public Boolean ShowBarOnly { get;  set; }
-
-        public void CopyFrom(IXLConditionalFormat other)
-        {
-            Style = other.Style;
-            ConditionalFormatType = other.ConditionalFormatType;
-            TimePeriod = other.TimePeriod;
-            IconSetStyle = other.IconSetStyle;
-            Operator = other.Operator;
-            Bottom = other.Bottom;
-            Percent = other.Percent;
-            ReverseIconOrder = other.ReverseIconOrder;
-            ShowIconOnly = other.ShowIconOnly;
-            ShowBarOnly = other.ShowBarOnly;
-
-            Values.Clear();
-            other.Values.ForEach(kp => Values.Add(kp.Key, new XLFormula(kp.Value)));
-            //CopyDictionary(Values, other.Values);
-            CopyDictionary(Colors, other.Colors);
-            CopyDictionary(ContentTypes, other.ContentTypes);
-            CopyDictionary(IconSetOperators, other.IconSetOperators);
-        }
-
-        private void CopyDictionary<T>(XLDictionary<T> target, XLDictionary<T> source)
-        {
-            target.Clear();
-            source.ForEach(kp => target.Add(kp.Key, kp.Value));
-        }
-
-        public IXLStyle WhenIsBlank()
-        {
-            ConditionalFormatType = XLConditionalFormatType.IsBlank;
-            return Style;
-        }
-        public IXLStyle WhenNotBlank()
-        {
-            ConditionalFormatType = XLConditionalFormatType.NotBlank;
-            return Style;
-        }
-        public IXLStyle WhenIsError()
-        {
-            ConditionalFormatType = XLConditionalFormatType.IsError;
-            return Style;
-        }
-        public IXLStyle WhenNotError()
-        {
-            ConditionalFormatType = XLConditionalFormatType.NotError;
-            return Style;
-        }
-        public IXLStyle WhenDateIs(XLTimePeriod timePeriod)
-        {
-            TimePeriod = timePeriod;
-            ConditionalFormatType = XLConditionalFormatType.TimePeriod;
-            return Style;
-        }
-        public IXLStyle WhenContains(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            ConditionalFormatType = XLConditionalFormatType.ContainsText;
-            Operator = XLCFOperator.Contains;
-            return Style;
-        }
-        public IXLStyle WhenNotContains(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            ConditionalFormatType = XLConditionalFormatType.NotContainsText;
-            Operator = XLCFOperator.NotContains;
-            return Style;
-        }
-        public IXLStyle WhenStartsWith(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            ConditionalFormatType = XLConditionalFormatType.StartsWith;
-            Operator = XLCFOperator.StartsWith;
-            return Style;
-        }
-        public IXLStyle WhenEndsWith(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            ConditionalFormatType = XLConditionalFormatType.EndsWith;
-            Operator = XLCFOperator.EndsWith;
-            return Style;
-        }
-
-        public IXLStyle WhenEquals(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            Operator = XLCFOperator.Equal;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenNotEquals(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            Operator = XLCFOperator.NotEqual;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenGreaterThan(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            Operator = XLCFOperator.GreaterThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenLessThan(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            Operator = XLCFOperator.LessThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenEqualOrGreaterThan(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            Operator = XLCFOperator.EqualOrGreaterThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenEqualOrLessThan(String value)
-        {
-            Values.Initialize(new XLFormula { Value = value });
-            Operator = XLCFOperator.EqualOrLessThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenBetween(String minValue, String maxValue)
-        {
-            Values.Initialize(new XLFormula { Value = minValue });
-            Values.Add(new XLFormula { Value = maxValue });
-            Operator = XLCFOperator.Between;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenNotBetween(String minValue, String maxValue)
-        {
-            Values.Initialize(new XLFormula { Value = minValue });
-            Values.Add(new XLFormula { Value = maxValue });
-            Operator = XLCFOperator.NotBetween;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-
-        public IXLStyle WhenEquals(Double value)
-        {
-            Values.Initialize(new XLFormula(value));
-            Operator = XLCFOperator.Equal;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenNotEquals(Double value)
-        {
-            Values.Initialize(new XLFormula(value));
-            Operator = XLCFOperator.NotEqual;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenGreaterThan(Double value)
-        {
-            Values.Initialize(new XLFormula(value));
-            Operator = XLCFOperator.GreaterThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenLessThan(Double value)
-        {
-            Values.Initialize(new XLFormula(value));
-            Operator = XLCFOperator.LessThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenEqualOrGreaterThan(Double value)
-        {
-            Values.Initialize(new XLFormula(value));
-            Operator = XLCFOperator.EqualOrGreaterThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenEqualOrLessThan(Double value)
-        {
-            Values.Initialize(new XLFormula(value));
-            Operator = XLCFOperator.EqualOrLessThan;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenBetween(Double minValue, Double maxValue)
-    {
-            Values.Initialize(new XLFormula (minValue));
-            Values.Add(new XLFormula(maxValue));
-            Operator = XLCFOperator.Between;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-        public IXLStyle WhenNotBetween(Double minValue, Double maxValue)
-        {
-            Values.Initialize(new XLFormula(minValue));
-            Values.Add(new XLFormula(maxValue));
-            Operator = XLCFOperator.NotBetween;
-            ConditionalFormatType = XLConditionalFormatType.CellIs;
-            return Style;
-        }
-
-        public IXLStyle WhenIsDuplicate()
-        {
-            ConditionalFormatType = XLConditionalFormatType.IsDuplicate;
-            return Style;
-        }
-        public IXLStyle WhenIsUnique()
-        {
-            ConditionalFormatType = XLConditionalFormatType.IsUnique;
-            return Style;
-        }
-        public IXLStyle WhenIsTrue(String formula)
-        {
-            String f = formula.TrimStart()[0] == '=' ? formula : "=" + formula;
-            Values.Initialize(new XLFormula {Value = f});
-            ConditionalFormatType = XLConditionalFormatType.Expression;
-            return Style;
-        }
-        public IXLStyle WhenIsTop(Int32 value, XLTopBottomType topBottomType = XLTopBottomType.Items)
-        {
-            Values.Initialize(new XLFormula(value));
-            Percent = topBottomType == XLTopBottomType.Percent;
-            ConditionalFormatType = XLConditionalFormatType.Top10;
-            Bottom = false;
-            return Style;
-        }
-        public IXLStyle WhenIsBottom(Int32 value, XLTopBottomType topBottomType = XLTopBottomType.Items)
-        {
-            Values.Initialize(new XLFormula(value));
-            Percent = topBottomType == XLTopBottomType.Percent;
-            ConditionalFormatType = XLConditionalFormatType.Top10;
-            Bottom = true;
-            return Style;
-        }
-        
-        public IXLCFColorScaleMin ColorScale()
-        {
-            ConditionalFormatType = XLConditionalFormatType.ColorScale;
-            return new XLCFColorScaleMin(this);
-        }
-        public IXLCFDataBarMin DataBar(XLColor color, Boolean showBarOnly = false)
-        {
-            Colors.Initialize(color);
-            ShowBarOnly = showBarOnly;
-            ConditionalFormatType = XLConditionalFormatType.DataBar;
-            return new XLCFDataBarMin(this);
-        }
-        public IXLCFIconSet IconSet(XLIconSetStyle iconSetStyle, Boolean reverseIconOrder = false, Boolean showIconOnly = false)
-        {
-            IconSetOperators.Clear();
-            Values.Clear();
-            ContentTypes.Clear();
-            ConditionalFormatType = XLConditionalFormatType.IconSet;
-            IconSetStyle = iconSetStyle;
-            ReverseIconOrder = reverseIconOrder;
-            ShowIconOnly = showIconOnly;
-            return new XLCFIconSet(this);
-        }
-    }
-}
-
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLConditionalFormats.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLConditionalFormats.cs
deleted file mode 100644
index 0b221ad..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/ConditionalFormats/XLConditionalFormats.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLConditionalFormats: IXLConditionalFormats
-    {
-        private readonly List<IXLConditionalFormat> _conditionalFormats = new List<IXLConditionalFormat>();
-        public void Add(IXLConditionalFormat conditionalFormat)
-        {
-            _conditionalFormats.Add(conditionalFormat);
-        }
-
-        public IEnumerator<IXLConditionalFormat> GetEnumerator()
-        {
-            return _conditionalFormats.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Remove(Predicate<IXLConditionalFormat> predicate)
-        {
-            _conditionalFormats.RemoveAll(predicate);
-        }
-
-        public void RemoveAll()
-        {
-            _conditionalFormats.Clear();
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/IXLAddress.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/IXLAddress.cs
deleted file mode 100644
index 48ad531..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/IXLAddress.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLAddress : IEqualityComparer<IXLAddress>, IEquatable<IXLAddress>
-    {
-        IXLWorksheet Worksheet { get; }
-        Int32 RowNumber { get; }
-        Int32 ColumnNumber { get; }
-        String ColumnLetter { get; }
-        Boolean FixedRow { get; }
-        Boolean FixedColumn { get; }
-        String ToStringRelative();
-        String ToStringRelative(Boolean includeSheet);
-        String ToStringFixed();
-        String ToStringFixed(XLReferenceStyle referenceStyle);
-        String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet);
-        String ToString(XLReferenceStyle referenceStyle);
-        String UniqueId { get; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLAddress.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLAddress.cs
deleted file mode 100644
index d9b9a8e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLAddress.cs
+++ /dev/null
@@ -1,383 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace ClosedXML.Excel
-{
-    internal class XLAddress : IXLAddress
-    {
-        #region Static
-        /// <summary>
-        /// Create address without worksheet. For calculation only!
-        /// </summary>
-        /// <param name="cellAddressString"></param>
-        /// <returns></returns>
-        public static XLAddress Create(string cellAddressString)
-        {
-            return Create(null, cellAddressString);
-        }
-
-        public static XLAddress Create(XLAddress cellAddress)
-        {
-            return new XLAddress(cellAddress.Worksheet, cellAddress.RowNumber, cellAddress.ColumnNumber, cellAddress.FixedRow, cellAddress.FixedColumn);
-        }
-
-        public static XLAddress Create(XLWorksheet worksheet, string cellAddressString)
-        {
-            var fixedColumn = cellAddressString[0] == '$';
-            Int32 startPos;
-            if (fixedColumn)
-            {
-                startPos = 1;
-            }
-            else
-            {
-                startPos = 0;
-            }
-
-            int rowPos = startPos;
-            while (cellAddressString[rowPos] > '9')
-            {
-                rowPos++;
-            }
-
-            var fixedRow = cellAddressString[rowPos] == '$';
-            string columnLetter;
-            int rowNumber;
-            if (fixedRow)
-            {
-                if (fixedColumn)
-                {
-                    columnLetter = cellAddressString.Substring(startPos, rowPos - 1);
-                }
-                else
-                {
-                    columnLetter = cellAddressString.Substring(startPos, rowPos);
-                }
-
-                rowNumber = int.Parse(cellAddressString.Substring(rowPos + 1), XLHelper.NumberFormatForParse);
-            }
-            else
-            {
-                if (fixedColumn)
-                {
-                    columnLetter = cellAddressString.Substring(startPos, rowPos - 1);
-                }
-                else
-                {
-                    columnLetter = cellAddressString.Substring(startPos, rowPos);
-                }
-
-                rowNumber = Int32.Parse(cellAddressString.Substring(rowPos), XLHelper.NumberFormatForParse);
-            }
-            return new XLAddress(worksheet, rowNumber, columnLetter, fixedRow, fixedColumn);
-        }
-        #endregion
-        #region Private fields
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        private bool _fixedRow;
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        private bool _fixedColumn;
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        private string _columnLetter;
-
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        private readonly int _rowNumber;
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        private readonly int _columnNumber;
-        private string _trimmedAddress;
-        #endregion
-        #region Constructors
-        /// <summary>
-        /// 	Initializes a new <see cref = "XLAddress" /> struct using a mixed notation.  Attention: without worksheet for calculation only!
-        /// </summary>
-        /// <param name = "rowNumber">The row number of the cell address.</param>
-        /// <param name = "columnLetter">The column letter of the cell address.</param>
-        /// <param name = "fixedRow"></param>
-        /// <param name = "fixedColumn"></param>
-        public XLAddress(int rowNumber, string columnLetter, bool fixedRow, bool fixedColumn)
-                : this(null, rowNumber, columnLetter, fixedRow, fixedColumn)
-        {
-        }
-        /// <summary>
-        /// 	Initializes a new <see cref = "XLAddress" /> struct using a mixed notation.
-        /// </summary>
-        /// <param name = "worksheet"></param>
-        /// <param name = "rowNumber">The row number of the cell address.</param>
-        /// <param name = "columnLetter">The column letter of the cell address.</param>
-        /// <param name = "fixedRow"></param>
-        /// <param name = "fixedColumn"></param>
-        public XLAddress(XLWorksheet worksheet, int rowNumber, string columnLetter, bool fixedRow, bool fixedColumn)
-                : this(worksheet, rowNumber, XLHelper.GetColumnNumberFromLetter(columnLetter), fixedRow, fixedColumn)
-        {
-            _columnLetter = columnLetter;
-        }
-
-        /// <summary>
-        /// 	Initializes a new <see cref = "XLAddress" /> struct using R1C1 notation. Attention: without worksheet for calculation only!
-        /// </summary>
-        /// <param name = "rowNumber">The row number of the cell address.</param>
-        /// <param name = "columnNumber">The column number of the cell address.</param>
-        /// <param name = "fixedRow"></param>
-        /// <param name = "fixedColumn"></param>
-        public XLAddress(int rowNumber, int columnNumber, bool fixedRow, bool fixedColumn)
-                : this(null, rowNumber, columnNumber, fixedRow, fixedColumn)
-        {
-        }
-        /// <summary>
-        /// 	Initializes a new <see cref = "XLAddress" /> struct using R1C1 notation.
-        /// </summary>
-        /// <param name = "worksheet"></param>
-        /// <param name = "rowNumber">The row number of the cell address.</param>
-        /// <param name = "columnNumber">The column number of the cell address.</param>
-        /// <param name = "fixedRow"></param>
-        /// <param name = "fixedColumn"></param>
-        public XLAddress(XLWorksheet worksheet, int rowNumber, int columnNumber, bool fixedRow, bool fixedColumn)
-
-        {
-            Worksheet = worksheet;
-
-            _rowNumber = rowNumber;
-            _columnNumber = columnNumber;
-            _columnLetter = null;
-            _fixedColumn = fixedColumn;
-            _fixedRow = fixedRow;
-
-            
-        }
-        #endregion
-        #region Properties
-        public XLWorksheet Worksheet { get; internal set; }
-        IXLWorksheet IXLAddress.Worksheet
-        {
-            [DebuggerStepThrough]
-            get { return Worksheet; }
-        }
-
-        public bool HasWorksheet
-        {
-            [DebuggerStepThrough]
-            get { return Worksheet != null; }
-        }
-
-        public bool FixedRow
-        {
-            get { return _fixedRow; }
-            set { _fixedRow = value; }
-        }
-
-        public bool FixedColumn
-        {
-            get { return _fixedColumn; }
-            set { _fixedColumn = value; }
-        }
-
-        /// <summary>
-        /// 	Gets the row number of this address.
-        /// </summary>
-        public Int32 RowNumber
-        {
-            get { return _rowNumber; }
-        }
-
-        /// <summary>
-        /// 	Gets the column number of this address.
-        /// </summary>
-        public Int32 ColumnNumber
-        {
-            get { return _columnNumber; }
-        }
-
-        /// <summary>
-        /// 	Gets the column letter(s) of this address.
-        /// </summary>
-        public String ColumnLetter
-        {
-            get { return _columnLetter ?? (_columnLetter = XLHelper.GetColumnLetterFromNumber(_columnNumber)); }
-        }
-        #endregion
-        #region Overrides
-        public override string ToString()
-        {
-            String retVal = ColumnLetter;
-            if (_fixedColumn)
-            {
-                retVal = "$" + retVal;
-            }
-            if (_fixedRow)
-            {
-                retVal += "$";
-            }
-            retVal += _rowNumber.ToInvariantString();
-            return retVal;
-        }
-
-        public string ToString(XLReferenceStyle referenceStyle)
-        {
-            if (referenceStyle == XLReferenceStyle.A1)
-            {
-                return ColumnLetter + _rowNumber.ToInvariantString();
-            }
-            if (referenceStyle == XLReferenceStyle.R1C1)
-            {
-                return String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
-            }
-            if (HasWorksheet && Worksheet.Workbook.ReferenceStyle == XLReferenceStyle.R1C1)
-            {
-                return String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
-            }
-            return ColumnLetter + _rowNumber.ToInvariantString();
-        }
-        #endregion
-        #region Methods
-        public string GetTrimmedAddress()
-        {
-            return _trimmedAddress ?? (_trimmedAddress = ColumnLetter + _rowNumber.ToInvariantString());
-        }
-
-
-
-        #endregion
-        #region Operator Overloads
-        public static XLAddress operator +(XLAddress left, XLAddress right)
-        {
-            return new XLAddress(left.Worksheet,
-                                 left.RowNumber + right.RowNumber,
-                                 left.ColumnNumber + right.ColumnNumber,
-                                 left._fixedRow,
-                                 left._fixedColumn);
-        }
-
-        public static XLAddress operator -(XLAddress left, XLAddress right)
-        {
-            return new XLAddress(left.Worksheet,
-                                 left.RowNumber - right.RowNumber,
-                                 left.ColumnNumber - right.ColumnNumber,
-                                 left._fixedRow,
-                                 left._fixedColumn);
-        }
-
-        public static XLAddress operator +(XLAddress left, Int32 right)
-        {
-            return new XLAddress(left.Worksheet,
-                                 left.RowNumber + right,
-                                 left.ColumnNumber + right,
-                                 left._fixedRow,
-                                 left._fixedColumn);
-        }
-
-        public static XLAddress operator -(XLAddress left, Int32 right)
-        {
-            return new XLAddress(left.Worksheet,
-                                 left.RowNumber - right,
-                                 left.ColumnNumber - right,
-                                 left._fixedRow,
-                                 left._fixedColumn);
-        }
-
-        public static Boolean operator ==(XLAddress left, XLAddress right)
-        {
-            if (ReferenceEquals(left, right))
-            {
-                return true;
-            }
-            return !ReferenceEquals(left, null) && left.Equals(right);
-        }
-
-        public static Boolean operator !=(XLAddress left, XLAddress right)
-        {
-            return !(left == right);
-        }
-        #endregion
-        #region Interface Requirements
-        #region IEqualityComparer<XLCellAddress> Members
-        public Boolean Equals(IXLAddress x, IXLAddress y)
-        {
-            return x == y;
-        }
-
-        public Int32 GetHashCode(IXLAddress obj)
-        {
-            return obj.GetHashCode();
-        }
-
-        public new Boolean Equals(object x, object y)
-        {
-            return x == y;
-        }
-
-        public Int32 GetHashCode(object obj)
-        {
-            return (obj).GetHashCode();
-        }
-
-        public override int GetHashCode()
-        {
-            return _rowNumber ^ _columnNumber;
-        }
-        #endregion
-        #region IEquatable<XLCellAddress> Members
-        public bool Equals(IXLAddress other)
-        {
-            var right = other as XLAddress;
-            if (ReferenceEquals(right, null))
-            {
-                return false;
-            }
-            return _rowNumber == right._rowNumber && _columnNumber == right._columnNumber;
-        }
-
-        public override Boolean Equals(Object other)
-        {
-            return Equals((XLAddress) other);
-        }
-        #endregion
-        #endregion
-
-        public String ToStringRelative()
-        {
-            return ToStringRelative(false);
-        }
-
-        public String ToStringFixed()
-        {
-            return ToStringFixed(XLReferenceStyle.Default);
-        }
-
-        public String ToStringRelative(Boolean includeSheet)
-        {
-            if (includeSheet)
-                return String.Format("'{0}'!{1}",
-                    Worksheet.Name,
-                    GetTrimmedAddress());
-
-            return GetTrimmedAddress();
-        }
-
-        public String ToStringFixed(XLReferenceStyle referenceStyle)
-        {
-            return ToStringFixed(referenceStyle, false);
-        }
-
-        public String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet)
-        {
-            String address;
-            if (referenceStyle == XLReferenceStyle.A1)
-                address = String.Format("${0}${1}", ColumnLetter, _rowNumber.ToInvariantString());
-            else if (referenceStyle == XLReferenceStyle.R1C1)
-                address = String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
-            else if (HasWorksheet && Worksheet.Workbook.ReferenceStyle == XLReferenceStyle.R1C1)
-                address = String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
-            else
-                address = String.Format("${0}${1}", ColumnLetter, _rowNumber.ToInvariantString());
-
-            if (includeSheet)
-                return String.Format("'{0}'!{1}",
-                    Worksheet.Name,
-                    address);
-
-            return address;
-        }
-
-        public String UniqueId { get { return RowNumber.ToString("0000000") + ColumnNumber.ToString("00000"); } }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLSheetPoint.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLSheetPoint.cs
deleted file mode 100644
index 1d71682..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLSheetPoint.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal struct XLSheetPoint:IEquatable<XLSheetPoint>
-    {
-        public XLSheetPoint(Int32  row, Int32 column)
-        {
-            Row = row;
-            Column = column;
-        }
-
-        public readonly Int32 Row;
-        public readonly Int32 Column;
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLSheetPoint)obj);
-        }
-
-        public bool Equals(XLSheetPoint other)
-        {
-            return Row == other.Row && Column == other.Column;
-        }
-
-        public override int GetHashCode()
-        {
-            return (Row * -1) ^ Column;
-        }
-
-        public static bool operator==(XLSheetPoint a, XLSheetPoint b)
-        {
-            return a.Row == b.Row && a.Column == b.Column;
-        }
-
-        public static bool operator !=(XLSheetPoint a, XLSheetPoint b)
-        {
-            return a.Row != b.Row || a.Column != b.Column;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLSheetRange.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLSheetRange.cs
deleted file mode 100644
index 2845011..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Coordinates/XLSheetRange.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal struct XLSheetRange:IEquatable<XLSheetRange>
-    {
-        public XLSheetRange(XLSheetPoint firstPoint, XLSheetPoint lastPoint)
-        {
-            FirstPoint = firstPoint;
-            LastPoint = lastPoint;
-        }
-
-        public readonly XLSheetPoint FirstPoint;
-        public readonly XLSheetPoint LastPoint;
-
-        public bool Equals(XLSheetRange other)
-        {
-            return FirstPoint.Equals(other.FirstPoint) && LastPoint.Equals(other.LastPoint);
-        }
-
-        public override int GetHashCode()
-        {
-            return FirstPoint.GetHashCode() ^ LastPoint.GetHashCode();
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/IXLCustomProperties.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/IXLCustomProperties.cs
deleted file mode 100644
index afdbff2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/IXLCustomProperties.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLCustomProperties: IEnumerable<IXLCustomProperty>
-    {
-        void Add(IXLCustomProperty customProperty);
-        void Add<T>(String name, T value);
-        void Delete(String name);
-        IXLCustomProperty CustomProperty(String name);
-        
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/IXLCustomProperty.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/IXLCustomProperty.cs
deleted file mode 100644
index f34e306..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/IXLCustomProperty.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLCustomPropertyType { Text, Number, Date, Boolean}
-    public interface IXLCustomProperty
-    {
-        String Name { get; set; }
-        XLCustomPropertyType Type { get; }
-        Object Value { get; set; }
-        T GetValue<T>();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/XLCustomProperties.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/XLCustomProperties.cs
deleted file mode 100644
index 98e98ac..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/XLCustomProperties.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCustomProperties: IXLCustomProperties, IEnumerable<IXLCustomProperty>
-    {
-        XLWorkbook workbook;
-        public XLCustomProperties(XLWorkbook workbook)
-        {
-            this.workbook = workbook;
-        }
-
-        private Dictionary<String, IXLCustomProperty> customProperties = new Dictionary<String, IXLCustomProperty>();
-        public void Add(IXLCustomProperty customProperty)
-        {
-            customProperties.Add(customProperty.Name, customProperty);
-        }
-        public void Add<T>(String name, T value)
-        {
-            var cp = new XLCustomProperty(workbook) { Name = name, Value = value };
-            Add(cp);
-        }
-
-        public void Delete(String name)
-        {
-            customProperties.Remove(name);
-        }
-        public IXLCustomProperty CustomProperty(String name)
-        {
-            return customProperties[name];
-        }
-
-        public IEnumerator<IXLCustomProperty> GetEnumerator()
-        {
-            return customProperties.Values.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-      
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/XLCustomProperty.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/XLCustomProperty.cs
deleted file mode 100644
index 36e6f56..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/CustomProperties/XLCustomProperty.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLCustomProperty : IXLCustomProperty
-    {
-        private readonly XLWorkbook _workbook;
-
-        private String name;
-
-        public XLCustomProperty(XLWorkbook workbook)
-        {
-            _workbook = workbook;
-        }
-
-        #region IXLCustomProperty Members
-
-        public String Name
-        {
-            get { return name; }
-            set
-            {
-                if (_workbook.CustomProperties.Any(t => t.Name == value))
-                    throw new ArgumentException(
-                        String.Format("This workbook already contains a custom property named '{0}'", value));
-
-                name = value;
-            }
-        }
-
-        public XLCustomPropertyType Type
-        {
-            get
-            {
-                Double dTest;
-                if (Value is DateTime)
-                    return XLCustomPropertyType.Date;
-                
-                if (Value is Boolean)
-                    return XLCustomPropertyType.Boolean;
-                
-                if (Double.TryParse(Value.ToString(), out dTest))
-                    return XLCustomPropertyType.Number;
-                
-                return XLCustomPropertyType.Text;
-            }
-        }
-
-        public Object Value { get; set; }
-
-        public T GetValue<T>()
-        {
-            return (T)Convert.ChangeType(Value, typeof(T));
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLDataValidation.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLDataValidation.cs
deleted file mode 100644
index f2072de..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLDataValidation.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLErrorStyle { Stop, Warning, Information }
-    public enum XLAllowedValues { AnyValue, WholeNumber, Decimal, Date, Time, TextLength, List, Custom }
-    public enum XLOperator { EqualTo, NotEqualTo, GreaterThan, LessThan, EqualOrGreaterThan, EqualOrLessThan, Between, NotBetween }
-    public interface IXLDataValidation
-    {
-        IXLRanges Ranges { get; set; }
-        //void Delete();
-        //void CopyFrom(IXLDataValidation dataValidation);
-        Boolean ShowInputMessage { get; set; }
-        Boolean ShowErrorMessage { get; set; }
-        Boolean IgnoreBlanks { get; set; }
-        Boolean InCellDropdown { get; set; }
-        String InputTitle { get; set; }
-        String InputMessage { get; set; }
-        String ErrorTitle { get; set; }
-        String ErrorMessage { get; set; }
-        XLErrorStyle ErrorStyle { get; set; }
-        XLAllowedValues AllowedValues { get; set; }
-        XLOperator Operator { get; set; }
-
-        String Value { get; set; }
-        String MinValue { get; set; }
-        String MaxValue { get; set; }
-
-        XLWholeNumberCriteria WholeNumber { get; }
-        XLDecimalCriteria Decimal { get; }
-        XLDateCriteria Date { get; }
-        XLTimeCriteria Time { get; }
-        XLTextLengthCriteria TextLength { get; }
-
-        void List(String list);
-        void List(String list, Boolean inCellDropdown);
-        void List(IXLRange range);
-        void List(IXLRange range, Boolean inCellDropdown);
-
-        void Custom(String customValidation);
-        void Clear();
-        Boolean IsDirty();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLDataValidations.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLDataValidations.cs
deleted file mode 100644
index eb8aa6b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLDataValidations.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDataValidations: IEnumerable<IXLDataValidation>
-    {
-        void Add(IXLDataValidation dataValidation);
-        Boolean ContainsSingle(IXLRange range);
-        
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLValidationCriteria.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLValidationCriteria.cs
deleted file mode 100644
index b5be419..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/IXLValidationCriteria.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLValidationCriteria
-    {
-        void EqualTo(String value);
-        void NotEqualTo(String value);
-        void GreaterThan(String value);
-        void LessThan(String value);
-        void EqualOrGreaterThan(String value);
-        void EqualOrLessThan(String value);
-        void Between(String minValue, String maxValue);
-        void NotBetween(String minValue, String maxValue);
-
-        void EqualTo(IXLRange range);
-        void NotEqualTo(IXLRange range);
-        void GreaterThan(IXLRange range);
-        void LessThan(IXLRange range);
-        void EqualOrGreaterThan(IXLRange range);
-        void EqualOrLessThan(IXLRange range);
-        void Between(IXLRange minValue, IXLRange maxValue);
-        void NotBetween(IXLRange minValue, IXLRange maxValue);
-
-        void EqualTo(IXLCell cell);
-        void NotEqualTo(IXLCell cell);
-        void GreaterThan(IXLCell cell);
-        void LessThan(IXLCell cell);
-        void EqualOrGreaterThan(IXLCell cell);
-        void EqualOrLessThan(IXLCell cell);
-        void Between(IXLCell minValue, IXLCell maxValue);
-        void NotBetween(IXLCell minValue, IXLCell maxValue);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDataValidation.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDataValidation.cs
deleted file mode 100644
index 2371e2b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDataValidation.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDataValidation : IXLDataValidation
-    {
-        public XLDataValidation(IXLRanges ranges)
-        {
-            
-            Ranges = new XLRanges();
-            ranges.ForEach(r=>
-                               {
-                                   var newR =
-                                       new XLRange(new XLRangeParameters(r.RangeAddress as XLRangeAddress,
-                                                                         r.Worksheet.Style) {IgnoreEvents = true});
-                                   (Ranges as XLRanges).Add(newR);
-                               } );
-            Initialize();
-        }
-
-        private void Initialize()
-        {
-            AllowedValues = XLAllowedValues.AnyValue;
-            IgnoreBlanks = true;
-            ShowErrorMessage = true;
-            ShowInputMessage = true;
-            InCellDropdown = true;
-            InputTitle = String.Empty;
-            InputMessage = String.Empty;
-            ErrorTitle = String.Empty;
-            ErrorMessage = String.Empty;
-            ErrorStyle = XLErrorStyle.Stop;
-            Operator = XLOperator.Between;
-            Value = String.Empty;
-            MinValue = String.Empty;
-            MaxValue = String.Empty;
-        }
-
-        public Boolean IsDirty()
-        {
-            return
-                AllowedValues != XLAllowedValues.AnyValue
-                || (ShowInputMessage &&
-                  (!XLHelper.IsNullOrWhiteSpace(InputTitle) || !XLHelper.IsNullOrWhiteSpace(InputMessage)))
-                ||(ShowErrorMessage &&
-                  (!XLHelper.IsNullOrWhiteSpace(ErrorTitle) || !XLHelper.IsNullOrWhiteSpace(ErrorMessage)));
-
-        }
-
-        public XLDataValidation(IXLDataValidation dataValidation)
-        {
-            CopyFrom(dataValidation);
-        }
-
-        #region IXLDataValidation Members
-
-        public IXLRanges Ranges { get; set; }
-
-
-        public Boolean IgnoreBlanks { get; set; }
-        public Boolean InCellDropdown { get; set; }
-        public Boolean ShowInputMessage { get; set; }
-        public String InputTitle { get; set; }
-        public String InputMessage { get; set; }
-        public Boolean ShowErrorMessage { get; set; }
-        public String ErrorTitle { get; set; }
-        public String ErrorMessage { get; set; }
-        public XLErrorStyle ErrorStyle { get; set; }
-        private XLAllowedValues _allowedValues;
-        public XLAllowedValues AllowedValues
-        {
-            get { return _allowedValues; }
-            set { _allowedValues = value; }
-        }
-        
-        public XLOperator Operator { get; set; }
-
-        public String Value
-        {
-            get { return MinValue; }
-            set { MinValue = value; }
-        }
-
-        public String MinValue { get; set; }
-        public String MaxValue { get; set; }
-
-        public XLWholeNumberCriteria WholeNumber
-        {
-            get
-            {
-                AllowedValues = XLAllowedValues.WholeNumber;
-                return new XLWholeNumberCriteria(this);
-            }
-        }
-
-        public XLDecimalCriteria Decimal
-        {
-            get
-            {
-                AllowedValues = XLAllowedValues.Decimal;
-                return new XLDecimalCriteria(this);
-            }
-        }
-
-        public XLDateCriteria Date
-        {
-            get
-            {
-                AllowedValues = XLAllowedValues.Date;
-                return new XLDateCriteria(this);
-            }
-        }
-
-        public XLTimeCriteria Time
-        {
-            get
-            {
-                AllowedValues = XLAllowedValues.Time;
-                return new XLTimeCriteria(this);
-            }
-        }
-
-        public XLTextLengthCriteria TextLength
-        {
-            get
-            {
-                AllowedValues = XLAllowedValues.TextLength;
-                return new XLTextLengthCriteria(this);
-            }
-        }
-
-        public void List(String list)
-        {
-            List(list, true);
-        }
-
-        public void List(String list, Boolean inCellDropdown)
-        {
-            AllowedValues = XLAllowedValues.List;
-            InCellDropdown = inCellDropdown;
-            Value = list;
-        }
-
-        public void List(IXLRange range)
-        {
-            List(range, true);
-        }
-
-        public void List(IXLRange range, Boolean inCellDropdown)
-        {
-            List(range.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true));
-        }
-
-        public void Custom(String customValidation)
-        {
-            AllowedValues = XLAllowedValues.Custom;
-            Value = customValidation;
-        }
-
-        #endregion
-
-        public void CopyFrom(IXLDataValidation dataValidation)
-        {
-            if (dataValidation == this) return;
-
-            if (Ranges == null && dataValidation.Ranges != null)
-            {
-                Ranges = new XLRanges();
-                dataValidation.Ranges.ForEach(r => Ranges.Add(r));
-            }
-
-
-            IgnoreBlanks = dataValidation.IgnoreBlanks;
-            InCellDropdown = dataValidation.InCellDropdown;
-            ShowErrorMessage = dataValidation.ShowErrorMessage;
-            ShowInputMessage = dataValidation.ShowInputMessage;
-            InputTitle = dataValidation.InputTitle;
-            InputMessage = dataValidation.InputMessage;
-            ErrorTitle = dataValidation.ErrorTitle;
-            ErrorMessage = dataValidation.ErrorMessage;
-            ErrorStyle = dataValidation.ErrorStyle;
-            AllowedValues = dataValidation.AllowedValues;
-            Operator = dataValidation.Operator;
-            MinValue = dataValidation.MinValue;
-            MaxValue = dataValidation.MaxValue;
-
-        }
-
-        public void Clear()
-        {
-            Initialize();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDataValidations.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDataValidations.cs
deleted file mode 100644
index 8ebd76f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDataValidations.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-    using System.Linq;
-
-    internal class XLDataValidations : IXLDataValidations
-    {
-        private readonly List<IXLDataValidation> _dataValidations = new List<IXLDataValidation>();
-
-        #region IXLDataValidations Members
-
-        public void Add(IXLDataValidation dataValidation)
-        {
-            _dataValidations.Add(dataValidation);
-        }
-
-        public IEnumerator<IXLDataValidation> GetEnumerator()
-        {
-            return _dataValidations.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public Boolean ContainsSingle(IXLRange range)
-        {
-            Int32 count = 0;
-            foreach (var xlDataValidation in _dataValidations.Where(dv => dv.Ranges.Contains(range)))
-            {
-                count++;
-                if (count > 1) return false;
-            }
-
-            return count == 1;
-        }
-
-        #endregion
-
-        public void Delete(IXLDataValidation dataValidation)
-        {
-            _dataValidations.RemoveAll(dv => dv.Ranges.Equals(dataValidation.Ranges));
-        }
-
-        public void Delete(IXLRange range)
-        {
-            _dataValidations.RemoveAll(dv => dv.Ranges.Contains(range));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDateCriteria.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDateCriteria.cs
deleted file mode 100644
index 792e6b0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDateCriteria.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Globalization;
-
-namespace ClosedXML.Excel
-{
-    public class XLDateCriteria : XLValidationCriteria
-    {
-        public XLDateCriteria(IXLDataValidation dataValidation)
-            : base(dataValidation)
-        {
-        }
-
-        public void EqualTo(DateTime value)
-        {
-            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-
-        public void NotEqualTo(DateTime value)
-        {
-            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-
-        public void GreaterThan(DateTime value)
-        {
-            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-
-        public void LessThan(DateTime value)
-        {
-            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-
-        public void EqualOrGreaterThan(DateTime value)
-        {
-            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-
-        public void EqualOrLessThan(DateTime value)
-        {
-            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-
-        public void Between(DateTime minValue, DateTime maxValue)
-        {
-            dataValidation.MinValue = minValue.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.MaxValue = maxValue.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.Between;
-        }
-
-        public void NotBetween(DateTime minValue, DateTime maxValue)
-        {
-            dataValidation.MinValue = minValue.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.MaxValue = maxValue.ToOADate().ToString(CultureInfo.InvariantCulture);
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDecimalCriteria.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDecimalCriteria.cs
deleted file mode 100644
index 93f190b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLDecimalCriteria.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public class XLDecimalCriteria : XLValidationCriteria
-    {
-        public XLDecimalCriteria(IXLDataValidation dataValidation)
-            : base(dataValidation)
-        {
-        }
-
-        public void EqualTo(Double value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-
-        public void NotEqualTo(Double value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-
-        public void GreaterThan(Double value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-
-        public void LessThan(Double value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-
-        public void EqualOrGreaterThan(Double value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-
-        public void EqualOrLessThan(Double value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-
-        public void Between(Double minValue, Double maxValue)
-        {
-            dataValidation.MinValue = minValue.ToString();
-            dataValidation.MaxValue = maxValue.ToString();
-            dataValidation.Operator = XLOperator.Between;
-        }
-
-        public void NotBetween(Double minValue, Double maxValue)
-        {
-            dataValidation.MinValue = minValue.ToString();
-            dataValidation.MaxValue = maxValue.ToString();
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLTextLengthCriteria.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLTextLengthCriteria.cs
deleted file mode 100644
index 876b802..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLTextLengthCriteria.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public class XLTextLengthCriteria : XLValidationCriteria
-    {
-        public XLTextLengthCriteria(IXLDataValidation dataValidation)
-            : base(dataValidation)
-        {
-        }
-
-        public void EqualTo(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-
-        public void NotEqualTo(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-
-        public void GreaterThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-
-        public void LessThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-
-        public void EqualOrGreaterThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-
-        public void EqualOrLessThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-
-        public void Between(Int32 minValue, Int32 maxValue)
-        {
-            dataValidation.MinValue = minValue.ToString();
-            dataValidation.MaxValue = maxValue.ToString();
-            dataValidation.Operator = XLOperator.Between;
-        }
-
-        public void NotBetween(Int32 minValue, Int32 maxValue)
-        {
-            dataValidation.MinValue = minValue.ToString();
-            dataValidation.MaxValue = maxValue.ToString();
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLTimeCriteria.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLTimeCriteria.cs
deleted file mode 100644
index 5d93a2e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLTimeCriteria.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public class XLTimeCriteria : XLValidationCriteria
-    {
-        public XLTimeCriteria(IXLDataValidation dataValidation)
-            : base(dataValidation)
-        {
-        }
-
-        private static String GetXLTime(TimeSpan value)
-        {
-            return (value.TotalHours / 24.0).ToString();
-        }
-
-        public void EqualTo(TimeSpan value)
-        {
-            dataValidation.Value = GetXLTime(value);
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-
-        public void NotEqualTo(TimeSpan value)
-        {
-            dataValidation.Value = GetXLTime(value);
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-
-        public void GreaterThan(TimeSpan value)
-        {
-            dataValidation.Value = GetXLTime(value);
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-
-        public void LessThan(TimeSpan value)
-        {
-            dataValidation.Value = GetXLTime(value);
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-
-        public void EqualOrGreaterThan(TimeSpan value)
-        {
-            dataValidation.Value = GetXLTime(value);
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-
-        public void EqualOrLessThan(TimeSpan value)
-        {
-            dataValidation.Value = GetXLTime(value);
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-
-        public void Between(TimeSpan minValue, TimeSpan maxValue)
-        {
-            dataValidation.MinValue = GetXLTime(minValue);
-            dataValidation.MaxValue = GetXLTime(maxValue);
-            dataValidation.Operator = XLOperator.Between;
-        }
-
-        public void NotBetween(TimeSpan minValue, TimeSpan maxValue)
-        {
-            dataValidation.MinValue = GetXLTime(minValue);
-            dataValidation.MaxValue = GetXLTime(maxValue);
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLValidationCriteria.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLValidationCriteria.cs
deleted file mode 100644
index 449e688..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLValidationCriteria.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public abstract class XLValidationCriteria : IXLValidationCriteria
-    {
-        protected IXLDataValidation dataValidation;
-
-        internal XLValidationCriteria(IXLDataValidation dataValidation)
-        {
-            this.dataValidation = dataValidation;
-        }
-
-        #region IXLValidationCriteria Members
-
-        public void EqualTo(String value)
-        {
-            dataValidation.Value = value;
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-
-        public void NotEqualTo(String value)
-        {
-            dataValidation.Value = value;
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-
-        public void GreaterThan(String value)
-        {
-            dataValidation.Value = value;
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-
-        public void LessThan(String value)
-        {
-            dataValidation.Value = value;
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-
-        public void EqualOrGreaterThan(String value)
-        {
-            dataValidation.Value = value;
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-
-        public void EqualOrLessThan(String value)
-        {
-            dataValidation.Value = value;
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-
-        public void Between(String minValue, String maxValue)
-        {
-            dataValidation.MinValue = minValue;
-            dataValidation.MaxValue = maxValue;
-            dataValidation.Operator = XLOperator.Between;
-        }
-
-        public void NotBetween(String minValue, String maxValue)
-        {
-            dataValidation.MinValue = minValue;
-            dataValidation.MaxValue = maxValue;
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-
-
-        public void EqualTo(IXLRange range)
-        {
-            dataValidation.Value = range.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-
-        public void NotEqualTo(IXLRange range)
-        {
-            dataValidation.Value = range.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-
-        public void GreaterThan(IXLRange range)
-        {
-            dataValidation.Value = range.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-
-        public void LessThan(IXLRange range)
-        {
-            dataValidation.Value = range.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-
-        public void EqualOrGreaterThan(IXLRange range)
-        {
-            dataValidation.Value = range.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-
-        public void EqualOrLessThan(IXLRange range)
-        {
-            dataValidation.Value = range.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-
-        public void Between(IXLRange minValue, IXLRange maxValue)
-        {
-            dataValidation.MinValue =  minValue.RangeAddress.ToStringFixed();
-            dataValidation.MaxValue =  maxValue.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.Between;
-        }
-
-        public void NotBetween(IXLRange minValue, IXLRange maxValue)
-        {
-            dataValidation.MinValue = minValue.RangeAddress.ToStringFixed();
-            dataValidation.MaxValue = maxValue.RangeAddress.ToStringFixed();
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-
-        public void EqualTo(IXLCell cell)
-        {
-            dataValidation.Value = cell.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-
-        public void NotEqualTo(IXLCell cell)
-        {
-            dataValidation.Value = cell.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-
-        public void GreaterThan(IXLCell cell)
-        {
-            dataValidation.Value = cell.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-
-        public void LessThan(IXLCell cell)
-        {
-            dataValidation.Value = cell.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-
-        public void EqualOrGreaterThan(IXLCell cell)
-        {
-            dataValidation.Value = cell.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-
-        public void EqualOrLessThan(IXLCell cell)
-        {
-            dataValidation.Value = cell.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-
-        public void Between(IXLCell minValue, IXLCell maxValue)
-        {
-            dataValidation.MinValue = minValue.Address.ToStringFixed();
-            dataValidation.MaxValue = maxValue.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.Between;
-        }
-
-        public void NotBetween(IXLCell minValue, IXLCell maxValue)
-        {
-            dataValidation.MinValue = minValue.Address.ToStringFixed();
-            dataValidation.MaxValue = maxValue.Address.ToStringFixed();
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLWholeNumberCriteria.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLWholeNumberCriteria.cs
deleted file mode 100644
index 01c8dba..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/DataValidation/XLWholeNumberCriteria.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public class XLWholeNumberCriteria : XLValidationCriteria
-    {
-        public XLWholeNumberCriteria(IXLDataValidation dataValidation): base(dataValidation)
-        {
-            
-        }
-
-        public void EqualTo(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualTo;
-        }
-        public void NotEqualTo(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.NotEqualTo;
-        }
-        public void GreaterThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.GreaterThan;
-        }
-        public void LessThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.LessThan;
-        }
-        public void EqualOrGreaterThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
-        }
-        public void EqualOrLessThan(Int32 value)
-        {
-            dataValidation.Value = value.ToString();
-            dataValidation.Operator = XLOperator.EqualOrLessThan;
-        }
-        public void Between(Int32 minValue, Int32 maxValue)
-        {
-            dataValidation.MinValue = minValue.ToString();
-            dataValidation.MaxValue = maxValue.ToString();
-            dataValidation.Operator = XLOperator.Between;
-        }
-        public void NotBetween(Int32 minValue, Int32 maxValue)
-        {
-            dataValidation.MinValue = minValue.ToString();
-            dataValidation.MaxValue = maxValue.ToString();
-            dataValidation.Operator = XLOperator.NotBetween;
-        }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/IXLDrawing.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/IXLDrawing.cs
deleted file mode 100644
index e83422a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/IXLDrawing.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLDrawingAnchor { MoveAndSizeWithCells, MoveWithCells, Absolute}
-    public interface IXLDrawing<T>
-    {
-        Int32 ShapeId { get; }
-
-        Boolean Visible { get; set; }
-        T SetVisible();
-        T SetVisible(Boolean hidden);
-                
-        ////String Name { get; set; }
-        ////T SetName(String name);
-
-        ////String Description { get; set; }
-        ////T SetDescription(String description);
-
-        IXLDrawingPosition Position { get;  }
-
-        Int32 ZOrder { get; set; }
-        T SetZOrder(Int32 zOrder);
-
-        //Boolean HorizontalFlip { get; set; }
-        //T SetHorizontalFlip();
-        //T SetHorizontalFlip(Boolean horizontalFlip);
-
-        //Boolean VerticalFlip { get; set; }
-        //T SetVerticalFlip();
-        //T SetVerticalFlip(Boolean verticalFlip);
-
-        //Int32 Rotation { get; set; }
-        //T SetRotation(Int32 rotation);
-
-        //Int32 ExtentLength { get; set; }
-        //T SetExtentLength(Int32 ExtentLength);
-
-        //Int32 ExtentWidth { get; set; }
-        //T SetExtentWidth(Int32 extentWidth);
-
-        IXLDrawingStyle Style { get; }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/IXLDrawingPosition.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/IXLDrawingPosition.cs
deleted file mode 100644
index ac22822..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/IXLDrawingPosition.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingPosition
-    {
-        Int32 Column { get; set; }
-        IXLDrawingPosition SetColumn(Int32 column);
-        Double ColumnOffset { get; set; }
-        IXLDrawingPosition SetColumnOffset(Double columnOffset);
-
-        Int32 Row { get; set; }
-        IXLDrawingPosition SetRow(Int32 row);
-        Double RowOffset { get; set; }
-        IXLDrawingPosition SetRowOffset(Double rowOffset);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingAlignment.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingAlignment.cs
deleted file mode 100644
index ab838a6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingAlignment.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLDrawingTextDirection
-    {
-        Context,
-        LeftToRight,
-        RightToLeft
-    }
-    public enum XLDrawingTextOrientation
-    {
-        LeftToRight,
-        Vertical,
-        BottomToTop,
-        TopToBottom
-    }
-    public enum XLDrawingHorizontalAlignment { Left, Justify, Center, Right, Distributed }
-    public enum XLDrawingVerticalAlignment { Top, Justify, Center, Bottom, Distributed }
-    public interface IXLDrawingAlignment
-    {
-        XLDrawingHorizontalAlignment Horizontal { get; set; }
-        XLDrawingVerticalAlignment Vertical { get; set; }
-        Boolean AutomaticSize { get; set; }
-        XLDrawingTextDirection Direction { get; set; }
-        XLDrawingTextOrientation Orientation { get; set; }
-
-        IXLDrawingStyle SetHorizontal(XLDrawingHorizontalAlignment value);
-        IXLDrawingStyle SetVertical(XLDrawingVerticalAlignment value);
-        IXLDrawingStyle SetAutomaticSize(); IXLDrawingStyle SetAutomaticSize(Boolean value);
-        IXLDrawingStyle SetDirection(XLDrawingTextDirection value);
-        IXLDrawingStyle SetOrientation(XLDrawingTextOrientation value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingColorsAndLines.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingColorsAndLines.cs
deleted file mode 100644
index 135cc55..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingColorsAndLines.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLDashStyle
-    {
-        Solid,
-        RoundDot,
-        SquareDot,
-        Dash,
-        DashDot,
-        LongDash,
-        LongDashDot,
-        LongDashDotDot
-    }
-    public enum XLLineStyle
-    {
-        Single, ThinThin, ThinThick, ThickThin, ThickBetweenThin
-    }
-    public interface IXLDrawingColorsAndLines
-    {
-        XLColor FillColor { get; set; }
-        Double FillTransparency { get; set; }
-        XLColor LineColor { get; set; }
-        Double LineTransparency { get; set; }
-        Double LineWeight { get; set; }
-        XLDashStyle LineDash { get; set; }
-        XLLineStyle LineStyle { get; set; }
-
-        IXLDrawingStyle SetFillColor(XLColor value);
-        IXLDrawingStyle SetFillTransparency(Double value);
-        IXLDrawingStyle SetLineColor(XLColor value);
-        IXLDrawingStyle SetLineTransparency(Double value);
-        IXLDrawingStyle SetLineWeight(Double value);
-        IXLDrawingStyle SetLineDash(XLDashStyle value);
-        IXLDrawingStyle SetLineStyle(XLLineStyle value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingFont.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingFont.cs
deleted file mode 100644
index d63ced5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingFont.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingFont : IXLFontBase
-    {
-        IXLDrawingStyle SetBold(); IXLDrawingStyle SetBold(Boolean value);
-        IXLDrawingStyle SetItalic(); IXLDrawingStyle SetItalic(Boolean value);
-        IXLDrawingStyle SetUnderline(); IXLDrawingStyle SetUnderline(XLFontUnderlineValues value);
-        IXLDrawingStyle SetStrikethrough(); IXLDrawingStyle SetStrikethrough(Boolean value);
-        IXLDrawingStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
-        IXLDrawingStyle SetShadow(); IXLDrawingStyle SetShadow(Boolean value);
-        IXLDrawingStyle SetFontSize(Double value);
-        IXLDrawingStyle SetFontColor(XLColor value);
-        IXLDrawingStyle SetFontName(String value);
-        IXLDrawingStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingMargins.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingMargins.cs
deleted file mode 100644
index cce06e8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingMargins.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingMargins
-    {
-        Boolean Automatic { get; set; }
-        Double Left { get; set; }
-        Double Right { get; set; }
-        Double Top { get; set; }
-        Double Bottom { get; set; }
-        Double All { set; }
-
-        IXLDrawingStyle SetAutomatic(); IXLDrawingStyle SetAutomatic(Boolean value);
-        IXLDrawingStyle SetLeft(Double value);
-        IXLDrawingStyle SetRight(Double value);
-        IXLDrawingStyle SetTop(Double value);
-        IXLDrawingStyle SetBottom(Double value);
-        IXLDrawingStyle SetAll(Double value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingProperties.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingProperties.cs
deleted file mode 100644
index cf2118b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingProperties.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingProperties
-    {
-        XLDrawingAnchor Positioning { get; set; }
-        IXLDrawingStyle SetPositioning(XLDrawingAnchor value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingProtection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingProtection.cs
deleted file mode 100644
index 67ff8cd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingProtection.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingProtection
-    {
-        Boolean Locked { get; set; }
-        Boolean LockText { get; set; }
-
-        IXLDrawingStyle SetLocked(); IXLDrawingStyle SetLocked(Boolean value);
-        IXLDrawingStyle SetLockText(); IXLDrawingStyle SetLockText(Boolean value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingSize.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingSize.cs
deleted file mode 100644
index 5025a9d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingSize.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingSize
-    {
-        Boolean AutomaticSize { get; set; }
-        Double Height { get; set; }
-        Double Width { get; set; }
-
-        IXLDrawingStyle SetAutomaticSize(); IXLDrawingStyle SetAutomaticSize(Boolean value);
-        IXLDrawingStyle SetHeight(Double value);
-        IXLDrawingStyle SetWidth(Double value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingStyle.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingStyle.cs
deleted file mode 100644
index fac4343..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingStyle.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingStyle
-    {
-        //IXLDrawingFont Font { get; }
-        IXLDrawingAlignment Alignment { get; }
-        IXLDrawingColorsAndLines ColorsAndLines { get; }
-        IXLDrawingSize Size { get; }
-        IXLDrawingProtection Protection { get; }
-        IXLDrawingProperties Properties { get; }
-        IXLDrawingMargins Margins { get; }
-        IXLDrawingWeb Web { get; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingWeb.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingWeb.cs
deleted file mode 100644
index abc5ccd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/IXLDrawingWeb.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLDrawingWeb
-    {
-        String AlternateText { get; set; }
-        IXLDrawingStyle SetAlternateText(String value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingAlignment.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingAlignment.cs
deleted file mode 100644
index 789b5c4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingAlignment.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingAlignment: IXLDrawingAlignment
-    {
-        private readonly IXLDrawingStyle _style;
-
-        public XLDrawingAlignment(IXLDrawingStyle style)
-        {
-            _style = style;
-        }
-        public XLDrawingHorizontalAlignment Horizontal { get; set; }		public IXLDrawingStyle SetHorizontal(XLDrawingHorizontalAlignment value) { Horizontal = value; return _style; }
-        public XLDrawingVerticalAlignment Vertical { get; set; }		public IXLDrawingStyle SetVertical(XLDrawingVerticalAlignment value) { Vertical = value; return _style; }
-        public Boolean AutomaticSize { get; set; }	public IXLDrawingStyle SetAutomaticSize() { AutomaticSize = true; return _style; }	public IXLDrawingStyle SetAutomaticSize(Boolean value) { AutomaticSize = value; return _style; }
-        public XLDrawingTextDirection Direction { get; set; }		public IXLDrawingStyle SetDirection(XLDrawingTextDirection value) { Direction = value; return _style; }
-        public XLDrawingTextOrientation Orientation { get; set; }		public IXLDrawingStyle SetOrientation(XLDrawingTextOrientation value) { Orientation = value; return _style; }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingColorsAndLines.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingColorsAndLines.cs
deleted file mode 100644
index 5ed7386..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingColorsAndLines.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingColorsAndLines: IXLDrawingColorsAndLines
-    {
-                private readonly IXLDrawingStyle _style;
-
-        public XLDrawingColorsAndLines(IXLDrawingStyle style)
-        {
-            _style = style;
-        }
-        public XLColor FillColor { get; set; }		public IXLDrawingStyle SetFillColor(XLColor value) { FillColor = value; return _style; }
-        public Double FillTransparency { get; set; }		public IXLDrawingStyle SetFillTransparency(Double value) { FillTransparency = value; return _style; }
-        public XLColor LineColor { get; set; }		public IXLDrawingStyle SetLineColor(XLColor value) { LineColor = value; return _style; }
-        public Double LineTransparency { get; set; }		public IXLDrawingStyle SetLineTransparency(Double value) { LineTransparency = value; return _style; }
-        public Double LineWeight { get; set; }		public IXLDrawingStyle SetLineWeight(Double value) { LineWeight = value; return _style; }
-        public XLDashStyle LineDash { get; set; }		public IXLDrawingStyle SetLineDash(XLDashStyle value) { LineDash = value; return _style; }
-        public XLLineStyle LineStyle { get; set; }		public IXLDrawingStyle SetLineStyle(XLLineStyle value) { LineStyle = value; return _style; }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingFont.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingFont.cs
deleted file mode 100644
index a96b07e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingFont.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingFont : IXLDrawingFont
-    {
-        private readonly IXLDrawingStyle _style;
-
-        public XLDrawingFont(IXLDrawingStyle style)
-        {
-            _style = style;
-            FontName = "Tahoma";
-            FontSize = 9;
-            Underline = XLFontUnderlineValues.None;
-            FontColor = XLColor.FromIndex(64);
-        }
-
-        public Boolean Bold { get; set; }
-        public Boolean Italic { get; set; }
-        public XLFontUnderlineValues Underline { get; set; }
-        public Boolean Strikethrough { get; set; }
-        public XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
-        public Boolean Shadow { get; set; }
-        public Double FontSize { get; set; }
-        public XLColor FontColor { get; set; }
-        public String FontName { get; set; }
-        public XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
-
-
-        public IXLDrawingStyle SetBold()
-        {
-            Bold = true;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetBold(Boolean value)
-        {
-            Bold = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetItalic()
-        {
-            Italic = true;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetItalic(Boolean value)
-        {
-            Italic = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetUnderline()
-        {
-            Underline = XLFontUnderlineValues.Single;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetUnderline(XLFontUnderlineValues value)
-        {
-            Underline = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetStrikethrough()
-        {
-            Strikethrough = true;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetStrikethrough(Boolean value)
-        {
-            Strikethrough = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value)
-        {
-            VerticalAlignment = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetShadow()
-        {
-            Shadow = true;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetShadow(Boolean value)
-        {
-            Shadow = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetFontSize(Double value)
-        {
-            FontSize = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetFontColor(XLColor value)
-        {
-            FontColor = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetFontName(String value)
-        {
-            FontName = value;
-            return _style;
-        }
-
-        public IXLDrawingStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value)
-        {
-            FontFamilyNumbering = value;
-            return _style;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingMargins.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingMargins.cs
deleted file mode 100644
index 3694114..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingMargins.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingMargins: IXLDrawingMargins
-    {
-        private readonly IXLDrawingStyle _style;
-        public XLDrawingMargins(IXLDrawingStyle style)
-        {
-            _style = style;
-        }
-        public Boolean Automatic { get; set; }	public IXLDrawingStyle SetAutomatic() { Automatic = true; return _style; }	public IXLDrawingStyle SetAutomatic(Boolean value) { Automatic = value; return _style; }
-        Double _left;
-        public Double Left { get { return _left; } set { _left = value; Automatic = false; } }		
-        public IXLDrawingStyle SetLeft(Double value) { Left = value; return _style; }
-        Double _right;
-        public Double Right { get { return _right; } set { _right = value; Automatic = false; } }		public IXLDrawingStyle SetRight(Double value) { Right = value; return _style; }
-        Double _top;
-        public Double Top { get { return _top; } set { _top = value; Automatic = false; } }		public IXLDrawingStyle SetTop(Double value) { Top = value; return _style; }
-        Double _bottom;
-        public Double Bottom { get { return _bottom; } set { _bottom = value; Automatic = false; } }		public IXLDrawingStyle SetBottom(Double value) { Bottom = value; return _style; }
-        public Double All
-        {
-            set
-            {
-                _left = value;
-                _right = value;
-                _top = value;
-                _bottom = value;
-                Automatic = false;
-            }
-        }	
-        public IXLDrawingStyle SetAll(Double value) { All = value; return _style; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingProperties.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingProperties.cs
deleted file mode 100644
index 6f0ce19..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingProperties.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingProperties : IXLDrawingProperties
-    {
-                private readonly IXLDrawingStyle _style;
-
-        public XLDrawingProperties(IXLDrawingStyle style)
-        {
-            _style = style;
-        }
-        public XLDrawingAnchor Positioning { get; set; }		public IXLDrawingStyle SetPositioning(XLDrawingAnchor value) { Positioning = value; return _style; }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingProtection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingProtection.cs
deleted file mode 100644
index d95633c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingProtection.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingProtection : IXLDrawingProtection
-    {
-                private readonly IXLDrawingStyle _style;
-
-        public XLDrawingProtection(IXLDrawingStyle style)
-        {
-            _style = style;
-        }
-        public Boolean Locked { get; set; }	public IXLDrawingStyle SetLocked() { Locked = true; return _style; }	public IXLDrawingStyle SetLocked(Boolean value) { Locked = value; return _style; }
-        public Boolean LockText { get; set; }	public IXLDrawingStyle SetLockText() { LockText = true; return _style; }	public IXLDrawingStyle SetLockText(Boolean value) { LockText = value; return _style; }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingSize.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingSize.cs
deleted file mode 100644
index 11f30f9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingSize.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingSize : IXLDrawingSize
-    {
-                private readonly IXLDrawingStyle _style;
-
-        public XLDrawingSize(IXLDrawingStyle style)
-        {
-            _style = style;
-        }
-
-        public Boolean AutomaticSize { get { return _style.Alignment.AutomaticSize; } set { _style.Alignment.AutomaticSize = value; } }	
-        public IXLDrawingStyle SetAutomaticSize() { AutomaticSize = true; return _style; }	public IXLDrawingStyle SetAutomaticSize(Boolean value) { AutomaticSize = value; return _style; }
-        public Double Height { get; set; }		public IXLDrawingStyle SetHeight(Double value) { Height = value; return _style; }
-        public Double Width { get; set; }		public IXLDrawingStyle SetWidth(Double value) { Width = value; return _style; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingStyle.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingStyle.cs
deleted file mode 100644
index 056f639..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingStyle.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingStyle: IXLDrawingStyle
-    {
-        public XLDrawingStyle()
-        {
-            //Font = new XLDrawingFont(this);
-            Alignment = new XLDrawingAlignment(this);
-            ColorsAndLines = new XLDrawingColorsAndLines(this);
-            Size = new XLDrawingSize(this);
-            Protection = new XLDrawingProtection(this);
-            Properties = new XLDrawingProperties(this);
-            Margins = new XLDrawingMargins(this);
-            Web = new XLDrawingWeb(this);
-        }
-        //public IXLDrawingFont Font { get; private set; }
-        public IXLDrawingAlignment Alignment { get; private set; }
-        public IXLDrawingColorsAndLines ColorsAndLines { get; private set; }
-        public IXLDrawingSize Size { get; private set; }
-        public IXLDrawingProtection Protection { get; private set; }
-        public IXLDrawingProperties Properties { get; private set; }
-        public IXLDrawingMargins Margins { get; private set; }
-        public IXLDrawingWeb Web { get; private set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingWeb.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingWeb.cs
deleted file mode 100644
index c3fe40d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/Style/XLDrawingWeb.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingWeb : IXLDrawingWeb
-    {
-        private readonly IXLDrawingStyle _style;
-
-        public XLDrawingWeb(IXLDrawingStyle style)
-        {
-            _style = style;
-        }
-        public String AlternateText { get; set; }		public IXLDrawingStyle SetAlternateText(String value) { AlternateText = value; return _style; }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/XLDrawing.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/XLDrawing.cs
deleted file mode 100644
index 9f55075..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/XLDrawing.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawing<T>: IXLDrawing<T>
-    {
-        internal T Container;
-        public XLDrawing()
-        {
-            Style = new XLDrawingStyle();
-            Position = new XLDrawingPosition();
-        }
-
-        public Int32 ShapeId { get; internal set; }
-
-        public Boolean Visible { get; set; }
-        public T SetVisible()
-        {
-            Visible = true;
-            return Container;
-        }
-        public T SetVisible(Boolean hidden)
-        {
-            Visible = hidden;
-            return Container;
-        }
-
-        public String Name { get; set; }
-        public T SetName(String name)
-        {
-            Name = name;
-            return Container;
-        }
-
-        public String Description { get; set; }
-        public T SetDescription(String description)
-        {
-            Description = description;
-            return Container;
-        }
-
-        public IXLDrawingPosition Position { get; private set; }
-
-        public Int32 ZOrder { get; set; }
-        public T SetZOrder(Int32 zOrder)
-        {
-            ZOrder = zOrder;
-            return Container;
-        }
-
-        public Boolean HorizontalFlip { get; set; }
-        public T SetHorizontalFlip()
-        {
-            HorizontalFlip = true;
-            return Container;
-        }
-        public T SetHorizontalFlip(Boolean horizontalFlip)
-        {
-            HorizontalFlip = horizontalFlip;
-            return Container;
-        }
-
-        public Boolean VerticalFlip { get; set; }
-        public T SetVerticalFlip()
-        {
-            VerticalFlip = true;
-            return Container;
-        }
-        public T SetVerticalFlip(Boolean verticalFlip)
-        {
-            VerticalFlip = verticalFlip;
-            return Container;
-        }
-
-        public Int32 Rotation { get; set; }
-        public T SetRotation(Int32 rotation)
-        {
-            Rotation = rotation;
-            return Container;
-        }
-
-        public Int32 OffsetX { get; set; }
-        public T SetOffsetX(Int32 offsetX)
-        {
-            OffsetX = offsetX;
-            return Container;
-        }
-
-        public Int32 OffsetY { get; set; }
-        public T SetOffsetY(Int32 offsetY)
-        {
-            OffsetY = offsetY;
-            return Container;
-        }
-
-        public Int32 ExtentLength { get; set; }
-        public T SetExtentLength(Int32 extentLength)
-        {
-            ExtentLength = extentLength;
-            return Container;
-        }
-
-        public Int32 ExtentWidth { get; set; }
-        public T SetExtentWidth(Int32 extentWidth)
-        {
-            ExtentWidth = extentWidth;
-            return Container;
-        }
-
-        public IXLDrawingStyle Style { get; private set; }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/XLDrawingPosition.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/XLDrawingPosition.cs
deleted file mode 100644
index ccb73ae..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Drawings/XLDrawingPosition.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLDrawingPosition: IXLDrawingPosition
-    {
-        public Int32 Column { get; set; }
-        public IXLDrawingPosition SetColumn(Int32 column) { Column = column; return this; }
-        public Double ColumnOffset { get; set; }
-        public IXLDrawingPosition SetColumnOffset(Double columnOffset) { ColumnOffset = columnOffset; return this; }
-         
-        public Int32 Row { get; set; }
-        public IXLDrawingPosition SetRow(Int32 row) { Row = row; return this; }
-        public Double RowOffset { get; set; }
-        public IXLDrawingPosition SetRowOffset(Double rowOffset) { RowOffset = rowOffset; return this; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/EnumConverter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/EnumConverter.cs
deleted file mode 100644
index e1384ca..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/EnumConverter.cs
+++ /dev/null
@@ -1,1262 +0,0 @@
-using System;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.Vml;
-
-namespace ClosedXML.Excel
-{
-    internal static class EnumConverter
-    {
-        #region To OpenXml
-        public static UnderlineValues ToOpenXml(this XLFontUnderlineValues value)
-        {
-            switch (value)
-            {
-                case XLFontUnderlineValues.Double:
-                    return UnderlineValues.Double;
-                case XLFontUnderlineValues.DoubleAccounting:
-                    return UnderlineValues.DoubleAccounting;
-                case XLFontUnderlineValues.None:
-                    return UnderlineValues.None;
-                case XLFontUnderlineValues.Single:
-                    return UnderlineValues.Single;
-                case XLFontUnderlineValues.SingleAccounting:
-                    return UnderlineValues.SingleAccounting;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static OrientationValues ToOpenXml(this XLPageOrientation value)
-        {
-            switch (value)
-            {
-                case XLPageOrientation.Default:
-                    return OrientationValues.Default;
-                case XLPageOrientation.Landscape:
-                    return OrientationValues.Landscape;
-                case XLPageOrientation.Portrait:
-                    return OrientationValues.Portrait;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static VerticalAlignmentRunValues ToOpenXml(this XLFontVerticalTextAlignmentValues value)
-        {
-            switch (value)
-            {
-                case XLFontVerticalTextAlignmentValues.Baseline:
-                    return VerticalAlignmentRunValues.Baseline;
-                case XLFontVerticalTextAlignmentValues.Subscript:
-                    return VerticalAlignmentRunValues.Subscript;
-                case XLFontVerticalTextAlignmentValues.Superscript:
-                    return VerticalAlignmentRunValues.Superscript;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static PatternValues ToOpenXml(this XLFillPatternValues value)
-        {
-            switch (value)
-            {
-                case XLFillPatternValues.DarkDown:
-                    return PatternValues.DarkDown;
-                case XLFillPatternValues.DarkGray:
-                    return PatternValues.DarkGray;
-                case XLFillPatternValues.DarkGrid:
-                    return PatternValues.DarkGrid;
-                case XLFillPatternValues.DarkHorizontal:
-                    return PatternValues.DarkHorizontal;
-                case XLFillPatternValues.DarkTrellis:
-                    return PatternValues.DarkTrellis;
-                case XLFillPatternValues.DarkUp:
-                    return PatternValues.DarkUp;
-                case XLFillPatternValues.DarkVertical:
-                    return PatternValues.DarkVertical;
-                case XLFillPatternValues.Gray0625:
-                    return PatternValues.Gray0625;
-                case XLFillPatternValues.Gray125:
-                    return PatternValues.Gray125;
-                case XLFillPatternValues.LightDown:
-                    return PatternValues.LightDown;
-                case XLFillPatternValues.LightGray:
-                    return PatternValues.LightGray;
-                case XLFillPatternValues.LightGrid:
-                    return PatternValues.LightGrid;
-                case XLFillPatternValues.LightHorizontal:
-                    return PatternValues.LightHorizontal;
-                case XLFillPatternValues.LightTrellis:
-                    return PatternValues.LightTrellis;
-                case XLFillPatternValues.LightUp:
-                    return PatternValues.LightUp;
-                case XLFillPatternValues.LightVertical:
-                    return PatternValues.LightVertical;
-                case XLFillPatternValues.MediumGray:
-                    return PatternValues.MediumGray;
-                case XLFillPatternValues.None:
-                    return PatternValues.None;
-                case XLFillPatternValues.Solid:
-                    return PatternValues.Solid;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static BorderStyleValues ToOpenXml(this XLBorderStyleValues value)
-        {
-            switch (value)
-            {
-                case XLBorderStyleValues.DashDot:
-                    return BorderStyleValues.DashDot;
-                case XLBorderStyleValues.DashDotDot:
-                    return BorderStyleValues.DashDotDot;
-                case XLBorderStyleValues.Dashed:
-                    return BorderStyleValues.Dashed;
-                case XLBorderStyleValues.Dotted:
-                    return BorderStyleValues.Dotted;
-                case XLBorderStyleValues.Double:
-                    return BorderStyleValues.Double;
-                case XLBorderStyleValues.Hair:
-                    return BorderStyleValues.Hair;
-                case XLBorderStyleValues.Medium:
-                    return BorderStyleValues.Medium;
-                case XLBorderStyleValues.MediumDashDot:
-                    return BorderStyleValues.MediumDashDot;
-                case XLBorderStyleValues.MediumDashDotDot:
-                    return BorderStyleValues.MediumDashDotDot;
-                case XLBorderStyleValues.MediumDashed:
-                    return BorderStyleValues.MediumDashed;
-                case XLBorderStyleValues.None:
-                    return BorderStyleValues.None;
-                case XLBorderStyleValues.SlantDashDot:
-                    return BorderStyleValues.SlantDashDot;
-                case XLBorderStyleValues.Thick:
-                    return BorderStyleValues.Thick;
-                case XLBorderStyleValues.Thin:
-                    return BorderStyleValues.Thin;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static HorizontalAlignmentValues ToOpenXml(this XLAlignmentHorizontalValues value)
-        {
-            switch (value)
-            {
-                case XLAlignmentHorizontalValues.Center:
-                    return HorizontalAlignmentValues.Center;
-                case XLAlignmentHorizontalValues.CenterContinuous:
-                    return HorizontalAlignmentValues.CenterContinuous;
-                case XLAlignmentHorizontalValues.Distributed:
-                    return HorizontalAlignmentValues.Distributed;
-                case XLAlignmentHorizontalValues.Fill:
-                    return HorizontalAlignmentValues.Fill;
-                case XLAlignmentHorizontalValues.General:
-                    return HorizontalAlignmentValues.General;
-                case XLAlignmentHorizontalValues.Justify:
-                    return HorizontalAlignmentValues.Justify;
-                case XLAlignmentHorizontalValues.Left:
-                    return HorizontalAlignmentValues.Left;
-                case XLAlignmentHorizontalValues.Right:
-                    return HorizontalAlignmentValues.Right;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static VerticalAlignmentValues ToOpenXml(this XLAlignmentVerticalValues value)
-        {
-            switch (value)
-            {
-                case XLAlignmentVerticalValues.Bottom:
-                    return VerticalAlignmentValues.Bottom;
-                case XLAlignmentVerticalValues.Center:
-                    return VerticalAlignmentValues.Center;
-                case XLAlignmentVerticalValues.Distributed:
-                    return VerticalAlignmentValues.Distributed;
-                case XLAlignmentVerticalValues.Justify:
-                    return VerticalAlignmentValues.Justify;
-                case XLAlignmentVerticalValues.Top:
-                    return VerticalAlignmentValues.Top;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static PageOrderValues ToOpenXml(this XLPageOrderValues value)
-        {
-            switch (value)
-            {
-                case XLPageOrderValues.DownThenOver:
-                    return PageOrderValues.DownThenOver;
-                case XLPageOrderValues.OverThenDown:
-                    return PageOrderValues.OverThenDown;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static CellCommentsValues ToOpenXml(this XLShowCommentsValues value)
-        {
-            switch (value)
-            {
-                case XLShowCommentsValues.AsDisplayed:
-                    return CellCommentsValues.AsDisplayed;
-                case XLShowCommentsValues.AtEnd:
-                    return CellCommentsValues.AtEnd;
-                case XLShowCommentsValues.None:
-                    return CellCommentsValues.None;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static PrintErrorValues ToOpenXml(this XLPrintErrorValues value)
-        {
-            switch (value)
-            {
-                case XLPrintErrorValues.Blank:
-                    return PrintErrorValues.Blank;
-                case XLPrintErrorValues.Dash:
-                    return PrintErrorValues.Dash;
-                case XLPrintErrorValues.Displayed:
-                    return PrintErrorValues.Displayed;
-                case XLPrintErrorValues.NA:
-                    return PrintErrorValues.NA;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static CalculateModeValues ToOpenXml(this XLCalculateMode value)
-        {
-            switch (value)
-            {
-                case XLCalculateMode.Auto:
-                    return CalculateModeValues.Auto;
-                case XLCalculateMode.AutoNoTable:
-                    return CalculateModeValues.AutoNoTable;
-                case XLCalculateMode.Manual:
-                    return CalculateModeValues.Manual;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static ReferenceModeValues ToOpenXml(this XLReferenceStyle value)
-        {
-            switch (value)
-            {
-                case XLReferenceStyle.R1C1:
-                    return ReferenceModeValues.R1C1;
-                case XLReferenceStyle.A1:
-                    return ReferenceModeValues.A1;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static uint ToOpenXml(this XLAlignmentReadingOrderValues value)
-        {
-            switch (value)
-            {
-                case XLAlignmentReadingOrderValues.ContextDependent:
-                    return 0;
-                case XLAlignmentReadingOrderValues.LeftToRight:
-                    return 1;
-                case XLAlignmentReadingOrderValues.RightToLeft:
-                    return 2;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static TotalsRowFunctionValues ToOpenXml(this XLTotalsRowFunction value)
-        {
-            switch (value)
-            {
-                case XLTotalsRowFunction.None:
-                    return TotalsRowFunctionValues.None;
-                case XLTotalsRowFunction.Sum:
-                    return TotalsRowFunctionValues.Sum;
-                case XLTotalsRowFunction.Minimum:
-                    return TotalsRowFunctionValues.Minimum;
-                case XLTotalsRowFunction.Maximum:
-                    return TotalsRowFunctionValues.Maximum;
-                case XLTotalsRowFunction.Average:
-                    return TotalsRowFunctionValues.Average;
-                case XLTotalsRowFunction.Count:
-                    return TotalsRowFunctionValues.Count;
-                case XLTotalsRowFunction.CountNumbers:
-                    return TotalsRowFunctionValues.CountNumbers;
-                case XLTotalsRowFunction.StandardDeviation:
-                    return TotalsRowFunctionValues.StandardDeviation;
-                case XLTotalsRowFunction.Variance:
-                    return TotalsRowFunctionValues.Variance;
-                case XLTotalsRowFunction.Custom:
-                    return TotalsRowFunctionValues.Custom;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static DataValidationValues ToOpenXml(this XLAllowedValues value)
-        {
-            switch (value)
-            {
-                case XLAllowedValues.AnyValue:
-                    return DataValidationValues.None;
-                case XLAllowedValues.Custom:
-                    return DataValidationValues.Custom;
-                case XLAllowedValues.Date:
-                    return DataValidationValues.Date;
-                case XLAllowedValues.Decimal:
-                    return DataValidationValues.Decimal;
-                case XLAllowedValues.List:
-                    return DataValidationValues.List;
-                case XLAllowedValues.TextLength:
-                    return DataValidationValues.TextLength;
-                case XLAllowedValues.Time:
-                    return DataValidationValues.Time;
-                case XLAllowedValues.WholeNumber:
-                    return DataValidationValues.Whole;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static DataValidationErrorStyleValues ToOpenXml(this XLErrorStyle value)
-        {
-            switch (value)
-            {
-                case XLErrorStyle.Information:
-                    return DataValidationErrorStyleValues.Information;
-                case XLErrorStyle.Warning:
-                    return DataValidationErrorStyleValues.Warning;
-                case XLErrorStyle.Stop:
-                    return DataValidationErrorStyleValues.Stop;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static DataValidationOperatorValues ToOpenXml(this XLOperator value)
-        {
-            switch (value)
-            {
-                case XLOperator.Between:
-                    return DataValidationOperatorValues.Between;
-                case XLOperator.EqualOrGreaterThan:
-                    return DataValidationOperatorValues.GreaterThanOrEqual;
-                case XLOperator.EqualOrLessThan:
-                    return DataValidationOperatorValues.LessThanOrEqual;
-                case XLOperator.EqualTo:
-                    return DataValidationOperatorValues.Equal;
-                case XLOperator.GreaterThan:
-                    return DataValidationOperatorValues.GreaterThan;
-                case XLOperator.LessThan:
-                    return DataValidationOperatorValues.LessThan;
-                case XLOperator.NotBetween:
-                    return DataValidationOperatorValues.NotBetween;
-                case XLOperator.NotEqualTo:
-                    return DataValidationOperatorValues.NotEqual;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static SheetStateValues ToOpenXml(this XLWorksheetVisibility value)
-        {
-            switch (value)
-            {
-                case XLWorksheetVisibility.Visible:
-                    return SheetStateValues.Visible;
-                case XLWorksheetVisibility.Hidden:
-                    return SheetStateValues.Hidden;
-                case XLWorksheetVisibility.VeryHidden:
-                    return SheetStateValues.VeryHidden;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static PhoneticAlignmentValues ToOpenXml(this XLPhoneticAlignment value)
-        {
-            switch (value)
-            {
-                case XLPhoneticAlignment.Center :
-                    return  PhoneticAlignmentValues.Center;
-                case XLPhoneticAlignment.Distributed:
-                    return PhoneticAlignmentValues.Distributed;
-                case XLPhoneticAlignment.Left:
-                    return PhoneticAlignmentValues.Left;
-                case XLPhoneticAlignment.NoControl:
-                    return PhoneticAlignmentValues.NoControl;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static PhoneticValues ToOpenXml(this XLPhoneticType value)
-        {
-            switch (value)
-            {
-                case XLPhoneticType.FullWidthKatakana:
-                    return PhoneticValues.FullWidthKatakana;
-                case XLPhoneticType.HalfWidthKatakana:
-                    return PhoneticValues.HalfWidthKatakana;
-                case XLPhoneticType.Hiragana:
-                    return PhoneticValues.Hiragana;
-                case XLPhoneticType.NoConversion:
-                    return PhoneticValues.NoConversion;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static DataConsolidateFunctionValues ToOpenXml(this XLPivotSummary value)
-        {
-            switch (value)
-            {
-                case XLPivotSummary.Sum: return DataConsolidateFunctionValues.Sum;
-                case XLPivotSummary.Count: return DataConsolidateFunctionValues.Count;
-                case XLPivotSummary.Average: return DataConsolidateFunctionValues.Average;
-                case XLPivotSummary.Minimum: return DataConsolidateFunctionValues.Minimum;
-                case XLPivotSummary.Maximum: return DataConsolidateFunctionValues.Maximum;
-                case XLPivotSummary.Product: return DataConsolidateFunctionValues.Product;
-                case XLPivotSummary.CountNumbers: return DataConsolidateFunctionValues.CountNumbers;
-                case XLPivotSummary.StandardDeviation: return DataConsolidateFunctionValues.StandardDeviation;
-                case XLPivotSummary.PopulationStandardDeviation: return DataConsolidateFunctionValues.StandardDeviationP;
-                case XLPivotSummary.Variance: return DataConsolidateFunctionValues.Variance;
-                case XLPivotSummary.PopulationVariance: return DataConsolidateFunctionValues.VarianceP;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static ShowDataAsValues ToOpenXml(this XLPivotCalculation value)
-        {
-            switch (value)
-            {
-                case XLPivotCalculation.Normal: return ShowDataAsValues.Normal;
-                case XLPivotCalculation.DifferenceFrom: return ShowDataAsValues.Difference;
-                case XLPivotCalculation.PctOf: return ShowDataAsValues.Percent;
-                case XLPivotCalculation.PctDifferenceFrom: return ShowDataAsValues.PercentageDifference;
-                case XLPivotCalculation.RunningTotal: return ShowDataAsValues.RunTotal;
-                case XLPivotCalculation.PctOfRow: return ShowDataAsValues.PercentOfRaw; // There's a typo in the OpenXML SDK =)
-                case XLPivotCalculation.PctOfColumn: return ShowDataAsValues.PercentOfColumn;
-                case XLPivotCalculation.PctOfTotal: return ShowDataAsValues.PercentOfTotal;
-                case XLPivotCalculation.Index: return ShowDataAsValues.Index;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static FilterOperatorValues ToOpenXml(this XLFilterOperator value)
-        {
-            switch(value)
-            {
-                case XLFilterOperator.Equal: return FilterOperatorValues.Equal;
-                case XLFilterOperator.NotEqual: return FilterOperatorValues.NotEqual;
-                case XLFilterOperator.GreaterThan: return FilterOperatorValues.GreaterThan;
-                case XLFilterOperator.EqualOrGreaterThan: return FilterOperatorValues.GreaterThanOrEqual;
-                case XLFilterOperator.LessThan: return FilterOperatorValues.LessThan;
-                case XLFilterOperator.EqualOrLessThan: return FilterOperatorValues.LessThanOrEqual;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static DynamicFilterValues ToOpenXml(this XLFilterDynamicType value)
-        {
-            switch (value)
-            {
-                case XLFilterDynamicType.AboveAverage: return DynamicFilterValues.AboveAverage;
-                case XLFilterDynamicType.BelowAverage: return DynamicFilterValues.BelowAverage;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static SheetViewValues ToOpenXml(this XLSheetViewOptions value)
-        {
-            switch (value)
-            {
-                case XLSheetViewOptions.Normal: return SheetViewValues.Normal;
-                case XLSheetViewOptions.PageBreakPreview: return SheetViewValues.PageBreakPreview;
-                case XLSheetViewOptions.PageLayout: return SheetViewValues.PageLayout;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static StrokeLineStyleValues ToOpenXml(this XLLineStyle value)
-        {
-            switch (value)
-            {
-                case XLLineStyle.Single : return StrokeLineStyleValues.Single ;
-                case XLLineStyle.ThickBetweenThin: return StrokeLineStyleValues.ThickBetweenThin;
-                case XLLineStyle.ThickThin: return StrokeLineStyleValues.ThickThin;
-                case XLLineStyle.ThinThick: return StrokeLineStyleValues.ThinThick;
-                case XLLineStyle.ThinThin: return StrokeLineStyleValues.ThinThin;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static ConditionalFormatValues ToOpenXml(this XLConditionalFormatType value)
-        {
-            switch (value)
-            {
-                case XLConditionalFormatType.Expression: return ConditionalFormatValues.Expression;
-                case XLConditionalFormatType.CellIs: return ConditionalFormatValues.CellIs;
-                case XLConditionalFormatType.ColorScale: return ConditionalFormatValues.ColorScale;
-                case XLConditionalFormatType.DataBar: return ConditionalFormatValues.DataBar;
-                case XLConditionalFormatType.IconSet: return ConditionalFormatValues.IconSet;
-                case XLConditionalFormatType.Top10: return ConditionalFormatValues.Top10;
-                case XLConditionalFormatType.IsUnique: return ConditionalFormatValues.UniqueValues;
-                case XLConditionalFormatType.IsDuplicate: return ConditionalFormatValues.DuplicateValues;
-                case XLConditionalFormatType.ContainsText: return ConditionalFormatValues.ContainsText;
-                case XLConditionalFormatType.NotContainsText: return ConditionalFormatValues.NotContainsText;
-                case XLConditionalFormatType.StartsWith: return ConditionalFormatValues.BeginsWith;
-                case XLConditionalFormatType.EndsWith: return ConditionalFormatValues.EndsWith;
-                case XLConditionalFormatType.IsBlank: return ConditionalFormatValues.ContainsBlanks;
-                case XLConditionalFormatType.NotBlank: return ConditionalFormatValues.NotContainsBlanks;
-                case XLConditionalFormatType.IsError: return ConditionalFormatValues.ContainsErrors;
-                case XLConditionalFormatType.NotError: return ConditionalFormatValues.NotContainsErrors;
-                case XLConditionalFormatType.TimePeriod: return ConditionalFormatValues.TimePeriod;
-                case XLConditionalFormatType.AboveAverage: return ConditionalFormatValues.AboveAverage;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static ConditionalFormatValueObjectValues ToOpenXml(this XLCFContentType value)
-        {
-            switch (value)
-            {
-                case XLCFContentType.Number: return ConditionalFormatValueObjectValues.Number;
-                case XLCFContentType.Percent: return ConditionalFormatValueObjectValues.Percent;
-                case XLCFContentType.Maximum: return ConditionalFormatValueObjectValues.Max;
-                case XLCFContentType.Minimum: return ConditionalFormatValueObjectValues.Min;
-                case XLCFContentType.Formula: return ConditionalFormatValueObjectValues.Formula;
-                case XLCFContentType.Percentile: return ConditionalFormatValueObjectValues.Percentile;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static ConditionalFormattingOperatorValues ToOpenXml(this XLCFOperator value)
-        {
-            switch (value)
-            {
-                case XLCFOperator.LessThan: return ConditionalFormattingOperatorValues.LessThan;
-                case XLCFOperator.EqualOrLessThan: return ConditionalFormattingOperatorValues.LessThanOrEqual;
-                case XLCFOperator.Equal: return ConditionalFormattingOperatorValues.Equal;
-                case XLCFOperator.NotEqual: return ConditionalFormattingOperatorValues.NotEqual;
-                case XLCFOperator.EqualOrGreaterThan: return ConditionalFormattingOperatorValues.GreaterThanOrEqual;
-                case XLCFOperator.GreaterThan: return ConditionalFormattingOperatorValues.GreaterThan;
-                case XLCFOperator.Between: return ConditionalFormattingOperatorValues.Between;
-                case XLCFOperator.NotBetween: return ConditionalFormattingOperatorValues.NotBetween;
-                case XLCFOperator.Contains : return ConditionalFormattingOperatorValues.ContainsText;
-                case XLCFOperator.NotContains: return ConditionalFormattingOperatorValues.NotContains;
-                case XLCFOperator.StartsWith: return ConditionalFormattingOperatorValues.BeginsWith;
-                case XLCFOperator.EndsWith: return ConditionalFormattingOperatorValues.EndsWith;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static IconSetValues ToOpenXml(this XLIconSetStyle value)
-        {
-            switch (value)
-            {
-                case XLIconSetStyle.ThreeArrows: return IconSetValues.ThreeArrows;
-                case XLIconSetStyle.ThreeArrowsGray: return IconSetValues.ThreeArrowsGray;
-                case XLIconSetStyle.ThreeFlags: return IconSetValues.ThreeFlags;
-                case XLIconSetStyle.ThreeTrafficLights1: return IconSetValues.ThreeTrafficLights1;
-                case XLIconSetStyle.ThreeTrafficLights2: return IconSetValues.ThreeTrafficLights2;
-                case XLIconSetStyle.ThreeSigns: return IconSetValues.ThreeSigns;
-                case XLIconSetStyle.ThreeSymbols: return IconSetValues.ThreeSymbols;
-                case XLIconSetStyle.ThreeSymbols2: return IconSetValues.ThreeSymbols2;
-                case XLIconSetStyle.FourArrows: return IconSetValues.FourArrows;
-                case XLIconSetStyle.FourArrowsGray: return IconSetValues.FourArrowsGray;
-                case XLIconSetStyle.FourRedToBlack: return IconSetValues.FourRedToBlack;
-                case XLIconSetStyle.FourRating: return IconSetValues.FourRating;
-                case XLIconSetStyle.FourTrafficLights: return IconSetValues.FourTrafficLights;
-                case XLIconSetStyle.FiveArrows: return IconSetValues.FiveArrows;
-                case XLIconSetStyle.FiveArrowsGray: return IconSetValues.FiveArrowsGray;
-                case XLIconSetStyle.FiveRating: return IconSetValues.FiveRating;
-                case XLIconSetStyle.FiveQuarters: return IconSetValues.FiveQuarters;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        #endregion
-        #region To ClosedXml
-        public static XLFontUnderlineValues ToClosedXml(this UnderlineValues value)
-        {
-            switch (value)
-            {
-                case UnderlineValues.Double:
-                    return XLFontUnderlineValues.Double;
-                case UnderlineValues.DoubleAccounting:
-                    return XLFontUnderlineValues.DoubleAccounting;
-                case UnderlineValues.None:
-                    return XLFontUnderlineValues.None;
-                case UnderlineValues.Single:
-                    return XLFontUnderlineValues.Single;
-                case UnderlineValues.SingleAccounting:
-                    return XLFontUnderlineValues.SingleAccounting;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLPageOrientation ToClosedXml(this OrientationValues value)
-        {
-            switch (value)
-            {
-                case OrientationValues.Default:
-                    return XLPageOrientation.Default;
-                case OrientationValues.Landscape:
-                    return XLPageOrientation.Landscape;
-                case OrientationValues.Portrait:
-                    return XLPageOrientation.Portrait;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLFontVerticalTextAlignmentValues ToClosedXml(this VerticalAlignmentRunValues value)
-        {
-            switch (value)
-            {
-                case VerticalAlignmentRunValues.Baseline:
-                    return XLFontVerticalTextAlignmentValues.Baseline;
-                case VerticalAlignmentRunValues.Subscript:
-                    return XLFontVerticalTextAlignmentValues.Subscript;
-                case VerticalAlignmentRunValues.Superscript:
-                    return XLFontVerticalTextAlignmentValues.Superscript;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLFillPatternValues ToClosedXml(this PatternValues value)
-        {
-            switch (value)
-            {
-                case PatternValues.DarkDown:
-                    return XLFillPatternValues.DarkDown;
-                case PatternValues.DarkGray:
-                    return XLFillPatternValues.DarkGray;
-                case PatternValues.DarkGrid:
-                    return XLFillPatternValues.DarkGrid;
-                case PatternValues.DarkHorizontal:
-                    return XLFillPatternValues.DarkHorizontal;
-                case PatternValues.DarkTrellis:
-                    return XLFillPatternValues.DarkTrellis;
-                case PatternValues.DarkUp:
-                    return XLFillPatternValues.DarkUp;
-                case PatternValues.DarkVertical:
-                    return XLFillPatternValues.DarkVertical;
-                case PatternValues.Gray0625:
-                    return XLFillPatternValues.Gray0625;
-                case PatternValues.Gray125:
-                    return XLFillPatternValues.Gray125;
-                case PatternValues.LightDown:
-                    return XLFillPatternValues.LightDown;
-                case PatternValues.LightGray:
-                    return XLFillPatternValues.LightGray;
-                case PatternValues.LightGrid:
-                    return XLFillPatternValues.LightGrid;
-                case PatternValues.LightHorizontal:
-                    return XLFillPatternValues.LightHorizontal;
-                case PatternValues.LightTrellis:
-                    return XLFillPatternValues.LightTrellis;
-                case PatternValues.LightUp:
-                    return XLFillPatternValues.LightUp;
-                case PatternValues.LightVertical:
-                    return XLFillPatternValues.LightVertical;
-                case PatternValues.MediumGray:
-                    return XLFillPatternValues.MediumGray;
-                case PatternValues.None:
-                    return XLFillPatternValues.None;
-                case PatternValues.Solid:
-                    return XLFillPatternValues.Solid;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLBorderStyleValues ToClosedXml(this BorderStyleValues value)
-        {
-            switch (value)
-            {
-                case BorderStyleValues.DashDot:
-                    return XLBorderStyleValues.DashDot;
-                case BorderStyleValues.DashDotDot:
-                    return XLBorderStyleValues.DashDotDot;
-                case BorderStyleValues.Dashed:
-                    return XLBorderStyleValues.Dashed;
-                case BorderStyleValues.Dotted:
-                    return XLBorderStyleValues.Dotted;
-                case BorderStyleValues.Double:
-                    return XLBorderStyleValues.Double;
-                case BorderStyleValues.Hair:
-                    return XLBorderStyleValues.Hair;
-                case BorderStyleValues.Medium:
-                    return XLBorderStyleValues.Medium;
-                case BorderStyleValues.MediumDashDot:
-                    return XLBorderStyleValues.MediumDashDot;
-                case BorderStyleValues.MediumDashDotDot:
-                    return XLBorderStyleValues.MediumDashDotDot;
-                case BorderStyleValues.MediumDashed:
-                    return XLBorderStyleValues.MediumDashed;
-                case BorderStyleValues.None:
-                    return XLBorderStyleValues.None;
-                case BorderStyleValues.SlantDashDot:
-                    return XLBorderStyleValues.SlantDashDot;
-                case BorderStyleValues.Thick:
-                    return XLBorderStyleValues.Thick;
-                case BorderStyleValues.Thin:
-                    return XLBorderStyleValues.Thin;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLAlignmentHorizontalValues ToClosedXml(this HorizontalAlignmentValues value)
-        {
-            switch (value)
-            {
-                case HorizontalAlignmentValues.Center:
-                    return XLAlignmentHorizontalValues.Center;
-                case HorizontalAlignmentValues.CenterContinuous:
-                    return XLAlignmentHorizontalValues.CenterContinuous;
-                case HorizontalAlignmentValues.Distributed:
-                    return XLAlignmentHorizontalValues.Distributed;
-                case HorizontalAlignmentValues.Fill:
-                    return XLAlignmentHorizontalValues.Fill;
-                case HorizontalAlignmentValues.General:
-                    return XLAlignmentHorizontalValues.General;
-                case HorizontalAlignmentValues.Justify:
-                    return XLAlignmentHorizontalValues.Justify;
-                case HorizontalAlignmentValues.Left:
-                    return XLAlignmentHorizontalValues.Left;
-                case HorizontalAlignmentValues.Right:
-                    return XLAlignmentHorizontalValues.Right;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLAlignmentVerticalValues ToClosedXml(this VerticalAlignmentValues value)
-        {
-            switch (value)
-            {
-                case VerticalAlignmentValues.Bottom:
-                    return XLAlignmentVerticalValues.Bottom;
-                case VerticalAlignmentValues.Center:
-                    return XLAlignmentVerticalValues.Center;
-                case VerticalAlignmentValues.Distributed:
-                    return XLAlignmentVerticalValues.Distributed;
-                case VerticalAlignmentValues.Justify:
-                    return XLAlignmentVerticalValues.Justify;
-                case VerticalAlignmentValues.Top:
-                    return XLAlignmentVerticalValues.Top;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLPageOrderValues ToClosedXml(this PageOrderValues value)
-        {
-            switch (value)
-            {
-                case PageOrderValues.DownThenOver:
-                    return XLPageOrderValues.DownThenOver;
-                case PageOrderValues.OverThenDown:
-                    return XLPageOrderValues.OverThenDown;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLShowCommentsValues ToClosedXml(this CellCommentsValues value)
-        {
-            switch (value)
-            {
-                case CellCommentsValues.AsDisplayed:
-                    return XLShowCommentsValues.AsDisplayed;
-                case CellCommentsValues.AtEnd:
-                    return XLShowCommentsValues.AtEnd;
-                case CellCommentsValues.None:
-                    return XLShowCommentsValues.None;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLPrintErrorValues ToClosedXml(this PrintErrorValues value)
-        {
-            switch (value)
-            {
-                case PrintErrorValues.Blank:
-                    return XLPrintErrorValues.Blank;
-                case PrintErrorValues.Dash:
-                    return XLPrintErrorValues.Dash;
-                case PrintErrorValues.Displayed:
-                    return XLPrintErrorValues.Displayed;
-                case PrintErrorValues.NA:
-                    return XLPrintErrorValues.NA;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLCalculateMode ToClosedXml(this CalculateModeValues value)
-        {
-            switch (value)
-            {
-                case CalculateModeValues.Auto:
-                    return XLCalculateMode.Auto;
-                case CalculateModeValues.AutoNoTable:
-                    return XLCalculateMode.AutoNoTable;
-                case CalculateModeValues.Manual:
-                    return XLCalculateMode.Manual;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLReferenceStyle ToClosedXml(this ReferenceModeValues value)
-        {
-            switch (value)
-            {
-                case ReferenceModeValues.R1C1:
-                    return XLReferenceStyle.R1C1;
-                case ReferenceModeValues.A1:
-                    return XLReferenceStyle.A1;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLAlignmentReadingOrderValues ToClosedXml(this uint value)
-        {
-            switch (value)
-            {
-                case 0:
-                    return XLAlignmentReadingOrderValues.ContextDependent;
-                case 1:
-                    return XLAlignmentReadingOrderValues.LeftToRight;
-                case 2:
-                    return XLAlignmentReadingOrderValues.RightToLeft;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLTotalsRowFunction ToClosedXml(this TotalsRowFunctionValues value)
-        {
-            switch (value)
-            {
-                case TotalsRowFunctionValues.None:
-                    return XLTotalsRowFunction.None;
-                case TotalsRowFunctionValues.Sum:
-                    return XLTotalsRowFunction.Sum;
-                case TotalsRowFunctionValues.Minimum:
-                    return XLTotalsRowFunction.Minimum;
-                case TotalsRowFunctionValues.Maximum:
-                    return XLTotalsRowFunction.Maximum;
-                case TotalsRowFunctionValues.Average:
-                    return XLTotalsRowFunction.Average;
-                case TotalsRowFunctionValues.Count:
-                    return XLTotalsRowFunction.Count;
-                case TotalsRowFunctionValues.CountNumbers:
-                    return XLTotalsRowFunction.CountNumbers;
-                case TotalsRowFunctionValues.StandardDeviation:
-                    return XLTotalsRowFunction.StandardDeviation;
-                case TotalsRowFunctionValues.Variance:
-                    return XLTotalsRowFunction.Variance;
-                case TotalsRowFunctionValues.Custom:
-                    return XLTotalsRowFunction.Custom;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLAllowedValues ToClosedXml(this DataValidationValues value)
-        {
-            switch (value)
-            {
-                case DataValidationValues.None:
-                    return XLAllowedValues.AnyValue;
-                case DataValidationValues.Custom:
-                    return XLAllowedValues.Custom;
-                case DataValidationValues.Date:
-                    return XLAllowedValues.Date;
-                case DataValidationValues.Decimal:
-                    return XLAllowedValues.Decimal;
-                case DataValidationValues.List:
-                    return XLAllowedValues.List;
-                case DataValidationValues.TextLength:
-                    return XLAllowedValues.TextLength;
-                case DataValidationValues.Time:
-                    return XLAllowedValues.Time;
-                case DataValidationValues.Whole:
-                    return XLAllowedValues.WholeNumber;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLErrorStyle ToClosedXml(this DataValidationErrorStyleValues value)
-        {
-            switch (value)
-            {
-                case DataValidationErrorStyleValues.Information:
-                    return XLErrorStyle.Information;
-                case DataValidationErrorStyleValues.Warning:
-                    return XLErrorStyle.Warning;
-                case DataValidationErrorStyleValues.Stop:
-                    return XLErrorStyle.Stop;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLOperator ToClosedXml(this DataValidationOperatorValues value)
-        {
-            switch (value)
-            {
-                case DataValidationOperatorValues.Between:
-                    return XLOperator.Between;
-                case DataValidationOperatorValues.GreaterThanOrEqual:
-                    return XLOperator.EqualOrGreaterThan;
-                case DataValidationOperatorValues.LessThanOrEqual:
-                    return XLOperator.EqualOrLessThan;
-                case DataValidationOperatorValues.Equal:
-                    return XLOperator.EqualTo;
-                case DataValidationOperatorValues.GreaterThan:
-                    return XLOperator.GreaterThan;
-                case DataValidationOperatorValues.LessThan:
-                    return XLOperator.LessThan;
-                case DataValidationOperatorValues.NotBetween:
-                    return XLOperator.NotBetween;
-                case DataValidationOperatorValues.NotEqual:
-                    return XLOperator.NotEqualTo;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLWorksheetVisibility ToClosedXml(this SheetStateValues value)
-        {
-            switch (value)
-            {
-                case SheetStateValues.Visible:
-                    return XLWorksheetVisibility.Visible;
-                case SheetStateValues.Hidden:
-                    return XLWorksheetVisibility.Hidden;
-                case SheetStateValues.VeryHidden:
-                    return XLWorksheetVisibility.VeryHidden;
-                    #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                    #endregion
-            }
-        }
-        public static XLPhoneticAlignment ToClosedXml(this PhoneticAlignmentValues value)
-        {
-            switch (value)
-            {
-                case PhoneticAlignmentValues.Center:
-                    return XLPhoneticAlignment.Center;
-                case PhoneticAlignmentValues.Distributed:
-                    return XLPhoneticAlignment.Distributed;
-                case PhoneticAlignmentValues.Left:
-                    return XLPhoneticAlignment.Left;
-                case PhoneticAlignmentValues.NoControl:
-                    return XLPhoneticAlignment.NoControl;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLPhoneticType ToClosedXml(this PhoneticValues value)
-        {
-            switch (value)
-            {
-                case PhoneticValues.FullWidthKatakana: return XLPhoneticType.FullWidthKatakana;
-                case PhoneticValues.HalfWidthKatakana:
-                    return XLPhoneticType.HalfWidthKatakana;
-                case PhoneticValues.Hiragana:
-                    return XLPhoneticType.Hiragana;
-                case PhoneticValues.NoConversion:
-                    return XLPhoneticType.NoConversion;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLPivotSummary ToClosedXml(this DataConsolidateFunctionValues value)
-        {
-            switch (value)
-            {
-                case DataConsolidateFunctionValues.Sum: return XLPivotSummary.Sum;
-                case DataConsolidateFunctionValues.Count: return XLPivotSummary.Count;
-                case DataConsolidateFunctionValues.Average: return XLPivotSummary.Average;
-                case DataConsolidateFunctionValues.Minimum: return XLPivotSummary.Minimum;
-                case DataConsolidateFunctionValues.Maximum: return XLPivotSummary.Maximum;
-                case DataConsolidateFunctionValues.Product: return XLPivotSummary.Product;
-                case DataConsolidateFunctionValues.CountNumbers: return XLPivotSummary.CountNumbers;
-                case DataConsolidateFunctionValues.StandardDeviation: return XLPivotSummary.StandardDeviation;
-                case DataConsolidateFunctionValues.StandardDeviationP: return XLPivotSummary.PopulationStandardDeviation;
-                case DataConsolidateFunctionValues.Variance: return XLPivotSummary.Variance;
-                case DataConsolidateFunctionValues.VarianceP: return XLPivotSummary.PopulationVariance;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLPivotCalculation ToClosedXml(this ShowDataAsValues value)
-        {
-            switch (value)
-            {
-                case ShowDataAsValues.Normal: return XLPivotCalculation.Normal;
-                case ShowDataAsValues.Difference: return XLPivotCalculation.DifferenceFrom;
-                case ShowDataAsValues.Percent: return XLPivotCalculation.PctOf;
-                case ShowDataAsValues.PercentageDifference: return XLPivotCalculation.PctDifferenceFrom;
-                case ShowDataAsValues.RunTotal: return XLPivotCalculation.RunningTotal;
-                case ShowDataAsValues.PercentOfRaw: return XLPivotCalculation.PctOfRow; // There's a typo in the OpenXML SDK =)
-                case ShowDataAsValues.PercentOfColumn: return XLPivotCalculation.PctOfColumn;
-                case ShowDataAsValues.PercentOfTotal: return XLPivotCalculation.PctOfTotal;
-                case ShowDataAsValues.Index: return XLPivotCalculation.Index;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLFilterOperator ToClosedXml(this FilterOperatorValues value)
-        {
-            switch (value)
-            {
-                case FilterOperatorValues.Equal: return XLFilterOperator.Equal;
-                case FilterOperatorValues.NotEqual: return XLFilterOperator.NotEqual;
-                case FilterOperatorValues.GreaterThan: return XLFilterOperator.GreaterThan;
-                case FilterOperatorValues.LessThan: return XLFilterOperator.LessThan;
-                case FilterOperatorValues.GreaterThanOrEqual: return XLFilterOperator.EqualOrGreaterThan;
-                case FilterOperatorValues.LessThanOrEqual: return XLFilterOperator.EqualOrLessThan;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLFilterDynamicType ToClosedXml(this DynamicFilterValues value)
-        {
-            switch (value)
-            {
-                case DynamicFilterValues.AboveAverage: return XLFilterDynamicType.AboveAverage;
-                case DynamicFilterValues.BelowAverage: return XLFilterDynamicType.BelowAverage;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLSheetViewOptions ToClosedXml(this SheetViewValues value)
-        {
-            switch (value)
-            {
-                case SheetViewValues.Normal: return XLSheetViewOptions.Normal;
-                case SheetViewValues.PageBreakPreview: return XLSheetViewOptions.PageBreakPreview;
-                case SheetViewValues.PageLayout: return XLSheetViewOptions.PageLayout;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLLineStyle ToClosedXml(this StrokeLineStyleValues value)
-        {
-            switch (value)
-            {
-                case StrokeLineStyleValues.Single: return XLLineStyle.Single;
-                case StrokeLineStyleValues.ThickBetweenThin: return XLLineStyle.ThickBetweenThin;
-                case StrokeLineStyleValues.ThickThin: return XLLineStyle.ThickThin;
-                case StrokeLineStyleValues.ThinThick: return XLLineStyle.ThinThick;
-                case StrokeLineStyleValues.ThinThin: return XLLineStyle.ThinThin;
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLConditionalFormatType ToClosedXml(this ConditionalFormatValues value)
-        {
-            switch (value)
-            {
-                case ConditionalFormatValues.Expression: return XLConditionalFormatType.Expression;
-                case ConditionalFormatValues.CellIs: return XLConditionalFormatType.CellIs;
-                case ConditionalFormatValues.ColorScale: return XLConditionalFormatType.ColorScale;
-                case ConditionalFormatValues.DataBar: return XLConditionalFormatType.DataBar;
-                case ConditionalFormatValues.IconSet: return XLConditionalFormatType.IconSet;
-                case ConditionalFormatValues.Top10: return XLConditionalFormatType.Top10;
-                case ConditionalFormatValues.UniqueValues: return XLConditionalFormatType.IsUnique;
-                case ConditionalFormatValues.DuplicateValues: return XLConditionalFormatType.IsDuplicate;
-                case ConditionalFormatValues.ContainsText: return XLConditionalFormatType.ContainsText;
-                case ConditionalFormatValues.NotContainsText: return XLConditionalFormatType.NotContainsText;
-                case ConditionalFormatValues.BeginsWith: return XLConditionalFormatType.StartsWith;
-                case ConditionalFormatValues.EndsWith: return XLConditionalFormatType.EndsWith;
-                case ConditionalFormatValues.ContainsBlanks: return XLConditionalFormatType.IsBlank;
-                case ConditionalFormatValues.NotContainsBlanks: return XLConditionalFormatType.NotBlank;
-                case ConditionalFormatValues.ContainsErrors: return XLConditionalFormatType.IsError;
-                case ConditionalFormatValues.NotContainsErrors: return XLConditionalFormatType.NotError;
-                case ConditionalFormatValues.TimePeriod: return XLConditionalFormatType.TimePeriod;
-                case ConditionalFormatValues.AboveAverage: return XLConditionalFormatType.AboveAverage;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLCFContentType ToClosedXml(this ConditionalFormatValueObjectValues value)
-        {
-            switch (value)
-            {
-                case ConditionalFormatValueObjectValues.Number: return XLCFContentType.Number;
-                case ConditionalFormatValueObjectValues.Percent: return XLCFContentType.Percent;
-                case ConditionalFormatValueObjectValues.Max: return XLCFContentType.Maximum;
-                case ConditionalFormatValueObjectValues.Min: return XLCFContentType.Minimum;
-                case ConditionalFormatValueObjectValues.Formula: return XLCFContentType.Formula;
-                case ConditionalFormatValueObjectValues.Percentile: return XLCFContentType.Percentile;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        public static XLCFOperator ToClosedXml(this ConditionalFormattingOperatorValues value)
-        {
-            switch (value)
-            {
-                case ConditionalFormattingOperatorValues.LessThan: return XLCFOperator.LessThan;
-                case ConditionalFormattingOperatorValues.LessThanOrEqual: return XLCFOperator.EqualOrLessThan;
-                case ConditionalFormattingOperatorValues.Equal: return XLCFOperator.Equal;
-                case ConditionalFormattingOperatorValues.NotEqual: return XLCFOperator.NotEqual;
-                case ConditionalFormattingOperatorValues.GreaterThanOrEqual: return XLCFOperator.EqualOrGreaterThan;
-                case ConditionalFormattingOperatorValues.GreaterThan: return XLCFOperator.GreaterThan;
-                case ConditionalFormattingOperatorValues.Between: return XLCFOperator.Between;
-                case ConditionalFormattingOperatorValues.NotBetween: return XLCFOperator.NotBetween;
-                case ConditionalFormattingOperatorValues.ContainsText: return XLCFOperator.Contains;
-                case ConditionalFormattingOperatorValues.NotContains: return XLCFOperator.NotContains;
-                case ConditionalFormattingOperatorValues.BeginsWith: return XLCFOperator.StartsWith;
-                case ConditionalFormattingOperatorValues.EndsWith: return XLCFOperator.EndsWith;
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-
-        public static XLIconSetStyle ToClosedXml(this IconSetValues value)
-        {
-            switch (value)
-            {
-                case IconSetValues.ThreeArrows: return XLIconSetStyle.ThreeArrows;
-                case IconSetValues.ThreeArrowsGray: return XLIconSetStyle.ThreeArrowsGray;
-                case IconSetValues.ThreeFlags: return XLIconSetStyle.ThreeFlags;
-                case IconSetValues.ThreeTrafficLights1: return XLIconSetStyle.ThreeTrafficLights1;
-                case IconSetValues.ThreeTrafficLights2: return XLIconSetStyle.ThreeTrafficLights2;
-                case IconSetValues.ThreeSigns: return XLIconSetStyle.ThreeSigns;
-                case IconSetValues.ThreeSymbols: return XLIconSetStyle.ThreeSymbols;
-                case IconSetValues.ThreeSymbols2: return XLIconSetStyle.ThreeSymbols2;
-                case IconSetValues.FourArrows: return XLIconSetStyle.FourArrows;
-                case IconSetValues.FourArrowsGray: return XLIconSetStyle.FourArrowsGray;
-                case IconSetValues.FourRedToBlack: return XLIconSetStyle.FourRedToBlack;
-                case IconSetValues.FourRating: return XLIconSetStyle.FourRating;
-                case IconSetValues.FourTrafficLights: return XLIconSetStyle.FourTrafficLights;
-                case IconSetValues.FiveArrows: return XLIconSetStyle.FiveArrows;
-                case IconSetValues.FiveArrowsGray: return XLIconSetStyle.FiveArrowsGray;
-                case IconSetValues.FiveRating: return XLIconSetStyle.FiveRating;
-                case IconSetValues.FiveQuarters: return XLIconSetStyle.FiveQuarters;
-
-
-                #region default
-                default:
-                    throw new ApplicationException("Not implemented value!");
-                #endregion
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/IXLHyperlinks.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/IXLHyperlinks.cs
deleted file mode 100644
index 2fd3b44..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/IXLHyperlinks.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLHyperlinks: IEnumerable<XLHyperlink>
-    {
-        void Add(XLHyperlink hyperlink);
-        void Delete(XLHyperlink hyperlink);
-        void Delete(IXLAddress address);
-        
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlink_Internal.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlink_Internal.cs
deleted file mode 100644
index db4f36b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlink_Internal.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public partial class XLHyperlink
-    {
-        internal XLHyperlink()
-        { 
-
-        }
-
-        internal XLHyperlink(XLHyperlink hyperlink)
-        {
-            _externalAddress = hyperlink._externalAddress;
-            _internalAddress = hyperlink._internalAddress;
-            Tooltip = hyperlink.Tooltip;
-            IsExternal = hyperlink.IsExternal;
-        }
-
-        internal void SetValues(String address, String tooltip)
-        {
-            Tooltip = tooltip;
-            if (address[0] == '.')
-            {
-                _externalAddress = new Uri(address, UriKind.Relative);
-                IsExternal = true;
-            }
-            else
-            {
-                Uri uri;
-                if(Uri.TryCreate(address, UriKind.Absolute, out uri))
-                {
-                    _externalAddress = uri;
-                    IsExternal = true;
-                }
-                else
-                {
-                    _internalAddress = address;
-                    IsExternal = false;    
-                }
-            }
-        }
-
-        internal void SetValues(Uri uri, String tooltip)
-        {
-            Tooltip = tooltip;
-            _externalAddress = uri;
-            IsExternal = true;
-        }
-
-        internal void SetValues(IXLCell cell, String tooltip)
-        {
-            Tooltip = tooltip;
-            _internalAddress = cell.Address.ToString();
-            IsExternal = false;
-        }
-
-        internal void SetValues(IXLRangeBase range, String tooltip)
-        {
-            Tooltip = tooltip;
-            _internalAddress = range.RangeAddress.ToString();
-            IsExternal = false;
-        }
-
-        internal XLWorksheet Worksheet { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlink_public.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlink_public.cs
deleted file mode 100644
index 3f0dab5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlink_public.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    public partial class XLHyperlink
-    {
-        private Uri _externalAddress;
-        private String _internalAddress;
-
-        public XLHyperlink(String address)
-        {
-            SetValues(address, String.Empty);
-        }
-
-        public XLHyperlink(String address, String tooltip)
-        {
-            SetValues(address, tooltip);
-        }
-
-        public XLHyperlink(IXLCell cell)
-        {
-            SetValues(cell, String.Empty);
-        }
-
-        public XLHyperlink(IXLCell cell, String tooltip)
-        {
-            SetValues(cell, tooltip);
-        }
-
-        public XLHyperlink(IXLRangeBase range)
-        {
-            SetValues(range, String.Empty);
-        }
-
-        public XLHyperlink(IXLRangeBase range, String tooltip)
-        {
-            SetValues(range, tooltip);
-        }
-
-        public XLHyperlink(Uri uri)
-        {
-            SetValues(uri, String.Empty);
-        }
-
-        public XLHyperlink(Uri uri, String tooltip)
-        {
-            SetValues(uri, tooltip);
-        }
-
-        public Boolean IsExternal { get; set; }
-
-        public Uri ExternalAddress
-        {
-            get
-            {
-                return IsExternal ? _externalAddress : null;
-            }
-            set
-            {
-                _externalAddress = value;
-                IsExternal = true;
-            }
-        }
-
-        public IXLCell Cell { get; internal set; }
-
-        public String InternalAddress
-        {
-            get
-            {
-                if (IsExternal)
-                    return null;
-                if (_internalAddress.Contains('!'))
-                {
-                    return _internalAddress[0] != '\''
-                               ? String.Format("'{0}'!{1}", _internalAddress.Substring(0, _internalAddress.IndexOf('!')),
-                                               _internalAddress.Substring(_internalAddress.IndexOf('!') + 1))
-                               : _internalAddress;
-                }
-                return String.Format("'{0}'!{1}", Worksheet.Name, _internalAddress);
-            }
-            set
-            {
-                _internalAddress = value;
-                IsExternal = false;
-            }
-        }
-
-        public String Tooltip { get; set; }
-
-        public void Delete()
-        {
-            if (Cell == null) return;
-            Worksheet.Hyperlinks.Delete(Cell.Address);
-            if (Cell.Style.Font.FontColor.Equals(XLColor.FromTheme(XLThemeColor.Hyperlink)))
-                Cell.Style.Font.FontColor = Worksheet.Style.Font.FontColor;
-
-            Cell.Style.Font.Underline = Worksheet.Style.Font.Underline;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlinks.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlinks.cs
deleted file mode 100644
index 8d980da..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Hyperlinks/XLHyperlinks.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    internal class XLHyperlinks: IXLHyperlinks
-    {
-        private Dictionary<IXLAddress, XLHyperlink> hyperlinks = new Dictionary<IXLAddress, XLHyperlink>();
-        public IEnumerator<XLHyperlink> GetEnumerator()
-        {
-            return hyperlinks.Values.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Add(XLHyperlink hyperlink)
-        {
-            hyperlinks.Add(hyperlink.Cell.Address, hyperlink);
-        }
-
-        public void Delete(XLHyperlink hyperlink)
-        {
-            hyperlinks.Remove(hyperlink.Cell.Address);
-        }
-
-        public void Delete(IXLAddress address)
-        {
-            hyperlinks.Remove(address);
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLOutline.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLOutline.cs
deleted file mode 100644
index aae00ee..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLOutline.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-namespace ClosedXML.Excel
-{
-    public enum XLOutlineSummaryVLocation { Top, Bottom };
-    public enum XLOutlineSummaryHLocation { Left, Right };
-    public interface IXLOutline
-    {
-        XLOutlineSummaryVLocation SummaryVLocation { get; set; }
-        XLOutlineSummaryHLocation SummaryHLocation { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLSheetProtection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLSheetProtection.cs
deleted file mode 100644
index 149ae06..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLSheetProtection.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLSheetProtection
-    {
-        Boolean Protected { get; set; }
-
-        Boolean AutoFilter { get; set; }
-        Boolean DeleteColumns { get; set; }
-        Boolean DeleteRows { get; set; }
-        Boolean FormatCells { get; set; }
-        Boolean FormatColumns { get; set; }
-        Boolean FormatRows { get; set; }
-        Boolean InsertColumns { get; set; }
-        Boolean InsertHyperlinks { get; set; }
-        Boolean InsertRows { get; set; }
-        Boolean Objects { get; set; }
-        Boolean PivotTables { get; set; }
-        Boolean Scenarios { get; set; }
-        Boolean SelectLockedCells { get; set; }
-        Boolean SelectUnlockedCells { get; set; }
-        Boolean Sort { get; set; }
-
-        IXLSheetProtection SetAutoFilter(); IXLSheetProtection SetAutoFilter(Boolean value);
-        IXLSheetProtection SetDeleteColumns(); IXLSheetProtection SetDeleteColumns(Boolean value);
-        IXLSheetProtection SetDeleteRows(); IXLSheetProtection SetDeleteRows(Boolean value);
-        IXLSheetProtection SetFormatCells(); IXLSheetProtection SetFormatCells(Boolean value);
-        IXLSheetProtection SetFormatColumns(); IXLSheetProtection SetFormatColumns(Boolean value);
-        IXLSheetProtection SetFormatRows(); IXLSheetProtection SetFormatRows(Boolean value);
-        IXLSheetProtection SetInsertColumns(); IXLSheetProtection SetInsertColumns(Boolean value);
-        IXLSheetProtection SetInsertHyperlinks(); IXLSheetProtection SetInsertHyperlinks(Boolean value);
-        IXLSheetProtection SetInsertRows(); IXLSheetProtection SetInsertRows(Boolean value);
-        IXLSheetProtection SetObjects(); IXLSheetProtection SetObjects(Boolean value);
-        IXLSheetProtection SetPivotTables(); IXLSheetProtection SetPivotTables(Boolean value);
-        IXLSheetProtection SetScenarios(); IXLSheetProtection SetScenarios(Boolean value);
-        IXLSheetProtection SetSelectLockedCells(); IXLSheetProtection SetSelectLockedCells(Boolean value);
-        IXLSheetProtection SetSelectUnlockedCells(); IXLSheetProtection SetSelectUnlockedCells(Boolean value);
-        IXLSheetProtection SetSort(); IXLSheetProtection SetSort(Boolean value);
-
-        IXLSheetProtection Protect();
-        IXLSheetProtection Protect(String password);
-        IXLSheetProtection Unprotect();
-        IXLSheetProtection Unprotect(String password);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLSheetView.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLSheetView.cs
deleted file mode 100644
index eee1ed0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLSheetView.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLSheetViewOptions { Normal, PageBreakPreview, PageLayout }
-    public interface IXLSheetView
-    {
-        /// <summary>
-        /// Gets or sets the row after which the vertical split should take place.
-        /// </summary>
-        Int32 SplitRow { get; set; }
-        /// <summary>
-        /// Gets or sets the column after which the horizontal split should take place.
-        /// </summary>
-        Int32 SplitColumn { get; set; }
-        //Boolean FreezePanes { get; set; }
-        /// <summary>
-        /// Freezes the top X rows.
-        /// </summary>
-        /// <param name="rows">The rows to freeze.</param>
-        void FreezeRows(Int32 rows);
-        /// <summary>
-        /// Freezes the left X columns.
-        /// </summary>
-        /// <param name="columns">The columns to freeze.</param>
-        void FreezeColumns(Int32 columns);
-        /// <summary>
-        /// Freezes the specified rows and columns.
-        /// </summary>
-        /// <param name="rows">The rows to freeze.</param>
-        /// <param name="columns">The columns to freeze.</param>
-        void Freeze(Int32 rows, Int32 columns);
-
-        XLSheetViewOptions View { get; set; }
-
-        IXLSheetView SetView(XLSheetViewOptions value);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLTheme.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLTheme.cs
deleted file mode 100644
index b4daa78..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLTheme.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-namespace ClosedXML.Excel
-{
-    public interface IXLTheme
-    {
-        XLColor Background1 { get; set; }
-        XLColor Text1 { get; set; }
-        XLColor Background2 { get; set; }
-        XLColor Text2 { get; set; }
-        XLColor Accent1 { get; set; }
-        XLColor Accent2 { get; set; }
-        XLColor Accent3 { get; set; }
-        XLColor Accent4 { get; set; }
-        XLColor Accent5 { get; set; }
-        XLColor Accent6 { get; set; }
-        XLColor Hyperlink { get; set; }
-        XLColor FollowedHyperlink { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheet.cs
deleted file mode 100644
index 0d9dcd6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheet.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLWorksheetVisibility { Visible, Hidden, VeryHidden }
-    public interface IXLWorksheet : IXLRangeBase
-    {
-        /// <summary>
-        /// Gets the workbook that contains this worksheet
-        /// </summary>
-        XLWorkbook Workbook { get; }
-
-        /// <summary>
-        /// Gets or sets the default column width for this worksheet.
-        /// </summary>
-        Double ColumnWidth { get; set; }
-        /// <summary>
-        /// Gets or sets the default row height for this worksheet.
-        /// </summary>
-        Double RowHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name (caption) of this worksheet.
-        /// </summary>
-        String Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the position of the sheet.
-        /// <para>When setting the Position all other sheets' positions are shifted accordingly.</para>
-        /// </summary>
-        Int32 Position { get; set; }
-
-        /// <summary>
-        /// Gets an object to manipulate the sheet's print options.
-        /// </summary>
-        IXLPageSetup PageSetup { get; }
-        /// <summary>
-        /// Gets an object to manipulate the Outline levels.
-        /// </summary>
-        IXLOutline Outline { get; }
-
-        /// <summary>
-        /// Gets the first row of the worksheet.
-        /// </summary>
-        IXLRow FirstRow();
-        /// <summary>
-        /// Gets the first row of the worksheet that contains a cell with a value.
-        /// <para>Formatted empty cells do not count.</para>
-        /// </summary>
-        IXLRow FirstRowUsed();
-        /// <summary>
-        /// Gets the first row of the worksheet that contains a cell with a value.
-        /// </summary>
-        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
-        IXLRow FirstRowUsed(Boolean includeFormats);
-        /// <summary>
-        /// Gets the last row of the worksheet.
-        /// </summary>
-        IXLRow LastRow();
-        /// <summary>
-        /// Gets the last row of the worksheet that contains a cell with a value.
-        /// </summary>
-        IXLRow LastRowUsed();
-        /// <summary>
-        /// Gets the last row of the worksheet that contains a cell with a value.
-        /// </summary>
-        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
-        IXLRow LastRowUsed(Boolean includeFormats);
-        /// <summary>
-        /// Gets the first column of the worksheet.
-        /// </summary>
-        IXLColumn FirstColumn();
-        /// <summary>
-        /// Gets the first column of the worksheet that contains a cell with a value.
-        /// </summary>
-        IXLColumn FirstColumnUsed();
-        /// <summary>
-        /// Gets the first column of the worksheet that contains a cell with a value.
-        /// </summary>
-        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
-        IXLColumn FirstColumnUsed(Boolean includeFormats);
-        /// <summary>
-        /// Gets the last column of the worksheet.
-        /// </summary>
-        IXLColumn LastColumn();
-        /// <summary>
-        /// Gets the last column of the worksheet that contains a cell with a value.
-        /// </summary>
-        IXLColumn LastColumnUsed();
-        /// <summary>
-        /// Gets the last column of the worksheet that contains a cell with a value.
-        /// </summary>
-        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
-        IXLColumn LastColumnUsed(Boolean includeFormats);
-        /// <summary>
-        /// Gets a collection of all columns in this worksheet.
-        /// </summary>
-        IXLColumns Columns();
-        /// <summary>
-        /// Gets a collection of the specified columns in this worksheet, separated by commas.
-        /// <para>e.g. Columns("G:H"), Columns("10:11,13:14"), Columns("P:Q,S:T"), Columns("V")</para>
-        /// </summary>
-        /// <param name="columns">The columns to return.</param>
-        IXLColumns Columns(String columns);
-        /// <summary>
-        /// Gets a collection of the specified columns in this worksheet.
-        /// </summary>
-        /// <param name="firstColumn">The first column to return.</param>
-        /// <param name="lastColumn">The last column to return.</param>
-        IXLColumns Columns(String firstColumn, String lastColumn);
-        /// <summary>
-        /// Gets a collection of the specified columns in this worksheet.
-        /// </summary>
-        /// <param name="firstColumn">The first column to return.</param>
-        /// <param name="lastColumn">The last column to return.</param>
-        IXLColumns Columns(Int32 firstColumn, Int32 lastColumn);
-        /// <summary>
-        /// Gets a collection of all rows in this worksheet.
-        /// </summary>
-        IXLRows Rows();
-        /// <summary>
-        /// Gets a collection of the specified rows in this worksheet, separated by commas.
-        /// <para>e.g. Rows("4:5"), Rows("7:8,10:11"), Rows("13")</para>
-        /// </summary>
-        /// <param name="rows">The rows to return.</param>
-        IXLRows Rows(String rows);
-        /// <summary>
-        /// Gets a collection of the specified rows in this worksheet.
-        /// </summary>
-        /// <param name="firstRow">The first row to return.</param>
-        /// <param name="lastRow">The last row to return.</param>
-        /// <returns></returns>
-        IXLRows Rows(Int32 firstRow, Int32 lastRow);
-        /// <summary>
-        /// Gets the specified row of the worksheet.
-        /// </summary>
-        /// <param name="row">The worksheet's row.</param>
-        IXLRow Row(Int32 row);
-        /// <summary>
-        /// Gets the specified column of the worksheet.
-        /// </summary>
-        /// <param name="column">The worksheet's column.</param>
-        IXLColumn Column(Int32 column);
-        /// <summary>
-        /// Gets the specified column of the worksheet.
-        /// </summary>
-        /// <param name="column">The worksheet's column.</param>
-        IXLColumn Column(String column);
-        /// <summary>
-        /// Gets the cell at the specified row and column.
-        /// </summary>
-        /// <param name="row">The cell's row.</param>
-        /// <param name="column">The cell's column.</param>
-        IXLCell Cell(int row, int column);
-        /// <summary>Gets the cell at the specified address.</summary>
-        /// <param name="cellAddressInRange">The cell address in the worksheet.</param>
-        IXLCell Cell(string cellAddressInRange);
-        /// <summary>
-        /// Gets the cell at the specified row and column.
-        /// </summary>
-        /// <param name="row">The cell's row.</param>
-        /// <param name="column">The cell's column.</param>
-        IXLCell Cell(int row, string column);
-        /// <summary>Gets the cell at the specified address.</summary>
-        /// <param name="cellAddressInRange">The cell address in the worksheet.</param>
-        IXLCell Cell(IXLAddress cellAddressInRange);
-
-        /// <summary>
-        /// Returns the specified range.
-        /// </summary>
-        /// <param name="rangeAddress">The range boundaries.</param>
-        IXLRange Range(IXLRangeAddress rangeAddress);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <para>e.g. Range("A1"), Range("A1:C2")</para>
-        /// <param name="rangeAddress">The range boundaries.</param>
-        IXLRange Range(string rangeAddress);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCell">The first cell in the range.</param>
-        /// <param name="lastCell"> The last cell in the range.</param>
-        IXLRange Range(IXLCell firstCell, IXLCell lastCell);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCellAddress">The first cell address in the worksheet.</param>
-        /// <param name="lastCellAddress"> The last cell address in the worksheet.</param>
-        IXLRange Range(string firstCellAddress, string lastCellAddress);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCellAddress">The first cell address in the worksheet.</param>
-        /// <param name="lastCellAddress"> The last cell address in the worksheet.</param>
-        IXLRange Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress);
-
-        /// <summary>Returns a collection of ranges, separated by commas.</summary>
-        /// <para>e.g. Ranges("A1"), Ranges("A1:C2"), Ranges("A1:B2,D1:D4")</para>
-        /// <param name="ranges">The ranges to return.</param>
-        IXLRanges Ranges(string ranges);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCellRow">   The first cell's row of the range to return.</param>
-        /// <param name="firstCellColumn">The first cell's column of the range to return.</param>
-        /// <param name="lastCellRow">    The last cell's row of the range to return.</param>
-        /// <param name="lastCellColumn"> The last cell's column of the range to return.</param>
-        /// <returns>.</returns>
-        IXLRange Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn);
-
-        /// <summary>Gets the number of rows in this worksheet.</summary>
-        int RowCount();
-
-        /// <summary>Gets the number of columns in this worksheet.</summary>
-        int ColumnCount();
-
-        /// <summary>
-        /// Collapses all outlined rows.
-        /// </summary>
-        IXLWorksheet CollapseRows();
-        /// <summary>
-        /// Collapses all outlined columns.
-        /// </summary>
-        IXLWorksheet CollapseColumns();
-        /// <summary>
-        /// Expands all outlined rows.
-        /// </summary>
-        IXLWorksheet ExpandRows();
-        /// <summary>
-        /// Expands all outlined columns.
-        /// </summary>
-        IXLWorksheet ExpandColumns();
-
-        /// <summary>
-        /// Collapses the outlined rows of the specified level.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        IXLWorksheet CollapseRows(Int32 outlineLevel);
-        /// <summary>
-        /// Collapses the outlined columns of the specified level.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        IXLWorksheet CollapseColumns(Int32 outlineLevel);
-        /// <summary>
-        /// Expands the outlined rows of the specified level.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        IXLWorksheet ExpandRows(Int32 outlineLevel);
-        /// <summary>
-        /// Expands the outlined columns of the specified level.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        IXLWorksheet ExpandColumns(Int32 outlineLevel);
-
-        /// <summary>
-        /// Deletes this worksheet.
-        /// </summary>
-        void Delete();
-
-
-        /// <summary>
-        /// Gets an object to manage this worksheet's named ranges.
-        /// </summary>
-        IXLNamedRanges NamedRanges { get; }
-        /// <summary>
-        /// Gets the specified named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the range.</param>
-        IXLNamedRange NamedRange(String rangeName);
-
-        /// <summary>
-        /// Gets an object to manage how the worksheet is going to displayed by Excel.
-        /// </summary>
-        IXLSheetView SheetView { get; }
-
-        /// <summary>
-        /// Gets the Excel table of the given index
-        /// </summary>
-        /// <param name="index">Index of the table to return</param>
-        IXLTable Table(Int32 index);
-        /// <summary>
-        /// Gets the Excel table of the given name
-        /// </summary>
-        /// <param name="name">Name of the table to return</param>
-        IXLTable Table(String name);
-        /// <summary>
-        /// Gets an object to manage this worksheet's Excel tables
-        /// </summary>
-        IXLTables Tables { get; }
-
-        /// <summary>
-        /// Copies the 
-        /// </summary>
-        /// <param name="newSheetName"></param>
-        /// <returns></returns>
-        IXLWorksheet CopyTo(String newSheetName);
-        IXLWorksheet CopyTo(String newSheetName, Int32 position);
-        IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName);
-        IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName, Int32 position);
-
-        IXLRange RangeUsed();
-        IXLRange RangeUsed(bool includeFormats);
-
-        IXLDataValidations DataValidations { get; }
-
-        XLWorksheetVisibility Visibility { get; set; }
-        IXLWorksheet Hide();
-        IXLWorksheet Unhide();
-
-        IXLSheetProtection Protection { get; }
-        IXLSheetProtection Protect();
-        IXLSheetProtection Protect(String password);
-        IXLSheetProtection Unprotect();
-        IXLSheetProtection Unprotect(String password);
-
-        IXLSortElements SortRows { get; }
-        IXLSortElements SortColumns { get; }
-
-        IXLRange Sort();
-
-        IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-
-        //IXLCharts Charts { get; }
-
-        Boolean ShowFormulas { get; set; }
-        Boolean ShowGridLines { get; set; }
-        Boolean ShowOutlineSymbols { get; set; }
-        Boolean ShowRowColHeaders { get; set; }
-        Boolean ShowRuler { get; set; }
-        Boolean ShowWhiteSpace { get; set; }
-        Boolean ShowZeros { get; set; }
-
-        IXLWorksheet SetShowFormulas(); IXLWorksheet SetShowFormulas(Boolean value);
-        IXLWorksheet SetShowGridLines(); IXLWorksheet SetShowGridLines(Boolean value);
-        IXLWorksheet SetShowOutlineSymbols(); IXLWorksheet SetShowOutlineSymbols(Boolean value);
-        IXLWorksheet SetShowRowColHeaders(); IXLWorksheet SetShowRowColHeaders(Boolean value);
-        IXLWorksheet SetShowRuler(); IXLWorksheet SetShowRuler(Boolean value);
-        IXLWorksheet SetShowWhiteSpace(); IXLWorksheet SetShowWhiteSpace(Boolean value);
-        IXLWorksheet SetShowZeros(); IXLWorksheet SetShowZeros(Boolean value);
-
-
-        XLColor TabColor { get; set; }
-        IXLWorksheet SetTabColor(XLColor color);
-
-        Boolean TabSelected { get; set; }
-        Boolean TabActive { get; set; }
-
-        IXLWorksheet SetTabSelected(); IXLWorksheet SetTabSelected(Boolean value);
-        IXLWorksheet SetTabActive(); IXLWorksheet SetTabActive(Boolean value);
-
-        IXLPivotTable PivotTable(String name);
-        IXLPivotTables PivotTables { get; }
-
-        Boolean RightToLeft { get; set; }
-        IXLWorksheet SetRightToLeft(); IXLWorksheet SetRightToLeft(Boolean value);
-
-        IXLBaseAutoFilter AutoFilter { get; }
-
-        IXLRows RowsUsed(Boolean includeFormats = false, Func<IXLRow, Boolean> predicate = null);
-        IXLRows RowsUsed(Func<IXLRow, Boolean> predicate);
-        IXLColumns ColumnsUsed(Boolean includeFormats = false, Func<IXLColumn, Boolean> predicate = null);
-        IXLColumns ColumnsUsed(Func<IXLColumn, Boolean> predicate);
-
-        IXLRanges MergedRanges { get; }
-        IXLConditionalFormats ConditionalFormats { get; }
-
-        IXLRanges SelectedRanges { get; }
-        IXLCell ActiveCell { get; set; }
-
-        Object Evaluate(String expression);
-
-        String Author { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheets.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheets.cs
deleted file mode 100644
index ea10629..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheets.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLWorksheets: IEnumerable<IXLWorksheet>
-    {
-        int Count { get; }
-        bool TryGetWorksheet(string sheetName,out IXLWorksheet worksheet);
-
-        IXLWorksheet Worksheet(String sheetName);
-        IXLWorksheet Worksheet(Int32 position);
-        IXLWorksheet Add(String sheetName);
-        IXLWorksheet Add(String sheetName, Int32 position);
-        IXLWorksheet Add(DataTable dataTable);
-        IXLWorksheet Add(DataTable dataTable, String sheetName);
-        void Add(DataSet dataSet);
-        void Delete(String sheetName);
-        void Delete(Int32 position);
-
-        
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLCallbackAction.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLCallbackAction.cs
deleted file mode 100644
index 9238200..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLCallbackAction.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel.Misc
-{
-	internal class XLCallbackAction
-	{
-		public XLCallbackAction(Action<XLRange, Int32> action)
-		{
-			this.Action = action;
-		}
-
-		public Action<XLRange, Int32> Action { get; set; }
-	}
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLDictionary.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLDictionary.cs
deleted file mode 100644
index a79707c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLDictionary.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public class XLDictionary<T>: Dictionary<Int32, T>
-    {
-        public XLDictionary()
-        {
-            
-        }
-        public XLDictionary(XLDictionary<T> other)
-        {
-            other.Values.ForEach(Add);
-        }
-
-        public void Initialize(T value)
-        {
-            if (Count > 0)
-                Clear();
-
-            Add(value);
-        }
-
-        public void Add(T value)
-        {
-            Add(Count + 1, value);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLFormula.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLFormula.cs
deleted file mode 100644
index 2ff7a44..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLFormula.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public class XLFormula
-    {
-        public XLFormula()
-        {}
-
-        public XLFormula(XLFormula defaultFormula)
-        {
-            _value = defaultFormula._value;
-            IsFormula = defaultFormula.IsFormula;
-        }
-
-        public XLFormula(String value)
-        {
-            Value = value;
-        }
-
-        public XLFormula(double value)
-        {
-            Value = value.ToInvariantString();
-        }
-        
-        public XLFormula(int value)
-        {
-            Value = value.ToInvariantString();
-        }
-
-        internal String _value;
-        public String Value 
-        { 
-            get { return _value; }
-            set
-            {
-                if (value == null)
-                {
-                    _value = String.Empty;
-                }
-                else
-                {
-                    _value = value.Trim();
-                    IsFormula = !XLHelper.IsNullOrWhiteSpace(_value) && _value.TrimStart()[0] == '=' ;
-                    if (IsFormula)
-                        _value = _value.Substring(1);
-                }
-                
-
-            }
-        }
-
-        public Boolean IsFormula { get; internal set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLIdManager.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLIdManager.cs
deleted file mode 100644
index 1c8c7fd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLIdManager.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLIdManager
-    {
-        private HashSet<Int32> _hash = new HashSet<Int32>();
-        
-
-        public Int32 GetNext()
-        {
-            if (_hash.Count == 0)
-            {
-                _hash.Add(1);
-                return 1;
-            }
-
-            Int32 id = 1;
-            while (true)
-            {
-                if (!_hash.Contains(id))
-                {
-                    _hash.Add(id);
-                    return id;
-                }
-                id++;
-            }
-        }
-        public void Add(Int32 value)
-        {
-            _hash.Add(value);
-        }
-        public void Add(IEnumerable<Int32> values)
-        {
-            values.ForEach(v => _hash.Add(v));
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLReentrantEnumerableSet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLReentrantEnumerableSet.cs
deleted file mode 100644
index c902733..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Misc/XLReentrantEnumerableSet.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
-
-namespace ClosedXML.Excel.Misc
-{
-	/// <summary>
-	/// This is most definitely NOT thread-safe, but it is reentrant (e.g. you can insert and remove
-	/// items during enumeration)
-	/// </summary>
-	/// <typeparam name="T"></typeparam>
-	internal class XLReentrantEnumerableSet<T> : IEnumerable<T>
-	{
-		private HashSet<T> _hashSet;
-		private List<T> _list;
-
-		private int _activeEnumerators;
-
-		public XLReentrantEnumerableSet()
-		{
-			_list = new List<T>();
-			_hashSet = new HashSet<T>();
-		}
-
-		public void Add(T item)
-		{
-			if(!_hashSet.Contains(item))
-			{
-				// Add item to end of list
-				_list.Add(item);
-
-				// Store the item in the hashset too.
-				_hashSet.Add(item);
-			}
-		}
-
-		public void Remove(T item)
-		{
-			_hashSet.Remove(item);
-			
-			fixup();
-		}
-
-		private void fixup()
-		{
-			// Only fixup the list if there are no active enumerators
-			if(_activeEnumerators > 0)
-				return;
-
-			// Only fixup the list if there are more than a certain number of items to deal with
-			// This saves fixing up the list continually.
-			if(_list.Count < 1000 || (_list.Count < _hashSet.Count * 1.5))
-				return;
-
-			// Rebuild the list skipping out omitted items
-			_list = _list.Where(item => _hashSet.Contains(item)).ToList();
-		}
-		
-		public IEnumerator<T> GetEnumerator()
-		{
-			// Mark that we are enumerating
-			_activeEnumerators++;
-			try
-			{
-				int idx = 0;
-
-				// Important, store count here, as more items may be added while we are enumerating
-				// and we only want to enumerate items that were already there.
-				int count = _list.Count;
-				while(idx < count)
-				{
-					var item = _list[idx];
-
-					// Skip over items in the list which aren't in the hashset; they could have been
-					// removed while we were enumerating or previously removed.
-					if(_hashSet.Contains(item))
-					{
-						yield return item;
-					}
-
-					idx++;
-				}
-
-			}
-			finally
-			{
-				// Finished enumerating, can now fixup
-				_activeEnumerators--;
-				fixup();
-			}
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return this.GetEnumerator();
-		}
-	}
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/IXLNamedRange.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/IXLNamedRange.cs
deleted file mode 100644
index 886f1e0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/IXLNamedRange.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLNamedRange
-    {
-        /// <summary>
-        /// Gets or sets the name of the range.
-        /// </summary>
-        /// <value>
-        /// The name of the range.
-        /// </value>
-        String Name { get; set; }
-
-        /// <summary>
-        /// Gets the ranges associated with this named range.
-        /// <para>Note: A named range can point to multiple ranges.</para>
-        /// </summary>
-        IXLRanges Ranges { get; }
-
-        /// <summary>
-        /// Gets or sets the comment for this named range.
-        /// </summary>
-        /// <value>
-        /// The comment for this named range.
-        /// </value>
-        String Comment { get; set; }
-
-        /// <summary>
-        /// Adds the specified range to this named range.
-        /// <para>Note: A named range can point to multiple ranges.</para>
-        /// </summary>
-        /// <param name="workbook">Workbook containing the range</param>
-        /// <param name="rangeAddress">The range address to add.</param>
-        IXLRanges Add(XLWorkbook workbook, String rangeAddress);
-
-        /// <summary>
-        /// Adds the specified range to this named range.
-        /// <para>Note: A named range can point to multiple ranges.</para>
-        /// </summary>
-        /// <param name="range">The range to add.</param>
-        IXLRanges Add(IXLRange range);
-
-        /// <summary>
-        /// Adds the specified ranges to this named range.
-        /// <para>Note: A named range can point to multiple ranges.</para>
-        /// </summary>
-        /// <param name="ranges">The ranges to add.</param>
-        IXLRanges Add(IXLRanges ranges);
-
-
-        /// <summary>
-        /// Deletes this named range (not the cells).
-        /// </summary>
-        void Delete();
-
-        /// <summary>
-        /// Clears the list of ranges associated with this named range.
-        /// <para>(it does not clear the cells)</para>
-        /// </summary>
-        void Clear();
-
-        /// <summary>
-        /// Removes the specified range from this named range.
-        /// <para>Note: A named range can point to multiple ranges.</para>
-        /// </summary>
-        /// <param name="rangeAddress">The range address to remove.</param>
-        void Remove(String rangeAddress);
-
-        /// <summary>
-        /// Removes the specified range from this named range.
-        /// <para>Note: A named range can point to multiple ranges.</para>
-        /// </summary>
-        /// <param name="rangeAddress">The range to remove.</param>
-        void Remove(IXLRange range);
-
-        /// <summary>
-        /// Removes the specified ranges from this named range.
-        /// <para>Note: A named range can point to multiple ranges.</para>
-        /// </summary>
-        /// <param name="rangeAddress">The ranges to remove.</param>
-        void Remove(IXLRanges ranges);
-
-
-        IXLNamedRange SetRefersTo(String range);
-        IXLNamedRange SetRefersTo(IXLRangeBase range);
-        IXLNamedRange SetRefersTo(IXLRanges ranges);
-
-        String RefersTo { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/IXLNamedRanges.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/IXLNamedRanges.cs
deleted file mode 100644
index bec7353..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/IXLNamedRanges.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLNamedRanges: IEnumerable<IXLNamedRange>
-    {
-        /// <summary>
-        /// Gets the specified named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the range.</param>
-        IXLNamedRange NamedRange(String rangeName);
-        
-        /// <summary>
-        /// Adds a new named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the range to add.</param>
-        /// <param name="rangeAddress">The range address to add.</param>
-        /// <returns></returns>
-        IXLNamedRange Add(String rangeName, String rangeAddress);
-
-        /// <summary>
-        /// Adds a new named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the range to add.</param>
-        /// <param name="range">The range to add.</param>
-        /// <returns></returns>
-        IXLNamedRange Add(String rangeName, IXLRange range);
-
-        /// <summary>
-        /// Adds a new named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the range to add.</param>
-        /// <param name="ranges">The ranges to add.</param>
-        /// <returns></returns>
-        IXLNamedRange Add(String rangeName, IXLRanges ranges);
-
-        /// <summary>
-        /// Adds a new named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the ranges to add.</param>
-        /// <param name="rangeAddress">The range address to add.</param>
-        /// <param name="comment">The comment for the new named range.</param>
-        IXLNamedRange Add(String rangeName, String rangeAddress, String comment);
-
-        /// <summary>
-        /// Adds a new named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the ranges to add.</param>
-        /// <param name="range">The range to add.</param>
-        /// <param name="comment">The comment for the new named range.</param>
-        IXLNamedRange Add(String rangeName, IXLRange range, String comment);
-
-        /// <summary>
-        /// Adds a new named range.
-        /// </summary>
-        /// <param name="rangeName">Name of the ranges to add.</param>
-        /// <param name="ranges">The ranges to add.</param>
-        /// <param name="comment">The comment for the new named range.</param>
-        IXLNamedRange Add(String rangeName, IXLRanges ranges, String comment);
-
-        /// <summary>
-        /// Deletes the specified named range (not the cells).
-        /// </summary>
-        /// <param name="rangeName">Name of the range to delete.</param>
-        void Delete(String rangeName);
-
-        /// <summary>
-        /// Deletes the specified named range's index (not the cells).
-        /// </summary>
-        /// <param name="rangeIndex">Index of the named range to delete.</param>
-        void Delete(Int32 rangeIndex);
-
-
-        /// <summary>
-        /// Deletes all named ranges (not the cells).
-        /// </summary>
-        void DeleteAll();
-
-        Boolean TryGetValue(String name, out IXLNamedRange range);
-
-        Boolean Contains(String name);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/XLNamedRange.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/XLNamedRange.cs
deleted file mode 100644
index a2958fb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/XLNamedRange.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Text.RegularExpressions;
-
-    internal class XLNamedRange: IXLNamedRange
-    {
-
-        private List<String> _rangeList = new List<String>();
-        private readonly XLNamedRanges _namedRanges;
-        public XLNamedRange(XLNamedRanges namedRanges , String rangeName, String range,  String comment = null)
-        {
-            Name = rangeName;
-            _rangeList.Add(range);
-            Comment = comment;
-            _namedRanges = namedRanges;
-        }
-
-        public XLNamedRange(XLNamedRanges namedRanges, String rangeName, IXLRanges ranges, String comment = null)
-        {
-            Name = rangeName;
-            ranges.ForEach(r => _rangeList.Add(r.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true)));
-            Comment = comment;
-            _namedRanges = namedRanges;
-        }
-
-        public String Name { get; set; }
-        public IXLRanges Ranges
-        {
-            get
-            {
-                var ranges = new XLRanges();
-                foreach (var rangeToAdd in 
-                   from rangeAddress in _rangeList.SelectMany(c=>c.Split(',')).Where(s=>s[0] != '"')
-                   let match = XLHelper.NamedRangeReferenceRegex.Match(rangeAddress)
-                   select
-                       match.Groups["Sheet"].Success
-                       ?  _namedRanges.Workbook.WorksheetsInternal.Worksheet(match.Groups["Sheet"].Value).Range(match.Groups["Range"].Value) as IXLRangeBase
-                       : _namedRanges.Workbook.Worksheets.SelectMany(sheet => sheet.Tables).Single(table => table.Name == match.Groups["Table"].Value).DataRange.Column(match.Groups["Column"].Value) )
-                {
-                    ranges.Add(rangeToAdd);
-                }
-                return ranges;
-            }
-        }
-
-        public String Comment { get; set; }
-
-        public IXLRanges Add(XLWorkbook workbook, String rangeAddress)
-        {
-            var ranges = new XLRanges();
-            var byExclamation = rangeAddress.Split('!');
-            var wsName = byExclamation[0].Replace("'", "");
-            var rng = byExclamation[1];
-            var rangeToAdd = workbook.WorksheetsInternal.Worksheet(wsName).Range(rng);
-
-            ranges.Add(rangeToAdd);
-            return Add(ranges);
-        }
-        public IXLRanges Add(IXLRange range)
-        {
-            var ranges = new XLRanges {range};
-            return Add(ranges);
-        }
-        public IXLRanges Add(IXLRanges ranges)
-        {
-            ranges.ForEach(r => _rangeList.Add(r.ToString()));
-            return ranges;
-        }
-
-        public void Delete()
-        {
-            _namedRanges.Delete(Name);
-        }
-        public void Clear()
-        {
-            _rangeList.Clear();
-        }
-        public void Remove(String rangeAddress)
-        {
-            _rangeList.Remove(rangeAddress);
-        }
-        public void Remove(IXLRange range)
-        {
-            _rangeList.Remove(range.ToString());
-        }
-        public void Remove(IXLRanges ranges)
-        {
-            ranges.ForEach(r => _rangeList.Remove(r.ToString()));
-        }
-
-
-        public override string ToString()
-        {
-            String retVal = _rangeList.Aggregate(String.Empty, (agg, r) => agg + (r + ","));
-            if (retVal.Length > 0) retVal = retVal.Substring(0, retVal.Length - 1);
-            return retVal;
-        }
-
-        public String RefersTo
-        {
-            get { return ToString(); }
-            set
-            {
-                _rangeList.Clear();
-                _rangeList.Add(value);
-            }
-        }
-
-        internal List<String> RangeList
-        {
-            get { return _rangeList; }
-            set { _rangeList = value; }
-        }
-
-        public IXLNamedRange SetRefersTo(String range)
-        {
-            RefersTo = range;
-            return this;
-        }
-        public IXLNamedRange SetRefersTo(IXLRangeBase range)
-        {
-            _rangeList.Clear();
-            _rangeList.Add(range.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true));
-            return this;
-        }
-        public IXLNamedRange SetRefersTo(IXLRanges ranges)
-        {
-            _rangeList.Clear();
-            ranges.ForEach(r => _rangeList.Add(r.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true)));
-            return this;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/XLNamedRanges.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/XLNamedRanges.cs
deleted file mode 100644
index 2b0b015..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/NamedRanges/XLNamedRanges.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLNamedRanges: IXLNamedRanges
-    {
-        readonly Dictionary<String, IXLNamedRange> _namedRanges = new Dictionary<String, IXLNamedRange>();
-        internal XLWorkbook Workbook { get; set; }
-       
-        public XLNamedRanges(XLWorkbook workbook)
-        {
-            Workbook = workbook;
-        }
-
-        #region IXLNamedRanges Members
-
-        public IXLNamedRange NamedRange(String rangeName)
-        {
-            IXLNamedRange range;
-            if (_namedRanges.TryGetValue(rangeName, out range))
-                return range;
-
-            return null;
-        }
-
-        public IXLNamedRange Add(String rangeName, String rangeAddress)
-        {
-            return Add(rangeName, rangeAddress, null);
-        }
-        public IXLNamedRange Add(String rangeName, IXLRange range)
-        {
-            return Add(rangeName, range, null);
-        }
-        public IXLNamedRange Add(String rangeName, IXLRanges ranges)
-        {
-            return Add(rangeName, ranges, null);
-        }
-        public IXLNamedRange Add(String rangeName, String rangeAddress, String comment )
-        {
-            var namedRange = new XLNamedRange(this, rangeName, rangeAddress, comment);
-            _namedRanges.Add(rangeName, namedRange);
-            return namedRange;
-        }
-        public IXLNamedRange Add(String rangeName, IXLRange range, String comment)
-        {
-            var ranges = new XLRanges {range};
-            return Add(rangeName, ranges, comment);
-        }
-        public IXLNamedRange Add(String rangeName, IXLRanges ranges, String comment)
-        {
-            var namedRange = new XLNamedRange(this, rangeName, ranges, comment);
-            _namedRanges.Add(rangeName, namedRange);
-            return namedRange;
-        }
-
-        public void Delete(String rangeName)
-        {
-            _namedRanges.Remove(rangeName);
-        }
-        public void Delete(Int32 rangeIndex)
-        {
-            _namedRanges.Remove(_namedRanges.ElementAt(rangeIndex).Key);
-        }
-        public void DeleteAll()
-        {
-            _namedRanges.Clear();
-        }
-        
-        #endregion
-
-        #region IEnumerable<IXLNamedRange> Members
-
-        public IEnumerator<IXLNamedRange> GetEnumerator()
-        {
-            return _namedRanges.Values.GetEnumerator();
-        }
-
-        #endregion
-
-        #region IEnumerable Members
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        #endregion
-
-        public Boolean TryGetValue(String name, out IXLNamedRange range)
-        {
-            if (_namedRanges.TryGetValue(name, out range)) return true;
-
-            range = Workbook.NamedRange(name);
-            return range != null;
-        }
-
-        public Boolean Contains(String name)
-        {
-            if (_namedRanges.ContainsKey(name)) return true;
-            return Workbook.NamedRange(name) != null;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLHFItem.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLHFItem.cs
deleted file mode 100644
index 2710292..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLHFItem.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLHFPredefinedText
-    { 
-        PageNumber, NumberOfPages, Date, Time, FullPath, Path, File, SheetName
-    }
-    public enum XLHFOccurrence
-    { 
-        AllPages, OddPages, EvenPages, FirstPage
-    }
-
-    public interface IXLHFItem: IXLWithRichString
-    {
-        /// <summary>
-        /// Gets the text of the specified header/footer occurrence.
-        /// </summary>
-        /// <param name="occurrence">The occurrence.</param>
-        String GetText(XLHFOccurrence occurrence);
-
-        /// <summary>
-        /// Adds the given predefined text to this header/footer item.
-        /// </summary>
-        /// <param name="predefinedText">The predefined text to add to this header/footer item.</param>
-        IXLRichString AddText(XLHFPredefinedText predefinedText);
-
-        /// <summary>
-        /// Adds the given text to this header/footer item.
-        /// </summary>
-        /// <param name="text">The text to add to this header/footer item.</param>
-        /// <param name="occurrence">The occurrence for the text.</param>
-        IXLRichString AddText(String text, XLHFOccurrence occurrence);
-
-        /// <summary>
-        /// Adds the given predefined text to this header/footer item.
-        /// </summary>
-        /// <param name="predefinedText">The predefined text to add to this header/footer item.</param>
-        /// <param name="occurrence">The occurrence for the predefined text.</param>
-        IXLRichString AddText(XLHFPredefinedText predefinedText, XLHFOccurrence occurrence);
-
-        /// <summary>Clears the text/formats of this header/footer item.</summary>
-        /// <param name="occurrence">The occurrence to clear.</param>
-        void Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages);
-
-        IXLRichString AddImage(String imagePath, XLHFOccurrence occurrence = XLHFOccurrence.AllPages);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLHeaderFooter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLHeaderFooter.cs
deleted file mode 100644
index c8c2f7c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLHeaderFooter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLHFMode { OddPagesOnly, OddAndEvenPages, Odd }
-    public interface IXLHeaderFooter
-    {
-        /// <summary>
-        /// Gets the left header/footer item.
-        /// </summary>
-        IXLHFItem Left { get; }
-
-        /// <summary>
-        /// Gets the middle header/footer item.
-        /// </summary>
-        IXLHFItem Center { get; }
-
-        /// <summary>
-        /// Gets the right header/footer item.
-        /// </summary>
-        IXLHFItem Right { get; }
-
-        /// <summary>
-        /// Gets the text of the specified header/footer occurrence.
-        /// </summary>
-        /// <param name="occurrence">The occurrence.</param>
-        String GetText(XLHFOccurrence occurrence);
-
-        IXLHeaderFooter Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLMargins.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLMargins.cs
deleted file mode 100644
index 2a1e40b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLMargins.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLMargins
-    {
-        /// <summary>Gets or sets the Left margin.</summary>
-        /// <value>The Left margin.</value>
-        Double Left { get; set; }
-
-        /// <summary>Gets or sets the Right margin.</summary>
-        /// <value>The Right margin.</value>
-        Double Right { get; set; }
-
-        /// <summary>Gets or sets the Top margin.</summary>
-        /// <value>The Top margin.</value>
-        Double Top { get; set; }
-
-        /// <summary>Gets or sets the Bottom margin.</summary>
-        /// <value>The Bottom margin.</value>
-        Double Bottom { get; set; }
-
-        /// <summary>Gets or sets the Header margin.</summary>
-        /// <value>The Header margin.</value>
-        Double Header { get; set; }
-
-        /// <summary>Gets or sets the Footer margin.</summary>
-        /// <value>The Footer margin.</value>
-        Double Footer { get; set; }
-
-        IXLMargins SetLeft(Double value);
-        IXLMargins SetRight(Double value);
-        IXLMargins SetTop(Double value);
-        IXLMargins SetBottom(Double value);
-        IXLMargins SetHeader(Double value);
-        IXLMargins SetFooter(Double value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLPageSetup.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLPageSetup.cs
deleted file mode 100644
index 463c0ee..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLPageSetup.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public enum XLPageOrientation { Default, Portrait, Landscape }
-    public enum XLPaperSize
-    {
-        LetterPaper = 1,
-        LetterSmallPaper = 2,
-        TabloidPaper = 3,
-        LedgerPaper = 4,
-        LegalPaper = 5,
-        StatementPaper = 6,
-        ExecutivePaper = 7,
-        A3Paper = 8,
-        A4Paper = 9,
-        A4SmallPaper = 10,
-        A5Paper = 11,
-        B4Paper = 12,
-        B5Paper = 13,
-        FolioPaper = 14,
-        QuartoPaper = 15,
-        StandardPaper = 16,
-        StandardPaper1 = 17,
-        NotePaper = 18,
-        No9Envelope = 19,
-        No10Envelope = 20,
-        No11Envelope = 21,
-        No12Envelope = 22,
-        No14Envelope = 23,
-        CPaper = 24,
-        DPaper = 25,
-        EPaper = 26,
-        DlEnvelope = 27,
-        C5Envelope = 28,
-        C3Envelope = 29,
-        C4Envelope = 30,
-        C6Envelope = 31,
-        C65Envelope = 32,
-        B4Envelope = 33,
-        B5Envelope = 34,
-        B6Envelope = 35,
-        ItalyEnvelope = 36,
-        MonarchEnvelope = 37,
-        No634Envelope = 38,
-        UsStandardFanfold = 39,
-        GermanStandardFanfold = 40,
-        GermanLegalFanfold = 41,
-        IsoB4 = 42,
-        JapaneseDoublePostcard = 43,
-        StandardPaper2 = 44,
-        StandardPaper3 = 45,
-        StandardPaper4 = 46,
-        InviteEnvelope = 47,
-        LetterExtraPaper = 50,
-        LegalExtraPaper = 51,
-        TabloidExtraPaper = 52,
-        A4ExtraPaper = 53,
-        LetterTransversePaper = 54,
-        A4TransversePaper = 55,
-        LetterExtraTransversePaper = 56,
-        SuperaSuperaA4Paper = 57,
-        SuperbSuperbA3Paper = 58,
-        LetterPlusPaper = 59,
-        A4PlusPaper = 60,
-        A5TransversePaper = 61,
-        JisB5TransversePaper = 62,
-        A3ExtraPaper = 63,
-        A5ExtraPaper = 64,
-        IsoB5ExtraPaper = 65,
-        A2Paper = 66,
-        A3TransversePaper = 67,
-        A3ExtraTransversePaper = 68
-    }
-    public enum XLPageOrderValues { DownThenOver, OverThenDown }
-    public enum XLShowCommentsValues { None, AtEnd, AsDisplayed }
-    public enum XLPrintErrorValues { Blank, Dash, Displayed, NA }
-    
-    public interface IXLPageSetup
-    {
-        /// <summary>
-        /// Gets an object to manage the print areas of the worksheet.
-        /// </summary>
-        IXLPrintAreas PrintAreas { get; }
-        /// <summary>
-        /// Gets the first row that will repeat on the top of the printed pages.
-        /// <para>Use SetRowsToRepeatAtTop() to set the rows that will be repeated on the top of the printed pages.</para>
-        /// </summary>
-        Int32 FirstRowToRepeatAtTop { get; }
-        /// <summary>
-        /// Gets the last row that will repeat on the top of the printed pages.
-        /// <para>Use SetRowsToRepeatAtTop() to set the rows that will be repeated on the top of the printed pages.</para>
-        /// </summary>
-        Int32 LastRowToRepeatAtTop { get; }
-        /// <summary>
-        /// Sets the rows to repeat on the top of the printed pages.
-        /// </summary>
-        /// <param name="range">The range of rows to repeat on the top of the printed pages.</param>
-        void SetRowsToRepeatAtTop(String range);
-        /// <summary>
-        /// Sets the rows to repeat on the top of the printed pages.
-        /// </summary>
-        /// <param name="firstRowToRepeatAtTop">The first row to repeat at top.</param>
-        /// <param name="lastRowToRepeatAtTop">The last row to repeat at top.</param>
-        void SetRowsToRepeatAtTop(Int32 firstRowToRepeatAtTop, Int32 lastRowToRepeatAtTop);
-
-        /// <summary>Gets the first column to repeat on the left of the printed pages.</summary>
-        /// <value>The first column to repeat on the left of the printed pages.</value>
-        Int32 FirstColumnToRepeatAtLeft { get; }
-        /// <summary>Gets the last column to repeat on the left of the printed pages.</summary>
-        /// <value>The last column to repeat on the left of the printed pages.</value>
-        Int32 LastColumnToRepeatAtLeft { get; }
-        /// <summary>
-        /// Sets the rows to repeat on the left of the printed pages.
-        /// </summary>
-        /// <param name="firstColumnToRepeatAtLeft">The first column to repeat at left.</param>
-        /// <param name="lastColumnToRepeatAtLeft">The last column to repeat at left.</param>
-        void SetColumnsToRepeatAtLeft(Int32 firstColumnToRepeatAtLeft, Int32 lastColumnToRepeatAtLeft);
-        /// <summary>
-        /// Sets the rows to repeat on the left of the printed pages.
-        /// </summary>
-        /// <param name="range">The range of rows to repeat on the left of the printed pages.</param>
-        void SetColumnsToRepeatAtLeft(String range);
-
-        /// <summary>Gets or sets the page orientation for printing.</summary>
-        /// <value>The page orientation.</value>
-        XLPageOrientation PageOrientation { get; set; }
-        /// <summary>
-        /// Gets or sets the number of pages wide (horizontal) the worksheet will be printed on.
-        /// <para>If you don't specify the PagesTall, Excel will adjust that value</para>
-        /// <para>based on the contents of the worksheet and the PagesWide number.</para>
-        /// <para>Setting this value will override the Scale value.</para>
-        /// </summary>
-        Int32 PagesWide { get; set; }
-        /// <summary>
-        /// Gets or sets the number of pages tall (vertical) the worksheet will be printed on.
-        /// <para>If you don't specify the PagesWide, Excel will adjust that value</para>
-        /// <para>based on the contents of the worksheet and the PagesTall number.</para>
-        /// <para>Setting this value will override the Scale value.</para>
-        /// </summary>
-        Int32 PagesTall { get; set; }
-        /// <summary>
-        /// Gets or sets the scale at which the worksheet will be printed.
-        /// <para>The worksheet will be printed on as many pages as necessary to print at the given scale.</para>
-        /// <para>Setting this value will override the PagesWide and PagesTall values.</para>
-        /// </summary>
-        Int32 Scale { get; set; }
-        /// <summary>
-        /// Gets or sets the horizontal dpi for printing the worksheet.
-        /// </summary>
-        Int32 HorizontalDpi { get; set; }
-        /// <summary>
-        /// Gets or sets the vertical dpi for printing the worksheet.
-        /// </summary>
-        Int32 VerticalDpi { get; set; }
-        /// <summary>
-        /// Gets or sets the page number that will begin the printout.
-        /// <para>For example, the first page of your printout could be numbered page 5.</para>
-        /// </summary>
-        Int64 FirstPageNumber { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether the worksheet will be centered on the page horizontally.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the worksheet will be centered on the page horizontally; otherwise, <c>false</c>.
-        /// </value>
-        Boolean CenterHorizontally { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether the worksheet will be centered on the page vertically.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the worksheet will be centered on the page vartically; otherwise, <c>false</c>.
-        /// </value>
-        Boolean CenterVertically { get; set; }
-        /// <summary>
-        /// Sets the scale at which the worksheet will be printed. This is equivalent to setting the Scale property.
-        /// <para>The worksheet will be printed on as many pages as necessary to print at the given scale.</para>
-        /// <para>Setting this value will override the PagesWide and PagesTall values.</para>
-        /// </summary>
-        /// <param name="pctOfNormalSize">The scale at which the worksheet will be printed.</param>
-        void AdjustTo(Int32 pctOfNormalSize);
-        /// <summary>
-        /// Gets or sets the number of pages the worksheet will be printed on.
-        /// <para>This is equivalent to setting both PagesWide and PagesTall properties.</para>
-        /// <para>Setting this value will override the Scale value.</para>
-        /// </summary>
-        /// <param name="pagesWide">The pages wide.</param>
-        /// <param name="pagesTall">The pages tall.</param>
-        void FitToPages(Int32 pagesWide, Int32 pagesTall);
-        /// <summary>
-        /// Gets or sets the size of the paper to print the worksheet.
-        /// </summary>
-        XLPaperSize PaperSize { get; set; }
-        /// <summary>
-        /// Gets an object to work with the page margins.
-        /// </summary>
-        IXLMargins Margins { get; }
-
-        /// <summary>
-        /// Gets an object to work with the page headers.
-        /// </summary>
-        IXLHeaderFooter Header { get; }
-        /// <summary>
-        /// Gets an object to work with the page footers.
-        /// </summary>
-        IXLHeaderFooter Footer { get; }
-        /// <summary>
-        /// Gets or sets a value indicating whether Excel will automatically adjust the font size to the scale of the worksheet.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if Excel will automatically adjust the font size to the scale of the worksheet; otherwise, <c>false</c>.
-        /// </value>
-        Boolean ScaleHFWithDocument { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether the header and footer margins are aligned with the left and right margins of the worksheet.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the header and footer margins are aligned with the left and right margins of the worksheet; otherwise, <c>false</c>.
-        /// </value>
-        Boolean AlignHFWithMargins { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the gridlines will be printed.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the gridlines will be printed; otherwise, <c>false</c>.
-        /// </value>
-        Boolean ShowGridlines { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether to show row numbers and column letters/numbers.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> to show row numbers and column letters/numbers; otherwise, <c>false</c>.
-        /// </value>
-        Boolean ShowRowAndColumnHeadings { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether the worksheet will be printed in black and white.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the worksheet will be printed in black and white; otherwise, <c>false</c>.
-        /// </value>
-        Boolean BlackAndWhite { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether the worksheet will be printed in draft quality.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the worksheet will be printed in draft quality; otherwise, <c>false</c>.
-        /// </value>
-        Boolean DraftQuality { get; set; }
-        /// <summary>
-        /// Gets or sets the page order for printing.
-        /// </summary>
-        XLPageOrderValues PageOrder { get; set; }
-        /// <summary>
-        /// Gets or sets how the comments will be printed.
-        /// </summary>
-        XLShowCommentsValues ShowComments { get; set; }
-
-        /// <summary>
-        /// Gets a list with the row breaks (for printing).
-        /// </summary>
-        List<Int32> RowBreaks { get; }
-        /// <summary>
-        /// Gets a list with the column breaks (for printing).
-        /// </summary>
-        List<Int32> ColumnBreaks { get; }
-        /// <summary>
-        /// Adds a horizontal page break after the given row.
-        /// </summary>
-        /// <param name="row">The row to insert the break.</param>
-        void AddHorizontalPageBreak(Int32 row);
-
-        /// <summary>
-        /// Adds a vertical page break after the given column.
-        /// </summary>
-        /// <param name="column">The column to insert the break.</param>
-        void AddVerticalPageBreak(Int32 column);
-
-        /// <summary>
-        /// Gets or sets how error values will be printed.
-        /// </summary>
-        XLPrintErrorValues PrintErrorValue { get; set; }
-
-        IXLPageSetup SetPageOrientation(XLPageOrientation value);
-        IXLPageSetup SetPagesWide(Int32 value);
-        IXLPageSetup SetPagesTall(Int32 value);
-        IXLPageSetup SetScale(Int32 value);
-        IXLPageSetup SetHorizontalDpi(Int32 value);
-        IXLPageSetup SetVerticalDpi(Int32 value);
-        IXLPageSetup SetFirstPageNumber(Int64 value);
-        IXLPageSetup SetCenterHorizontally(); IXLPageSetup SetCenterHorizontally(Boolean value);
-        IXLPageSetup SetCenterVertically(); IXLPageSetup SetCenterVertically(Boolean value);
-        IXLPageSetup SetPaperSize(XLPaperSize value);
-        IXLPageSetup SetScaleHFWithDocument(); IXLPageSetup SetScaleHFWithDocument(Boolean value);
-        IXLPageSetup SetAlignHFWithMargins(); IXLPageSetup SetAlignHFWithMargins(Boolean value);
-        IXLPageSetup SetShowGridlines(); IXLPageSetup SetShowGridlines(Boolean value);
-        IXLPageSetup SetShowRowAndColumnHeadings(); IXLPageSetup SetShowRowAndColumnHeadings(Boolean value);
-        IXLPageSetup SetBlackAndWhite(); IXLPageSetup SetBlackAndWhite(Boolean value);
-        IXLPageSetup SetDraftQuality(); IXLPageSetup SetDraftQuality(Boolean value);
-        IXLPageSetup SetPageOrder(XLPageOrderValues value);
-        IXLPageSetup SetShowComments(XLShowCommentsValues value);
-        IXLPageSetup SetPrintErrorValue(XLPrintErrorValues value);
-
-
-        Boolean DifferentFirstPageOnHF { get; set; }
-        IXLPageSetup SetDifferentFirstPageOnHF(); IXLPageSetup SetDifferentFirstPageOnHF(Boolean value);
-        Boolean DifferentOddEvenPagesOnHF { get; set; }
-        IXLPageSetup SetDifferentOddEvenPagesOnHF(); IXLPageSetup SetDifferentOddEvenPagesOnHF(Boolean value);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLPrintAreas.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLPrintAreas.cs
deleted file mode 100644
index 48b5816..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/IXLPrintAreas.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLPrintAreas: IEnumerable<IXLRange>
-    {
-        /// <summary>Removes the print areas from the worksheet.</summary>
-        void Clear();
-
-        /// <summary>Adds a range to the print areas.</summary>
-        /// <param name="firstCellRow">   The first cell row.</param>
-        /// <param name="firstCellColumn">The first cell column.</param>
-        /// <param name="lastCellRow">    The last cell row.</param>
-        /// <param name="lastCellColumn"> The last cell column.</param>
-        void Add(Int32 firstCellRow, Int32 firstCellColumn, Int32 lastCellRow, Int32 lastCellColumn);
-
-        /// <summary>Adds a range to the print areas.</summary>
-        /// <param name="rangeAddress">The range address to add.</param>
-        void Add(String rangeAddress);
-
-        /// <summary>Adds a range to the print areas.</summary>
-        /// <param name="firstCellAddress">The first cell address.</param>
-        /// <param name="lastCellAddress"> The last cell address.</param>
-        void Add(String firstCellAddress, String lastCellAddress);
-
-        /// <summary>Adds a range to the print areas.</summary>
-        /// <param name="firstCellAddress">The first cell address.</param>
-        /// <param name="lastCellAddress"> The last cell address.</param>
-        void Add(IXLAddress firstCellAddress, IXLAddress lastCellAddress);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFItem.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFItem.cs
deleted file mode 100644
index 7e3ccda..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFItem.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLHFItem : IXLHFItem
-    {
-        private readonly XLWorksheet _worksheet;
-        public XLHFItem(XLWorksheet worksheet)
-        {
-            _worksheet = worksheet;
-        }
-        public XLHFItem(XLHFItem defaultHFItem, XLWorksheet worksheet)
-            :this(worksheet)
-        {
-            defaultHFItem.texts.ForEach(kp => texts.Add(kp.Key, kp.Value));
-        }
-        private readonly Dictionary<XLHFOccurrence, List<XLHFText>> texts = new Dictionary<XLHFOccurrence, List<XLHFText>>();
-        public String GetText(XLHFOccurrence occurrence)
-        {
-            var sb = new StringBuilder();
-            if(texts.ContainsKey(occurrence))
-            {
-                foreach (var hfText in texts[occurrence])
-                    sb.Append(hfText.GetHFText(sb.ToString()));
-            }
-
-            return sb.ToString();
-        }
-
-        public IXLRichString AddText(String text)
-        {
-            return AddText(text, XLHFOccurrence.AllPages);
-        }
-        public IXLRichString AddText(XLHFPredefinedText predefinedText)
-        {
-            return AddText(predefinedText, XLHFOccurrence.AllPages);
-        }
-
-        public IXLRichString AddText(String text, XLHFOccurrence occurrence)
-        {
-            XLRichString richText = new XLRichString(text, XLWorkbook.DefaultStyle.Font, this);
-
-            var hfText = new XLHFText(richText, _worksheet);
-            if (occurrence == XLHFOccurrence.AllPages)
-            {
-                AddTextToOccurrence(hfText, XLHFOccurrence.EvenPages);
-                AddTextToOccurrence(hfText, XLHFOccurrence.FirstPage);
-                AddTextToOccurrence(hfText, XLHFOccurrence.OddPages);
-            }
-            else
-            {
-                AddTextToOccurrence(hfText, occurrence);
-            }
-
-            return richText;
-        }
-
-        public IXLRichString AddNewLine()
-        {
-            return AddText(Environment.NewLine);
-        }
-
-        public IXLRichString AddImage(String imagePath, XLHFOccurrence occurrence = XLHFOccurrence.AllPages)
-        {
-            throw new NotImplementedException();
-        }
-
-        private void AddTextToOccurrence(XLHFText hfText, XLHFOccurrence occurrence)
-        {
-            if (texts.ContainsKey(occurrence))
-                texts[occurrence].Add(hfText);
-            else
-                texts.Add(occurrence, new List<XLHFText> { hfText });
-        }
-
-        public IXLRichString AddText(XLHFPredefinedText predefinedText, XLHFOccurrence occurrence)
-        {
-            String hfText;
-            switch (predefinedText)
-            {
-                case XLHFPredefinedText.PageNumber: hfText = "&P"; break;
-                case XLHFPredefinedText.NumberOfPages : hfText = "&N"; break;
-                case XLHFPredefinedText.Date : hfText = "&D"; break;
-                case XLHFPredefinedText.Time : hfText = "&T"; break;
-                case XLHFPredefinedText.Path : hfText = "&Z"; break;
-                case XLHFPredefinedText.File : hfText = "&F"; break;
-                case XLHFPredefinedText.SheetName : hfText = "&A"; break;
-                case XLHFPredefinedText.FullPath: hfText = "&Z&F"; break;
-                default: throw new NotImplementedException();
-            }
-            return AddText(hfText, occurrence);
-        }
-
-        public void Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages)
-        {
-            if (occurrence == XLHFOccurrence.AllPages)
-            {
-                ClearOccurrence(XLHFOccurrence.EvenPages);
-                ClearOccurrence(XLHFOccurrence.FirstPage);
-                ClearOccurrence(XLHFOccurrence.OddPages);
-            }
-            else
-            {
-                ClearOccurrence(occurrence);
-            }
-        }
-
-        private void ClearOccurrence(XLHFOccurrence occurrence)
-        {
-            if (texts.ContainsKey(occurrence))
-                texts.Remove(occurrence);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFText.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFText.cs
deleted file mode 100644
index ed921ea..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFText.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLHFText
-    {
-        private readonly XLWorksheet _worksheet;
-        public XLHFText(XLRichString richText, XLWorksheet worksheet)
-        {
-            RichText = richText;
-            _worksheet = worksheet;
-        }
-        public XLRichString RichText { get; private set; }
-
-        public String GetHFText(String prevText)
-        {
-            StringBuilder sb = new StringBuilder();
-            var wsFont = _worksheet.Style.Font;
-
-            if (RichText.FontName != null && RichText.FontName != wsFont.FontName)
-                sb.Append("&\"" + RichText.FontName);
-            else
-                sb.Append("&\"-");
-
-            if (RichText.Bold && RichText.Italic)
-                sb.Append(",Bold Italic\"");
-            else if (RichText.Bold)
-                sb.Append(",Bold\"");
-            else if (RichText.Italic)
-                sb.Append(",Italic\"");
-            else
-                sb.Append(",Regular\"");
-
-            if (RichText.FontSize > 0 && Math.Abs(RichText.FontSize - wsFont.FontSize) > XLHelper.Epsilon)
-                sb.Append("&" + RichText.FontSize);
-
-            if (RichText.Strikethrough && !wsFont.Strikethrough)
-                sb.Append("&S");
-
-            if (RichText.VerticalAlignment != wsFont.VerticalAlignment)
-            {
-                if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Subscript)
-                    sb.Append("&Y");
-                else if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Superscript)
-                    sb.Append("&X");
-            }
-
-            if (RichText.Underline != wsFont.Underline)
-            {
-                if (RichText.Underline == XLFontUnderlineValues.Single)
-                    sb.Append("&U");
-                else if (RichText.Underline == XLFontUnderlineValues.Double)
-                    sb.Append("&E");
-            }
-
-            var lastColorPosition = prevText.LastIndexOf("&K");
-
-            if (
-                (lastColorPosition >= 0 && !RichText.FontColor.Equals(XLColor.FromHtml("#" + prevText.Substring(lastColorPosition + 2, 6))))
-                || (lastColorPosition == -1 && !RichText.FontColor.Equals(wsFont.FontColor))
-                )
-                sb.Append("&K" + RichText.FontColor.Color.ToHex().Substring(2));
-
-            sb.Append(RichText.Text);
-
-            if (RichText.Underline != wsFont.Underline)
-            {
-                if (RichText.Underline == XLFontUnderlineValues.Single)
-                    sb.Append("&U");
-                else if (RichText.Underline == XLFontUnderlineValues.Double)
-                    sb.Append("&E");
-            }
-
-            if (RichText.VerticalAlignment != wsFont.VerticalAlignment)
-            {
-                if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Subscript)
-                    sb.Append("&Y");
-                else if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Superscript)
-                    sb.Append("&X");
-            }
-
-            if (RichText.Strikethrough && !wsFont.Strikethrough)
-                sb.Append("&S");
-
-            return sb.ToString();
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs
deleted file mode 100644
index 1da5789..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    using System.Linq;
-
-    internal class XLHeaderFooter: IXLHeaderFooter
-    {
-        public XLHeaderFooter(XLWorksheet worksheet)
-        {
-            Left = new XLHFItem(worksheet);
-            Right = new XLHFItem(worksheet);
-            Center = new XLHFItem(worksheet);
-            SetAsInitial();
-        }
-
-        public XLHeaderFooter(XLHeaderFooter defaultHF, XLWorksheet worksheet)
-        {
-            defaultHF.innerTexts.ForEach(kp => innerTexts.Add(kp.Key, kp.Value));
-            Left = new XLHFItem(defaultHF.Left as XLHFItem, worksheet);
-            Center = new XLHFItem(defaultHF.Center as XLHFItem, worksheet);
-            Right = new XLHFItem(defaultHF.Right as XLHFItem, worksheet);
-            SetAsInitial();
-        }
-
-        public IXLHFItem Left { get; private set; }
-        public IXLHFItem Center { get; private set; }
-        public IXLHFItem Right { get; private set; }
-
-        public String GetText(XLHFOccurrence occurrence)
-        {
-            if (innerTexts.ContainsKey(occurrence)) return innerTexts[occurrence];
-
-            var retVal = String.Empty;
-            var leftText = Left.GetText(occurrence);
-            var centerText = Center.GetText(occurrence);
-            var rightText = Right.GetText(occurrence);
-            retVal += leftText.Length > 0 ? "&L" + leftText : String.Empty;
-            retVal += centerText.Length > 0 ? "&C" + centerText : String.Empty;
-            retVal += rightText.Length > 0 ? "&R" + rightText : String.Empty;
-            if (retVal.Length > 255)
-                throw new ArgumentOutOfRangeException("Headers and Footers cannot be longer than 255 characters (including style markups)");
-            return retVal;
-        }
-
-        private Dictionary<XLHFOccurrence, String> innerTexts = new Dictionary<XLHFOccurrence, String>();
-        internal String SetInnerText(XLHFOccurrence occurrence, String text)
-        { 
-            if (innerTexts.ContainsKey(occurrence))
-                innerTexts[occurrence] = text;
-            else
-                innerTexts.Add(occurrence, text);
-
-            return innerTexts[occurrence];
-        }
-
-        private Dictionary<XLHFOccurrence, String> _initialTexts;
-
-        private Boolean _changed;
-        internal Boolean Changed
-        {
-            get
-            {
-                return _changed || _initialTexts.Any(it => GetText(it.Key) != it.Value);
-            }
-            set { _changed = value; }
-        }
-
-        internal void SetAsInitial()
-        {
-            _initialTexts = new Dictionary<XLHFOccurrence, string>();
-            foreach (var o in Enum.GetValues(typeof(XLHFOccurrence)).Cast<XLHFOccurrence>())
-            {
-                _initialTexts.Add(o, GetText(o));
-            }
-        }
-
-
-        public IXLHeaderFooter Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages)
-        {
-            Left.Clear(occurrence);
-            Right.Clear(occurrence);
-            Center.Clear(occurrence);
-            return this;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLMargins.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLMargins.cs
deleted file mode 100644
index 896254a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLMargins.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLMargins: IXLMargins
-    {
-        public Double Left { get; set; }
-        public Double Right { get; set; }
-        public Double Top { get; set; }
-        public Double Bottom { get; set; }
-        public Double Header { get; set; }
-        public Double Footer { get; set; }
-
-        public IXLMargins SetLeft(Double value) { Left = value; return this; }
-        public IXLMargins SetRight(Double value) { Right = value; return this; }
-        public IXLMargins SetTop(Double value) { Top = value; return this; }
-        public IXLMargins SetBottom(Double value) { Bottom = value; return this; }
-        public IXLMargins SetHeader(Double value) { Header = value; return this; }
-        public IXLMargins SetFooter(Double value) { Footer = value; return this; }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLPageSetup.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLPageSetup.cs
deleted file mode 100644
index 5eaa80a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLPageSetup.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPageSetup : IXLPageSetup
-    {
-        public XLPageSetup(XLPageSetup defaultPageOptions, XLWorksheet worksheet)
-        {
-            
-            if (defaultPageOptions != null)
-            {
-                PrintAreas = new XLPrintAreas(defaultPageOptions.PrintAreas as XLPrintAreas, worksheet);
-                CenterHorizontally = defaultPageOptions.CenterHorizontally;
-                CenterVertically = defaultPageOptions.CenterVertically;
-                FirstPageNumber = defaultPageOptions.FirstPageNumber;
-                HorizontalDpi = defaultPageOptions.HorizontalDpi;
-                PageOrientation = defaultPageOptions.PageOrientation;
-                VerticalDpi = defaultPageOptions.VerticalDpi;
-
-                PaperSize = defaultPageOptions.PaperSize;
-                _pagesTall = defaultPageOptions.PagesTall;
-                _pagesWide = defaultPageOptions.PagesWide;
-                _scale = defaultPageOptions.Scale;
-                
-
-                if (defaultPageOptions.Margins != null)
-                {
-                    Margins = new XLMargins
-                                  {
-                                Top = defaultPageOptions.Margins.Top,
-                                Bottom = defaultPageOptions.Margins.Bottom,
-                                Left = defaultPageOptions.Margins.Left,
-                                Right = defaultPageOptions.Margins.Right,
-                                Header = defaultPageOptions.Margins.Header,
-                                Footer = defaultPageOptions.Margins.Footer
-                            };
-                }
-                AlignHFWithMargins = defaultPageOptions.AlignHFWithMargins;
-                ScaleHFWithDocument = defaultPageOptions.ScaleHFWithDocument;
-                ShowGridlines = defaultPageOptions.ShowGridlines;
-                ShowRowAndColumnHeadings = defaultPageOptions.ShowRowAndColumnHeadings;
-                BlackAndWhite = defaultPageOptions.BlackAndWhite;
-                DraftQuality = defaultPageOptions.DraftQuality;
-                PageOrder = defaultPageOptions.PageOrder;
-
-                ColumnBreaks = defaultPageOptions.ColumnBreaks.ToList();
-                RowBreaks = defaultPageOptions.RowBreaks.ToList();
-                Header = new XLHeaderFooter(defaultPageOptions.Header as XLHeaderFooter, worksheet);
-                Footer = new XLHeaderFooter(defaultPageOptions.Footer as XLHeaderFooter, worksheet);
-                PrintErrorValue = defaultPageOptions.PrintErrorValue;
-            }
-            else
-            {
-                PrintAreas = new XLPrintAreas(worksheet);
-                Header = new XLHeaderFooter(worksheet);
-                Footer = new XLHeaderFooter(worksheet);
-                ColumnBreaks = new List<Int32>();
-                RowBreaks = new List<Int32>();
-            }
-        }
-        public IXLPrintAreas PrintAreas { get; private set; }
-
-
-        public Int32 FirstRowToRepeatAtTop { get; private set; }
-        public Int32 LastRowToRepeatAtTop { get; private set; }
-        public void SetRowsToRepeatAtTop(String range)
-        {
-            var arrRange = range.Replace("$", "").Split(':');
-            SetRowsToRepeatAtTop(Int32.Parse(arrRange[0]), Int32.Parse(arrRange[1]));
-        }
-        public void SetRowsToRepeatAtTop(Int32 firstRowToRepeatAtTop, Int32 lastRowToRepeatAtTop)
-        {
-            if (firstRowToRepeatAtTop <= 0) throw new ArgumentOutOfRangeException("The first row has to be greater than zero.");
-            if (firstRowToRepeatAtTop > lastRowToRepeatAtTop) throw new ArgumentOutOfRangeException("The first row has to be less than the second row.");
-
-            FirstRowToRepeatAtTop = firstRowToRepeatAtTop;
-            LastRowToRepeatAtTop = lastRowToRepeatAtTop;
-        }
-        public Int32 FirstColumnToRepeatAtLeft { get; private set; }
-        public Int32 LastColumnToRepeatAtLeft { get; private set; }
-        public void SetColumnsToRepeatAtLeft(String range)
-        {
-            var arrRange = range.Replace("$", "").Split(':');
-            Int32 iTest;
-            if (Int32.TryParse(arrRange[0], out iTest))
-                SetColumnsToRepeatAtLeft(Int32.Parse(arrRange[0]), Int32.Parse(arrRange[1]));
-            else
-                SetColumnsToRepeatAtLeft(arrRange[0], arrRange[1]);
-        }
-        public void SetColumnsToRepeatAtLeft(String firstColumnToRepeatAtLeft, String lastColumnToRepeatAtLeft)
-        {
-            SetColumnsToRepeatAtLeft(XLHelper.GetColumnNumberFromLetter(firstColumnToRepeatAtLeft), XLHelper.GetColumnNumberFromLetter(lastColumnToRepeatAtLeft));
-        }
-        public void SetColumnsToRepeatAtLeft(Int32 firstColumnToRepeatAtLeft, Int32 lastColumnToRepeatAtLeft)
-        {
-            if (firstColumnToRepeatAtLeft <= 0) throw new ArgumentOutOfRangeException("The first column has to be greater than zero.");
-            if (firstColumnToRepeatAtLeft > lastColumnToRepeatAtLeft) throw new ArgumentOutOfRangeException("The first column has to be less than the second column.");
-
-            FirstColumnToRepeatAtLeft = firstColumnToRepeatAtLeft;
-            LastColumnToRepeatAtLeft = lastColumnToRepeatAtLeft;
-        }
-
-        public XLPageOrientation PageOrientation { get; set; }
-        public XLPaperSize PaperSize { get; set; }
-        public Int32 HorizontalDpi { get; set; }
-        public Int32 VerticalDpi { get; set; }
-        public Int64 FirstPageNumber { get; set; }
-        public Boolean CenterHorizontally { get; set; }
-        public Boolean CenterVertically { get; set; }
-        public XLPrintErrorValues PrintErrorValue { get; set; }
-        public IXLMargins Margins { get; set; }
-
-        private Int32 _pagesWide;
-        public Int32 PagesWide 
-        {
-            get
-            {
-                return _pagesWide;
-            }
-            set
-            {
-                _pagesWide = value;
-                if (_pagesWide >0)
-                    _scale = 0;
-            }
-        }
-        
-        private Int32 _pagesTall;
-        public Int32 PagesTall
-        {
-            get
-            {
-                return _pagesTall;
-            }
-            set
-            {
-                _pagesTall = value;
-                if (_pagesTall >0)
-                    _scale = 0;
-            }
-        }
-
-        private Int32 _scale;
-        public Int32 Scale
-        {
-            get
-            {
-                return _scale;
-            }
-            set
-            {
-                _scale = value;
-                if (_scale <= 0) return;
-                _pagesTall = 0;
-                _pagesWide = 0;
-            }
-        }
-
-        public void AdjustTo(Int32 pctOfNormalSize)
-        {
-            Scale = pctOfNormalSize;
-            _pagesWide = 0;
-            _pagesTall = 0;
-        }
-        public void FitToPages(Int32 pagesWide, Int32 pagesTall)
-        {
-            _pagesWide = pagesWide;
-            this._pagesTall = pagesTall;
-            _scale = 0;
-        }
-
-
-        public IXLHeaderFooter Header { get; private set; }
-        public IXLHeaderFooter Footer { get; private set; }
-
-        public Boolean ScaleHFWithDocument { get; set; }
-        public Boolean AlignHFWithMargins { get; set; }
-
-        public Boolean ShowGridlines { get; set; }
-        public Boolean ShowRowAndColumnHeadings { get; set; }
-        public Boolean BlackAndWhite { get; set; }
-        public Boolean DraftQuality { get; set; }
-
-        public XLPageOrderValues PageOrder { get; set; }
-        public XLShowCommentsValues ShowComments { get; set; }
-
-        public List<Int32> RowBreaks { get; private set; }
-        public List<Int32> ColumnBreaks { get; private set; }
-        public void AddHorizontalPageBreak(Int32 row)
-        {
-            if (!RowBreaks.Contains(row))
-                RowBreaks.Add(row);
-        }
-        public void AddVerticalPageBreak(Int32 column)
-        {
-            if (!ColumnBreaks.Contains(column))
-                ColumnBreaks.Add(column);
-        }
-
-        //public void SetPageBreak(IXLRange range, XLPageBreakLocations breakLocation)
-        //{
-        //    switch (breakLocation)
-        //    {
-        //        case XLPageBreakLocations.AboveRange: RowBreaks.Add(range.Internals.Worksheet.Row(range.RowNumber)); break;
-        //        case XLPageBreakLocations.BelowRange: RowBreaks.Add(range.Internals.Worksheet.Row(range.RowCount())); break;
-        //        case XLPageBreakLocations.LeftOfRange: ColumnBreaks.Add(range.Internals.Worksheet.Column(range.ColumnNumber)); break;
-        //        case XLPageBreakLocations.RightOfRange: ColumnBreaks.Add(range.Internals.Worksheet.Column(range.ColumnCount())); break;
-        //        default: throw new NotImplementedException();
-        //    }
-        //}
-
-        public IXLPageSetup SetPageOrientation(XLPageOrientation value) { PageOrientation = value; return this; }
-        public IXLPageSetup SetPagesWide(Int32 value) { PagesWide = value; return this; }
-        public IXLPageSetup SetPagesTall(Int32 value) { PagesTall = value; return this; }
-        public IXLPageSetup SetScale(Int32 value) { Scale = value; return this; }
-        public IXLPageSetup SetHorizontalDpi(Int32 value) { HorizontalDpi = value; return this; }
-        public IXLPageSetup SetVerticalDpi(Int32 value) { VerticalDpi = value; return this; }
-        public IXLPageSetup SetFirstPageNumber(Int64 value) { FirstPageNumber = value; return this; }
-        public IXLPageSetup SetCenterHorizontally() { CenterHorizontally = true; return this; }	public IXLPageSetup SetCenterHorizontally(Boolean value) { CenterHorizontally = value; return this; }
-        public IXLPageSetup SetCenterVertically() { CenterVertically = true; return this; }	public IXLPageSetup SetCenterVertically(Boolean value) { CenterVertically = value; return this; }
-        public IXLPageSetup SetPaperSize(XLPaperSize value) { PaperSize = value; return this; }
-        public IXLPageSetup SetScaleHFWithDocument() { ScaleHFWithDocument = true; return this; }	public IXLPageSetup SetScaleHFWithDocument(Boolean value) { ScaleHFWithDocument = value; return this; }
-        public IXLPageSetup SetAlignHFWithMargins() { AlignHFWithMargins = true; return this; }	public IXLPageSetup SetAlignHFWithMargins(Boolean value) { AlignHFWithMargins = value; return this; }
-        public IXLPageSetup SetShowGridlines() { ShowGridlines = true; return this; }	public IXLPageSetup SetShowGridlines(Boolean value) { ShowGridlines = value; return this; }
-        public IXLPageSetup SetShowRowAndColumnHeadings() { ShowRowAndColumnHeadings = true; return this; }	public IXLPageSetup SetShowRowAndColumnHeadings(Boolean value) { ShowRowAndColumnHeadings = value; return this; }
-        public IXLPageSetup SetBlackAndWhite() { BlackAndWhite = true; return this; }	public IXLPageSetup SetBlackAndWhite(Boolean value) { BlackAndWhite = value; return this; }
-        public IXLPageSetup SetDraftQuality() { DraftQuality = true; return this; }	public IXLPageSetup SetDraftQuality(Boolean value) { DraftQuality = value; return this; }
-        public IXLPageSetup SetPageOrder(XLPageOrderValues value) { PageOrder = value; return this; }
-        public IXLPageSetup SetShowComments(XLShowCommentsValues value) { ShowComments = value; return this; }
-        public IXLPageSetup SetPrintErrorValue(XLPrintErrorValues value) { PrintErrorValue = value; return this; }
-
-        public Boolean DifferentFirstPageOnHF { get; set; }
-        public IXLPageSetup SetDifferentFirstPageOnHF()
-        {
-            return SetDifferentFirstPageOnHF(true);
-        }
-        public IXLPageSetup SetDifferentFirstPageOnHF(Boolean value)
-        {
-            DifferentFirstPageOnHF = value;
-            return this;
-        }
-        public Boolean DifferentOddEvenPagesOnHF { get; set; }
-        public IXLPageSetup SetDifferentOddEvenPagesOnHF()
-        {
-            return SetDifferentOddEvenPagesOnHF(true);
-        }
-        public IXLPageSetup SetDifferentOddEvenPagesOnHF(Boolean value)
-        {
-            DifferentOddEvenPagesOnHF = value;
-            return this;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLPrintAreas.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLPrintAreas.cs
deleted file mode 100644
index 797d2fc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLPrintAreas.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPrintAreas : IXLPrintAreas
-    {
-        List<IXLRange> ranges = new List<IXLRange>();
-        private XLWorksheet worksheet;
-        public XLPrintAreas(XLWorksheet worksheet)
-        {
-            this.worksheet = worksheet;
-        }
-
-        public XLPrintAreas(XLPrintAreas defaultPrintAreas, XLWorksheet worksheet)
-        {
-            ranges = defaultPrintAreas.ranges.ToList();
-            this.worksheet = worksheet;
-        }
-
-        public void Clear()
-        {
-            ranges.Clear();
-        }
-
-        public void Add(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn)
-        {
-            ranges.Add(worksheet.Range(firstCellRow, firstCellColumn, lastCellRow, lastCellColumn));
-        }
-
-        public void Add(string rangeAddress)
-        {
-            ranges.Add(worksheet.Range(rangeAddress));
-        }
-
-        public void Add(string firstCellAddress, string lastCellAddress)
-        {
-            ranges.Add(worksheet.Range(firstCellAddress, lastCellAddress));
-        }
-
-        public void Add(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
-        {
-            ranges.Add(worksheet.Range(firstCellAddress, lastCellAddress));
-        }
-
-        public IEnumerator<IXLRange> GetEnumerator()
-        {
-            return ranges.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotField.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotField.cs
deleted file mode 100644
index 8e69e8b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotField.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLSubtotalFunction
-    {
-        Automatic,
-        None,
-        Sum,
-        Count,
-        Average,
-        Minimum,
-        Maximum,
-        Product,
-        CountNumbers,
-        StandardDeviation,
-        PopulationStandardDeviation,
-        Variance,
-        PopulationVariance,
-    }
-    public enum XLPivotLayout { Outline, Tabular, Compact }
-    public interface IXLPivotField
-    {
-        String SourceName { get; }
-        String CustomName { get; set; }
-
-        List<XLSubtotalFunction> Subtotals { get; }
-        Boolean IncludeNewItemsInFilter { get; set; }
-
-        XLPivotLayout Layout { get; set; }
-        Boolean SubtotalsAtTop { get; set; }
-        Boolean RepeatItemLabels { get; set; }
-        Boolean InsertBlankLines  { get; set; }
-        Boolean ShowBlankItems { get; set; }
-        Boolean InsertPageBreaks { get; set; }
-
-        IXLPivotField SetCustomName(String value);
-
-        IXLPivotField AddSubtotal(XLSubtotalFunction value);
-        IXLPivotField SetIncludeNewItemsInFilter(); IXLPivotField SetIncludeNewItemsInFilter(Boolean value);
-
-        IXLPivotField SetLayout(XLPivotLayout value);
-        IXLPivotField SetSubtotalsAtTop(); IXLPivotField SetSubtotalsAtTop(Boolean value);
-        IXLPivotField SetRepeatItemLabels(); IXLPivotField SetRepeatItemLabels(Boolean value);
-        IXLPivotField SetInsertBlankLines(); IXLPivotField SetInsertBlankLines(Boolean value);
-        IXLPivotField SetShowBlankItems(); IXLPivotField SetShowBlankItems(Boolean value);
-        IXLPivotField SetInsertPageBreaks(); IXLPivotField SetInsertPageBreaks(Boolean value);
-
-        List<string> SharedStrings { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotFields.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotFields.cs
deleted file mode 100644
index 7b01687..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotFields.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLPivotFields: IEnumerable<IXLPivotField>
-    {
-        IXLPivotField Add(String sourceName);
-        IXLPivotField Add(String sourceName, String customName);
-        void Clear();
-        void Remove(String sourceName);
-
-        int IndexOf(IXLPivotField pf);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotTable.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotTable.cs
deleted file mode 100644
index 414f421..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotTable.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLPivotTableTheme
-    {
-        PivotStyleDark1,
-        PivotStyleDark10,
-        PivotStyleDark11,
-        PivotStyleDark12,
-        PivotStyleDark13,
-        PivotStyleDark14,
-        PivotStyleDark15,
-        PivotStyleDark16,
-        PivotStyleDark17,
-        PivotStyleDark18,
-        PivotStyleDark19,
-        PivotStyleDark2,
-        PivotStyleDark20,
-        PivotStyleDark21,
-        PivotStyleDark22,
-        PivotStyleDark23,
-        PivotStyleDark24,
-        PivotStyleDark25,
-        PivotStyleDark26,
-        PivotStyleDark27,
-        PivotStyleDark28,
-        PivotStyleDark3,
-        PivotStyleDark4,
-        PivotStyleDark5,
-        PivotStyleDark6,
-        PivotStyleDark7,
-        PivotStyleDark8,
-        PivotStyleDark9,
-        PivotStyleLight1,
-        PivotStyleLight10,
-        PivotStyleLight11,
-        PivotStyleLight12,
-        PivotStyleLight13,
-        PivotStyleLight14,
-        PivotStyleLight15,
-        PivotStyleLight16,
-        PivotStyleLight17,
-        PivotStyleLight18,
-        PivotStyleLight19,
-        PivotStyleLight2,
-        PivotStyleLight20,
-        PivotStyleLight21,
-        PivotStyleLight22,
-        PivotStyleLight23,
-        PivotStyleLight24,
-        PivotStyleLight25,
-        PivotStyleLight26,
-        PivotStyleLight27,
-        PivotStyleLight28,
-        PivotStyleLight3,
-        PivotStyleLight4,
-        PivotStyleLight5,
-        PivotStyleLight6,
-        PivotStyleLight7,
-        PivotStyleLight8,
-        PivotStyleLight9,
-        PivotStyleMedium1,
-        PivotStyleMedium10,
-        PivotStyleMedium11,
-        PivotStyleMedium12,
-        PivotStyleMedium13,
-        PivotStyleMedium14,
-        PivotStyleMedium15,
-        PivotStyleMedium16,
-        PivotStyleMedium17,
-        PivotStyleMedium18,
-        PivotStyleMedium19,
-        PivotStyleMedium2,
-        PivotStyleMedium20,
-        PivotStyleMedium21,
-        PivotStyleMedium22,
-        PivotStyleMedium23,
-        PivotStyleMedium24,
-        PivotStyleMedium25,
-        PivotStyleMedium26,
-        PivotStyleMedium27,
-        PivotStyleMedium28,
-        PivotStyleMedium3,
-        PivotStyleMedium4,
-        PivotStyleMedium5,
-        PivotStyleMedium6,
-        PivotStyleMedium7,
-        PivotStyleMedium8,
-        PivotStyleMedium9
-    }
-
-    public enum XLPivotSubtotals
-    {
-        DoNotShow,
-        AtTop,
-        AtBottom
-    }
-
-    public enum XLFilterAreaOrder { DownThenOver, OverThenDown }
-    public enum XLItemsToRetain { Automatic, None, Max }
-
-    public interface IXLPivotTable
-    {
-        XLPivotTableTheme Theme { get; set; }
-
-        IXLPivotFields Fields { get; }
-        IXLPivotFields ReportFilters { get; }
-        IXLPivotFields  ColumnLabels { get; }
-        IXLPivotFields RowLabels { get; }
-        IXLPivotValues Values { get; }
-
-        String Name { get; set; }
-        String Title { get; set; }
-        String Description { get; set; }
-
-        IXLCell TargetCell { get; set; }
-        IXLRange SourceRange { get; set; }
-
-        Boolean MergeAndCenterWithLabels { get; set; } // MergeItem
-        Int32 RowLabelIndent { get; set; } // Indent
-        XLFilterAreaOrder FilterAreaOrder { get; set; } // PageOverThenDown 
-        Int32 FilterFieldsPageWrap { get; set; } // PageWrap
-        String ErrorValueReplacement { get; set; } // ErrorCaption
-        String EmptyCellReplacement { get; set; } // MissingCaption
-        Boolean AutofitColumns { get; set; } //UseAutoFormatting 
-        Boolean PreserveCellFormatting { get; set; } // PreserveFormatting 
-        
-        Boolean ShowGrandTotalsRows { get; set; } // RowGrandTotals 
-        Boolean ShowGrandTotalsColumns { get; set; } // ColumnGrandTotals 
-        Boolean FilteredItemsInSubtotals { get; set; } // Subtotal filtered page items
-        Boolean AllowMultipleFilters { get; set; } // MultipleFieldFilters 
-        Boolean UseCustomListsForSorting { get; set; } // CustomListSort 
-
-        Boolean ShowExpandCollapseButtons { get; set; }
-        Boolean ShowContextualTooltips { get; set; }
-        Boolean ShowPropertiesInTooltips { get; set; }
-        Boolean DisplayCaptionsAndDropdowns { get; set; }
-        Boolean ClassicPivotTableLayout { get; set; }
-        Boolean ShowValuesRow { get; set; }
-        Boolean ShowEmptyItemsOnRows { get; set; }
-        Boolean ShowEmptyItemsOnColumns { get; set; }
-        Boolean DisplayItemLabels { get; set; }
-        Boolean SortFieldsAtoZ { get; set; }
-
-        Boolean PrintExpandCollapsedButtons { get; set; }
-        Boolean RepeatRowLabels { get; set; }
-        Boolean PrintTitles { get; set; }
-
-        Boolean SaveSourceData { get; set; }
-        Boolean EnableShowDetails { get; set; }
-        Boolean RefreshDataOnOpen { get; set; }
-        XLItemsToRetain ItemsToRetainPerField { get; set; }
-        Boolean EnableCellEditing { get; set; }
-
-        IXLPivotTable SetName(String value);
-        IXLPivotTable SetTitle(String value);
-        IXLPivotTable SetDescription(String value);
-
-        IXLPivotTable SetMergeAndCenterWithLabels(); IXLPivotTable SetMergeAndCenterWithLabels(Boolean value);
-        IXLPivotTable SetRowLabelIndent(Int32 value);
-        IXLPivotTable SetFilterAreaOrder(XLFilterAreaOrder value);
-        IXLPivotTable SetFilterFieldsPageWrap(Int32 value);
-        IXLPivotTable SetErrorValueReplacement(String value);
-        IXLPivotTable SetEmptyCellReplacement(String value);
-        IXLPivotTable SetAutofitColumns(); IXLPivotTable SetAutofitColumns(Boolean value);
-        IXLPivotTable SetPreserveCellFormatting(); IXLPivotTable SetPreserveCellFormatting(Boolean value);
-
-        IXLPivotTable SetShowGrandTotalsRows(); IXLPivotTable SetShowGrandTotalsRows(Boolean value);
-        IXLPivotTable SetShowGrandTotalsColumns(); IXLPivotTable SetShowGrandTotalsColumns(Boolean value);
-        IXLPivotTable SetFilteredItemsInSubtotals(); IXLPivotTable SetFilteredItemsInSubtotals(Boolean value);
-        IXLPivotTable SetAllowMultipleFilters(); IXLPivotTable SetAllowMultipleFilters(Boolean value);
-        IXLPivotTable SetUseCustomListsForSorting(); IXLPivotTable SetUseCustomListsForSorting(Boolean value);
-
-        IXLPivotTable SetShowExpandCollapseButtons(); IXLPivotTable SetShowExpandCollapseButtons(Boolean value);
-        IXLPivotTable SetShowContextualTooltips(); IXLPivotTable SetShowContextualTooltips(Boolean value);
-        IXLPivotTable SetShowPropertiesInTooltips(); IXLPivotTable SetShowPropertiesInTooltips(Boolean value);
-        IXLPivotTable SetDisplayCaptionsAndDropdowns(); IXLPivotTable SetDisplayCaptionsAndDropdowns(Boolean value);
-        IXLPivotTable SetClassicPivotTableLayout(); IXLPivotTable SetClassicPivotTableLayout(Boolean value);
-        IXLPivotTable SetShowValuesRow(); IXLPivotTable SetShowValuesRow(Boolean value);
-        IXLPivotTable SetShowEmptyItemsOnRows(); IXLPivotTable SetShowEmptyItemsOnRows(Boolean value);
-        IXLPivotTable SetShowEmptyItemsOnColumns(); IXLPivotTable SetShowEmptyItemsOnColumns(Boolean value);
-        IXLPivotTable SetDisplayItemLabels(); IXLPivotTable SetDisplayItemLabels(Boolean value);
-        IXLPivotTable SetSortFieldsAtoZ(); IXLPivotTable SetSortFieldsAtoZ(Boolean value);
-
-        IXLPivotTable SetPrintExpandCollapsedButtons(); IXLPivotTable SetPrintExpandCollapsedButtons(Boolean value);
-        IXLPivotTable SetRepeatRowLabels(); IXLPivotTable SetRepeatRowLabels(Boolean value);
-        IXLPivotTable SetPrintTitles(); IXLPivotTable SetPrintTitles(Boolean value);
-
-        IXLPivotTable SetSaveSourceData(); IXLPivotTable SetSaveSourceData(Boolean value);
-        IXLPivotTable SetEnableShowDetails(); IXLPivotTable SetEnableShowDetails(Boolean value);
-        IXLPivotTable SetRefreshDataOnOpen(); IXLPivotTable SetRefreshDataOnOpen(Boolean value);
-        IXLPivotTable SetItemsToRetainPerField(XLItemsToRetain value);
-        IXLPivotTable SetEnableCellEditing(); IXLPivotTable SetEnableCellEditing(Boolean value);
-
-        Boolean ShowRowHeaders { get; set; }
-        Boolean ShowColumnHeaders { get; set; }
-        Boolean ShowRowStripes { get; set; }
-        Boolean ShowColumnStripes { get; set; }
-        XLPivotSubtotals Subtotals { get; set; }
-        XLPivotLayout Layout { set; }
-        Boolean InsertBlankLines { set; }
-
-        IXLPivotTable SetShowRowHeaders(); IXLPivotTable SetShowRowHeaders(Boolean value);
-        IXLPivotTable SetShowColumnHeaders(); IXLPivotTable SetShowColumnHeaders(Boolean value);
-        IXLPivotTable SetShowRowStripes(); IXLPivotTable SetShowRowStripes(Boolean value);
-        IXLPivotTable SetShowColumnStripes(); IXLPivotTable SetShowColumnStripes(Boolean value);
-        IXLPivotTable SetSubtotals(XLPivotSubtotals value);
-        IXLPivotTable SetLayout(XLPivotLayout value);
-        IXLPivotTable SetInsertBlankLines(); IXLPivotTable SetInsertBlankLines(Boolean value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotTables.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotTables.cs
deleted file mode 100644
index 1f3bb63..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/IXLPivotTables.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLPivotTables: IEnumerable<IXLPivotTable>
-    {
-        IXLPivotTable PivotTable(String name);
-        void Add(String name, IXLPivotTable pivotTable);
-        IXLPivotTable AddNew(String name, IXLCell target, IXLRange source);
-        void Delete(String name);
-        void DeleteAll();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValue.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValue.cs
deleted file mode 100644
index 48c6190..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValue.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public enum XLPivotSummary
-    {
-        Sum,
-        Count,
-        Average,
-        Minimum,
-        Maximum,
-        Product,
-        CountNumbers,
-        StandardDeviation,
-        PopulationStandardDeviation,
-        Variance,
-        PopulationVariance,
-    }
-
-    public enum XLPivotCalculation
-    {
-        Normal,
-        DifferenceFrom,
-        PctOf,
-        PctDifferenceFrom,
-        RunningTotal,
-        PctOfRow,
-        PctOfColumn,
-        PctOfTotal,
-        Index
-    }
-    public enum XLPivotCalculationItem
-    {
-        Value, Previous, Next
-    }
-
-    public interface IXLPivotValue
-    {
-        String SourceName { get; }
-        String CustomName { get; set; }
-
-        IXLPivotValueFormat NumberFormat { get; }
-
-        XLPivotSummary SummaryFormula { get; set; }
-        XLPivotCalculation Calculation { get; set; }
-        String BaseField { get; set; }
-        String BaseItem { get; set; }
-        XLPivotCalculationItem CalculationItem { get; set; }
-
-        IXLPivotValue SetSummaryFormula(XLPivotSummary value);
-        IXLPivotValue SetCalculation(XLPivotCalculation value);
-        IXLPivotValue SetBaseField(String value);
-        IXLPivotValue SetBaseItem(String value);
-        IXLPivotValue SetCalculationItem(XLPivotCalculationItem value);
-
-
-        IXLPivotValue ShowAsNormal();
-        IXLPivotValueCombination ShowAsDifferenceFrom(String fieldSourceName);
-        IXLPivotValueCombination ShowAsPctFrom(String fieldSourceName);
-        IXLPivotValueCombination ShowAsPctDifferenceFrom(String fieldSourceName);
-        IXLPivotValue ShowAsRunningTotalIn(String fieldSourceName);
-        IXLPivotValue ShowAsPctOfRow();
-        IXLPivotValue ShowAsPctOfColumn();
-        IXLPivotValue ShowAsPctOfTotal();
-        IXLPivotValue ShowAsIndex();
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueCombination.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueCombination.cs
deleted file mode 100644
index 3e655b8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueCombination.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLPivotValueCombination
-    {
-        IXLPivotValue And(String item);
-        IXLPivotValue AndPrevious();
-        IXLPivotValue AndNext();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueFormat.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueFormat.cs
deleted file mode 100644
index 6ccaedf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueFormat.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLPivotValueFormat: IXLNumberFormatBase
-    {
-        IXLPivotValue SetNumberFormatId(Int32 value);
-        IXLPivotValue SetFormat(String value);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValues.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValues.cs
deleted file mode 100644
index 0d971e6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValues.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLPivotValues: IEnumerable<IXLPivotValue>
-    {
-        IXLPivotValue Add(String sourceName);
-        IXLPivotValue Add(String sourceName, String customName);
-        void Clear();
-        void Remove(String sourceName);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValue.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValue.cs
deleted file mode 100644
index 37ec344..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValue.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPivotValue: IXLPivotValue
-    {
-        public XLPivotValue(string sourceName)
-        {
-            SourceName = sourceName;
-            NumberFormat = new XLPivotValueFormat(this);
-        }
-
-        public IXLPivotValueFormat NumberFormat { get; private set; }
-        public String SourceName { get; private set; }	
-        public String CustomName { get; set; }		public IXLPivotValue SetCustomName(String value) { CustomName = value; return this; }
-
-        public XLPivotSummary SummaryFormula { get; set; }		public IXLPivotValue SetSummaryFormula(XLPivotSummary value) { SummaryFormula = value; return this; }
-        public XLPivotCalculation Calculation { get; set; }		public IXLPivotValue SetCalculation(XLPivotCalculation value) { Calculation = value; return this; }
-        public String BaseField { get; set; }		public IXLPivotValue SetBaseField(String value) { BaseField = value; return this; }
-        public String BaseItem { get; set; }		public IXLPivotValue SetBaseItem(String value) { BaseItem = value; return this; }
-        public XLPivotCalculationItem CalculationItem { get; set; }		public IXLPivotValue SetCalculationItem(XLPivotCalculationItem value) { CalculationItem = value; return this; }
-
-
-        public IXLPivotValue ShowAsNormal()
-        {
-            return SetCalculation(XLPivotCalculation.Normal);
-        }
-        public IXLPivotValueCombination ShowAsDifferenceFrom(String fieldSourceName)
-        {
-            BaseField = fieldSourceName;
-            SetCalculation(XLPivotCalculation.DifferenceFrom);
-            return new XLPivotValueCombination(this);
-        }
-        public IXLPivotValueCombination ShowAsPctFrom(String fieldSourceName)
-        {
-            BaseField = fieldSourceName;
-            SetCalculation(XLPivotCalculation.PctOf);
-            return new XLPivotValueCombination(this);
-        }
-        public IXLPivotValueCombination ShowAsPctDifferenceFrom(String fieldSourceName)
-        {
-            BaseField = fieldSourceName;
-            SetCalculation(XLPivotCalculation.PctDifferenceFrom);
-            return new XLPivotValueCombination(this);
-        }
-        public IXLPivotValue ShowAsRunningTotalIn(String fieldSourceName)
-        {
-            BaseField = fieldSourceName;
-            return SetCalculation(XLPivotCalculation.RunningTotal);
-        }
-        public IXLPivotValue ShowAsPctOfRow()
-        {
-            return SetCalculation(XLPivotCalculation.PctOfRow);
-        }
-
-        public IXLPivotValue ShowAsPctOfColumn()
-        {
-            return SetCalculation(XLPivotCalculation.PctOfColumn);
-        }
-
-        public IXLPivotValue ShowAsPctOfTotal()
-        {
-            return SetCalculation(XLPivotCalculation.PctOfTotal);
-        }
-
-        public IXLPivotValue ShowAsIndex()
-        {
-            return SetCalculation(XLPivotCalculation.Index);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueCombination.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueCombination.cs
deleted file mode 100644
index 56f04bc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueCombination.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPivotValueCombination: IXLPivotValueCombination
-    {
-        private readonly IXLPivotValue _pivotValue;
-        public XLPivotValueCombination(IXLPivotValue pivotValue)
-        {
-            _pivotValue = pivotValue;
-        }
-        public IXLPivotValue And(String item)
-        {
-            _pivotValue.BaseItem = item;
-            _pivotValue.CalculationItem = XLPivotCalculationItem.Value;
-            return _pivotValue;
-        }
-        public IXLPivotValue AndPrevious()
-        {
-            _pivotValue.CalculationItem = XLPivotCalculationItem.Previous;
-            return _pivotValue;
-        }
-        public IXLPivotValue AndNext()
-        {
-            _pivotValue.CalculationItem = XLPivotCalculationItem.Next;
-            return _pivotValue;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueFormat.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueFormat.cs
deleted file mode 100644
index 191d46c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueFormat.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPivotValueFormat: IXLPivotValueFormat
-    {
-        private readonly XLPivotValue _pivotValue;
-        public XLPivotValueFormat(XLPivotValue pivotValue)
-        {
-            _pivotValue = pivotValue;
-            _format = "General";
-            _numberFormatId = 0;
-        }
-
-        private Int32 _numberFormatId = -1;
-        public Int32 NumberFormatId
-        {
-            get { return _numberFormatId; }
-            set
-            {
-                _numberFormatId = value;
-                _format = string.Empty;
-            }
-        }
-
-        private String _format = String.Empty;
-        public String Format
-        {
-            get { return _format; }
-            set
-            {
-                _format = value;
-                _numberFormatId = -1;
-            }
-        }
-
-        public IXLPivotValue SetNumberFormatId(Int32 value)
-        {
-            NumberFormatId = value;
-            return _pivotValue;
-        }
-        public IXLPivotValue SetFormat(String value)
-        {
-            Format = value;
-
-            switch (value)
-            {
-                case "General":
-                    _numberFormatId = 0;
-                    break;
-                case "0":
-                    _numberFormatId = 1;
-                    break;
-                case "0.00":
-                    _numberFormatId = 2;
-                    break;
-                case "#,##0":
-                    _numberFormatId = 3;
-                    break;
-                case "#,##0.00":
-                    _numberFormatId = 4;
-                    break;
-                case "0%":
-                    _numberFormatId = 9;
-                    break;
-                case "0.00%":
-                    _numberFormatId = 10;
-                    break;
-                case "0.00E+00":
-                    _numberFormatId = 11;
-                    break;
-            }
-
-
-            return _pivotValue;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValues.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValues.cs
deleted file mode 100644
index b855923..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValues.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPivotValues: IXLPivotValues
-    {
-        private readonly Dictionary<String, IXLPivotValue> _pivotValues = new Dictionary<string, IXLPivotValue>();
-        public IEnumerator<IXLPivotValue> GetEnumerator()
-        {
-            return _pivotValues.Values.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLPivotValue Add(String sourceName)
-        {
-            return Add(sourceName, sourceName);
-        }
-        public IXLPivotValue Add(String sourceName, String customName)
-        {
-            var pivotValue = new XLPivotValue(sourceName) { CustomName = customName };
-            _pivotValues.Add(sourceName, pivotValue);
-            return pivotValue;
-        }
-
-        public void Clear()
-        {
-            _pivotValues.Clear();
-        }
-        public void Remove(String sourceName)
-        {
-            _pivotValues.Remove(sourceName);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotField.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotField.cs
deleted file mode 100644
index 84291fd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotField.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-
-    public class XLPivotField: IXLPivotField
-    {
-        public XLPivotField(string sourceName)
-        {
-            SourceName = sourceName;
-            SharedStrings = new List<string>();
-            Subtotals = new List<XLSubtotalFunction>();
-        }
-
-        public String SourceName { get; private set; }	
-        public String CustomName { get; set; }		public IXLPivotField SetCustomName(String value) { CustomName = value; return this; }
-
-        public List<XLSubtotalFunction> Subtotals { get; private set; }		public IXLPivotField AddSubtotal(XLSubtotalFunction value) { Subtotals.Add(value); return this; }
-        public Boolean IncludeNewItemsInFilter { get; set; }	public IXLPivotField SetIncludeNewItemsInFilter() { IncludeNewItemsInFilter = true; return this; }	public IXLPivotField SetIncludeNewItemsInFilter(Boolean value) { IncludeNewItemsInFilter = value; return this; }
-
-        public XLPivotLayout Layout { get; set; }		public IXLPivotField SetLayout(XLPivotLayout value) { Layout = value; return this; }
-        public Boolean SubtotalsAtTop { get; set; }	public IXLPivotField SetSubtotalsAtTop() { SubtotalsAtTop = true; return this; }	public IXLPivotField SetSubtotalsAtTop(Boolean value) { SubtotalsAtTop = value; return this; }
-        public Boolean RepeatItemLabels { get; set; }	public IXLPivotField SetRepeatItemLabels() { RepeatItemLabels = true; return this; }	public IXLPivotField SetRepeatItemLabels(Boolean value) { RepeatItemLabels = value; return this; }
-        public Boolean InsertBlankLines { get; set; }	public IXLPivotField SetInsertBlankLines() { InsertBlankLines = true; return this; }	public IXLPivotField SetInsertBlankLines(Boolean value) { InsertBlankLines = value; return this; }
-        public Boolean ShowBlankItems { get; set; }	public IXLPivotField SetShowBlankItems() { ShowBlankItems = true; return this; }	public IXLPivotField SetShowBlankItems(Boolean value) { ShowBlankItems = value; return this; }
-        public Boolean InsertPageBreaks { get; set; }	public IXLPivotField SetInsertPageBreaks() { InsertPageBreaks = true; return this; }	public IXLPivotField SetInsertPageBreaks(Boolean value) { InsertPageBreaks = value; return this; }
-
-        public List<string> SharedStrings { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotFields.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotFields.cs
deleted file mode 100644
index 95e15d5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotFields.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public class XLPivotFields: IXLPivotFields
-    {
-        private readonly Dictionary<String, IXLPivotField> _pivotFields = new Dictionary<string, IXLPivotField>();
-        public IEnumerator<IXLPivotField> GetEnumerator()
-        {
-            return _pivotFields.Values.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLPivotField Add(String sourceName)
-        {
-            return Add(sourceName, sourceName);
-        }
-        public IXLPivotField Add(String sourceName, String customName)
-        {
-            var pivotField = new XLPivotField(sourceName) {CustomName = customName};
-            _pivotFields.Add(sourceName, pivotField);
-            return pivotField;
-        }
-
-        public void Clear()
-        {
-            _pivotFields.Clear();
-        }
-        public void Remove(String sourceName)
-        {
-            _pivotFields.Remove(sourceName);
-        }
-
-        public int IndexOf(IXLPivotField pf)
-        {
-            var selectedItem = _pivotFields.Select((item, index) => new {Item = item, Position = index}).FirstOrDefault(i => i.Item.Key == pf.SourceName);
-            if (selectedItem == null)
-                throw new IndexOutOfRangeException("Invalid field name.");
-            return selectedItem.Position;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotTable.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotTable.cs
deleted file mode 100644
index dc2b6ee..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotTable.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPivotTable: IXLPivotTable
-    {
-        public XLPivotTable()
-        {
-            Fields = new XLPivotFields();
-            ReportFilters = new XLPivotFields();
-            ColumnLabels=new XLPivotFields();
-            RowLabels = new XLPivotFields();
-            Values = new XLPivotValues();
-            Theme = XLPivotTableTheme.PivotStyleLight16;
-
-            SetExcelDefaults();
-        }
-
-        public IXLCell TargetCell { get; set; }
-        public IXLRange SourceRange { get; set; }
-
-        public IXLPivotFields Fields { get; private set; }
-        public IXLPivotFields ReportFilters { get; private set; }
-        public IXLPivotFields ColumnLabels { get; private set; }
-        public IXLPivotFields RowLabels { get; private set; }
-        public IXLPivotValues Values { get; private set; }
-
-        public XLPivotTableTheme Theme { get; set; }		public IXLPivotTable SetTheme(XLPivotTableTheme value) { Theme = value; return this; }
-        public String Name { get; set; }		public IXLPivotTable SetName(String value) { Name = value; return this; }
-        public String Title { get; set; }		public IXLPivotTable SetTitle(String value) { Title = value; return this; }
-        public String Description { get; set; }		public IXLPivotTable SetDescription(String value) { Description = value; return this; }
-
-        public Boolean MergeAndCenterWithLabels { get; set; }	public IXLPivotTable SetMergeAndCenterWithLabels() { MergeAndCenterWithLabels = true; return this; }	public IXLPivotTable SetMergeAndCenterWithLabels(Boolean value) { MergeAndCenterWithLabels = value; return this; }
-        public Int32 RowLabelIndent { get; set; }		public IXLPivotTable SetRowLabelIndent(Int32 value) { RowLabelIndent = value; return this; }
-        public XLFilterAreaOrder FilterAreaOrder { get; set; }		public IXLPivotTable SetFilterAreaOrder(XLFilterAreaOrder value) { FilterAreaOrder = value; return this; }
-        public Int32 FilterFieldsPageWrap { get; set; }		public IXLPivotTable SetFilterFieldsPageWrap(Int32 value) { FilterFieldsPageWrap = value; return this; }
-        public String ErrorValueReplacement { get; set; }		public IXLPivotTable SetErrorValueReplacement(String value) { ErrorValueReplacement = value; return this; }
-        public String EmptyCellReplacement { get; set; }		public IXLPivotTable SetEmptyCellReplacement(String value) { EmptyCellReplacement = value; return this; }
-        public Boolean AutofitColumns { get; set; }	public IXLPivotTable SetAutofitColumns() { AutofitColumns = true; return this; }	public IXLPivotTable SetAutofitColumns(Boolean value) { AutofitColumns = value; return this; }
-        public Boolean PreserveCellFormatting { get; set; }	public IXLPivotTable SetPreserveCellFormatting() { PreserveCellFormatting = true; return this; }	public IXLPivotTable SetPreserveCellFormatting(Boolean value) { PreserveCellFormatting = value; return this; }
-
-        public Boolean ShowGrandTotalsRows { get; set; }	public IXLPivotTable SetShowGrandTotalsRows() { ShowGrandTotalsRows = true; return this; }	public IXLPivotTable SetShowGrandTotalsRows(Boolean value) { ShowGrandTotalsRows = value; return this; }
-        public Boolean ShowGrandTotalsColumns { get; set; }	public IXLPivotTable SetShowGrandTotalsColumns() { ShowGrandTotalsColumns = true; return this; }	public IXLPivotTable SetShowGrandTotalsColumns(Boolean value) { ShowGrandTotalsColumns = value; return this; }
-        public Boolean FilteredItemsInSubtotals { get; set; }	public IXLPivotTable SetFilteredItemsInSubtotals() { FilteredItemsInSubtotals = true; return this; }	public IXLPivotTable SetFilteredItemsInSubtotals(Boolean value) { FilteredItemsInSubtotals = value; return this; }
-        public Boolean AllowMultipleFilters { get; set; }	public IXLPivotTable SetAllowMultipleFilters() { AllowMultipleFilters = true; return this; }	public IXLPivotTable SetAllowMultipleFilters(Boolean value) { AllowMultipleFilters = value; return this; }
-        public Boolean UseCustomListsForSorting { get; set; }	public IXLPivotTable SetUseCustomListsForSorting() { UseCustomListsForSorting = true; return this; }	public IXLPivotTable SetUseCustomListsForSorting(Boolean value) { UseCustomListsForSorting = value; return this; }
-
-        public Boolean ShowExpandCollapseButtons { get; set; }	public IXLPivotTable SetShowExpandCollapseButtons() { ShowExpandCollapseButtons = true; return this; }	public IXLPivotTable SetShowExpandCollapseButtons(Boolean value) { ShowExpandCollapseButtons = value; return this; }
-        public Boolean ShowContextualTooltips { get; set; }	public IXLPivotTable SetShowContextualTooltips() { ShowContextualTooltips = true; return this; }	public IXLPivotTable SetShowContextualTooltips(Boolean value) { ShowContextualTooltips = value; return this; }
-        public Boolean ShowPropertiesInTooltips { get; set; }	public IXLPivotTable SetShowPropertiesInTooltips() { ShowPropertiesInTooltips = true; return this; }	public IXLPivotTable SetShowPropertiesInTooltips(Boolean value) { ShowPropertiesInTooltips = value; return this; }
-        public Boolean DisplayCaptionsAndDropdowns { get; set; }	public IXLPivotTable SetDisplayCaptionsAndDropdowns() { DisplayCaptionsAndDropdowns = true; return this; }	public IXLPivotTable SetDisplayCaptionsAndDropdowns(Boolean value) { DisplayCaptionsAndDropdowns = value; return this; }
-        public Boolean ClassicPivotTableLayout { get; set; }	public IXLPivotTable SetClassicPivotTableLayout() { ClassicPivotTableLayout = true; return this; }	public IXLPivotTable SetClassicPivotTableLayout(Boolean value) { ClassicPivotTableLayout = value; return this; }
-        public Boolean ShowValuesRow { get; set; }	public IXLPivotTable SetShowValuesRow() { ShowValuesRow = true; return this; }	public IXLPivotTable SetShowValuesRow(Boolean value) { ShowValuesRow = value; return this; }
-        public Boolean ShowEmptyItemsOnRows { get; set; }	public IXLPivotTable SetShowEmptyItemsOnRows() { ShowEmptyItemsOnRows = true; return this; }	public IXLPivotTable SetShowEmptyItemsOnRows(Boolean value) { ShowEmptyItemsOnRows = value; return this; }
-        public Boolean ShowEmptyItemsOnColumns { get; set; }	public IXLPivotTable SetShowEmptyItemsOnColumns() { ShowEmptyItemsOnColumns = true; return this; }	public IXLPivotTable SetShowEmptyItemsOnColumns(Boolean value) { ShowEmptyItemsOnColumns = value; return this; }
-        public Boolean DisplayItemLabels { get; set; }	public IXLPivotTable SetDisplayItemLabels() { DisplayItemLabels = true; return this; }	public IXLPivotTable SetDisplayItemLabels(Boolean value) { DisplayItemLabels = value; return this; }
-        public Boolean SortFieldsAtoZ { get; set; }	public IXLPivotTable SetSortFieldsAtoZ() { SortFieldsAtoZ = true; return this; }	public IXLPivotTable SetSortFieldsAtoZ(Boolean value) { SortFieldsAtoZ = value; return this; }
-
-        public Boolean PrintExpandCollapsedButtons { get; set; }	public IXLPivotTable SetPrintExpandCollapsedButtons() { PrintExpandCollapsedButtons = true; return this; }	public IXLPivotTable SetPrintExpandCollapsedButtons(Boolean value) { PrintExpandCollapsedButtons = value; return this; }
-        public Boolean RepeatRowLabels { get; set; }	public IXLPivotTable SetRepeatRowLabels() { RepeatRowLabels = true; return this; }	public IXLPivotTable SetRepeatRowLabels(Boolean value) { RepeatRowLabels = value; return this; }
-        public Boolean PrintTitles { get; set; }	public IXLPivotTable SetPrintTitles() { PrintTitles = true; return this; }	public IXLPivotTable SetPrintTitles(Boolean value) { PrintTitles = value; return this; }
-
-        public Boolean SaveSourceData { get; set; }	public IXLPivotTable SetSaveSourceData() { SaveSourceData = true; return this; }	public IXLPivotTable SetSaveSourceData(Boolean value) { SaveSourceData = value; return this; }
-        public Boolean EnableShowDetails { get; set; }	public IXLPivotTable SetEnableShowDetails() { EnableShowDetails = true; return this; }	public IXLPivotTable SetEnableShowDetails(Boolean value) { EnableShowDetails = value; return this; }
-        public Boolean RefreshDataOnOpen { get; set; }	public IXLPivotTable SetRefreshDataOnOpen() { RefreshDataOnOpen = true; return this; }	public IXLPivotTable SetRefreshDataOnOpen(Boolean value) { RefreshDataOnOpen = value; return this; }
-        public XLItemsToRetain ItemsToRetainPerField { get; set; }		public IXLPivotTable SetItemsToRetainPerField(XLItemsToRetain value) { ItemsToRetainPerField = value; return this; }
-        public Boolean EnableCellEditing { get; set; }	public IXLPivotTable SetEnableCellEditing() { EnableCellEditing = true; return this; }	public IXLPivotTable SetEnableCellEditing(Boolean value) { EnableCellEditing = value; return this; }
-
-
-        public Boolean ShowRowHeaders { get; set; }	public IXLPivotTable SetShowRowHeaders() { ShowRowHeaders = true; return this; }	public IXLPivotTable SetShowRowHeaders(Boolean value) { ShowRowHeaders = value; return this; }
-        public Boolean ShowColumnHeaders { get; set; }	public IXLPivotTable SetShowColumnHeaders() { ShowColumnHeaders = true; return this; }	public IXLPivotTable SetShowColumnHeaders(Boolean value) { ShowColumnHeaders = value; return this; }
-        public Boolean ShowRowStripes { get; set; }	public IXLPivotTable SetShowRowStripes() { ShowRowStripes = true; return this; }	public IXLPivotTable SetShowRowStripes(Boolean value) { ShowRowStripes = value; return this; }
-        public Boolean ShowColumnStripes { get; set; }	public IXLPivotTable SetShowColumnStripes() { ShowColumnStripes = true; return this; }	public IXLPivotTable SetShowColumnStripes(Boolean value) { ShowColumnStripes = value; return this; }
-        public XLPivotSubtotals Subtotals { get; set; }		public IXLPivotTable SetSubtotals(XLPivotSubtotals value) { Subtotals = value; return this; }
-
-        public XLPivotLayout Layout
-        {
-            set { Fields.ForEach(f=>f.SetLayout(value)); }
-        }
-
-        public IXLPivotTable SetLayout(XLPivotLayout value) { Layout = value; return this; }
-
-        public Boolean InsertBlankLines
-        {
-            set { Fields.ForEach(f=>f.SetInsertBlankLines(value)); }
-        }
-
-        public IXLPivotTable SetInsertBlankLines() { InsertBlankLines = true; return this; }	public IXLPivotTable SetInsertBlankLines(Boolean value) { InsertBlankLines = value; return this; }
-
-        private void SetExcelDefaults()
-        {
-            EmptyCellReplacement = String.Empty;
-            AutofitColumns = true;
-            PreserveCellFormatting = true;
-            ShowGrandTotalsColumns = true;
-            ShowGrandTotalsRows = true;
-            UseCustomListsForSorting = true;
-            ShowExpandCollapseButtons = true;
-            ShowContextualTooltips = true;
-            DisplayCaptionsAndDropdowns = true;
-            RepeatRowLabels = true;
-            SaveSourceData = true;
-            EnableShowDetails = true;
-            ShowColumnHeaders = true;
-            ShowRowHeaders = true;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotTables.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotTables.cs
deleted file mode 100644
index fe945b3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/PivotTables/XLPivotTables.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPivotTables: IXLPivotTables
-    {
-        private readonly Dictionary<String, XLPivotTable> _pivotTables = new Dictionary<string, XLPivotTable>();
-        public IEnumerator<IXLPivotTable> GetEnumerator()
-        {
-            return _pivotTables.Values.Cast<IXLPivotTable>().GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public XLPivotTable PivotTable(String name)
-        {
-            return _pivotTables[name];
-        }
-        IXLPivotTable IXLPivotTables.PivotTable(String name)
-        {
-            return PivotTable(name);
-        }
-        public void Delete(String name)
-        {
-            _pivotTables.Remove(name);
-        }
-        public void DeleteAll()
-        {
-            _pivotTables.Clear();
-        }
-
-        public void Add(String name, IXLPivotTable pivotTable)
-        {
-            _pivotTables.Add(name, (XLPivotTable)pivotTable);
-        }
-
-        public IXLPivotTable AddNew(string name, IXLCell target, IXLRange source)
-        {
-            var pivotTable = new XLPivotTable { Name = name, TargetCell = target, SourceRange = source };
-            _pivotTables.Add(name, pivotTable);
-            return pivotTable;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLBaseCollection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLBaseCollection.cs
deleted file mode 100644
index 118db37..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLBaseCollection.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLBaseCollection<TSingle, TMultiple>: IEnumerable<TSingle>
-    { 
-        Int32 Count { get; }
-
-        IXLStyle Style { get; set; }
-
-        IXLDataValidation SetDataValidation();
-
-        /// <summary>
-        /// Creates a named range out of these ranges. 
-        /// <para>If the named range exists, it will add these ranges to that named range.</para>
-        /// <para>The default scope for the named range is Workbook.</para>
-        /// </summary>
-        /// <param name="rangeName">Name of the range.</param>
-        TMultiple AddToNamed(String rangeName);
-
-        /// <summary>
-        /// Creates a named range out of these ranges. 
-        /// <para>If the named range exists, it will add these ranges to that named range.</para>
-        /// <param name="rangeName">Name of the range.</param>
-        /// <param name="scope">The scope for the named range.</param>
-        /// </summary>
-        TMultiple AddToNamed(String rangeName, XLScope scope);
-
-        /// <summary>
-        /// Creates a named range out of these ranges. 
-        /// <para>If the named range exists, it will add these ranges to that named range.</para>
-        /// <param name="rangeName">Name of the range.</param>
-        /// <param name="scope">The scope for the named range.</param>
-        /// <param name="comment">The comments for the named range.</param>
-        /// </summary>
-        TMultiple AddToNamed(String rangeName, XLScope scope, String comment);
-
-        /// <summary>
-        /// Sets the cells' value.
-        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
-        /// <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
-        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
-        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
-        /// </summary>
-        /// <value>
-        /// The object containing the value(s) to set.
-        /// </value>
-        Object Value { set; }
-
-        TMultiple SetValue<T>(T value);
-
-        /// <summary>
-        /// Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        TMultiple SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of these ranges.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        TMultiple Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRange.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRange.cs
deleted file mode 100644
index b813037..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRange.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-using System;
-
-
-namespace ClosedXML.Excel
-{
-    public enum XLShiftDeletedCells { ShiftCellsUp, ShiftCellsLeft }
-    public enum XLTransposeOptions { MoveCells, ReplaceCells }
-    public enum XLSearchContents { Values, Formulas, ValuesAndFormulas }
-    public interface IXLRange: IXLRangeBase
-    {
-        /// <summary>
-        /// Gets the cell at the specified row and column.
-        /// <para>The cell address is relative to the parent range.</para>
-        /// </summary>
-        /// <param name="row">The cell's row.</param>
-        /// <param name="column">The cell's column.</param>
-        IXLCell Cell(int row, int column);
-
-        /// <summary>Gets the cell at the specified address.</summary>
-        /// <para>The cell address is relative to the parent range.</para>
-        /// <param name="cellAddressInRange">The cell address in the parent range.</param>
-        IXLCell Cell(string cellAddressInRange);
-
-        /// <summary>
-        /// Gets the cell at the specified row and column.
-        /// <para>The cell address is relative to the parent range.</para>
-        /// </summary>
-        /// <param name="row">The cell's row.</param>
-        /// <param name="column">The cell's column.</param>
-        IXLCell Cell(int row, string column);
-        /// <summary>Gets the cell at the specified address.</summary>
-        /// <para>The cell address is relative to the parent range.</para>
-        /// <param name="cellAddressInRange">The cell address in the parent range.</param>
-        IXLCell Cell(IXLAddress cellAddressInRange);
-
-        /// <summary>
-        /// Gets the specified column of the range.
-        /// </summary>
-        /// <param name="column">The range column.</param>
-        IXLRangeColumn Column(int column);
-        /// <summary>
-        /// Gets the specified column of the range.
-        /// </summary>
-        /// <param name="column">The range column.</param>
-        IXLRangeColumn Column(string column);
-        /// <summary>
-        /// Gets the first column of the range.
-        /// </summary>
-        IXLRangeColumn FirstColumn(Func<IXLRangeColumn, Boolean> predicate = null);
-        /// <summary>
-        /// Gets the first column of the range that contains a cell with a value.
-        /// </summary>
-        IXLRangeColumn FirstColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null);
-        IXLRangeColumn FirstColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null);
-        /// <summary>
-        /// Gets the last column of the range.
-        /// </summary>
-        IXLRangeColumn LastColumn(Func<IXLRangeColumn, Boolean> predicate = null);
-        /// <summary>
-        /// Gets the last column of the range that contains a cell with a value.
-        /// </summary>
-        IXLRangeColumn LastColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null);
-        IXLRangeColumn LastColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null);
-        /// <summary>
-        /// Gets a collection of all columns in this range.
-        /// </summary>
-        IXLRangeColumns Columns(Func<IXLRangeColumn, Boolean> predicate = null);
-        /// <summary>
-        /// Gets a collection of the specified columns in this range.
-        /// </summary>
-        /// <param name="firstColumn">The first column to return.</param>
-        /// <param name="lastColumn">The last column to return.</param>
-        IXLRangeColumns Columns(int firstColumn, int lastColumn);
-        /// <summary>
-        /// Gets a collection of the specified columns in this range.
-        /// </summary>
-        /// <param name="firstColumn">The first column to return.</param>
-        /// <param name="lastColumn">The last column to return.</param>
-        IXLRangeColumns Columns(string firstColumn, string lastColumn);
-        /// <summary>
-        /// Gets a collection of the specified columns in this range, separated by commas.
-        /// <para>e.g. Columns("G:H"), Columns("10:11,13:14"), Columns("P:Q,S:T"), Columns("V")</para>
-        /// </summary>
-        /// <param name="columns">The columns to return.</param>
-        IXLRangeColumns Columns(string columns);
-
-        /// <summary>
-        /// Gets the first row of the range.
-        /// </summary>
-        IXLRangeRow FirstRow(Func<IXLRangeRow, Boolean> predicate = null);
-        /// <summary>
-        /// Gets the first row of the range that contains a cell with a value.
-        /// </summary>
-        IXLRangeRow FirstRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null);
-        IXLRangeRow FirstRowUsed(Func<IXLRangeRow, Boolean> predicate = null);
-        /// <summary>
-        /// Gets the last row of the range.
-        /// </summary>
-        IXLRangeRow LastRow(Func<IXLRangeRow, Boolean> predicate = null);
-        /// <summary>
-        /// Gets the last row of the range that contains a cell with a value.
-        /// </summary>
-        IXLRangeRow LastRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null);
-        IXLRangeRow LastRowUsed(Func<IXLRangeRow, Boolean> predicate = null);
-        /// <summary>
-        /// Gets the specified row of the range.
-        /// </summary>
-        /// <param name="row">The range row.</param>
-        IXLRangeRow Row(int row);
-
-        IXLRangeRows Rows(Func<IXLRangeRow, Boolean> predicate = null);
-
-        /// <summary>
-        /// Gets a collection of the specified rows in this range.
-        /// </summary>
-        /// <param name="firstRow">The first row to return.</param>
-        /// <param name="lastRow">The last row to return.</param>
-        /// <returns></returns>
-        IXLRangeRows Rows(int firstRow, int lastRow);
-        /// <summary>
-        /// Gets a collection of the specified rows in this range, separated by commas.
-        /// <para>e.g. Rows("4:5"), Rows("7:8,10:11"), Rows("13")</para>
-        /// </summary>
-        /// <param name="rows">The rows to return.</param>
-        IXLRangeRows Rows(string rows);
-
-        /// <summary>
-        /// Returns the specified range.
-        /// </summary>
-        /// <param name="rangeAddress">The range boundaries.</param>
-        IXLRange Range(IXLRangeAddress rangeAddress);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <para>e.g. Range("A1"), Range("A1:C2")</para>
-        /// <param name="rangeAddress">The range boundaries.</param>
-        IXLRange Range(string rangeAddress);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCell">The first cell in the range.</param>
-        /// <param name="lastCell"> The last cell in the range.</param>
-        IXLRange Range(IXLCell firstCell, IXLCell lastCell);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCellAddress">The first cell address in the range.</param>
-        /// <param name="lastCellAddress"> The last cell address in the range.</param>
-        IXLRange Range(string firstCellAddress, string lastCellAddress);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCellAddress">The first cell address in the range.</param>
-        /// <param name="lastCellAddress"> The last cell address in the range.</param>
-        IXLRange Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress);
-
-        /// <summary>Returns a collection of ranges, separated by commas.</summary>
-        /// <para>e.g. Ranges("A1"), Ranges("A1:C2"), Ranges("A1:B2,D1:D4")</para>
-        /// <param name="ranges">The ranges to return.</param>
-        IXLRanges Ranges(string ranges);
-
-        /// <summary>Returns the specified range.</summary>
-        /// <param name="firstCellRow">   The first cell's row of the range to return.</param>
-        /// <param name="firstCellColumn">The first cell's column of the range to return.</param>
-        /// <param name="lastCellRow">    The last cell's row of the range to return.</param>
-        /// <param name="lastCellColumn"> The last cell's column of the range to return.</param>
-        /// <returns>.</returns>
-        IXLRange Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn);
-
-        /// <summary>Gets the number of rows in this range.</summary>
-        int RowCount();
-
-        /// <summary>Gets the number of columns in this range.</summary>
-        int ColumnCount();
-
-        /// <summary>
-        /// Inserts X number of columns to the right of this range.
-        /// <para>All cells to the right of this range will be shifted X number of columns.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">Number of columns to insert.</param>
-        IXLRangeColumns InsertColumnsAfter(int numberOfColumns);
-        IXLRangeColumns InsertColumnsAfter(int numberOfColumns, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of columns to the left of this range.
-        /// <para>This range and all cells to the right of this range will be shifted X number of columns.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">Number of columns to insert.</param>
-        IXLRangeColumns InsertColumnsBefore(int numberOfColumns);
-        IXLRangeColumns InsertColumnsBefore(int numberOfColumns, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of rows on top of this range.
-        /// <para>This range and all cells below this range will be shifted X number of rows.</para>
-        /// </summary>
-        /// <param name="numberOfRows">Number of rows to insert.</param>
-        IXLRangeRows InsertRowsAbove(int numberOfRows);
-        IXLRangeRows InsertRowsAbove(int numberOfRows, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of rows below this range.
-        /// <para>All cells below this range will be shifted X number of rows.</para>
-        /// </summary>
-        /// <param name="numberOfRows">Number of rows to insert.</param>
-        IXLRangeRows InsertRowsBelow(int numberOfRows);
-        IXLRangeRows InsertRowsBelow(int numberOfRows, Boolean expandRange);
-
-        /// <summary>
-        /// Deletes this range and shifts the surrounding cells accordingly.
-        /// </summary>
-        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
-        void Delete(XLShiftDeletedCells shiftDeleteCells);
-
-        /// <summary>
-        /// Transposes the contents and styles of all cells in this range.
-        /// </summary>
-        /// <param name="transposeOption">How to handle the surrounding cells when transposing the range.</param>
-        void Transpose(XLTransposeOptions transposeOption);
-
-        IXLTable AsTable();
-        IXLTable AsTable(String name);
-        IXLTable CreateTable();
-        IXLTable CreateTable(String name);
-
-        IXLRange RangeUsed();
-
-        IXLRange CopyTo(IXLCell target);
-        IXLRange CopyTo(IXLRangeBase target);
-
-        IXLSortElements SortRows { get; }
-        IXLSortElements SortColumns { get; }
-
-        IXLRange Sort();
-
-        IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        
-
-        IXLRange SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of this range.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        new IXLRange Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        IXLRangeRows RowsUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null);
-        IXLRangeRows RowsUsed(Func<IXLRangeRow, Boolean> predicate = null);
-        IXLRangeColumns ColumnsUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null);
-        IXLRangeColumns ColumnsUsed(Func<IXLRangeColumn, Boolean> predicate = null);
-    }
-}
-
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeAddress.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeAddress.cs
deleted file mode 100644
index 8354d3d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeAddress.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRangeAddress
-    {
-        IXLWorksheet Worksheet { get; }
-
-        /// <summary>
-        /// Gets or sets the first address in the range.
-        /// </summary>
-        /// <value>
-        /// The first address.
-        /// </value>
-        IXLAddress FirstAddress { get; set; }
-        /// <summary>
-        /// Gets or sets the last address in the range.
-        /// </summary>
-        /// <value>
-        /// The last address.
-        /// </value>
-        IXLAddress LastAddress { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether this range is invalid.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this instance is invalid; otherwise, <c>false</c>.
-        /// </value>
-        Boolean IsInvalid { get; set; }
-
-        String ToStringRelative();
-        String ToStringRelative(Boolean includeSheet);
-        String ToStringFixed();
-        String ToStringFixed(XLReferenceStyle referenceStyle);
-        String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeBase.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeBase.cs
deleted file mode 100644
index d86698a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeBase.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLScope
-    {
-        Workbook,
-        Worksheet
-    } 
-
-    public interface IXLRangeBase: IDisposable
-    {
-        IXLWorksheet Worksheet { get; }
-
-        /// <summary>
-        ///   Gets an object with the boundaries of this range.
-        /// </summary>
-        IXLRangeAddress RangeAddress { get; }
-
-        /// <summary>
-        ///   Sets a value to every cell in this range.
-        ///   <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
-        ///   <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
-        ///   <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
-        ///   <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
-        /// </summary>
-        /// <value>
-        ///   The object containing the value(s) to set.
-        /// </value>
-        Object Value { set; }
-
-        /// <summary>
-        ///   Sets the type of the cells' data.
-        ///   <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
-        ///   <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
-        /// </summary>
-        /// <value>
-        ///   The type of the cell's data.
-        /// </value>
-        /// <exception cref = "ArgumentException"></exception>
-        XLCellValues DataType { set; }
-
-        /// <summary>
-        ///   Sets the cells' formula with A1 references.
-        /// </summary>
-        /// <value>The formula with A1 references.</value>
-        String FormulaA1 { set; }
-
-        /// <summary>
-        ///   Sets the cells' formula with R1C1 references.
-        /// </summary>
-        /// <value>The formula with R1C1 references.</value>
-        String FormulaR1C1 { set; }
-
-        IXLStyle Style { get; set; }
-
-        /// <summary>
-        ///   Gets or sets a value indicating whether this cell's text should be shared or not.
-        /// </summary>
-        /// <value>
-        ///   If false the cell's text will not be shared and stored as an inline value.
-        /// </value>
-        Boolean ShareString { set; }
-
-        IXLHyperlinks Hyperlinks { get; }
-
-
-        /// <summary>
-        ///   Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-
-        IXLCells Cells(String cells);
-
-        IXLCells Cells(Func<IXLCell, Boolean> predicate);
-
-        /// <summary>
-        ///   Returns the collection of cells that have a value. Formats are ignored.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        ///   Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name = "includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        IXLCells CellsUsed(Func<IXLCell, Boolean> predicate);
-
-        IXLCells CellsUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate);
-
-        /// <summary>
-        ///   Returns the first cell of this range.
-        /// </summary>
-        IXLCell FirstCell();
-
-        /// <summary>
-        ///   Returns the first cell with a value of this range. Formats are ignored.
-        ///   <para>The cell's address is going to be ([First Row with a value], [First Column with a value])</para>
-        /// </summary>
-        IXLCell FirstCellUsed();
-
-        /// <summary>
-        ///   Returns the first cell with a value of this range.
-        /// </summary>
-        /// <para>The cell's address is going to be ([First Row with a value], [First Column with a value])</para>
-        /// <param name = "includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCell FirstCellUsed(Boolean includeFormats);
-
-        IXLCell FirstCellUsed(Func<IXLCell, Boolean> predicate);
-
-        IXLCell FirstCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate);
-
-        /// <summary>
-        ///   Returns the last cell of this range.
-        /// </summary>
-        IXLCell LastCell();
-
-        /// <summary>
-        ///   Returns the last cell with a value of this range. Formats are ignored.
-        ///   <para>The cell's address is going to be ([Last Row with a value], [Last Column with a value])</para>
-        /// </summary>
-        IXLCell LastCellUsed();
-
-        /// <summary>
-        ///   Returns the last cell with a value of this range.
-        /// </summary>
-        /// <para>The cell's address is going to be ([Last Row with a value], [Last Column with a value])</para>
-        /// <param name = "includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCell LastCellUsed(Boolean includeFormats);
-
-        IXLCell LastCellUsed(Func<IXLCell, Boolean> predicate);
-
-        IXLCell LastCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate);
-
-        /// <summary>
-        ///   Determines whether this range contains the specified range (completely).
-        ///   <para>For partial matches use the range.Intersects method.</para>
-        /// </summary>
-        /// <param name = "rangeAddress">The range address.</param>
-        /// <returns>
-        ///   <c>true</c> if this range contains the specified range; otherwise, <c>false</c>.
-        /// </returns>
-        Boolean Contains(String rangeAddress);
-
-        /// <summary>
-        ///   Determines whether this range contains the specified range (completely).
-        ///   <para>For partial matches use the range.Intersects method.</para>
-        /// </summary>
-        /// <param name = "range">The range to match.</param>
-        /// <returns>
-        ///   <c>true</c> if this range contains the specified range; otherwise, <c>false</c>.
-        /// </returns>
-        Boolean Contains(IXLRangeBase range);
-
-        Boolean Contains(IXLCell cell);
-
-        /// <summary>
-        ///   Determines whether this range intersects the specified range.
-        ///   <para>For whole matches use the range.Contains method.</para>
-        /// </summary>
-        /// <param name = "rangeAddress">The range address.</param>
-        /// <returns>
-        ///   <c>true</c> if this range intersects the specified range; otherwise, <c>false</c>.
-        /// </returns>
-        Boolean Intersects(String rangeAddress);
-
-        /// <summary>
-        ///   Determines whether this range contains the specified range.
-        ///   <para>For whole matches use the range.Contains method.</para>
-        /// </summary>
-        /// <param name = "range">The range to match.</param>
-        /// <returns>
-        ///   <c>true</c> if this range intersects the specified range; otherwise, <c>false</c>.
-        /// </returns>
-        Boolean Intersects(IXLRangeBase range);
-
-        /// <summary>
-        ///   Unmerges this range.
-        /// </summary>
-        IXLRange Unmerge();
-
-        /// <summary>
-        ///   Merges this range.
-        ///   <para>The contents and style of the merged cells will be equal to the first cell.</para>
-        /// </summary>
-        IXLRange Merge();
-
-        IXLRange Merge(Boolean checkIntersect);
-
-        /// <summary>
-        ///   Creates a named range out of this range. 
-        ///   <para>If the named range exists, it will add this range to that named range.</para>
-        ///   <para>The default scope for the named range is Workbook.</para>
-        /// </summary>
-        /// <param name = "rangeName">Name of the range.</param>
-        IXLRange AddToNamed(String rangeName);
-
-        /// <summary>
-        ///   Creates a named range out of this range. 
-        ///   <para>If the named range exists, it will add this range to that named range.</para>
-        ///   <param name = "rangeName">Name of the range.</param>
-        ///   <param name = "scope">The scope for the named range.</param>
-        /// </summary>
-        IXLRange AddToNamed(String rangeName, XLScope scope);
-
-        /// <summary>
-        ///   Creates a named range out of this range. 
-        ///   <para>If the named range exists, it will add this range to that named range.</para>
-        ///   <param name = "rangeName">Name of the range.</param>
-        ///   <param name = "scope">The scope for the named range.</param>
-        ///   <param name = "comment">The comments for the named range.</param>
-        /// </summary>
-        IXLRange AddToNamed(String rangeName, XLScope scope, String comment);
-
-        /// <summary>
-        /// Clears the contents of this range.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLRangeBase Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-        
-        /// <summary>
-        ///   Deletes the cell comments from this range.
-        /// </summary>
-        void DeleteComments();
-
-        IXLRangeBase SetValue<T>(T value);
-
-        /// <summary>
-        ///   Converts this object to a range.
-        /// </summary>
-        IXLRange AsRange();
-
-        Boolean IsMerged();
-        Boolean IsEmpty();
-        Boolean IsEmpty(Boolean includeFormats);
-
-
-        IXLPivotTable CreatePivotTable(IXLCell targetCell);
-        IXLPivotTable CreatePivotTable(IXLCell targetCell, String name);
-
-
-
-        //IXLChart CreateChart(Int32 firstRow, Int32 firstColumn, Int32 lastRow, Int32 lastColumn);
-
-        IXLAutoFilter SetAutoFilter();
-
-        IXLDataValidation SetDataValidation();
-
-        IXLConditionalFormat AddConditionalFormat();
-
-        void Select();
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeColumn.cs
deleted file mode 100644
index 5de5a7f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeColumn.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRangeColumn : IXLRangeBase
-    {
-        /// <summary>
-        /// Gets the cell in the specified row.
-        /// </summary>
-        /// <param name="rowNumber">The cell's row.</param>
-        IXLCell Cell(Int32 rowNumber);
-
-        /// <summary>
-        /// Returns the specified group of cells, separated by commas.
-        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1:2,4:5")</para>
-        /// </summary>
-        /// <param name="cellsInColumn">The column cells to return.</param>
-        new IXLCells Cells(String cellsInColumn);
-        /// <summary>
-        /// Returns the specified group of cells.
-        /// </summary>
-        /// <param name="firstRow">The first row in the group of cells to return.</param>
-        /// <param name="lastRow">The last row in the group of cells to return.</param>
-        IXLCells Cells(Int32 firstRow, Int32 lastRow);
-
-        /// <summary>
-        /// Inserts X number of columns to the right of this range.
-        /// <para>All cells to the right of this range will be shifted X number of columns.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">Number of columns to insert.</param>
-        IXLRangeColumns InsertColumnsAfter(int numberOfColumns);
-        IXLRangeColumns InsertColumnsAfter(int numberOfColumns, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of columns to the left of this range.
-        /// <para>This range and all cells to the right of this range will be shifted X number of columns.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">Number of columns to insert.</param>
-        IXLRangeColumns InsertColumnsBefore(int numberOfColumns);
-        IXLRangeColumns InsertColumnsBefore(int numberOfColumns, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of cells on top of this column.
-        /// <para>This column and all cells below it will be shifted X number of rows.</para>
-        /// </summary>
-        /// <param name="numberOfRows">Number of cells to insert.</param>
-        IXLCells InsertCellsAbove(int numberOfRows);
-        IXLCells InsertCellsAbove(int numberOfRows, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of cells below this range.
-        /// <para>All cells below this column will be shifted X number of rows.</para>
-        /// </summary>
-        /// <param name="numberOfRows">Number of cells to insert.</param>
-        IXLCells InsertCellsBelow(int numberOfRows);
-        IXLCells InsertCellsBelow(int numberOfRows, Boolean expandRange);
-
-        /// <summary>
-        /// Deletes this range and shifts the cells at the right.
-        /// </summary>
-        void Delete();
-        /// <summary>
-        /// Deletes this range and shifts the surrounding cells accordingly.
-        /// </summary>
-        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
-        void Delete(XLShiftDeletedCells shiftDeleteCells);
-
-        /// <summary>
-        /// Gets this column's number in the range
-        /// </summary>
-        Int32 ColumnNumber();
-
-        /// <summary>
-        /// Gets this column's letter in the range
-        /// </summary>
-        String ColumnLetter();
-
-        Int32 CellCount();
-
-        IXLRangeColumn CopyTo(IXLCell target);
-        IXLRangeColumn CopyTo(IXLRangeBase target);
-
-        IXLRangeColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-        
-        IXLRangeColumn Column(Int32 start, Int32 end);
-        IXLRangeColumn Column(IXLCell start, IXLCell end);
-        IXLRangeColumns Columns(String columns);
-
-        IXLRangeColumn SetDataType(XLCellValues dataType);
-
-        IXLRangeColumn ColumnLeft();
-        IXLRangeColumn ColumnLeft(Int32 step);
-        IXLRangeColumn ColumnRight();
-        IXLRangeColumn ColumnRight(Int32 step);
-
-        IXLColumn WorksheetColumn();
-
-        IXLTable AsTable();
-        IXLTable AsTable(String name);
-        IXLTable CreateTable();
-        IXLTable CreateTable(String name);
-
-        /// <summary>
-        /// Clears the contents of this column.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        new IXLRangeColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        IXLRangeColumn ColumnUsed(Boolean includeFormats = false);
-    }
-}
-
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeColumns.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeColumns.cs
deleted file mode 100644
index 90faa05..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeColumns.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRangeColumns: IEnumerable<IXLRangeColumn>, IDisposable
-    {
-
-        /// <summary>
-        /// Adds a column range to this group.
-        /// </summary>
-        /// <param name="columRange">The column range to add.</param>
-        void Add(IXLRangeColumn columRange);
-
-        /// <summary>
-        /// Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-        
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        /// <summary>
-        /// Deletes all columns and shifts the columns at the right of them accordingly.
-        /// </summary>
-        void Delete();
-
-        IXLStyle Style { get; set; }
-
-        IXLRangeColumns SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of these columns.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLRangeColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        void Select();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeRow.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeRow.cs
deleted file mode 100644
index 8e641a9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeRow.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRangeRow: IXLRangeBase
-    {
-        /// <summary>
-        /// Gets the cell in the specified column.
-        /// </summary>
-        /// <param name="columnNumber">The cell's column.</param>
-        IXLCell Cell(Int32 columnNumber);
-
-        /// <summary>
-        /// Gets the cell in the specified column.
-        /// </summary>
-        /// <param name="columnLetter">The cell's column.</param>
-        IXLCell Cell(String columnLetter);
-
-        /// <summary>
-        /// Returns the specified group of cells, separated by commas.
-        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1:2,4:5")</para>
-        /// </summary>
-        /// <param name="cellsInRow">The row's cells to return.</param>
-        new IXLCells Cells(String cellsInRow);
-        /// <summary>
-        /// Returns the specified group of cells.
-        /// </summary>
-        /// <param name="firstColumn">The first column in the group of cells to return.</param>
-        /// <param name="lastColumn">The last column in the group of cells to return.</param>
-        IXLCells Cells(Int32 firstColumn, Int32 lastColumn);
-        /// <summary>
-        /// Returns the specified group of cells.
-        /// </summary>
-        /// <param name="firstColumn">The first column in the group of cells to return.</param>
-        /// <param name="lastColumn">The last column in the group of cells to return.</param>
-        IXLCells Cells(String firstColumn, String lastColumn);
-
-        /// <summary>
-        /// Inserts X number of cells to the right of this row.
-        /// <para>All cells to the right of this row will be shifted X number of columns.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">Number of cells to insert.</param>
-        IXLCells InsertCellsAfter(int numberOfColumns);
-        IXLCells InsertCellsAfter(int numberOfColumns, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of cells to the left of this row.
-        /// <para>This row and all cells to the right of it will be shifted X number of columns.</para>
-        /// </summary>
-        /// <param name="numberOfColumns">Number of cells to insert.</param>
-        IXLCells InsertCellsBefore(int numberOfColumns);
-        IXLCells InsertCellsBefore(int numberOfColumns, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of rows on top of this row.
-        /// <para>This row and all cells below it will be shifted X number of rows.</para>
-        /// </summary>
-        /// <param name="numberOfRows">Number of rows to insert.</param>
-        IXLRangeRows InsertRowsAbove(int numberOfRows);
-        IXLRangeRows InsertRowsAbove(int numberOfRows, Boolean expandRange);
-        /// <summary>
-        /// Inserts X number of rows below this row.
-        /// <para>All cells below this row will be shifted X number of rows.</para>
-        /// </summary>
-        /// <param name="numberOfRows">Number of rows to insert.</param>
-        IXLRangeRows InsertRowsBelow(int numberOfRows);
-        IXLRangeRows InsertRowsBelow(int numberOfRows, Boolean expandRange);
-
-        /// <summary>
-        /// Deletes this range and shifts the cells below.
-        /// </summary>
-        void Delete();
-        /// <summary>
-        /// Deletes this range and shifts the surrounding cells accordingly.
-        /// </summary>
-        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
-        void Delete(XLShiftDeletedCells shiftDeleteCells);
-
-        /// <summary>
-        /// Gets this row's number in the range
-        /// </summary>
-        Int32 RowNumber();
-
-        Int32 CellCount();
-
-        IXLRangeRow CopyTo(IXLCell target);
-        IXLRangeRow CopyTo(IXLRangeBase target);
-
-        IXLRangeRow Sort();
-        IXLRangeRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-
-        IXLRangeRow Row(Int32 start, Int32 end);
-        IXLRangeRow Row(IXLCell start, IXLCell end);
-        IXLRangeRows Rows(String rows);
-
-        IXLRangeRow SetDataType(XLCellValues dataType);
-
-        IXLRangeRow RowAbove();
-        IXLRangeRow RowAbove(Int32 step);
-        IXLRangeRow RowBelow();
-        IXLRangeRow RowBelow(Int32 step);
-
-        IXLRow WorksheetRow();
-
-        /// <summary>
-        /// Clears the contents of this row.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        new IXLRangeRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        IXLRangeRow RowUsed(Boolean includeFormats = false);
-    }
-}
-
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeRows.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeRows.cs
deleted file mode 100644
index 5c8d0c4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeRows.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRangeRows : IEnumerable<IXLRangeRow>, IDisposable
-    {
-        /// <summary>
-        /// Adds a row range to this group.
-        /// </summary>
-        /// <param name="rowRange">The row range to add.</param>
-        void Add(IXLRangeRow rowRange);
-
-        /// <summary>
-        /// Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-        
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        /// <summary>
-        /// Deletes all rows and shifts the rows below them accordingly.
-        /// </summary>
-        void Delete();
-
-        IXLStyle Style { get; set; }
-
-        IXLRangeRows SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of these rows.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLRangeRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        void Select();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRanges.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRanges.cs
deleted file mode 100644
index f73e201..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRanges.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRanges: IEnumerable<IXLRange>, IDisposable
-    {
-        /// <summary>
-        /// Adds the specified range to this group.
-        /// </summary>
-        /// <param name="range">The range to add to this group.</param>
-        void Add(IXLRangeBase range);
-
-        void Add(IXLCell range);
-
-        /// <summary>
-        /// Removes the specified range from this group.
-        /// </summary>
-        /// <param name="range">The range to remove from this group.</param>
-        void Remove(IXLRange range);
-
-        Int32 Count { get; }
-
-        Boolean Contains(IXLRange range);
-
-        IXLStyle Style { get; set; }
-
-        IXLDataValidation SetDataValidation();
-
-        /// <summary>
-        /// Creates a named range out of these ranges. 
-        /// <para>If the named range exists, it will add these ranges to that named range.</para>
-        /// <para>The default scope for the named range is Workbook.</para>
-        /// </summary>
-        /// <param name="rangeName">Name of the range.</param>
-        IXLRanges AddToNamed(String rangeName);
-
-        /// <summary>
-        /// Creates a named range out of these ranges. 
-        /// <para>If the named range exists, it will add these ranges to that named range.</para>
-        /// <param name="rangeName">Name of the range.</param>
-        /// <param name="scope">The scope for the named range.</param>
-        /// </summary>
-        IXLRanges AddToNamed(String rangeName, XLScope scope);
-
-        /// <summary>
-        /// Creates a named range out of these ranges. 
-        /// <para>If the named range exists, it will add these ranges to that named range.</para>
-        /// <param name="rangeName">Name of the range.</param>
-        /// <param name="scope">The scope for the named range.</param>
-        /// <param name="comment">The comments for the named range.</param>
-        /// </summary>
-        IXLRanges AddToNamed(String rangeName, XLScope scope, String comment);
-
-        /// <summary>
-        /// Sets the cells' value.
-        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
-        /// <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
-        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
-        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
-        /// </summary>
-        /// <value>
-        /// The object containing the value(s) to set.
-        /// </value>
-        Object Value { set; }
-
-        IXLRanges SetValue<T>(T value);
-
-        /// <summary>
-        /// Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        IXLRanges SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of these ranges.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLRanges Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        void Select();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/IXLSortElement.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/IXLSortElement.cs
deleted file mode 100644
index e687bdc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/IXLSortElement.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLSortOrder { Ascending, Descending }
-    public enum XLSortOrientation { TopToBottom, LeftToRight }
-    public interface IXLSortElement
-    {
-        Int32 ElementNumber { get; set; }
-        XLSortOrder SortOrder { get; set; }
-        Boolean IgnoreBlanks { get; set; }
-        Boolean MatchCase { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/IXLSortElements.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/IXLSortElements.cs
deleted file mode 100644
index 8d7c630..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/IXLSortElements.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLSortElements: IEnumerable<IXLSortElement>
-    {
-        void Add(Int32 elementNumber);
-        void Add(Int32 elementNumber, XLSortOrder sortOrder);
-        void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks);
-        void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase);
-
-        void Add(String elementNumber);
-        void Add(String elementNumber, XLSortOrder sortOrder);
-        void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks);
-        void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase);
-
-        void Clear();
-
-        void Remove(Int32 elementNumber);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/XLSortElement.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/XLSortElement.cs
deleted file mode 100644
index 6c17e2d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/XLSortElement.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLSortElement: IXLSortElement
-    {
-        public Int32 ElementNumber { get; set; }
-        public XLSortOrder SortOrder { get; set; }
-        public Boolean IgnoreBlanks { get; set; }
-        public Boolean MatchCase { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/XLSortElements.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/XLSortElements.cs
deleted file mode 100644
index adbc4cb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/Sort/XLSortElements.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    internal class XLSortElements: IXLSortElements
-    {
-        List<IXLSortElement> elements = new List<IXLSortElement>();
-        public void Add(Int32 elementNumber)
-        {
-            Add(elementNumber, XLSortOrder.Ascending);
-        }
-        public void Add(Int32 elementNumber, XLSortOrder sortOrder)
-        {
-            Add(elementNumber, sortOrder, true);
-        }
-        public void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks)
-        {
-            Add(elementNumber, sortOrder, ignoreBlanks, false);
-        }
-        public void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase)
-        {
-            elements.Add(new XLSortElement()
-            {
-                ElementNumber = elementNumber,
-                SortOrder = sortOrder,
-                IgnoreBlanks = ignoreBlanks,
-                MatchCase = matchCase
-            });
-        }
-
-        public void Add(String elementNumber)
-        {
-            Add(elementNumber, XLSortOrder.Ascending);
-        }
-        public void Add(String elementNumber, XLSortOrder sortOrder)
-        {
-            Add(elementNumber, sortOrder, true);
-        }
-        public void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks)
-        {
-            Add(elementNumber, sortOrder, ignoreBlanks, false);
-        }
-        public void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase)
-        {
-            elements.Add(new XLSortElement()
-            {
-                ElementNumber = XLHelper.GetColumnNumberFromLetter(elementNumber),
-                SortOrder = sortOrder,
-                IgnoreBlanks = ignoreBlanks,
-                MatchCase = matchCase
-            });
-        }
-
-        public IEnumerator<IXLSortElement> GetEnumerator()
-        {
-            return elements.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Clear()
-        {
-            elements.Clear();
-        }
-
-        public void Remove(Int32 elementNumber)
-        {
-            elements.RemoveAt(elementNumber - 1);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRange.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRange.cs
deleted file mode 100644
index 6ffdff1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRange.cs
+++ /dev/null
@@ -1,810 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-
-namespace ClosedXML.Excel
-{
-    internal class XLRange : XLRangeBase, IXLRange
-    {
-        #region Constructor
-
-        public XLRange(XLRangeParameters xlRangeParameters)
-            : base(xlRangeParameters.RangeAddress)
-        {
-            RangeParameters = new XLRangeParameters(xlRangeParameters.RangeAddress, xlRangeParameters.DefaultStyle);
-
-            if (!xlRangeParameters.IgnoreEvents)
-            {
-                SubscribeToShiftedRows((range, rowShifted) => this.WorksheetRangeShiftedRows(range, rowShifted));
-                SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
-                //xlRangeParameters.IgnoreEvents = true;
-            }
-            SetStyle(xlRangeParameters.DefaultStyle);
-        }
-
-        #endregion
-
-        public XLRangeParameters RangeParameters { get; private set; }
-
-        #region IXLRange Members
-
-
-        IXLRangeRow IXLRange.Row(Int32 row)
-        {
-            return Row(row);
-        }
-
-        IXLRangeColumn IXLRange.Column(Int32 column)
-        {
-            return Column(column);
-        }
-
-        IXLRangeColumn IXLRange.Column(String column)
-        {
-            return Column(column);
-        }
-
-        public IXLRangeColumns Columns(Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            var retVal = new XLRangeColumns();
-            Int32 columnCount = ColumnCount();
-            for (Int32 c = 1; c <= columnCount; c++)
-            {
-                var column = Column(c);
-                if (predicate == null || predicate(column))
-                    retVal.Add(column);
-                else
-                    column.Dispose();
-            }
-            return retVal;
-        }
-
-        public virtual IXLRangeColumns Columns(Int32 firstColumn, Int32 lastColumn)
-        {
-            var retVal = new XLRangeColumns();
-
-            for (int co = firstColumn; co <= lastColumn; co++)
-                retVal.Add(Column(co));
-            return retVal;
-        }
-
-        public IXLRangeColumns Columns(String firstColumn, String lastColumn)
-        {
-            return Columns(XLHelper.GetColumnNumberFromLetter(firstColumn),
-                           XLHelper.GetColumnNumberFromLetter(lastColumn));
-        }
-
-        public IXLRangeColumns Columns(String columns)
-        {
-            var retVal = new XLRangeColumns();
-            var columnPairs = columns.Split(',');
-            foreach (string tPair in columnPairs.Select(pair => pair.Trim()))
-            {
-                String firstColumn;
-                String lastColumn;
-                if (tPair.Contains(':') || tPair.Contains('-'))
-                {
-                    string[] columnRange = XLHelper.SplitRange(tPair);
-
-                    firstColumn = columnRange[0];
-                    lastColumn = columnRange[1];
-                }
-                else
-                {
-                    firstColumn = tPair;
-                    lastColumn = tPair;
-                }
-
-                Int32 tmp;
-                if (Int32.TryParse(firstColumn, out tmp))
-                {
-                    foreach (IXLRangeColumn col in Columns(Int32.Parse(firstColumn), Int32.Parse(lastColumn)))
-                        retVal.Add(col);
-                }
-                else
-                {
-                    foreach (IXLRangeColumn col in Columns(firstColumn, lastColumn))
-                        retVal.Add(col);
-                }
-            }
-            return retVal;
-        }
-
-        IXLCell IXLRange.Cell(int row, int column)
-        {
-            return Cell(row, column);
-        }
-
-        IXLCell IXLRange.Cell(string cellAddressInRange)
-        {
-            return Cell(cellAddressInRange);
-        }
-
-        IXLCell IXLRange.Cell(int row, string column)
-        {
-            return Cell(row, column);
-        }
-
-        IXLCell IXLRange.Cell(IXLAddress cellAddressInRange)
-        {
-            return Cell(cellAddressInRange);
-        }
-
-        IXLRange IXLRange.Range(IXLRangeAddress rangeAddress)
-        {
-            return Range(rangeAddress);
-        }
-
-        IXLRange IXLRange.Range(string rangeAddress)
-        {
-            return Range(rangeAddress);
-        }
-
-        IXLRange IXLRange.Range(IXLCell firstCell, IXLCell lastCell)
-        {
-            return Range(firstCell, lastCell);
-        }
-
-        IXLRange IXLRange.Range(string firstCellAddress, string lastCellAddress)
-        {
-            return Range(firstCellAddress, lastCellAddress);
-        }
-
-        IXLRange IXLRange.Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
-        {
-            return Range(firstCellAddress, lastCellAddress);
-        }
-
-        IXLRange IXLRange.Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn)
-        {
-            return Range(firstCellRow, firstCellColumn, lastCellRow, lastCellColumn);
-        }
-
-        public IXLRangeRows Rows(Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            var retVal = new XLRangeRows();
-            Int32 rowCount = RowCount();
-            for (Int32 r = 1; r <= rowCount; r++)
-            {
-                var row = Row(r);
-                if (predicate == null || predicate(row))
-                    retVal.Add(Row(r));
-                else
-                    row.Dispose();
-            }
-            return retVal;
-        }
-
-        public IXLRangeRows Rows(Int32 firstRow, Int32 lastRow)
-        {
-            var retVal = new XLRangeRows();
-
-            for (int ro = firstRow; ro <= lastRow; ro++)
-                retVal.Add(Row(ro));
-            return retVal;
-        }
-
-        public IXLRangeRows Rows(String rows)
-        {
-            var retVal = new XLRangeRows();
-            var rowPairs = rows.Split(',');
-            foreach (string tPair in rowPairs.Select(pair => pair.Trim()))
-            {
-                String firstRow;
-                String lastRow;
-                if (tPair.Contains(':') || tPair.Contains('-'))
-                {
-                    string[] rowRange = XLHelper.SplitRange(tPair);
-
-                    firstRow = rowRange[0];
-                    lastRow = rowRange[1];
-                }
-                else
-                {
-                    firstRow = tPair;
-                    lastRow = tPair;
-                }
-                foreach (IXLRangeRow row in Rows(Int32.Parse(firstRow), Int32.Parse(lastRow)))
-                    retVal.Add(row);
-            }
-            return retVal;
-        }
-
-        public void Transpose(XLTransposeOptions transposeOption)
-        {
-            int rowCount = RowCount();
-            int columnCount = ColumnCount();
-            int squareSide = rowCount > columnCount ? rowCount : columnCount;
-
-            var firstCell = FirstCell();
-
-            MoveOrClearForTranspose(transposeOption, rowCount, columnCount);
-            TransposeMerged(squareSide);
-            TransposeRange(squareSide);
-            RangeAddress.LastAddress = new XLAddress(Worksheet,
-                                                     firstCell.Address.RowNumber + columnCount - 1,
-                                                     firstCell.Address.ColumnNumber + rowCount - 1,
-                                                     RangeAddress.LastAddress.FixedRow,
-                                                     RangeAddress.LastAddress.FixedColumn);
-            if (rowCount > columnCount)
-            {
-                var rng = Worksheet.Range(
-                    RangeAddress.LastAddress.RowNumber + 1,
-                    RangeAddress.FirstAddress.ColumnNumber,
-                    RangeAddress.LastAddress.RowNumber + (rowCount - columnCount),
-                    RangeAddress.LastAddress.ColumnNumber);
-                rng.Delete(XLShiftDeletedCells.ShiftCellsUp);
-            }
-            else if (columnCount > rowCount)
-            {
-                var rng = Worksheet.Range(
-                    RangeAddress.FirstAddress.RowNumber,
-                    RangeAddress.LastAddress.ColumnNumber + 1,
-                    RangeAddress.LastAddress.RowNumber,
-                    RangeAddress.LastAddress.ColumnNumber + (columnCount - rowCount));
-                rng.Delete(XLShiftDeletedCells.ShiftCellsLeft);
-            }
-
-            foreach (IXLCell c in Range(1, 1, columnCount, rowCount).Cells())
-            {
-                var border = new XLBorder(this, c.Style.Border);
-                c.Style.Border.TopBorder = border.LeftBorder;
-                c.Style.Border.TopBorderColor = border.LeftBorderColor;
-                c.Style.Border.LeftBorder = border.TopBorder;
-                c.Style.Border.LeftBorderColor = border.TopBorderColor;
-                c.Style.Border.RightBorder = border.BottomBorder;
-                c.Style.Border.RightBorderColor = border.BottomBorderColor;
-                c.Style.Border.BottomBorder = border.RightBorder;
-                c.Style.Border.BottomBorderColor = border.RightBorderColor;
-            }
-        }
-
-        public IXLTable AsTable()
-        {
-            return new XLTable(this, false);
-        }
-
-        public IXLTable AsTable(String name)
-        {
-            return new XLTable(this, name, false);
-        }
-
-        IXLTable IXLRange.CreateTable()
-        {
-            return CreateTable();
-        }
-        public XLTable CreateTable()
-        {
-            return new XLTable(this, true, true);
-        }
-
-        IXLTable IXLRange.CreateTable(String name)
-        {
-            return CreateTable(name);
-        }
-        public XLTable CreateTable(String name)
-        {
-            return new XLTable(this, name, true, true);
-        }
-
-        public IXLTable CreateTable(String name, Boolean setAutofilter)
-        {
-            return new XLTable(this, name, true, setAutofilter);
-        }
-
-        public new IXLRange CopyTo(IXLCell target)
-        {
-            base.CopyTo(target);
-
-            Int32 lastRowNumber = target.Address.RowNumber + RowCount() - 1;
-            if (lastRowNumber > XLHelper.MaxRowNumber)
-                lastRowNumber = XLHelper.MaxRowNumber;
-            Int32 lastColumnNumber = target.Address.ColumnNumber + ColumnCount() - 1;
-            if (lastColumnNumber > XLHelper.MaxColumnNumber)
-                lastColumnNumber = XLHelper.MaxColumnNumber;
-
-            return target.Worksheet.Range(target.Address.RowNumber,
-                                          target.Address.ColumnNumber,
-                                          lastRowNumber,
-                                          lastColumnNumber);
-        }
-
-        public new IXLRange CopyTo(IXLRangeBase target)
-        {
-            base.CopyTo(target);
-
-            Int32 lastRowNumber = target.RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
-            if (lastRowNumber > XLHelper.MaxRowNumber)
-                lastRowNumber = XLHelper.MaxRowNumber;
-            Int32 lastColumnNumber = target.RangeAddress.FirstAddress.ColumnNumber + ColumnCount() - 1;
-            if (lastColumnNumber > XLHelper.MaxColumnNumber)
-                lastColumnNumber = XLHelper.MaxColumnNumber;
-
-            return target.Worksheet.Range(target.RangeAddress.FirstAddress.RowNumber,
-                                          target.RangeAddress.FirstAddress.ColumnNumber,
-                                          lastRowNumber,
-                                          lastColumnNumber);
-        }
-
-        public IXLRange SetDataType(XLCellValues dataType)
-        {
-            DataType = dataType;
-            return this;
-        }
-
-
-        public new IXLRange Sort()
-        {
-            return base.Sort().AsRange();
-        }
-        
-        public new IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            return base.Sort(columnsToSortBy, sortOrder, matchCase, ignoreBlanks).AsRange();
-        }
-        public new IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            return base.Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks).AsRange();
-        }
-        public new IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            return base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks).AsRange();
-        }
-        
-
-        #endregion
-
-        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
-        {
-            ShiftColumns(RangeAddress, range, columnsShifted);
-        }
-
-        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
-        {
-                ShiftRows(RangeAddress, range, rowsShifted);
-        }
-
-        IXLRangeColumn IXLRange.FirstColumn(Func<IXLRangeColumn, Boolean> predicate)
-        {
-            return FirstColumn(predicate);
-        }
-        public XLRangeColumn FirstColumn(Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            if (predicate == null)
-                return Column(1);
-
-            Int32 columnCount = ColumnCount();
-            for (Int32 c = 1; c <= columnCount; c++)
-            {
-                var column = Column(c);
-                if (predicate(column)) return column;
-
-                column.Dispose();
-            }
-
-            return null;
-        }
-
-        IXLRangeColumn IXLRange.LastColumn(Func<IXLRangeColumn, Boolean> predicate)
-        {
-            return LastColumn(predicate);
-        }
-        public XLRangeColumn LastColumn(Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            Int32 columnCount = ColumnCount();
-            if (predicate == null)
-                return Column(columnCount);
-
-            for (Int32 c = columnCount; c >= 1; c--)
-            {
-                var column = Column(c);
-                if (predicate(column)) return column;
-
-                column.Dispose();
-            }
-
-            return null;
-        }
-
-        IXLRangeColumn IXLRange.FirstColumnUsed(Func<IXLRangeColumn, Boolean> predicate )
-        {
-            return FirstColumnUsed(false, predicate);
-        }
-        public XLRangeColumn FirstColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            return FirstColumnUsed(false, predicate);
-        }
-
-        IXLRangeColumn IXLRange.FirstColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate)
-        {
-            return FirstColumnUsed(includeFormats, predicate);
-        }
-        public XLRangeColumn FirstColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            if (predicate == null)
-            {
-                Int32 firstColumnUsed = Worksheet.Internals.CellsCollection.FirstColumnUsed(
-                    RangeAddress.FirstAddress.RowNumber,
-                    RangeAddress.FirstAddress.ColumnNumber,
-                    RangeAddress.LastAddress.RowNumber,
-                    RangeAddress.LastAddress.ColumnNumber,
-                    includeFormats);
-
-                return firstColumnUsed == 0 ? null : Column(firstColumnUsed - RangeAddress.FirstAddress.ColumnNumber + 1);
-            }
-
-            Int32 columnCount = ColumnCount();
-            for (Int32 co = 1; co <= columnCount; co++)
-            {
-                var column = Column(co);
-
-                if (!column.IsEmpty(includeFormats) && predicate(column))
-                    return column;
-                column.Dispose();
-            }
-            return null;
-        }
-
-        IXLRangeColumn IXLRange.LastColumnUsed(Func<IXLRangeColumn, Boolean> predicate)
-        {
-            return LastColumnUsed(false, predicate);
-        }
-        public XLRangeColumn LastColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            return LastColumnUsed(false, predicate);
-        }
-
-        IXLRangeColumn IXLRange.LastColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate)
-        {
-            return LastColumnUsed(includeFormats, predicate);
-        }
-        public XLRangeColumn LastColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            if (predicate == null)
-            {
-                Int32 lastColumnUsed = Worksheet.Internals.CellsCollection.LastColumnUsed(
-                    RangeAddress.FirstAddress.RowNumber,
-                    RangeAddress.FirstAddress.ColumnNumber,
-                    RangeAddress.LastAddress.RowNumber,
-                    RangeAddress.LastAddress.ColumnNumber,
-                    includeFormats);
-
-                return lastColumnUsed == 0 ? null : Column(lastColumnUsed - RangeAddress.FirstAddress.ColumnNumber + 1);
-            }
-
-            Int32 columnCount = ColumnCount();
-            for (Int32 co = columnCount; co >= 1; co--)
-            {
-                var column = Column(co);
-
-                if (!column.IsEmpty(includeFormats) && predicate(column))
-                    return column;
-                column.Dispose();
-            }
-            return null;
-        }
-
-        IXLRangeRow IXLRange.FirstRow(Func<IXLRangeRow, Boolean> predicate)
-        {
-            return FirstRow(predicate);
-        }
-        public XLRangeRow FirstRow(Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            if (predicate == null)
-                return Row(1);
-
-            Int32 rowCount = RowCount();
-            for (Int32 ro = 1; ro <= rowCount; ro++)
-            {
-                var row = Row(ro);
-                if (predicate(row)) return row;
-
-                row.Dispose();
-            }
-
-            return null;
-        }
-
-        IXLRangeRow IXLRange.LastRow(Func<IXLRangeRow, Boolean> predicate)
-        {
-            return LastRow(predicate);
-        }
-        public XLRangeRow LastRow(Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            Int32 rowCount = RowCount();
-            if (predicate == null)
-                return Row(rowCount);
-
-            for (Int32 ro = rowCount; ro >= 1; ro--)
-            {
-                var row = Row(ro);
-                if (predicate(row)) return row;
-
-                row.Dispose();
-            }
-
-            return null;
-        }
-
-        IXLRangeRow IXLRange.FirstRowUsed(Func<IXLRangeRow, Boolean> predicate)
-        {
-            return FirstRowUsed(false, predicate);
-        }
-        public XLRangeRow FirstRowUsed(Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            return FirstRowUsed(false, predicate);
-        }
-
-        IXLRangeRow IXLRange.FirstRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate)
-        {
-            return FirstRowUsed(includeFormats, predicate);
-        }
-        public XLRangeRow FirstRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            if (predicate == null)
-            {
-                Int32 rowFromCells = Worksheet.Internals.CellsCollection.FirstRowUsed(
-                    RangeAddress.FirstAddress.RowNumber,
-                    RangeAddress.FirstAddress.ColumnNumber,
-                    RangeAddress.LastAddress.RowNumber,
-                    RangeAddress.LastAddress.ColumnNumber,
-                    includeFormats);
-
-                //Int32 rowFromRows = Worksheet.Internals.RowsCollection.FirstRowUsed(includeFormats);
-
-                return rowFromCells == 0 ? null : Row(rowFromCells - RangeAddress.FirstAddress.RowNumber + 1);
-            }
-
-            Int32 rowCount = RowCount();
-            for (Int32 ro = 1; ro <= rowCount; ro++)
-            {
-                var row = Row(ro);
-
-                if (!row.IsEmpty(includeFormats) && predicate(row))
-                    return row;
-                row.Dispose();
-            }
-            return null;
-        }
-
-        IXLRangeRow IXLRange.LastRowUsed(Func<IXLRangeRow, Boolean> predicate)
-        {
-            return LastRowUsed(false, predicate);
-        }
-        public XLRangeRow LastRowUsed(Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            return LastRowUsed(false, predicate);
-        }
-
-        IXLRangeRow IXLRange.LastRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate)
-        {
-            return LastRowUsed(includeFormats, predicate);
-        }
-        public XLRangeRow LastRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            if (predicate == null)
-            {
-                Int32 lastRowUsed = Worksheet.Internals.CellsCollection.LastRowUsed(
-                    RangeAddress.FirstAddress.RowNumber,
-                    RangeAddress.FirstAddress.ColumnNumber,
-                    RangeAddress.LastAddress.RowNumber,
-                    RangeAddress.LastAddress.ColumnNumber,
-                    includeFormats);
-
-                return lastRowUsed == 0 ? null : Row(lastRowUsed - RangeAddress.FirstAddress.RowNumber + 1);
-            }
-
-            Int32 rowCount = RowCount();
-            for (Int32 ro = rowCount; ro >= 1; ro--)
-            {
-                var row = Row(ro);
-
-                if (!row.IsEmpty(includeFormats) && predicate(row))
-                    return row;
-                row.Dispose();
-            }
-            return null;
-        }
-
-
-        IXLRangeRows IXLRange.RowsUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate)
-        {
-            return RowsUsed(includeFormats, predicate);
-        }
-        public XLRangeRows RowsUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            XLRangeRows rows = new XLRangeRows();
-            Int32 rowCount = RowCount();
-            for (Int32 ro = 1; ro <= rowCount; ro++)
-            {
-                var row = Row(ro);
-
-                if (!row.IsEmpty(includeFormats) && (predicate == null || predicate(row)))
-                    rows.Add(row);
-                else
-                    row.Dispose();
-            }
-            return rows;
-        }
-        IXLRangeRows IXLRange.RowsUsed(Func<IXLRangeRow, Boolean> predicate)
-        {
-            return RowsUsed(predicate);
-        }
-        public XLRangeRows RowsUsed(Func<IXLRangeRow, Boolean> predicate = null)
-        {
-            return RowsUsed(false, predicate);
-        }
-        IXLRangeColumns IXLRange.ColumnsUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate)
-        {
-            return ColumnsUsed(includeFormats, predicate);
-        }
-        public XLRangeColumns ColumnsUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            XLRangeColumns columns = new XLRangeColumns();
-            Int32 columnCount = ColumnCount();
-            for (Int32 co = 1; co <= columnCount; co++)
-            {
-                var column = Column(co);
-
-                if (!column.IsEmpty(includeFormats) && (predicate == null || predicate(column)))
-                    columns.Add(column);
-                else
-                    column.Dispose();
-            }
-            return columns;
-        }
-        IXLRangeColumns IXLRange.ColumnsUsed(Func<IXLRangeColumn, Boolean> predicate)
-        {
-            return ColumnsUsed(predicate);
-        }
-        public XLRangeColumns ColumnsUsed(Func<IXLRangeColumn, Boolean> predicate = null)
-        {
-            return ColumnsUsed(false, predicate);
-        }
-
-        public XLRangeRow Row(Int32 row)
-        {
-            if (row <= 0 || row > XLHelper.MaxRowNumber)
-                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}", XLHelper.MaxRowNumber));
-
-            var firstCellAddress = new XLAddress(Worksheet,
-                                                 RangeAddress.FirstAddress.RowNumber + row - 1,
-                                                 RangeAddress.FirstAddress.ColumnNumber,
-                                                 false,
-                                                 false);
-            var lastCellAddress = new XLAddress(Worksheet,
-                                                RangeAddress.FirstAddress.RowNumber + row - 1,
-                                                RangeAddress.LastAddress.ColumnNumber,
-                                                false,
-                                                false);
-            return new XLRangeRow(
-                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), false);
-        }
-
-        
-
-        public XLRangeColumn Column(Int32 column)
-        {
-            if (column <= 0 || column > XLHelper.MaxColumnNumber)
-                throw new IndexOutOfRangeException(String.Format("Column number must be between 1 and {0}", XLHelper.MaxColumnNumber));
-
-            var firstCellAddress = new XLAddress(Worksheet,
-                                                 RangeAddress.FirstAddress.RowNumber,
-                                                 RangeAddress.FirstAddress.ColumnNumber + column - 1,
-                                                 false,
-                                                 false);
-            var lastCellAddress = new XLAddress(Worksheet,
-                                                RangeAddress.LastAddress.RowNumber,
-                                                RangeAddress.FirstAddress.ColumnNumber + column - 1,
-                                                false,
-                                                false);
-            return new XLRangeColumn(
-                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), false);
-        }
-
-        public XLRangeColumn Column(String column)
-        {
-            return Column(XLHelper.GetColumnNumberFromLetter(column));
-        }
-
-        
-
-        private void TransposeRange(int squareSide)
-        {
-            var cellsToInsert = new Dictionary<XLSheetPoint, XLCell>();
-            var cellsToDelete = new List<XLSheetPoint>();
-            var rngToTranspose = Worksheet.Range(
-                RangeAddress.FirstAddress.RowNumber,
-                RangeAddress.FirstAddress.ColumnNumber,
-                RangeAddress.FirstAddress.RowNumber + squareSide - 1,
-                RangeAddress.FirstAddress.ColumnNumber + squareSide - 1);
-
-            Int32 roCount = rngToTranspose.RowCount();
-            Int32 coCount = rngToTranspose.ColumnCount();
-            for (Int32 ro = 1; ro <= roCount; ro++)
-            {
-                for (Int32 co = 1; co <= coCount; co++)
-                {
-                    var oldCell = rngToTranspose.Cell(ro, co);
-                    var newKey = rngToTranspose.Cell(co, ro).Address;
-                        // new XLAddress(Worksheet, c.Address.ColumnNumber, c.Address.RowNumber);
-                    var newCell = new XLCell(Worksheet, newKey, oldCell.GetStyleId());
-                    newCell.CopyFrom(oldCell, true);
-                    cellsToInsert.Add(new XLSheetPoint(newKey.RowNumber, newKey.ColumnNumber), newCell);
-                    cellsToDelete.Add(new XLSheetPoint(oldCell.Address.RowNumber, oldCell.Address.ColumnNumber));
-                }
-            }
-
-            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c));
-            cellsToInsert.ForEach(c => Worksheet.Internals.CellsCollection.Add(c.Key, c.Value));
-        }
-
-        private void TransposeMerged(Int32 squareSide)
-        {
-            var rngToTranspose = Worksheet.Range(
-                RangeAddress.FirstAddress.RowNumber,
-                RangeAddress.FirstAddress.ColumnNumber,
-                RangeAddress.FirstAddress.RowNumber + squareSide - 1,
-                RangeAddress.FirstAddress.ColumnNumber + squareSide - 1);
-
-            foreach (IXLRange merge in Worksheet.Internals.MergedRanges.Where(Contains))
-            {
-                merge.RangeAddress.LastAddress = rngToTranspose.Cell(merge.ColumnCount(), merge.RowCount()).Address;
-            }
-        }
-
-        private void MoveOrClearForTranspose(XLTransposeOptions transposeOption, int rowCount, int columnCount)
-        {
-            if (transposeOption == XLTransposeOptions.MoveCells)
-            {
-                if (rowCount > columnCount)
-                    InsertColumnsAfter(false, rowCount - columnCount, false);
-                else if (columnCount > rowCount)
-                    InsertRowsBelow(false, columnCount - rowCount, false);
-            }
-            else
-            {
-                if (rowCount > columnCount)
-                {
-                    int toMove = rowCount - columnCount;
-                    var rngToClear = Worksheet.Range(
-                        RangeAddress.FirstAddress.RowNumber,
-                        RangeAddress.LastAddress.ColumnNumber + 1,
-                        RangeAddress.LastAddress.RowNumber,
-                        RangeAddress.LastAddress.ColumnNumber + toMove);
-                    rngToClear.Clear();
-                }
-                else if (columnCount > rowCount)
-                {
-                    int toMove = columnCount - rowCount;
-                    var rngToClear = Worksheet.Range(
-                        RangeAddress.LastAddress.RowNumber + 1,
-                        RangeAddress.FirstAddress.ColumnNumber,
-                        RangeAddress.LastAddress.RowNumber + toMove,
-                        RangeAddress.LastAddress.ColumnNumber);
-                    rngToClear.Clear();
-                }
-            }
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = (XLRange)obj;
-            return RangeAddress.Equals(other.RangeAddress)
-                   && Worksheet.Equals(other.Worksheet);
-        }
-
-        public override int GetHashCode()
-        {
-            return RangeAddress.GetHashCode()
-                   ^ Worksheet.GetHashCode();
-        }
-
-        public new IXLRange Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            base.Clear(clearOptions);
-            return this;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeAddress.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeAddress.cs
deleted file mode 100644
index d5b0e94..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeAddress.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLRangeAddress : IXLRangeAddress
-    {
-        #region Private fields
-
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)] private XLAddress _firstAddress;
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)] private XLAddress _lastAddress;
-
-        #endregion
-
-        #region Constructor
-
-        public XLRangeAddress(XLRangeAddress rangeAddress): this(rangeAddress.FirstAddress, rangeAddress.LastAddress)
-        {
-            
-        }
-
-        public XLRangeAddress(XLAddress firstAddress, XLAddress lastAddress)
-        {
-            Worksheet = firstAddress.Worksheet;
-            FirstAddress = XLAddress.Create(firstAddress);
-            LastAddress = XLAddress.Create(lastAddress); 
-        }
-
-        public XLRangeAddress(XLWorksheet worksheet, String rangeAddress)
-        {
-            string addressToUse = rangeAddress.Contains("!")
-                                      ? rangeAddress.Substring(rangeAddress.IndexOf("!") + 1)
-                                      : rangeAddress;
-
-            string firstPart;
-            string secondPart;
-            if (addressToUse.Contains(':'))
-            {
-                var arrRange = addressToUse.Split(':');
-                firstPart = arrRange[0];
-                secondPart = arrRange[1];
-            }
-            else
-            {
-                firstPart = addressToUse;
-                secondPart = addressToUse;
-            }
-
-            if (XLHelper.IsValidA1Address(firstPart))
-            {
-                FirstAddress = XLAddress.Create(worksheet, firstPart);
-                LastAddress = XLAddress.Create(worksheet, secondPart);
-            }
-            else
-            {
-                firstPart = firstPart.Replace("$", String.Empty);
-                secondPart = secondPart.Replace("$", String.Empty);
-                if (char.IsDigit(firstPart[0]))
-                {
-                    FirstAddress = XLAddress.Create(worksheet, "A" + firstPart);
-                    LastAddress = XLAddress.Create(worksheet, XLHelper.MaxColumnLetter + secondPart);
-                }
-                else
-                {
-                    FirstAddress = XLAddress.Create(worksheet, firstPart + "1");
-                    LastAddress = XLAddress.Create(worksheet, secondPart + XLHelper.MaxRowNumber.ToString(CultureInfo.InvariantCulture));    
-                }
-            }
-
-            Worksheet = worksheet;
-        }
-
-        #endregion
-
-        #region Public properties
-
-        public XLWorksheet Worksheet { get; internal set; }
-
-        public XLAddress FirstAddress
-        {
-            get
-            {
-                if (IsInvalid)
-                    throw new Exception("Range is invalid.");
-
-                return _firstAddress;
-            }
-            set { _firstAddress = value; }
-        }
-
-        public XLAddress LastAddress
-        {
-            get
-            {
-                if (IsInvalid)
-                    throw new Exception("Range is an invalid state.");
-
-                return _lastAddress;
-            }
-            set { _lastAddress = value; }
-        }
-
-        IXLWorksheet IXLRangeAddress.Worksheet
-        {
-            get { return Worksheet; }
-        }
-
-        IXLAddress IXLRangeAddress.FirstAddress
-        {
-            [DebuggerStepThrough]
-            get { return FirstAddress; }
-            set { FirstAddress = value as XLAddress; }
-        }
-
-        IXLAddress IXLRangeAddress.LastAddress
-        {
-            [DebuggerStepThrough]
-            get { return LastAddress; }
-            set { LastAddress = value as XLAddress; }
-        }
-
-
-        public bool IsInvalid { get; set; }
-
-        #endregion
-
-        #region Public methods
-
-        public String ToStringRelative()
-        {
-            return ToStringRelative(false);
-        }
-
-        public String ToStringFixed()
-        {
-            return ToStringFixed(XLReferenceStyle.A1);
-        }
-
-        public String ToStringRelative(Boolean includeSheet)
-        {
-            if (includeSheet)
-                return String.Format("'{0}'!{1}:{2}", 
-                    Worksheet.Name, 
-                    _firstAddress.ToStringRelative(),
-                    _lastAddress.ToStringRelative());
-
-            return _firstAddress.ToStringRelative() + ":" + _lastAddress.ToStringRelative();
-        }
-
-        public String ToStringFixed(XLReferenceStyle referenceStyle)
-        {
-            return ToStringFixed(referenceStyle, false);
-        }
-
-        public String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet)
-        {
-            if (includeSheet)
-                return String.Format("'{0}'!{1}:{2}",
-                    Worksheet.Name,
-                    _firstAddress.ToStringFixed(referenceStyle),
-                    _lastAddress.ToStringFixed(referenceStyle));
-
-            return _firstAddress.ToStringFixed(referenceStyle) + ":" + _lastAddress.ToStringFixed(referenceStyle);           
-        }
-
-        public override string ToString()
-        {
-            return _firstAddress + ":" + _lastAddress;
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = (XLRangeAddress)obj;
-            return Worksheet.Equals(other.Worksheet)
-                   && FirstAddress.Equals(other.FirstAddress)
-                   && LastAddress.Equals(other.LastAddress);
-        }
-
-        public override int GetHashCode()
-        {
-            return
-                Worksheet.GetHashCode()
-                ^ FirstAddress.GetHashCode()
-                ^ LastAddress.GetHashCode();
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeBase.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeBase.cs
deleted file mode 100644
index 87d58f9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeBase.cs
+++ /dev/null
@@ -1,2017 +0,0 @@
-using ClosedXML.Excel.Misc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-
-
-namespace ClosedXML.Excel
-{
-    internal abstract class XLRangeBase : IXLRangeBase, IXLStylized
-    {
-        public Boolean StyleChanged { get; set; }
-        #region Fields
-
-        private IXLStyle _style;
-        private XLSortElements _sortRows;
-        private XLSortElements _sortColumns;
-
-        #endregion
-
-        private Int32 _styleCacheId;
-        protected void SetStyle(IXLStyle styleToUse)
-        {
-            _styleCacheId = Worksheet.Workbook.GetStyleId(styleToUse);
-            _style = null;
-            StyleChanged = false;
-        }
-        protected void SetStyle(Int32 styleId)
-        {
-            _styleCacheId = styleId;
-            _style = null;
-            StyleChanged = false;
-        }
-        public Int32 GetStyleId()
-        {
-            if (StyleChanged)
-                SetStyle(Style);
-
-            return _styleCacheId;
-        }
-        protected IXLStyle GetStyle()
-        {
-            return _style ?? (_style = new XLStyle(this, Worksheet.Workbook.GetStyleById(_styleCacheId)));
-        }
-
-        #region Constructor
-
-        static Int32 IdCounter = 0;
-        readonly Int32 Id;
-
-        protected XLRangeBase(XLRangeAddress rangeAddress)
-        {
-
-            Id = ++IdCounter;
-
-            RangeAddress = new XLRangeAddress(rangeAddress);
-        }
-
-        #endregion
-
-		private XLCallbackAction _shiftedRowsAction;
-
-        protected void SubscribeToShiftedRows(Action<XLRange, Int32> action)
-        {
-            if (Worksheet == null || !Worksheet.EventTrackingEnabled) return;
-
-			_shiftedRowsAction = new XLCallbackAction(action);
-
-			RangeAddress.Worksheet.RangeShiftedRows.Add(_shiftedRowsAction);
-        }
-
-        private XLCallbackAction _shiftedColumnsAction;
-		protected void SubscribeToShiftedColumns(Action<XLRange, Int32> action)
-        {
-            if (Worksheet == null || !Worksheet.EventTrackingEnabled) return;
-
-            _shiftedColumnsAction = new XLCallbackAction(action);
-
-			RangeAddress.Worksheet.RangeShiftedColumns.Add(_shiftedColumnsAction);
-        }
-
-        #region Public properties
-
-        //public XLRangeAddress RangeAddress { get; protected set; }
-
-        private XLRangeAddress _rangeAddress;
-        public XLRangeAddress RangeAddress
-        {
-            get { return _rangeAddress; }
-            protected set { _rangeAddress = value; }
-        }
-
-        public XLWorksheet Worksheet
-        {
-            get { return RangeAddress.Worksheet; }
-        }
-
-        public XLDataValidation NewDataValidation
-        {
-            get
-            {
-                var newRanges = new XLRanges { AsRange() };
-                var dataValidation = new XLDataValidation(newRanges);
-                
-                Worksheet.DataValidations.Add(dataValidation);
-                return dataValidation;
-            }
-        }
-
-        public XLDataValidation DataValidation
-        {
-            get
-            {
-                IXLDataValidation dataValidationToCopy = null;
-                var dvEmpty = new List<IXLDataValidation>();
-                foreach (IXLDataValidation dv in Worksheet.DataValidations)
-                {
-                    foreach (IXLRange dvRange in dv.Ranges.Where(dvRange => dvRange.Intersects(this)))
-                    {
-                        if (dataValidationToCopy == null)
-                            dataValidationToCopy = dv;
-
-                        dv.Ranges.Remove(dvRange);
-                        foreach (var column in dvRange.Columns())
-                        {
-                            if (column.Intersects(this))
-                            {
-                                Int32 dvStart = column.RangeAddress.FirstAddress.RowNumber;
-                                Int32 dvEnd = column.RangeAddress.LastAddress.RowNumber;
-                                Int32 thisStart = RangeAddress.FirstAddress.RowNumber;
-                                Int32 thisEnd = RangeAddress.LastAddress.RowNumber;
-
-                                if (thisStart > dvStart && thisEnd < dvEnd)
-                                {
-                                    var r1 = Worksheet.Column(column.ColumnNumber()).Column(dvStart, thisStart - 1);
-                                    r1.Dispose();
-                                    dv.Ranges.Add(r1);
-                                    var r2 = Worksheet.Column(column.ColumnNumber()).Column(thisEnd + 1, dvEnd);
-                                    r2.Dispose();
-                                    dv.Ranges.Add(r2);
-                                }
-                                else
-                                {
-                                    Int32 coStart;
-                                    if (dvStart < thisStart)
-                                        coStart = dvStart;
-                                    else
-                                        coStart = thisEnd + 1;
-
-                                    if (coStart <= dvEnd)
-                                    {
-                                        Int32 coEnd;
-                                        if (dvEnd > thisEnd)
-                                            coEnd = dvEnd;
-                                        else
-                                            coEnd = thisStart - 1;
-
-                                        if (coEnd >= dvStart)
-                                        {
-                                            var r = Worksheet.Column(column.ColumnNumber()).Column(coStart, coEnd);
-                                            r.Dispose();
-                                            dv.Ranges.Add(r);
-                                        }
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                column.Dispose();
-                                dv.Ranges.Add(column);
-                            }
-                        }
-
-                        if (!dv.Ranges.Any())
-                            dvEmpty.Add(dv);
-                    }
-                }
-
-                dvEmpty.ForEach(dv => Worksheet.DataValidations.Delete(dv));
-
-                var newRanges = new XLRanges {AsRange()};
-                var dataValidation = new XLDataValidation(newRanges);
-                if (dataValidationToCopy != null)
-                    dataValidation.CopyFrom(dataValidationToCopy);
-
-                Worksheet.DataValidations.Add(dataValidation);
-                return dataValidation;
-            }
-        }
-
-        #region IXLRangeBase Members
-
-        IXLRangeAddress IXLRangeBase.RangeAddress
-        {
-            get { return RangeAddress; }
-        }
-
-        IXLWorksheet IXLRangeBase.Worksheet
-        {
-            get { return RangeAddress.Worksheet; }
-        }
-
-        public String FormulaA1
-        {
-            set
-            {
-                Cells().ForEach(c =>
-                                    {
-                                        c.FormulaA1 = value;
-                                        c.FormulaReference = RangeAddress;
-                                    });
-            }
-        }
-
-        public String FormulaR1C1
-        {
-            set
-            {
-                Cells().ForEach(c =>
-                {
-                    c.FormulaR1C1 = value;
-                    c.FormulaReference = RangeAddress;
-                });
-            }
-        }
-
-        public Boolean ShareString
-        {
-            set { Cells().ForEach(c => c.ShareString = value); }
-        }
-
-        public IXLHyperlinks Hyperlinks
-        {
-            get
-            {
-                var hyperlinks = new XLHyperlinks();
-                var hls = from hl in Worksheet.Hyperlinks
-                          where Contains(hl.Cell.AsRange())
-                          select hl;
-                hls.ForEach(hyperlinks.Add);
-                return hyperlinks;
-            }
-        }
-
-
-
-        public Object Value
-        {
-            set { Cells().ForEach(c => c.Value = value); }
-        }
-
-        public XLCellValues DataType
-        {
-            set { Cells().ForEach(c => c.DataType = value); }
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges {AsRange()};
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        #endregion
-
-        #region IXLRangeBase Members
-
-        IXLCell IXLRangeBase.FirstCell()
-        {
-            return FirstCell();
-        }
-
-        IXLCell IXLRangeBase.LastCell()
-        {
-            return LastCell();
-        }
-
-        IXLCell IXLRangeBase.FirstCellUsed()
-        {
-            return FirstCellUsed(false);
-        }
-
-        IXLCell IXLRangeBase.FirstCellUsed(bool includeFormats)
-        {
-            return FirstCellUsed(includeFormats);
-        }
-
-        IXLCell IXLRangeBase.LastCellUsed()
-        {
-            return LastCellUsed(false);
-        }
-
-        IXLCell IXLRangeBase.LastCellUsed(bool includeFormats)
-        {
-            return LastCellUsed(includeFormats);
-        }
-
-        public IXLCells Cells()
-        {
-            var cells = new XLCells(false, false) {RangeAddress};
-            return cells;
-        }
-
-        public IXLCells Cells(String cells)
-        {
-            return Ranges(cells).Cells();
-        }
-
-        public IXLCells Cells(Func<IXLCell, Boolean> predicate)
-        {
-            var cells = new XLCells(false, false, predicate) { RangeAddress };
-            return cells;
-        }
-
-        public IXLCells CellsUsed()
-        {
-            var cells = new XLCells(true, false) {RangeAddress};
-            return cells;
-        }
-
-        IXLCells IXLRangeBase.CellsUsed(Boolean includeFormats)
-        {
-            return CellsUsed(includeFormats);
-        }
-
-        public IXLRange Merge()
-        {
-            return Merge(true);
-        }
-
-        public IXLRange Merge(Boolean checkIntersect)
-        {
-            if (checkIntersect)
-            {
-                string tAddress = RangeAddress.ToString();
-                foreach (var mergedRange in Worksheet.Internals.MergedRanges)
-                {
-                    if (mergedRange.Intersects(tAddress))
-                        Worksheet.Internals.MergedRanges.Remove(mergedRange);
-                }
-            }
-
-            var asRange = AsRange();
-            Worksheet.Internals.MergedRanges.Add(asRange);
-
-            return asRange;
-        }
-
-        public IXLRange Unmerge()
-        {
-            string tAddress = RangeAddress.ToString();
-            var asRange = AsRange();
-            if (Worksheet.Internals.MergedRanges.Select(m => m.RangeAddress.ToString()).Any(mAddress => mAddress == tAddress))
-                Worksheet.Internals.MergedRanges.Remove(asRange);
-
-            return asRange;
-        }
-
-        public IXLRangeBase Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            var includeFormats = clearOptions == XLClearOptions.Formats ||
-                                 clearOptions == XLClearOptions.ContentsAndFormats;
-            foreach (var cell in CellsUsed(includeFormats))
-            {
-                cell.Clear(clearOptions, true);
-            }
-
-            if (includeFormats)
-            {
-                ClearMerged();
-            }
-
-            if (clearOptions == XLClearOptions.ContentsAndFormats)
-            {
-                Worksheet.Internals.CellsCollection.RemoveAll(
-                    RangeAddress.FirstAddress.RowNumber,
-                    RangeAddress.FirstAddress.ColumnNumber,
-                    RangeAddress.LastAddress.RowNumber,
-                    RangeAddress.LastAddress.ColumnNumber
-                    );
-            }
-            return this;
-        }
-
-        public void DeleteComments() {
-            Cells().DeleteComments();
-        }
-
-        public bool Contains(String rangeAddress)
-        {
-            string addressToUse = rangeAddress.Contains("!")
-                                      ? rangeAddress.Substring(rangeAddress.IndexOf("!") + 1)
-                                      : rangeAddress;
-
-            XLAddress firstAddress;
-            XLAddress lastAddress;
-            if (addressToUse.Contains(':'))
-            {
-                var arrRange = addressToUse.Split(':');
-                firstAddress = XLAddress.Create(Worksheet, arrRange[0]);
-                lastAddress = XLAddress.Create(Worksheet, arrRange[1]);
-            }
-            else
-            {
-                firstAddress = XLAddress.Create(Worksheet, addressToUse);
-                lastAddress = XLAddress.Create(Worksheet, addressToUse);
-            }
-            return Contains(firstAddress, lastAddress);
-        }
-
-        public bool Contains(IXLRangeBase range)
-        {
-            return Contains((XLAddress)range.RangeAddress.FirstAddress, (XLAddress)range.RangeAddress.LastAddress);
-        }
-
-        public bool Intersects(string rangeAddress)
-        {
-            using (var range  = Worksheet.Range(rangeAddress))
-                return Intersects(range);
-        }
-
-        public bool Intersects(IXLRangeBase range)
-        {
-            if (range.RangeAddress.IsInvalid || RangeAddress.IsInvalid)
-                return false;
-            var ma = range.RangeAddress;
-            var ra = RangeAddress;
-
-            return !( // See if the two ranges intersect...
-                    ma.FirstAddress.ColumnNumber > ra.LastAddress.ColumnNumber
-                    || ma.LastAddress.ColumnNumber < ra.FirstAddress.ColumnNumber
-                    || ma.FirstAddress.RowNumber > ra.LastAddress.RowNumber
-                    || ma.LastAddress.RowNumber < ra.FirstAddress.RowNumber
-                    );
-        }
-
-        public virtual IXLStyle Style
-        {
-            get { return GetStyle(); }
-            set { Cells().ForEach(c => c.Style = value); }
-        }
-        IXLRange IXLRangeBase.AsRange()
-        {
-            return AsRange();
-        }
-        public virtual XLRange AsRange()
-        {
-            return Worksheet.Range(RangeAddress.FirstAddress, RangeAddress.LastAddress);
-        }
-
-      
-
-        public IXLRange AddToNamed(String rangeName)
-        {
-            return AddToNamed(rangeName, XLScope.Workbook);
-        }
-
-        public IXLRange AddToNamed(String rangeName, XLScope scope)
-        {
-            return AddToNamed(rangeName, scope, null);
-        }
-
-        public IXLRange AddToNamed(String rangeName, XLScope scope, String comment)
-        {
-            var namedRanges = scope == XLScope.Workbook
-                                  ? Worksheet.Workbook.NamedRanges
-                                  : Worksheet.NamedRanges;
-
-            if (namedRanges.Any(nr => String.Compare(nr.Name, rangeName, true) == 0))
-            {
-                var namedRange = namedRanges.Single(nr => String.Compare(nr.Name, rangeName, true) == 0);
-                namedRange.Add(Worksheet.Workbook, RangeAddress.ToStringFixed(XLReferenceStyle.A1, true));
-            }
-            else
-                namedRanges.Add(rangeName, RangeAddress.ToStringFixed(XLReferenceStyle.A1, true), comment);
-            return AsRange();
-        }
-
-        public IXLRangeBase SetValue<T>(T value)
-        {
-            Cells().ForEach(c => c.SetValue(value));
-            return this;
-        }
-
-        public Boolean IsMerged()
-        {
-            return Cells().Any(c => c.IsMerged());
-        }
-
-        public Boolean IsEmpty()
-        {
-            return !CellsUsed().Any() || CellsUsed().Any(c => c.IsEmpty());
-        }
-
-        public Boolean IsEmpty(Boolean includeFormats)
-        {
-            return !CellsUsed(includeFormats).Any<XLCell>() ||
-                   CellsUsed(includeFormats).Any<XLCell>(c => c.IsEmpty(includeFormats));
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public virtual IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                foreach (IXLCell cell in Cells())
-                    yield return cell.Style;
-                UpdatingStyle = false;
-            }
-        }
-
-        public virtual Boolean UpdatingStyle { get; set; }
-
-        public virtual IXLStyle InnerStyle
-        {
-            get { return GetStyle(); }
-            set { SetStyle(value); }
-        }
-
-        #endregion
-
-        public XLCell FirstCell()
-        {
-            return Cell(1, 1);
-        }
-
-        public XLCell LastCell()
-        {
-            return Cell(RowCount(), ColumnCount());
-        }
-
-        public XLCell FirstCellUsed()
-        {
-            return FirstCellUsed(false, null);
-        }
-
-        public XLCell FirstCellUsed(Boolean includeFormats)
-        {
-            return FirstCellUsed(includeFormats, null);
-        }
-
-        IXLCell IXLRangeBase.FirstCellUsed(Func<IXLCell, Boolean> predicate)
-        {
-            return FirstCellUsed(predicate);
-        }
-
-        public XLCell FirstCellUsed(Func<IXLCell, Boolean> predicate)
-        {
-            return FirstCellUsed(false, predicate);
-        }
-
-        IXLCell IXLRangeBase.FirstCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
-        {
-            return FirstCellUsed(includeFormats, predicate);
-        }
-
-        public XLCell FirstCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
-        {
-            Int32 fRow = RangeAddress.FirstAddress.RowNumber;
-            Int32 lRow = RangeAddress.LastAddress.RowNumber;
-            Int32 fColumn = RangeAddress.FirstAddress.ColumnNumber;
-            Int32 lColumn = RangeAddress.LastAddress.ColumnNumber;
-
-            var sp = Worksheet.Internals.CellsCollection.FirstPointUsed(fRow, fColumn, lRow, lColumn, includeFormats, predicate);
-
-            if (includeFormats)
-            {
-                var rowsUsed =
-                    Worksheet.Internals.RowsCollection.Where(r => r.Key >= fRow && r.Key <= lRow && !r.Value.IsEmpty(true));
-
-                var columnsUsed =
-                    Worksheet.Internals.ColumnsCollection.Where(c => c.Key >= fColumn && c.Key <= lColumn && !c.Value.IsEmpty(true));
-
-                // If there's a row or a column then check if the style is different
-                // and pick the first cell and check the style of it, if different
-                // than default then it's your cell.
-
-                Int32 ro = 0;
-                if (rowsUsed.Any())
-                    if (sp.Row > 0)
-                        ro = Math.Min(sp.Row, rowsUsed.First().Key);
-                    else
-                        ro = rowsUsed.First().Key;
-
-                Int32 co = 0;
-                if (columnsUsed.Any())
-                    if (sp.Column > 0)
-                        co = Math.Min(sp.Column, columnsUsed.First().Key);
-                    else
-                        co = columnsUsed.First().Key;
-
-                if (ro > 0 && co > 0)
-                    return Worksheet.Cell(ro, co);
-
-                if (ro > 0 && lColumn < XLHelper.MaxColumnNumber)
-                {
-                    for (co = fColumn; co <= lColumn; co++)
-                    {
-                        var cell = Worksheet.Cell(ro, co);
-                        if (!cell.IsEmpty(true)) return cell;
-                    }
-                }
-                else if (co > 0 && lRow < XLHelper.MaxRowNumber)
-                {
-                    for (ro = fRow; ro <= lRow; ro++)
-                    {
-                        var cell = Worksheet.Cell(ro, co);
-                        if (!cell.IsEmpty(true)) return cell;
-                    }
-                }
-
-                if (Worksheet.MergedRanges.Any(r => r.Intersects(this)))
-                {
-                    Int32 minRo =
-                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Min(r => r.RangeAddress.FirstAddress.RowNumber);
-                    Int32 minCo =
-                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Min(r => r.RangeAddress.FirstAddress.ColumnNumber);
-
-                    return Worksheet.Cell(minRo, minCo);
-                }
-            }
-
-           
-            if (sp.Row > 0) 
-                return Worksheet.Cell(sp.Row, sp.Column);
-
-            return null;
-        }
-
-        public XLCell LastCellUsed()
-        {
-            return LastCellUsed(false, null);
-        }
-
-        public XLCell LastCellUsed(Boolean includeFormats)
-        {
-            return LastCellUsed(includeFormats, null);
-        }
-
-        IXLCell IXLRangeBase.LastCellUsed(Func<IXLCell, Boolean> predicate)
-        {
-            return LastCellUsed(predicate);
-        }
-
-        public XLCell LastCellUsed(Func<IXLCell, Boolean> predicate)
-        {
-            return LastCellUsed(false, predicate);
-        }
-
-        IXLCell IXLRangeBase.LastCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
-        {
-            return LastCellUsed(includeFormats, predicate);
-        }
-
-        public XLCell LastCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
-        {
-            Int32 fRow = RangeAddress.FirstAddress.RowNumber;
-            Int32 lRow = RangeAddress.LastAddress.RowNumber;
-            Int32 fColumn = RangeAddress.FirstAddress.ColumnNumber;
-            Int32 lColumn = RangeAddress.LastAddress.ColumnNumber;
-
-            var sp = Worksheet.Internals.CellsCollection.LastPointUsed(fRow, fColumn, lRow, lColumn, includeFormats, predicate);
-
-            if (includeFormats)
-            {
-                var rowsUsed =
-                    Worksheet.Internals.RowsCollection.Where(r => r.Key >= fRow && r.Key <= lRow && !r.Value.IsEmpty(true));
-
-                var columnsUsed =
-                    Worksheet.Internals.ColumnsCollection.Where(c => c.Key >= fColumn && c.Key <= lColumn && !c.Value.IsEmpty(true));
-
-                // If there's a row or a column then check if the style is different
-                // and pick the first cell and check the style of it, if different
-                // than default then it's your cell.
-
-                Int32 ro = 0;
-                if (rowsUsed.Any())
-                    ro = Math.Max(sp.Row, rowsUsed.Last().Key);
-
-                Int32 co = 0;
-                if (columnsUsed.Any())
-                    co = Math.Max(sp.Column, columnsUsed.Last().Key);
-
-                if (ro > 0 && co > 0)
-                    return Worksheet.Cell(ro, co);
-
-                if (ro > 0 && lColumn < XLHelper.MaxColumnNumber)
-                {
-                    for (co = lColumn; co >= fColumn; co--)
-                    {
-                        var cell = Worksheet.Cell(ro, co);
-                        if (!cell.IsEmpty(true)) return cell;
-                    }
-                }
-                else if (co > 0 && lRow < XLHelper.MaxRowNumber)
-                {
-                    for (ro = lRow; ro >= fRow; ro--)
-                    {
-                        var cell = Worksheet.Cell(ro, co);
-                        if (!cell.IsEmpty(true)) return cell;
-                    }
-                }
-
-                if (Worksheet.MergedRanges.Any(r => r.Intersects(this)))
-                {
-                    Int32 minRo =
-                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Max(r => r.RangeAddress.LastAddress.RowNumber);
-                    Int32 minCo =
-                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Max(r => r.RangeAddress.LastAddress.ColumnNumber);
-
-                    return Worksheet.Cell(minRo, minCo);
-                }
-            }
-
-            
-            if (sp.Row > 0)
-                return Worksheet.Cell(sp.Row, sp.Column);
-
-            return null;
-        }
-
-        public XLCell Cell(Int32 row, Int32 column)
-        {
-            return Cell(new XLAddress(Worksheet, row, column, false, false));
-        }
-
-        public XLCell Cell(String cellAddressInRange)
-        {
-
-            if (XLHelper.IsValidA1Address(cellAddressInRange))
-                return Cell(XLAddress.Create(Worksheet, cellAddressInRange));
-
-            return (XLCell)Worksheet.NamedRange(cellAddressInRange).Ranges.First().FirstCell();
-        }
-
-        public XLCell Cell(Int32 row, String column)
-        {
-            return Cell(new XLAddress(Worksheet, row, column, false, false));
-        }
-
-        public XLCell Cell(IXLAddress cellAddressInRange)
-        {
-            return Cell(cellAddressInRange.RowNumber, cellAddressInRange.ColumnNumber);
-        }
-
-        public XLCell Cell(XLAddress cellAddressInRange)
-        {
-            Int32 absRow = cellAddressInRange.RowNumber + RangeAddress.FirstAddress.RowNumber - 1;
-            Int32 absColumn = cellAddressInRange.ColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1;
-
-            if (absRow <= 0 || absRow > XLHelper.MaxRowNumber)
-            {
-                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}",
-                                                                 XLHelper.MaxRowNumber));
-            }
-
-            if (absColumn <= 0 || absColumn > XLHelper.MaxColumnNumber)
-            {
-                throw new IndexOutOfRangeException(String.Format("Column number must be between 1 and {0}",
-                                                                 XLHelper.MaxColumnNumber));
-            }
-
-            var cell = Worksheet.Internals.CellsCollection.GetCell(absRow,
-                                                                   absColumn);
-
-            if (cell != null)
-                return cell;
-
-            //var style = Style;
-            Int32 styleId = GetStyleId();
-            Int32 worksheetStyleId = Worksheet.GetStyleId();
-
-            if (styleId == worksheetStyleId)
-            {
-                XLRow row;
-                XLColumn column;
-                if (Worksheet.Internals.RowsCollection.TryGetValue(absRow, out row)
-                    && row.GetStyleId() != worksheetStyleId)
-                    styleId = row.GetStyleId();
-                else if (Worksheet.Internals.ColumnsCollection.TryGetValue(absColumn, out column)
-                    && column.GetStyleId() != worksheetStyleId)
-                    styleId = column.GetStyleId();
-            }
-            var absoluteAddress = new XLAddress(cellAddressInRange.Worksheet,
-                                 absRow,
-                                 absColumn,
-                                 cellAddressInRange.FixedRow,
-                                 cellAddressInRange.FixedColumn);
-            var newCell = new XLCell(Worksheet, absoluteAddress, styleId);
-            Worksheet.Internals.CellsCollection.Add(absRow, absColumn, newCell);
-            return newCell;
-        }
-
-        public Int32 RowCount()
-        {
-            return RangeAddress.LastAddress.RowNumber - RangeAddress.FirstAddress.RowNumber + 1;
-        }
-
-        public Int32 RowNumber()
-        {
-            return RangeAddress.FirstAddress.RowNumber;
-        }
-
-        public Int32 ColumnCount()
-        {
-            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
-        }
-
-        public Int32 ColumnNumber()
-        {
-            return RangeAddress.FirstAddress.ColumnNumber;
-        }
-
-        public String ColumnLetter()
-        {
-            return RangeAddress.FirstAddress.ColumnLetter;
-        }
-
-        public virtual XLRange Range(String rangeAddressStr)
-        {
-            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressStr);
-            return Range(rangeAddress);
-        }
-
-        public XLRange Range(IXLCell firstCell, IXLCell lastCell)
-        {
-            var newFirstCellAddress = firstCell.Address as XLAddress;
-            var newLastCellAddress = lastCell.Address as XLAddress;
-            
-            return GetRange(newFirstCellAddress, newLastCellAddress);
-        }
-
-        private XLRange GetRange(XLAddress newFirstCellAddress, XLAddress newLastCellAddress)
-        {
-            var newRangeAddress = new XLRangeAddress(newFirstCellAddress, newLastCellAddress);
-            var xlRangeParameters = new XLRangeParameters(newRangeAddress, Style);
-            if (
-                newFirstCellAddress.RowNumber < RangeAddress.FirstAddress.RowNumber
-                || newFirstCellAddress.RowNumber > RangeAddress.LastAddress.RowNumber
-                || newLastCellAddress.RowNumber > RangeAddress.LastAddress.RowNumber
-                || newFirstCellAddress.ColumnNumber < RangeAddress.FirstAddress.ColumnNumber
-                || newFirstCellAddress.ColumnNumber > RangeAddress.LastAddress.ColumnNumber
-                || newLastCellAddress.ColumnNumber > RangeAddress.LastAddress.ColumnNumber
-                )
-            {
-                throw new ArgumentOutOfRangeException(String.Format(
-                    "The cells {0} and {1} are outside the range '{2}'.",
-                    newFirstCellAddress,
-                    newLastCellAddress,
-                    ToString()));
-            }
-
-            return new XLRange(xlRangeParameters);
-        }
-
-        public XLRange Range(String firstCellAddress, String lastCellAddress)
-        {
-            var rangeAddress = new XLRangeAddress(XLAddress.Create(Worksheet, firstCellAddress),
-                                                  XLAddress.Create(Worksheet, lastCellAddress));
-            return Range(rangeAddress);
-        }
-
-        public XLRange Range(Int32 firstCellRow, Int32 firstCellColumn, Int32 lastCellRow, Int32 lastCellColumn)
-        {
-            var rangeAddress = new XLRangeAddress(new XLAddress(Worksheet, firstCellRow, firstCellColumn, false, false),
-                                                  new XLAddress(Worksheet, lastCellRow, lastCellColumn, false, false));
-            return Range(rangeAddress);
-        }
-
-        public XLRange Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
-        {
-            var rangeAddress = new XLRangeAddress(firstCellAddress as XLAddress, lastCellAddress as XLAddress);
-            return Range(rangeAddress);
-        }
-
-        public XLRange Range(IXLRangeAddress rangeAddress)
-        {
-
-            var newFirstCellAddress = new XLAddress((XLWorksheet)rangeAddress.FirstAddress.Worksheet,
-                                 rangeAddress.FirstAddress.RowNumber + RangeAddress.FirstAddress.RowNumber - 1,
-                                 rangeAddress.FirstAddress.ColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1,
-                                 rangeAddress.FirstAddress.FixedRow,
-                                 rangeAddress.FirstAddress.FixedColumn);
-
-            newFirstCellAddress.FixedRow = rangeAddress.FirstAddress.FixedRow;
-            newFirstCellAddress.FixedColumn = rangeAddress.FirstAddress.FixedColumn;
-
-            var newLastCellAddress = new XLAddress((XLWorksheet)rangeAddress.LastAddress.Worksheet,
-                                rangeAddress.LastAddress.RowNumber + RangeAddress.FirstAddress.RowNumber - 1,
-                                rangeAddress.LastAddress.ColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1,
-                                rangeAddress.LastAddress.FixedRow,
-                                rangeAddress.LastAddress.FixedColumn);
-
-            newLastCellAddress.FixedRow = rangeAddress.LastAddress.FixedRow;
-            newLastCellAddress.FixedColumn = rangeAddress.LastAddress.FixedColumn;
-
-            return GetRange(newFirstCellAddress, newLastCellAddress);
-        }
-
-        public IXLRanges Ranges(String ranges)
-        {
-            var retVal = new XLRanges();
-            var rangePairs = ranges.Split(',');
-            foreach (string pair in rangePairs)
-                retVal.Add(Range(pair.Trim()));
-            return retVal;
-        }
-
-        public IXLRanges Ranges(params String[] ranges)
-        {
-            var retVal = new XLRanges();
-            foreach (string pair in ranges)
-                retVal.Add(Range(pair));
-            return retVal;
-        }
-
-        protected String FixColumnAddress(String address)
-        {
-            Int32 test;
-            if (Int32.TryParse(address, out test))
-                return "A" + address;
-            return address;
-        }
-
-        protected String FixRowAddress(String address)
-        {
-            Int32 test;
-            if (Int32.TryParse(address, out test))
-                return XLHelper.GetColumnLetterFromNumber(test) + "1";
-            return address;
-        }
-
-        public XLCells CellsUsed(bool includeFormats)
-        {
-            var cells = new XLCells(true, includeFormats) {RangeAddress};
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Func<IXLCell, Boolean> predicate)
-        {
-            var cells = new XLCells(true, false, predicate) { RangeAddress };
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
-        {
-            var cells = new XLCells(true, includeFormats, predicate) { RangeAddress };
-            return cells;
-        }
-
-        public IXLRangeColumns InsertColumnsAfter(Int32 numberOfColumns)
-        {
-            return InsertColumnsAfter(numberOfColumns, true);
-        }
-
-        public IXLRangeColumns InsertColumnsAfter(Int32 numberOfColumns, Boolean expandRange)
-        {
-            var retVal = InsertColumnsAfter(false, numberOfColumns);
-            // Adjust the range
-            if (expandRange)
-            {
-                RangeAddress = new XLRangeAddress(
-                    new XLAddress(Worksheet,
-                                  RangeAddress.FirstAddress.RowNumber,
-                                  RangeAddress.FirstAddress.ColumnNumber,
-                                  RangeAddress.FirstAddress.FixedRow,
-                                  RangeAddress.FirstAddress.FixedColumn),
-                    new XLAddress(Worksheet,
-                                  RangeAddress.LastAddress.RowNumber,
-                                  RangeAddress.LastAddress.ColumnNumber + numberOfColumns,
-                                  RangeAddress.LastAddress.FixedRow,
-                                  RangeAddress.LastAddress.FixedColumn));
-            }
-            return retVal;
-        }
-
-        public IXLRangeColumns InsertColumnsAfter(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
-		{
-			return InsertColumnsAfterInternal(onlyUsedCells, numberOfColumns, formatFromLeft);
-		}
-
-		public void InsertColumnsAfterVoid(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
-		{
-			InsertColumnsAfterInternal(onlyUsedCells, numberOfColumns, formatFromLeft, nullReturn: true);
-		}
-
-        private IXLRangeColumns InsertColumnsAfterInternal(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true, Boolean nullReturn = false)
-        {
-            int columnCount = ColumnCount();
-            int firstColumn = RangeAddress.FirstAddress.ColumnNumber + columnCount;
-            if (firstColumn > XLHelper.MaxColumnNumber)
-                firstColumn = XLHelper.MaxColumnNumber;
-            int lastColumn = firstColumn + ColumnCount() - 1;
-            if (lastColumn > XLHelper.MaxColumnNumber)
-                lastColumn = XLHelper.MaxColumnNumber;
-
-            int firstRow = RangeAddress.FirstAddress.RowNumber;
-            int lastRow = firstRow + RowCount() - 1;
-            if (lastRow > XLHelper.MaxRowNumber)
-                lastRow = XLHelper.MaxRowNumber;
-
-            var newRange = Worksheet.Range(firstRow, firstColumn, lastRow, lastColumn);
-            return newRange.InsertColumnsBeforeInternal(onlyUsedCells, numberOfColumns, formatFromLeft, nullReturn);
-        }
-
-        public IXLRangeColumns InsertColumnsBefore(Int32 numberOfColumns)
-        {
-            return InsertColumnsBefore(numberOfColumns, false);
-        }
-
-        public IXLRangeColumns InsertColumnsBefore(Int32 numberOfColumns, Boolean expandRange)
-        {
-            var retVal = InsertColumnsBefore(false, numberOfColumns);
-            // Adjust the range
-            if (expandRange)
-            {
-                RangeAddress = new XLRangeAddress(
-                    new XLAddress(Worksheet,
-                                  RangeAddress.FirstAddress.RowNumber,
-                                  RangeAddress.FirstAddress.ColumnNumber - numberOfColumns,
-                                  RangeAddress.FirstAddress.FixedRow,
-                                  RangeAddress.FirstAddress.FixedColumn),
-                    new XLAddress(Worksheet,
-                                  RangeAddress.LastAddress.RowNumber,
-                                  RangeAddress.LastAddress.ColumnNumber,
-                                  RangeAddress.LastAddress.FixedRow,
-                                  RangeAddress.LastAddress.FixedColumn));
-            }
-            return retVal;
-        }
-
-		public IXLRangeColumns InsertColumnsBefore(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
-		{
-			return InsertColumnsBeforeInternal(onlyUsedCells, numberOfColumns, formatFromLeft);
-		}
-
-		public void InsertColumnsBeforeVoid(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
-		{
-			InsertColumnsBeforeInternal(onlyUsedCells, numberOfColumns, formatFromLeft, nullReturn: true);
-		}
-
-        private IXLRangeColumns InsertColumnsBeforeInternal(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true, Boolean nullReturn = false)
-        {
-            foreach (XLWorksheet ws in Worksheet.Workbook.WorksheetsInternal)
-            {
-                foreach (XLCell cell in ws.Internals.CellsCollection.GetCells(c => !XLHelper.IsNullOrWhiteSpace(c.FormulaA1)))
-                    using (var asRange = AsRange())
-                        cell.ShiftFormulaColumns(asRange, numberOfColumns);
-            }
-
-
-            var cellsDataValidations = new Dictionary<XLAddress, DataValidationToCopy>();
-            var cellsToInsert = new Dictionary<IXLAddress, XLCell>();
-            var cellsToDelete = new List<IXLAddress>();
-            int firstColumn = RangeAddress.FirstAddress.ColumnNumber;
-            int firstRow = RangeAddress.FirstAddress.RowNumber;
-            int lastRow = RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
-
-            if (!onlyUsedCells)
-            {
-                int lastColumn = Worksheet.Internals.CellsCollection.MaxColumnUsed;
-                if (lastColumn > 0)
-                {
-                    for (int co = lastColumn; co >= firstColumn; co--)
-                    {
-                        for (int ro = lastRow; ro >= firstRow; ro--)
-                        {
-                            var oldKey = new XLAddress(Worksheet, ro, co, false, false);
-                            int newColumn = co + numberOfColumns;
-                            var newKey = new XLAddress(Worksheet, ro, newColumn, false, false);
-                            var oldCell = Worksheet.Internals.CellsCollection.GetCell(ro, co) ??
-                                          Worksheet.Cell(oldKey);
-
-                            var newCell = new XLCell(Worksheet, newKey, oldCell.GetStyleId());
-                            newCell.CopyValues(oldCell);
-                            newCell.FormulaA1 = oldCell.FormulaA1;
-                            cellsToInsert.Add(newKey, newCell);
-                            cellsToDelete.Add(oldKey);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                foreach (
-                    XLCell c in
-                        Worksheet.Internals.CellsCollection.GetCells(firstRow, firstColumn, lastRow,
-                                                                     Worksheet.Internals.CellsCollection.MaxColumnUsed))
-                {
-                    int newColumn = c.Address.ColumnNumber + numberOfColumns;
-                    var newKey = new XLAddress(Worksheet, c.Address.RowNumber, newColumn, false, false);
-                    var newCell = new XLCell(Worksheet, newKey, c.GetStyleId());
-                    newCell.CopyValues(c);
-                    if (c.HasDataValidation)
-                    {
-                        cellsDataValidations.Add(newCell.Address,
-                                                 new DataValidationToCopy
-                                                     {DataValidation = c.DataValidation, SourceAddress = c.Address});
-                        c.DataValidation.Clear();
-                    }
-                    newCell.FormulaA1 = c.FormulaA1;
-                    cellsToInsert.Add(newKey, newCell);
-                    cellsToDelete.Add(c.Address);
-                }
-            }
-
-            cellsDataValidations.ForEach(kp =>
-            {
-                XLCell targetCell;
-                if (!cellsToInsert.TryGetValue(kp.Key, out targetCell))
-                    targetCell = Worksheet.Cell(kp.Key);
-
-                targetCell.CopyDataValidation(Worksheet.Cell(kp.Value.SourceAddress), kp.Value.DataValidation);
-            });
-
-            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c.RowNumber, c.ColumnNumber));
-            cellsToInsert.ForEach(
-                c => Worksheet.Internals.CellsCollection.Add(c.Key.RowNumber, c.Key.ColumnNumber, c.Value));
-            //cellsDataValidations.ForEach(kp => Worksheet.Cell(kp.Key).CopyDataValidation(Worksheet.Cell(kp.Value.SourceAddress), kp.Value.DataValidation));
-
-            Int32 firstRowReturn = RangeAddress.FirstAddress.RowNumber;
-            Int32 lastRowReturn = RangeAddress.LastAddress.RowNumber ;
-            Int32 firstColumnReturn = RangeAddress.FirstAddress.ColumnNumber ;
-            Int32 lastColumnReturn = RangeAddress.FirstAddress.ColumnNumber + numberOfColumns - 1;
-
-            Worksheet.BreakConditionalFormatsIntoCells(cellsToDelete.Except(cellsToInsert.Keys).ToList());
-            using (var asRange = AsRange())
-                Worksheet.NotifyRangeShiftedColumns(asRange, numberOfColumns);
-
-            var rangeToReturn = Worksheet.Range(firstRowReturn, firstColumnReturn, lastRowReturn, lastColumnReturn);
-
-            if (formatFromLeft && rangeToReturn.RangeAddress.FirstAddress.ColumnNumber > 1)
-            {
-                using (var firstColumnUsed = rangeToReturn.FirstColumn())
-                {
-                    using (var model = firstColumnUsed.ColumnLeft())
-                    {
-                        var modelFirstRow = model.FirstCellUsed(true);
-                        var modelLastRow = model.LastCellUsed(true);
-                        if (modelLastRow != null)
-                        {
-                            Int32 firstRoReturned = modelFirstRow.Address.RowNumber
-                                                    - model.RangeAddress.FirstAddress.RowNumber + 1;
-                            Int32 lastRoReturned = modelLastRow.Address.RowNumber
-                                                   - model.RangeAddress.FirstAddress.RowNumber + 1;
-                            for (Int32 ro = firstRoReturned; ro <= lastRoReturned; ro++)
-                            {
-                                rangeToReturn.Row(ro).Style = model.Cell(ro).Style;
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                var lastRoUsed = rangeToReturn.LastRowUsed(true);
-                if (lastRoUsed != null)
-                {
-                    Int32 lastRoReturned = lastRoUsed.RowNumber();
-                    for (Int32 ro = 1; ro <= lastRoReturned; ro++)
-                    {
-                        var styleToUse = Worksheet.Internals.RowsCollection.ContainsKey(ro)
-                                             ? Worksheet.Internals.RowsCollection[ro].Style
-                                             : Worksheet.Style;
-                        rangeToReturn.Row(ro).Style = styleToUse;
-                    }
-                    
-                }
-            }
-
-			if(nullReturn)
-				return null;
-            
-            return rangeToReturn.Columns();
-        }
-
-        public IXLRangeRows InsertRowsBelow(Int32 numberOfRows)
-        {
-            return InsertRowsBelow(numberOfRows, true);
-        }
-
-        public IXLRangeRows InsertRowsBelow(Int32 numberOfRows, Boolean expandRange)
-        {
-            var retVal = InsertRowsBelow(false, numberOfRows);
-            // Adjust the range
-            if (expandRange)
-            {
-                RangeAddress = new XLRangeAddress(
-                    new XLAddress(Worksheet,
-                                  RangeAddress.FirstAddress.RowNumber,
-                                  RangeAddress.FirstAddress.ColumnNumber,
-                                  RangeAddress.FirstAddress.FixedRow,
-                                  RangeAddress.FirstAddress.FixedColumn),
-                    new XLAddress(Worksheet,
-                                  RangeAddress.LastAddress.RowNumber + numberOfRows,
-                                  RangeAddress.LastAddress.ColumnNumber,
-                                  RangeAddress.LastAddress.FixedRow,
-                                  RangeAddress.LastAddress.FixedColumn));
-            }
-            return retVal;
-        }
-
-		public IXLRangeRows InsertRowsBelow(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
-		{
-			return InsertRowsBelowInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: false);
-		}
-
-		public void InsertRowsBelowVoid(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
-		{
-			InsertRowsBelowInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: true);
-		}
-
-		private IXLRangeRows InsertRowsBelowInternal(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove, Boolean nullReturn)
-		{
-            int rowCount = RowCount();
-            int firstRow = RangeAddress.FirstAddress.RowNumber + rowCount;
-            if (firstRow > XLHelper.MaxRowNumber)
-                firstRow = XLHelper.MaxRowNumber;
-            int lastRow = firstRow + RowCount() - 1;
-            if (lastRow > XLHelper.MaxRowNumber)
-                lastRow = XLHelper.MaxRowNumber;
-
-            int firstColumn = RangeAddress.FirstAddress.ColumnNumber;
-            int lastColumn = firstColumn + ColumnCount() - 1;
-            if (lastColumn > XLHelper.MaxColumnNumber)
-                lastColumn = XLHelper.MaxColumnNumber;
-
-            var newRange = Worksheet.Range(firstRow, firstColumn, lastRow, lastColumn);
-            return newRange.InsertRowsAboveInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn);
-        }
-
-        public IXLRangeRows InsertRowsAbove(Int32 numberOfRows)
-        {
-            return InsertRowsAbove(numberOfRows, false);
-        }
-
-        public IXLRangeRows InsertRowsAbove(Int32 numberOfRows, Boolean expandRange)
-        {
-            var retVal = InsertRowsAbove(false, numberOfRows);
-            // Adjust the range
-            if (expandRange)
-            {
-                RangeAddress = new XLRangeAddress(
-                    new XLAddress(Worksheet,
-                                  RangeAddress.FirstAddress.RowNumber - numberOfRows,
-                                  RangeAddress.FirstAddress.ColumnNumber,
-                                  RangeAddress.FirstAddress.FixedRow,
-                                  RangeAddress.FirstAddress.FixedColumn),
-                    new XLAddress(Worksheet,
-                                  RangeAddress.LastAddress.RowNumber,
-                                  RangeAddress.LastAddress.ColumnNumber,
-                                  RangeAddress.LastAddress.FixedRow,
-                                  RangeAddress.LastAddress.FixedColumn));
-            }
-            return retVal;
-        }
-
-        struct DataValidationToCopy
-        {
-            public XLAddress SourceAddress;
-            public XLDataValidation DataValidation;
-        }
-		public void InsertRowsAboveVoid(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
-		{
-			InsertRowsAboveInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: true);
-		}
-		public IXLRangeRows InsertRowsAbove(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
-		{
-			return InsertRowsAboveInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: false);
-		}
-
-		private IXLRangeRows InsertRowsAboveInternal(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove, Boolean nullReturn)
-		{
-            using (var asRange = AsRange())
-                foreach (XLWorksheet ws in Worksheet.Workbook.WorksheetsInternal)
-                {
-                    foreach (XLCell cell in ws.Internals.CellsCollection.GetCells(c => !XLHelper.IsNullOrWhiteSpace(c.FormulaA1)))
-                            cell.ShiftFormulaRows(asRange, numberOfRows);
-                }
-
-            var cellsToInsert = new Dictionary<IXLAddress, XLCell>();
-            var cellsToDelete = new List<IXLAddress>();
-            var cellsDataValidations = new Dictionary<XLAddress, DataValidationToCopy>();
-            int firstRow = RangeAddress.FirstAddress.RowNumber;
-            int firstColumn = RangeAddress.FirstAddress.ColumnNumber;
-            int lastColumn = RangeAddress.FirstAddress.ColumnNumber + ColumnCount() - 1;
-
-            if (!onlyUsedCells)
-            {
-                int lastRow = Worksheet.Internals.CellsCollection.MaxRowUsed;
-                if (lastRow > 0)
-                {
-                    for (int ro = lastRow; ro >= firstRow; ro--)
-                    {
-                        for (int co = lastColumn; co >= firstColumn; co--)
-                        {
-                            var oldKey = new XLAddress(Worksheet, ro, co, false, false);
-                            int newRow = ro + numberOfRows;
-                            var newKey = new XLAddress(Worksheet, newRow, co, false, false);
-                            var oldCell = Worksheet.Internals.CellsCollection.GetCell(ro, co) ??
-                                          Worksheet.Cell(oldKey);
-
-                            var newCell = new XLCell(Worksheet, newKey, oldCell.GetStyleId());
-                            newCell.CopyValues(oldCell);
-                            newCell.FormulaA1 = oldCell.FormulaA1;
-                            cellsToInsert.Add(newKey, newCell);
-                            cellsToDelete.Add(oldKey);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                foreach (
-                    XLCell c in
-                        Worksheet.Internals.CellsCollection.GetCells(firstRow, firstColumn,
-                                                                     Worksheet.Internals.CellsCollection.MaxRowUsed,
-                                                                     lastColumn))
-                {
-                    int newRow = c.Address.RowNumber + numberOfRows;
-                    var newKey = new XLAddress(Worksheet, newRow, c.Address.ColumnNumber, false, false);
-                    var newCell = new XLCell(Worksheet, newKey, c.GetStyleId());
-                    newCell.CopyValues(c);
-                    if (c.HasDataValidation)
-                    {
-                        cellsDataValidations.Add(newCell.Address,
-                                                 new DataValidationToCopy
-                                                     {DataValidation = c.DataValidation, SourceAddress = c.Address});
-                        c.DataValidation.Clear();
-                    }
-                    newCell.FormulaA1 = c.FormulaA1;
-                    cellsToInsert.Add(newKey, newCell);
-                    cellsToDelete.Add(c.Address);
-                    
-                }
-            }
-
-            cellsDataValidations.ForEach(kp =>
-                                             {
-                                                 XLCell targetCell;
-                                                 if(!cellsToInsert.TryGetValue(kp.Key, out targetCell))
-                                                     targetCell = Worksheet.Cell(kp.Key);
-
-                                                 targetCell.CopyDataValidation(
-                                                     Worksheet.Cell(kp.Value.SourceAddress), kp.Value.DataValidation);
-                                             });
-
-            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c.RowNumber, c.ColumnNumber));
-            cellsToInsert.ForEach(
-                c => Worksheet.Internals.CellsCollection.Add(c.Key.RowNumber, c.Key.ColumnNumber, c.Value));
-            
-
-            Int32 firstRowReturn = RangeAddress.FirstAddress.RowNumber;
-            Int32 lastRowReturn = RangeAddress.FirstAddress.RowNumber + numberOfRows - 1;
-            Int32 firstColumnReturn = RangeAddress.FirstAddress.ColumnNumber;
-            Int32 lastColumnReturn = RangeAddress.LastAddress.ColumnNumber;
-
-            Worksheet.BreakConditionalFormatsIntoCells(cellsToDelete.Except(cellsToInsert.Keys).ToList());
-            using (var asRange = AsRange())
-                Worksheet.NotifyRangeShiftedRows(asRange, numberOfRows);
-
-            var rangeToReturn = Worksheet.Range(firstRowReturn, firstColumnReturn, lastRowReturn, lastColumnReturn);
-
-            if (formatFromAbove && rangeToReturn.RangeAddress.FirstAddress.RowNumber > 1)
-            {
-                using (var fr = rangeToReturn.FirstRow())
-                {
-                    using (var model = fr.RowAbove())
-                    {
-                        var modelFirstColumn = model.FirstCellUsed(true);
-                        var modelLastColumn = model.LastCellUsed(true);
-                        if (modelLastColumn != null)
-                        {
-                            Int32 firstCoReturned = modelFirstColumn.Address.ColumnNumber
-                                                    - model.RangeAddress.FirstAddress.ColumnNumber + 1;
-                            Int32 lastCoReturned = modelLastColumn.Address.ColumnNumber
-                                                   - model.RangeAddress.FirstAddress.ColumnNumber + 1;
-                            for (Int32 co = firstCoReturned; co <= lastCoReturned; co++)
-                            {
-                                rangeToReturn.Column(co).Style = model.Cell(co).Style;
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                var lastCoUsed = rangeToReturn.LastColumnUsed(true);
-                if (lastCoUsed != null)
-                {
-                    Int32 lastCoReturned = lastCoUsed.ColumnNumber();
-                    for (Int32 co = 1; co <= lastCoReturned; co++)
-                    {
-                        var styleToUse = Worksheet.Internals.ColumnsCollection.ContainsKey(co)
-                                             ? Worksheet.Internals.ColumnsCollection[co].Style
-                                             : Worksheet.Style;
-                        rangeToReturn.Column(co).Style = styleToUse;
-                    }
-                }
-            }
-
-			// Skip calling .Rows() for performance reasons if required.
-			if(nullReturn)
-				return null;
-
-            return rangeToReturn.Rows();
-        }
-
-        private void ClearMerged()
-        {
-            var mergeToDelete = Worksheet.Internals.MergedRanges.Where(Intersects).ToList();
-            mergeToDelete.ForEach(m => Worksheet.Internals.MergedRanges.Remove(m));
-        }
-
-        public Boolean Contains(IXLCell cell)
-        {
-            return Contains(cell.Address as XLAddress);
-        }
-
-        public bool Contains(XLAddress first, XLAddress last)
-        {
-            return Contains(first) && Contains(last);
-        }
-
-        public bool Contains(XLAddress address)
-        {
-            return RangeAddress.FirstAddress.RowNumber <= address.RowNumber &&
-                   address.RowNumber <= RangeAddress.LastAddress.RowNumber &&
-                   RangeAddress.FirstAddress.ColumnNumber <= address.ColumnNumber &&
-                   address.ColumnNumber <= RangeAddress.LastAddress.ColumnNumber;
-        }
-
-        public void Delete(XLShiftDeletedCells shiftDeleteCells)
-        {
-            int numberOfRows = RowCount();
-            int numberOfColumns = ColumnCount();
-            IXLRange shiftedRangeFormula = Worksheet.Range(
-                RangeAddress.FirstAddress.RowNumber,
-                RangeAddress.FirstAddress.ColumnNumber,
-                RangeAddress.LastAddress.RowNumber,
-                RangeAddress.LastAddress.ColumnNumber);
-
-
-            foreach (
-                XLCell cell in
-                    Worksheet.Workbook.Worksheets.Cast<XLWorksheet>().SelectMany(
-                        xlWorksheet => (xlWorksheet).Internals.CellsCollection.GetCells(
-                            c => !XLHelper.IsNullOrWhiteSpace(c.FormulaA1))))
-            {
-                if (shiftDeleteCells == XLShiftDeletedCells.ShiftCellsUp)
-                    cell.ShiftFormulaRows((XLRange)shiftedRangeFormula, numberOfRows * -1);
-                else
-                    cell.ShiftFormulaColumns((XLRange)shiftedRangeFormula, numberOfColumns * -1);
-            }
-
-            // Range to shift...
-            var cellsToInsert = new Dictionary<IXLAddress, XLCell>();
-            //var cellsDataValidations = new Dictionary<XLAddress, DataValidationToCopy>();
-            var cellsToDelete = new List<IXLAddress>();
-            var shiftLeftQuery = Worksheet.Internals.CellsCollection.GetCells(
-                RangeAddress.FirstAddress.RowNumber,
-                RangeAddress.FirstAddress.ColumnNumber,
-                RangeAddress.LastAddress.RowNumber,
-                Worksheet.Internals.CellsCollection.MaxColumnUsed);
-
-            var shiftUpQuery = Worksheet.Internals.CellsCollection.GetCells(
-                RangeAddress.FirstAddress.RowNumber,
-                RangeAddress.FirstAddress.ColumnNumber,
-                Worksheet.Internals.CellsCollection.MaxRowUsed,
-                RangeAddress.LastAddress.ColumnNumber);
-
-
-            int columnModifier = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsLeft ? ColumnCount() : 0;
-            int rowModifier = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsUp ? RowCount() : 0;
-            var cellsQuery = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsLeft ? shiftLeftQuery : shiftUpQuery;
-            foreach (XLCell c in cellsQuery)
-            {
-                var newKey = new XLAddress(Worksheet, c.Address.RowNumber - rowModifier,
-                                           c.Address.ColumnNumber - columnModifier,
-                                           false, false);
-                var newCell = new XLCell(Worksheet, newKey, c.GetStyleId());
-                newCell.CopyValues(c);
-                newCell.FormulaA1 = c.FormulaA1;
-                cellsToDelete.Add(c.Address);
-
-                bool canInsert = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsLeft
-                                     ? c.Address.ColumnNumber > RangeAddress.LastAddress.ColumnNumber
-                                     : c.Address.RowNumber > RangeAddress.LastAddress.RowNumber;
-
-                if (canInsert)
-                    cellsToInsert.Add(newKey, newCell);
-            }
-
-
-            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c.RowNumber, c.ColumnNumber));
-            cellsToInsert.ForEach(
-                c => Worksheet.Internals.CellsCollection.Add(c.Key.RowNumber, c.Key.ColumnNumber, c.Value));
-
-            var mergesToRemove = Worksheet.Internals.MergedRanges.Where(Contains).ToList();
-            mergesToRemove.ForEach(r => Worksheet.Internals.MergedRanges.Remove(r));
-
-            var hyperlinksToRemove = Worksheet.Hyperlinks.Where(hl => Contains(hl.Cell.AsRange())).ToList();
-            hyperlinksToRemove.ForEach(hl => Worksheet.Hyperlinks.Delete(hl));
-
-            Worksheet.BreakConditionalFormatsIntoCells(cellsToDelete.Except(cellsToInsert.Keys).ToList());
-            using (var shiftedRange = AsRange())
-            {
-                if (shiftDeleteCells == XLShiftDeletedCells.ShiftCellsUp)
-                    Worksheet.NotifyRangeShiftedRows(shiftedRange, rowModifier * -1);
-                else
-                    Worksheet.NotifyRangeShiftedColumns(shiftedRange, columnModifier * -1);
-            }
-        }
-
-        public override string ToString()
-        {
-            return String.Format("'{0}'!{1}:{2}", Worksheet.Name, RangeAddress.FirstAddress, RangeAddress.LastAddress);
-        }
-
-        protected void ShiftColumns(IXLRangeAddress thisRangeAddress, XLRange shiftedRange, int columnsShifted)
-        {
-            if (thisRangeAddress.IsInvalid || shiftedRange.RangeAddress.IsInvalid) return;
-
-            if ((columnsShifted < 0
-                 // all columns
-                 &&
-                 thisRangeAddress.FirstAddress.ColumnNumber >= shiftedRange.RangeAddress.FirstAddress.ColumnNumber
-                 &&
-                 thisRangeAddress.LastAddress.ColumnNumber <=
-                 shiftedRange.RangeAddress.FirstAddress.ColumnNumber - columnsShifted
-                 // all rows
-                 && thisRangeAddress.FirstAddress.RowNumber >= shiftedRange.RangeAddress.FirstAddress.RowNumber
-                 && thisRangeAddress.LastAddress.RowNumber <= shiftedRange.RangeAddress.LastAddress.RowNumber
-                ) || (
-                         shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
-                         thisRangeAddress.FirstAddress.ColumnNumber
-                         &&
-                         shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber
-                         &&
-                         shiftedRange.RangeAddress.LastAddress.RowNumber >= thisRangeAddress.LastAddress.RowNumber
-                         && shiftedRange.ColumnCount() >
-                         (thisRangeAddress.LastAddress.ColumnNumber - thisRangeAddress.FirstAddress.ColumnNumber + 1)
-                         +
-                         (thisRangeAddress.FirstAddress.ColumnNumber -
-                          shiftedRange.RangeAddress.FirstAddress.ColumnNumber)))
-                thisRangeAddress.IsInvalid = true;
-            else
-            {
-                if (shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber
-                    && shiftedRange.RangeAddress.LastAddress.RowNumber >= thisRangeAddress.LastAddress.RowNumber)
-                {
-                    if (
-                        (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
-                         thisRangeAddress.FirstAddress.ColumnNumber &&
-                         columnsShifted > 0)
-                        ||
-                        (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <
-                         thisRangeAddress.FirstAddress.ColumnNumber &&
-                         columnsShifted < 0)
-                        )
-                    {
-                        thisRangeAddress.FirstAddress = new XLAddress(Worksheet,
-                                                                      thisRangeAddress.FirstAddress.RowNumber,
-                                                                      thisRangeAddress.FirstAddress.ColumnNumber +
-                                                                      columnsShifted,
-                                                                      thisRangeAddress.FirstAddress.FixedRow,
-                                                                      thisRangeAddress.FirstAddress.FixedColumn);
-                    }
-
-                    if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
-                        thisRangeAddress.LastAddress.ColumnNumber)
-                    {
-                        thisRangeAddress.LastAddress = new XLAddress(Worksheet,
-                                                                     thisRangeAddress.LastAddress.RowNumber,
-                                                                     thisRangeAddress.LastAddress.ColumnNumber +
-                                                                     columnsShifted,
-                                                                     thisRangeAddress.LastAddress.FixedRow,
-                                                                     thisRangeAddress.LastAddress.FixedColumn);
-                    }
-                }
-            }
-        }
-
-        protected void ShiftRows(IXLRangeAddress thisRangeAddress, XLRange shiftedRange, int rowsShifted)
-        {
-            if (thisRangeAddress.IsInvalid || shiftedRange.RangeAddress.IsInvalid) return;
-
-            if ((rowsShifted < 0
-                 // all columns
-                 && thisRangeAddress.FirstAddress.ColumnNumber >= shiftedRange.RangeAddress.FirstAddress.ColumnNumber
-                 && thisRangeAddress.LastAddress.ColumnNumber <= shiftedRange.RangeAddress.FirstAddress.ColumnNumber
-                 // all rows
-                 && thisRangeAddress.FirstAddress.RowNumber >= shiftedRange.RangeAddress.FirstAddress.RowNumber
-                 && thisRangeAddress.LastAddress.RowNumber <= shiftedRange.RangeAddress.LastAddress.RowNumber - rowsShifted
-                ) || (
-                         shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber
-                         && shiftedRange.RangeAddress.FirstAddress.ColumnNumber <= thisRangeAddress.FirstAddress.ColumnNumber
-                         && shiftedRange.RangeAddress.LastAddress.ColumnNumber >= thisRangeAddress.LastAddress.ColumnNumber
-                         && shiftedRange.RowCount() >
-                            (thisRangeAddress.LastAddress.RowNumber - thisRangeAddress.FirstAddress.RowNumber + 1)
-                            + (thisRangeAddress.FirstAddress.RowNumber - shiftedRange.RangeAddress.FirstAddress.RowNumber)))
-                thisRangeAddress.IsInvalid = true;
-            else
-            {
-                if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <= thisRangeAddress.FirstAddress.ColumnNumber
-                    && shiftedRange.RangeAddress.LastAddress.ColumnNumber >= thisRangeAddress.LastAddress.ColumnNumber)
-                {
-                    if (
-                        (shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber && rowsShifted > 0)
-                        || (shiftedRange.RangeAddress.FirstAddress.RowNumber < thisRangeAddress.FirstAddress.RowNumber && rowsShifted < 0)
-                        )
-                    {
-                        thisRangeAddress.FirstAddress = new XLAddress(Worksheet,
-                                                                      thisRangeAddress.FirstAddress.RowNumber +
-                                                                      rowsShifted,
-                                                                      thisRangeAddress.FirstAddress.ColumnNumber,
-                                                                      thisRangeAddress.FirstAddress.FixedRow,
-                                                                      thisRangeAddress.FirstAddress.FixedColumn);
-                    }
-
-                    if (shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.LastAddress.RowNumber)
-                    {
-                        thisRangeAddress.LastAddress = new XLAddress(Worksheet,
-                                                                     thisRangeAddress.LastAddress.RowNumber +
-                                                                     rowsShifted,
-                                                                     thisRangeAddress.LastAddress.ColumnNumber,
-                                                                     thisRangeAddress.LastAddress.FixedRow,
-                                                                     thisRangeAddress.LastAddress.FixedColumn);
-                    }
-                }
-            }
-        }
-
-        public IXLRange RangeUsed()
-        {
-            return RangeUsed(false);
-        }
-
-        public IXLRange RangeUsed(bool includeFormats)
-        {
-            var firstCell = FirstCellUsed(includeFormats);
-            if (firstCell == null)
-                return null;
-            var lastCell = LastCellUsed(includeFormats);
-            return Worksheet.Range(firstCell, lastCell);
-        }
-
-        public virtual void CopyTo(IXLRangeBase target)
-        {
-            CopyTo(target.FirstCell());
-        }
-
-        public virtual void CopyTo(IXLCell target)
-        {
-            target.Value = this;
-        }
-
-        //public IXLChart CreateChart(Int32 firstRow, Int32 firstColumn, Int32 lastRow, Int32 lastColumn)
-        //{
-        //    IXLChart chart = new XLChartWorksheet;
-        //    chart.FirstRow = firstRow;
-        //    chart.LastRow = lastRow;
-        //    chart.LastColumn = lastColumn;
-        //    chart.FirstColumn = firstColumn;
-        //    Worksheet.Charts.Add(chart);
-        //    return chart;
-        //}
-
-
-        IXLPivotTable IXLRangeBase.CreatePivotTable(IXLCell targetCell)
-        {
-            return CreatePivotTable(targetCell);
-        }
-        IXLPivotTable IXLRangeBase.CreatePivotTable(IXLCell targetCell, String name)
-        {
-            return CreatePivotTable(targetCell, name);
-        }
-
-
-        public XLPivotTable CreatePivotTable(IXLCell targetCell)
-        {
-            return CreatePivotTable(targetCell, Guid.NewGuid().ToString());
-        }
-
-        public XLPivotTable CreatePivotTable(IXLCell targetCell, String name)
-        {
-            return (XLPivotTable)Worksheet.PivotTables.AddNew(name, targetCell, AsRange());
-        }
-
-        public IXLAutoFilter SetAutoFilter() 
-        {
-            using (var asRange = AsRange())
-              return Worksheet.AutoFilter.Set(asRange);
-        }
-
-        #region Sort
-
-        public IXLSortElements SortRows
-        {
-            get { return _sortRows ?? (_sortRows = new XLSortElements()); }
-        }
-
-        public IXLSortElements SortColumns
-        {
-            get { return _sortColumns ?? (_sortColumns = new XLSortElements()); }
-        }
-
-        public IXLRangeBase Sort()
-        {
-            if (!SortColumns.Any())
-            {
-                String columnsToSortBy = String.Empty;
-                Int32 maxColumn = ColumnCount();
-                if (maxColumn == XLHelper.MaxColumnNumber)
-                    maxColumn = LastCellUsed(true).Address.ColumnNumber;
-                for (int i = 1; i <= maxColumn; i++)
-                {
-                    columnsToSortBy += i + ",";
-                }
-                columnsToSortBy = columnsToSortBy.Substring(0, columnsToSortBy.Length - 1);
-                return Sort(columnsToSortBy);
-            }
-
-            SortRangeRows();
-            return this;
-        }
-
-        public IXLRangeBase Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            SortColumns.Clear();
-            if (XLHelper.IsNullOrWhiteSpace(columnsToSortBy))
-            {
-                columnsToSortBy = String.Empty;
-                Int32 maxColumn = ColumnCount();
-                if (maxColumn == XLHelper.MaxColumnNumber)
-                    maxColumn = LastCellUsed(true).Address.ColumnNumber;
-                for (int i = 1; i <= maxColumn; i++)
-                {
-                    columnsToSortBy += i + ",";
-                }
-                columnsToSortBy = columnsToSortBy.Substring(0, columnsToSortBy.Length - 1);
-            }
-
-            foreach (string coPairTrimmed in columnsToSortBy.Split(',').Select(coPair => coPair.Trim()))
-            {
-                String coString;
-                String order;
-                if (coPairTrimmed.Contains(' '))
-                {
-                    var pair = coPairTrimmed.Split(' ');
-                    coString = pair[0];
-                    order = pair[1];
-                }
-                else
-                {
-                    coString = coPairTrimmed;
-                    order = sortOrder == XLSortOrder.Ascending ? "ASC" : "DESC";
-                }
-
-                Int32 co;
-                if (!Int32.TryParse(coString, out co))
-                    co = XLHelper.GetColumnNumberFromLetter(coString);
-
-                SortColumns.Add(co, String.Compare(order, "ASC", true) == 0 ? XLSortOrder.Ascending : XLSortOrder.Descending, ignoreBlanks, matchCase);
-            }
-
-            SortRangeRows();
-            return this;
-        }
-
-        public IXLRangeBase Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            return Sort(columnToSortBy.ToString(), sortOrder, matchCase, ignoreBlanks);
-        }
-
-        public IXLRangeBase SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            SortRows.Clear();
-            Int32 maxColumn = ColumnCount();
-            if (maxColumn == XLHelper.MaxColumnNumber)
-                maxColumn = LastCellUsed(true).Address.ColumnNumber;
-
-            for (int i = 1; i <= maxColumn; i++)
-            {
-                SortRows.Add(i, sortOrder, ignoreBlanks, matchCase);
-            }
-
-            SortRangeColumns();
-            return this;
-        }
-
-
-        #region Sort Rows
-
-        private void SortRangeRows()
-        {
-            Int32 maxRow = RowCount();
-            if (maxRow == XLHelper.MaxRowNumber)
-                maxRow = LastCellUsed(true).Address.RowNumber;
-
-            SortingRangeRows(1, maxRow);
-        }
-
-        private void SwapRows(Int32 row1, Int32 row2)
-        {
-            int row1InWs = RangeAddress.FirstAddress.RowNumber + row1 - 1;
-            int row2InWs = RangeAddress.FirstAddress.RowNumber + row2 - 1;
-
-            Int32 firstColumn = RangeAddress.FirstAddress.ColumnNumber;
-            Int32 lastColumn = RangeAddress.LastAddress.ColumnNumber;
-
-            var range1Sp1 = new XLSheetPoint(row1InWs, firstColumn);
-            var range1Sp2 = new XLSheetPoint(row1InWs, lastColumn);
-            var range2Sp1 = new XLSheetPoint(row2InWs, firstColumn);
-            var range2Sp2 = new XLSheetPoint(row2InWs, lastColumn);
-
-            Worksheet.Internals.CellsCollection.SwapRanges(new XLSheetRange(range1Sp1, range1Sp2),
-                                                           new XLSheetRange(range2Sp1, range2Sp2), Worksheet);
-        }
-
-        private int SortRangeRows(int begPoint, int endPoint)
-        {
-            int pivot = begPoint;
-            int m = begPoint + 1;
-            int n = endPoint;
-            while ((m < endPoint) && RowQuick(pivot).CompareTo(RowQuick(m), SortColumns) >= 0)
-                m++;
-
-            while (n > begPoint && RowQuick(pivot).CompareTo(RowQuick(n), SortColumns) <= 0)
-                n--;
-            while (m < n)
-            {
-                SwapRows(m, n);
-
-                while (m < endPoint && RowQuick(pivot).CompareTo(RowQuick(m), SortColumns) >= 0)
-                    m++;
-
-                while (n > begPoint && RowQuick(pivot).CompareTo(RowQuick(n), SortColumns) <= 0)
-                    n--;
-            }
-            if (pivot != n)
-                SwapRows(n, pivot);
-            return n;
-        }
-
-        private void SortingRangeRows(int beg, int end)
-        {
-            if (end == beg)
-                return;
-            int pivot = SortRangeRows(beg, end);
-            if (pivot > beg)
-                SortingRangeRows(beg, pivot - 1);
-            if (pivot < end)
-                SortingRangeRows(pivot + 1, end);
-        }
-
-        #endregion
-
-        #region Sort Columns
-
-        private void SortRangeColumns()
-        {
-            Int32 maxColumn = ColumnCount();
-            if (maxColumn == XLHelper.MaxColumnNumber)
-                maxColumn = LastCellUsed(true).Address.ColumnNumber;
-            SortingRangeColumns(1, maxColumn);
-        }
-
-        private void SwapColumns(Int32 column1, Int32 column2)
-        {
-            int col1InWs = RangeAddress.FirstAddress.ColumnNumber + column1 - 1;
-            int col2InWs = RangeAddress.FirstAddress.ColumnNumber + column2 - 1;
-
-            Int32 firstRow = RangeAddress.FirstAddress.RowNumber;
-            Int32 lastRow = RangeAddress.LastAddress.RowNumber;
-
-            var range1Sp1 = new XLSheetPoint(firstRow, col1InWs);
-            var range1Sp2 = new XLSheetPoint(lastRow, col1InWs);
-            var range2Sp1 = new XLSheetPoint(firstRow, col2InWs);
-            var range2Sp2 = new XLSheetPoint(lastRow, col2InWs);
-
-            Worksheet.Internals.CellsCollection.SwapRanges(new XLSheetRange(range1Sp1, range1Sp2),
-                                                           new XLSheetRange(range2Sp1, range2Sp2), Worksheet);
-        }
-
-        private int SortRangeColumns(int begPoint, int endPoint)
-        {
-            int pivot = begPoint;
-            int m = begPoint + 1;
-            int n = endPoint;
-            while ((m < endPoint) && ColumnQuick(pivot).CompareTo((ColumnQuick(m)), SortRows) >= 0)
-                m++;
-
-            while ((n > begPoint) && ((ColumnQuick(pivot)).CompareTo((ColumnQuick(n)), SortRows) <= 0))
-                n--;
-            while (m < n)
-            {
-                SwapColumns(m, n);
-
-                while ((m < endPoint) && (ColumnQuick(pivot)).CompareTo((ColumnQuick(m)), SortRows) >= 0)
-                    m++;
-
-                while ((n > begPoint) && (ColumnQuick(pivot)).CompareTo((ColumnQuick(n)), SortRows) <= 0)
-                    n--;
-            }
-            if (pivot != n)
-                SwapColumns(n, pivot);
-            return n;
-        }
-
-        private void SortingRangeColumns(int beg, int end)
-        {
-            if (end == beg)
-                return;
-            int pivot = SortRangeColumns(beg, end);
-            if (pivot > beg)
-                SortingRangeColumns(beg, pivot - 1);
-            if (pivot < end)
-                SortingRangeColumns(pivot + 1, end);
-        }
-
-        #endregion
-
-        #endregion
-
-        public XLRangeColumn ColumnQuick(Int32 column)
-        {
-            var firstCellAddress = new XLAddress(Worksheet,
-                                                 RangeAddress.FirstAddress.RowNumber,
-                                                 RangeAddress.FirstAddress.ColumnNumber + column - 1,
-                                                 false,
-                                                 false);
-            var lastCellAddress = new XLAddress(Worksheet,
-                                                RangeAddress.LastAddress.RowNumber,
-                                                RangeAddress.FirstAddress.ColumnNumber + column - 1,
-                                                false,
-                                                false);
-            return new XLRangeColumn(
-                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), true);
-        }
-
-        public XLRangeRow RowQuick(Int32 row)
-        {
-            var firstCellAddress = new XLAddress(Worksheet,
-                                                 RangeAddress.FirstAddress.RowNumber + row - 1,
-                                                 RangeAddress.FirstAddress.ColumnNumber,
-                                                 false,
-                                                 false);
-            var lastCellAddress = new XLAddress(Worksheet,
-                                                RangeAddress.FirstAddress.RowNumber + row - 1,
-                                                RangeAddress.LastAddress.ColumnNumber,
-                                                false,
-                                                false);
-            return new XLRangeRow(
-                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), true);
-        }
-
-        public void Dispose()
-        {
-			if(_shiftedRowsAction != null)
-            {
-                RangeAddress.Worksheet.RangeShiftedRows.Remove(_shiftedRowsAction);
-				_shiftedRowsAction = null;
-            }
-
-			if(_shiftedColumnsAction != null)
-			{
-				RangeAddress.Worksheet.RangeShiftedColumns.Remove(_shiftedColumnsAction);
-				_shiftedColumnsAction = null;
-			}
-        }
-
-        public IXLDataValidation SetDataValidation()
-        {
-            return DataValidation;
-        }
-
-        public IXLConditionalFormat AddConditionalFormat()
-        {
-            using (var asRange = AsRange())
-            {
-                var cf = new XLConditionalFormat(asRange);
-                Worksheet.ConditionalFormats.Add(cf);
-                return cf;
-            }
-        }
-
-
-        internal IXLConditionalFormat AddConditionalFormat(IXLConditionalFormat source)
-        {
-            using (var asRange = AsRange())
-            {
-                var cf = new XLConditionalFormat(asRange);
-                cf.CopyFrom(source);
-                Worksheet.ConditionalFormats.Add(cf);
-                return cf;
-            }
-        }
-
-        public void Select()
-        {
-            Worksheet.SelectedRanges.Add(AsRange());
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeColumn.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeColumn.cs
deleted file mode 100644
index 77fc1ba..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeColumn.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-namespace ClosedXML.Excel
-{
-    using System;
-    using System.Linq;
-	
-
-    internal class XLRangeColumn : XLRangeBase, IXLRangeColumn
-    {
-        #region Constructor
-
-        public XLRangeColumn(XLRangeParameters rangeParameters, bool quickLoad)
-            : base(rangeParameters.RangeAddress)
-        {
-            if (quickLoad) return;
-
-			SubscribeToShiftedRows((range, rowsShifted) => this.WorksheetRangeShiftedRows(range, rowsShifted));
-			SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
-            SetStyle(rangeParameters.DefaultStyle);
-        }
-
-        #endregion
-
-        #region IXLRangeColumn Members
-
-        IXLCell IXLRangeColumn.Cell(int row)
-        {
-            return Cell(row);
-        }
-
-        public new IXLCells Cells(string cellsInColumn)
-        {
-            var retVal = new XLCells(false, false);
-            var rangePairs = cellsInColumn.Split(',');
-            foreach (string pair in rangePairs)
-                retVal.Add(Range(pair.Trim()).RangeAddress);
-            return retVal;
-        }
-
-        public IXLCells Cells(int firstRow, int lastRow)
-        {
-            return Cells(firstRow + ":" + lastRow);
-        }
-
-        public void Delete()
-        {
-            Delete(XLShiftDeletedCells.ShiftCellsLeft);
-        }
-
-        public IXLCells InsertCellsAbove(int numberOfRows)
-        {
-            return InsertCellsAbove(numberOfRows, false);
-        }
-
-        public IXLCells InsertCellsAbove(int numberOfRows, bool expandRange)
-        {
-            return InsertRowsAbove(numberOfRows, expandRange).Cells();
-        }
-
-        public IXLCells InsertCellsBelow(int numberOfRows)
-        {
-            return InsertCellsBelow(numberOfRows, true);
-        }
-
-        public IXLCells InsertCellsBelow(int numberOfRows, bool expandRange)
-        {
-            return InsertRowsBelow(numberOfRows, expandRange).Cells();
-        }
-
-        public int CellCount()
-        {
-            return RangeAddress.LastAddress.RowNumber - RangeAddress.FirstAddress.RowNumber + 1;
-        }
-
-        public IXLRangeColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            base.Sort(1, sortOrder, matchCase, ignoreBlanks);
-            return this;
-        }
-
-
-        public new IXLRangeColumn CopyTo(IXLCell target)
-        {
-            base.CopyTo(target);
-
-            int lastRowNumber = target.Address.RowNumber + RowCount() - 1;
-            if (lastRowNumber > XLHelper.MaxRowNumber)
-                lastRowNumber = XLHelper.MaxRowNumber;
-            int lastColumnNumber = target.Address.ColumnNumber + ColumnCount() - 1;
-            if (lastColumnNumber > XLHelper.MaxColumnNumber)
-                lastColumnNumber = XLHelper.MaxColumnNumber;
-
-            return target.Worksheet.Range(
-                target.Address.RowNumber,
-                target.Address.ColumnNumber,
-                lastRowNumber,
-                lastColumnNumber)
-                .Column(1);
-        }
-
-        public new IXLRangeColumn CopyTo(IXLRangeBase target)
-        {
-            base.CopyTo(target);
-
-            int lastRowNumber = target.RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
-            if (lastRowNumber > XLHelper.MaxRowNumber)
-                lastRowNumber = XLHelper.MaxRowNumber;
-            int lastColumnNumber = target.RangeAddress.FirstAddress.ColumnNumber + ColumnCount() - 1;
-            if (lastColumnNumber > XLHelper.MaxColumnNumber)
-                lastColumnNumber = XLHelper.MaxColumnNumber;
-
-            return target.Worksheet.Range(
-                target.RangeAddress.FirstAddress.RowNumber,
-                target.RangeAddress.FirstAddress.ColumnNumber,
-                lastRowNumber,
-                lastColumnNumber)
-                .Column(1);
-        }
-
-        public IXLRangeColumn Column(int start, int end)
-        {
-            return Range(start, end).FirstColumn();
-        }
-
-        public IXLRangeColumn Column(IXLCell start, IXLCell end)
-        {
-            return Column(start.Address.RowNumber, end.Address.RowNumber);
-        }
-
-        public IXLRangeColumns Columns(string columns)
-        {
-            var retVal = new XLRangeColumns();
-            var rowPairs = columns.Split(',');
-            foreach (string trimmedPair in rowPairs.Select(pair => pair.Trim()))
-            {
-                string firstRow;
-                string lastRow;
-                if (trimmedPair.Contains(':') || trimmedPair.Contains('-'))
-                {
-                    var rowRange = trimmedPair.Contains('-')
-                                       ? trimmedPair.Replace('-', ':').Split(':')
-                                       : trimmedPair.Split(':');
-
-                    firstRow = rowRange[0];
-                    lastRow = rowRange[1];
-                }
-                else
-                {
-                    firstRow = trimmedPair;
-                    lastRow = trimmedPair;
-                }
-
-                retVal.Add(Range(firstRow, lastRow).FirstColumn());
-            }
-
-            return retVal;
-        }
-
-        public IXLRangeColumn SetDataType(XLCellValues dataType)
-        {
-            DataType = dataType;
-            return this;
-        }
-
-        public IXLColumn WorksheetColumn()
-        {
-            return Worksheet.Column(RangeAddress.FirstAddress.ColumnNumber);
-        }
-
-        #endregion
-
-        public XLCell Cell(int row)
-        {
-            return Cell(row, 1);
-        }
-
-        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
-        {
-            ShiftColumns(RangeAddress, range, columnsShifted);
-        }
-
-        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
-        {
-            ShiftRows(RangeAddress, range, rowsShifted);
-        }
-
-        public XLRange Range(int firstRow, int lastRow)
-        {
-            return Range(firstRow, 1, lastRow, 1);
-        }
-
-        public override XLRange Range(string rangeAddressStr)
-        {
-            string rangeAddressToUse;
-            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
-            {
-                if (rangeAddressStr.Contains('-'))
-                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
-
-                var arrRange = rangeAddressStr.Split(':');
-                string firstPart = arrRange[0];
-                string secondPart = arrRange[1];
-                rangeAddressToUse = FixColumnAddress(firstPart) + ":" + FixColumnAddress(secondPart);
-            }
-            else
-                rangeAddressToUse = FixColumnAddress(rangeAddressStr);
-
-            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
-            return Range(rangeAddress);
-        }
-
-        public int CompareTo(XLRangeColumn otherColumn, IXLSortElements rowsToSort)
-        {
-            foreach (IXLSortElement e in rowsToSort)
-            {
-                var thisCell = Cell(e.ElementNumber);
-                var otherCell = otherColumn.Cell(e.ElementNumber);
-                int comparison;
-                bool thisCellIsBlank = thisCell.IsEmpty();
-                bool otherCellIsBlank = otherCell.IsEmpty();
-                if (e.IgnoreBlanks && (thisCellIsBlank || otherCellIsBlank))
-                {
-                    if (thisCellIsBlank && otherCellIsBlank)
-                        comparison = 0;
-                    else
-                    {
-                        if (thisCellIsBlank)
-                            comparison = e.SortOrder == XLSortOrder.Ascending ? 1 : -1;
-                        else
-                            comparison = e.SortOrder == XLSortOrder.Ascending ? -1 : 1;
-                    }
-                }
-                else
-                {
-                    if (thisCell.DataType == otherCell.DataType)
-                    {
-                        if (thisCell.DataType == XLCellValues.Text)
-                        {
-                            comparison = e.MatchCase
-                                             ? thisCell.InnerText.CompareTo(otherCell.InnerText)
-                                             : String.Compare(thisCell.InnerText, otherCell.InnerText, true);
-                        }
-                        else if (thisCell.DataType == XLCellValues.TimeSpan)
-                            comparison = thisCell.GetTimeSpan().CompareTo(otherCell.GetTimeSpan());
-                        else
-                            comparison = Double.Parse(thisCell.InnerText).CompareTo(Double.Parse(otherCell.InnerText));
-                    }
-                    else if (e.MatchCase)
-                        comparison = String.Compare(thisCell.GetString(), otherCell.GetString(), true);
-                    else
-                        comparison = thisCell.GetString().CompareTo(otherCell.GetString());
-                }
-
-                if (comparison != 0)
-                    return e.SortOrder == XLSortOrder.Ascending ? comparison : comparison * -1;
-            }
-
-            return 0;
-        }
-
-        private XLRangeColumn ColumnShift(Int32 columnsToShift)
-        {
-            Int32 columnNumber = ColumnNumber() + columnsToShift;
-            return Worksheet.Range(
-                RangeAddress.FirstAddress.RowNumber,
-                columnNumber,
-                RangeAddress.LastAddress.RowNumber,
-                columnNumber).FirstColumn();
-        }
-
-        #region XLRangeColumn Left
-
-        IXLRangeColumn IXLRangeColumn.ColumnLeft()
-        {
-            return ColumnLeft();
-        }
-
-        IXLRangeColumn IXLRangeColumn.ColumnLeft(Int32 step)
-        {
-            return ColumnLeft(step);
-        }
-
-        public XLRangeColumn ColumnLeft()
-        {
-            return ColumnLeft(1);
-        }
-
-        public XLRangeColumn ColumnLeft(Int32 step)
-        {
-            return ColumnShift(step * -1);
-        }
-
-        #endregion
-
-        #region XLRangeColumn Right
-
-        IXLRangeColumn IXLRangeColumn.ColumnRight()
-        {
-            return ColumnRight();
-        }
-
-        IXLRangeColumn IXLRangeColumn.ColumnRight(Int32 step)
-        {
-            return ColumnRight(step);
-        }
-
-        public XLRangeColumn ColumnRight()
-        {
-            return ColumnRight(1);
-        }
-
-        public XLRangeColumn ColumnRight(Int32 step)
-        {
-            return ColumnShift(step);
-        }
-
-        #endregion
-
-
-        public IXLTable AsTable()
-        {
-            using (var asRange = AsRange())
-               return asRange.AsTable(); 
-        }
-
-        public IXLTable AsTable(string name)
-        {
-            using (var asRange = AsRange())
-                return asRange.AsTable(name);
-        }
-
-        public IXLTable CreateTable()
-        {
-            using (var asRange = AsRange())
-                return asRange.CreateTable();
-        }
-
-        public IXLTable CreateTable(string name)
-        {
-            using (var asRange = AsRange())
-                return asRange.CreateTable(name);
-        }
-
-        public new IXLRangeColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            base.Clear(clearOptions);
-            return this;
-        }
-
-        public IXLRangeColumn ColumnUsed(Boolean includeFormats = false)
-        {
-            return Column(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeColumns.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeColumns.cs
deleted file mode 100644
index 83dbfa0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeColumns.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    internal class XLRangeColumns : IXLRangeColumns, IXLStylized
-    {
-        public Boolean StyleChanged { get; set; }
-        private readonly List<XLRangeColumn> _ranges = new List<XLRangeColumn>();
-        private IXLStyle _style;
-
-        public XLRangeColumns()
-        {
-            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
-        }
-
-        #region IXLRangeColumns Members
-
-        public IXLRangeColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            _ranges.ForEach(c => c.Clear(clearOptions));
-            return this;
-        }
-
-        public void Delete()
-        {
-            _ranges.OrderByDescending(c => c.ColumnNumber()).ForEach(r => r.Delete());
-            _ranges.Clear();
-        }
-
-        public void Add(IXLRangeColumn range)
-        {
-            _ranges.Add((XLRangeColumn)range);
-        }
-
-        public IEnumerator<IXLRangeColumn> GetEnumerator()
-        {
-            return _ranges.Cast<IXLRangeColumn>()
-              .OrderBy(r => r.Worksheet.Position)
-              .ThenBy(r => r.ColumnNumber())
-              .GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLStyle Style
-        {
-            get { return _style; }
-            set
-            {
-                _style = new XLStyle(this, value);
-                _ranges.ForEach(r => r.Style = value);
-            }
-        }
-
-        public IXLCells Cells()
-        {
-            var cells = new XLCells(false, false);
-            foreach (XLRangeColumn container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed()
-        {
-            var cells = new XLCells(true, false);
-            foreach (XLRangeColumn container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Boolean includeFormats)
-        {
-            var cells = new XLCells(true, includeFormats);
-            foreach (XLRangeColumn container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLRangeColumns SetDataType(XLCellValues dataType)
-        {
-            _ranges.ForEach(c => c.DataType = dataType);
-            return this;
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return _style;
-                foreach (XLRangeColumn rng in _ranges)
-                {
-                    yield return rng.Style;
-                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
-                        rng.RangeAddress.FirstAddress.RowNumber,
-                        rng.RangeAddress.FirstAddress.ColumnNumber,
-                        rng.RangeAddress.LastAddress.RowNumber,
-                        rng.RangeAddress.LastAddress.ColumnNumber))
-                        yield return r.Style;
-                }
-                UpdatingStyle = false;
-            }
-        }
-
-        public Boolean UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return _style; }
-            set { _style = new XLStyle(this, value); }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges();
-                this.ForEach(c => retVal.Add(c.AsRange()));
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        public void Dispose()
-        {
-            if (_ranges != null)
-                _ranges.ForEach(r => r.Dispose());
-        }
-
-        public void Select()
-        {
-            foreach (var range in this)
-                range.Select();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeParameters.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeParameters.cs
deleted file mode 100644
index f86d3ac..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeParameters.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace ClosedXML.Excel
-{
-    internal class XLRangeParameters
-    {
-        #region Constructor
-
-        public XLRangeParameters(XLRangeAddress rangeAddress, IXLStyle defaultStyle)
-        {
-            RangeAddress = rangeAddress;
-            _ignoreEvents = !rangeAddress.Worksheet.EventTrackingEnabled;
-            DefaultStyle = defaultStyle;
-        }
-
-        #endregion
-
-        #region Properties
-
-        public XLRangeAddress RangeAddress { get; private set; }
-
-        public IXLStyle DefaultStyle { get; private set; }
-        private bool _ignoreEvents;
-        public bool IgnoreEvents
-        { 
-            get { return _ignoreEvents; } 
-            set
-            {
-                _ignoreEvents = value;
-            } 
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeRow.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeRow.cs
deleted file mode 100644
index 802342f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeRow.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-namespace ClosedXML.Excel
-{
-    using System;
-    using System.Linq;
-	
-
-    internal class XLRangeRow : XLRangeBase, IXLRangeRow
-    {
-        #region Constructor
-
-        public XLRangeRow(XLRangeParameters rangeParameters, bool quickLoad)
-            : base(rangeParameters.RangeAddress)
-        {
-            RangeParameters = rangeParameters;
-            if (quickLoad) return;
-            if (!RangeParameters.IgnoreEvents)
-            {
-                SubscribeToShiftedRows((range, rowsShifted) => this.WorksheetRangeShiftedRows(range, rowsShifted));
-                SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
-            }
-            SetStyle(rangeParameters.DefaultStyle);
-        }
-
-        #endregion
-
-        
-        public XLRangeParameters RangeParameters { get; private set; }
-
-        #region IXLRangeRow Members
-
-        public IXLCell Cell(int column)
-        {
-            return Cell(1, column);
-        }
-
-        public new IXLCell Cell(string column)
-        {
-            return Cell(1, column);
-        }
-
-        public void Delete()
-        {
-            Delete(XLShiftDeletedCells.ShiftCellsUp);
-        }
-
-        public IXLCells InsertCellsAfter(int numberOfColumns)
-        {
-            return InsertCellsAfter(numberOfColumns, true);
-        }
-
-        public IXLCells InsertCellsAfter(int numberOfColumns, bool expandRange)
-        {
-            return InsertColumnsAfter(numberOfColumns, expandRange).Cells();
-        }
-
-        public IXLCells InsertCellsBefore(int numberOfColumns)
-        {
-            return InsertCellsBefore(numberOfColumns, false);
-        }
-
-        public IXLCells InsertCellsBefore(int numberOfColumns, bool expandRange)
-        {
-            return InsertColumnsBefore(numberOfColumns, expandRange).Cells();
-        }
-
-        public new IXLCells Cells(string cellsInRow)
-        {
-            var retVal = new XLCells(false, false);
-            var rangePairs = cellsInRow.Split(',');
-            foreach (string pair in rangePairs)
-                retVal.Add(Range(pair.Trim()).RangeAddress);
-            return retVal;
-        }
-
-        public IXLCells Cells(int firstColumn, int lastColumn)
-        {
-            return Cells(firstColumn + ":" + lastColumn);
-        }
-
-        public IXLCells Cells(string firstColumn, string lastColumn)
-        {
-            return Cells(XLHelper.GetColumnNumberFromLetter(firstColumn) + ":"
-                         + XLHelper.GetColumnNumberFromLetter(lastColumn));
-        }
-
-        public int CellCount()
-        {
-            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
-        }
-
-        public new IXLRangeRow Sort()
-        {
-            return SortLeftToRight();
-        }
-
-        public new IXLRangeRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
-            return this;
-        }
-
-        public new IXLRangeRow CopyTo(IXLCell target)
-        {
-            base.CopyTo(target);
-
-            int lastRowNumber = target.Address.RowNumber + RowCount() - 1;
-            if (lastRowNumber > XLHelper.MaxRowNumber)
-                lastRowNumber = XLHelper.MaxRowNumber;
-            int lastColumnNumber = target.Address.ColumnNumber + ColumnCount() - 1;
-            if (lastColumnNumber > XLHelper.MaxColumnNumber)
-                lastColumnNumber = XLHelper.MaxColumnNumber;
-
-            return target.Worksheet.Range(
-                target.Address.RowNumber,
-                target.Address.ColumnNumber,
-                lastRowNumber,
-                lastColumnNumber)
-                .Row(1);
-        }
-
-        public new IXLRangeRow CopyTo(IXLRangeBase target)
-        {
-            base.CopyTo(target);
-            int lastRowNumber = target.RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
-            if (lastRowNumber > XLHelper.MaxRowNumber)
-                lastRowNumber = XLHelper.MaxRowNumber;
-            int lastColumnNumber = target.RangeAddress.LastAddress.ColumnNumber + ColumnCount() - 1;
-            if (lastColumnNumber > XLHelper.MaxColumnNumber)
-                lastColumnNumber = XLHelper.MaxColumnNumber;
-
-            return target.Worksheet.Range(
-                target.RangeAddress.FirstAddress.RowNumber,
-                target.RangeAddress.LastAddress.ColumnNumber,
-                lastRowNumber,
-                lastColumnNumber)
-                .Row(1);
-        }
-
-        public IXLRangeRow Row(int start, int end)
-        {
-            return Range(1, start, 1, end).Row(1);
-        }
-
-        public IXLRangeRow Row(IXLCell start, IXLCell end)
-        {
-            return Row(start.Address.ColumnNumber, end.Address.ColumnNumber);
-        }
-
-        public IXLRangeRows Rows(string rows)
-        {
-            var retVal = new XLRangeRows();
-            var columnPairs = rows.Split(',');
-            foreach (string trimmedPair in columnPairs.Select(pair => pair.Trim()))
-            {
-                string firstColumn;
-                string lastColumn;
-                if (trimmedPair.Contains(':') || trimmedPair.Contains('-'))
-                {
-                    var columnRange = trimmedPair.Contains('-')
-                                          ? trimmedPair.Replace('-', ':').Split(':')
-                                          : trimmedPair.Split(':');
-                    firstColumn = columnRange[0];
-                    lastColumn = columnRange[1];
-                }
-                else
-                {
-                    firstColumn = trimmedPair;
-                    lastColumn = trimmedPair;
-                }
-
-                retVal.Add(Range(firstColumn, lastColumn).FirstRow());
-            }
-
-            return retVal;
-        }
-
-        public IXLRangeRow SetDataType(XLCellValues dataType)
-        {
-            DataType = dataType;
-            return this;
-        }
-
-        public IXLRow WorksheetRow()
-        {
-            return Worksheet.Row(RangeAddress.FirstAddress.RowNumber);
-        }
-
-        #endregion
-
-        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
-        {
-            ShiftColumns(RangeAddress, range, columnsShifted);
-        }
-
-        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
-        {
-            ShiftRows(RangeAddress, range, rowsShifted);
-        }
-
-        public IXLRange Range(int firstColumn, int lastColumn)
-        {
-            return Range(1, firstColumn, 1, lastColumn);
-        }
-
-        public override XLRange Range(string rangeAddressStr)
-        {
-            string rangeAddressToUse;
-            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
-            {
-                if (rangeAddressStr.Contains('-'))
-                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
-
-                var arrRange = rangeAddressStr.Split(':');
-                string firstPart = arrRange[0];
-                string secondPart = arrRange[1];
-                rangeAddressToUse = FixRowAddress(firstPart) + ":" + FixRowAddress(secondPart);
-            }
-            else
-                rangeAddressToUse = FixRowAddress(rangeAddressStr);
-
-            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
-            return Range(rangeAddress);
-        }
-
-        public int CompareTo(XLRangeRow otherRow, IXLSortElements columnsToSort)
-        {
-            foreach (IXLSortElement e in columnsToSort)
-            {
-                var thisCell = (XLCell)Cell(e.ElementNumber);
-                var otherCell = (XLCell)otherRow.Cell(e.ElementNumber);
-                int comparison;
-                bool thisCellIsBlank = thisCell.IsEmpty();
-                bool otherCellIsBlank = otherCell.IsEmpty();
-                if (e.IgnoreBlanks && (thisCellIsBlank || otherCellIsBlank))
-                {
-                    if (thisCellIsBlank && otherCellIsBlank)
-                        comparison = 0;
-                    else
-                    {
-                        if (thisCellIsBlank)
-                            comparison = e.SortOrder == XLSortOrder.Ascending ? 1 : -1;
-                        else
-                            comparison = e.SortOrder == XLSortOrder.Ascending ? -1 : 1;
-                    }
-                }
-                else
-                {
-                    if (thisCell.DataType == otherCell.DataType)
-                    {
-                        if (thisCell.DataType == XLCellValues.Text)
-                        {
-                            comparison = e.MatchCase
-                                             ? thisCell.InnerText.CompareTo(otherCell.InnerText)
-                                             : String.Compare(thisCell.InnerText, otherCell.InnerText, true);
-                        }
-                        else if (thisCell.DataType == XLCellValues.TimeSpan)
-                            comparison = thisCell.GetTimeSpan().CompareTo(otherCell.GetTimeSpan());
-                        else
-                            comparison = Double.Parse(thisCell.InnerText).CompareTo(Double.Parse(otherCell.InnerText));
-                    }
-                    else if (e.MatchCase)
-                        comparison = String.Compare(thisCell.GetString(), otherCell.GetString(), true);
-                    else
-                        comparison = thisCell.GetString().CompareTo(otherCell.GetString());
-                }
-
-                if (comparison != 0)
-                    return e.SortOrder == XLSortOrder.Ascending ? comparison : comparison * -1;
-            }
-
-            return 0;
-        }
-
-        private XLRangeRow RowShift(Int32 rowsToShift)
-        {
-            Int32 rowNum = RowNumber() + rowsToShift;
-
-            var range = Worksheet.Range(
-                rowNum,
-                RangeAddress.FirstAddress.ColumnNumber,
-                rowNum,
-                RangeAddress.LastAddress.ColumnNumber);
-                
-            var result = range.FirstRow();
-            range.Dispose();
-
-            return result;
-        }
-
-        #region XLRangeRow Above
-
-        IXLRangeRow IXLRangeRow.RowAbove()
-        {
-            return RowAbove();
-        }
-
-        IXLRangeRow IXLRangeRow.RowAbove(Int32 step)
-        {
-            return RowAbove(step);
-        }
-
-        public XLRangeRow RowAbove()
-        {
-            return RowAbove(1);
-        }
-
-        public XLRangeRow RowAbove(Int32 step)
-        {
-            return RowShift(step * -1);
-        }
-
-        #endregion
-
-        #region XLRangeRow Below
-
-        IXLRangeRow IXLRangeRow.RowBelow()
-        {
-            return RowBelow();
-        }
-
-        IXLRangeRow IXLRangeRow.RowBelow(Int32 step)
-        {
-            return RowBelow(step);
-        }
-
-        public XLRangeRow RowBelow()
-        {
-            return RowBelow(1);
-        }
-
-        public XLRangeRow RowBelow(Int32 step)
-        {
-            return RowShift(step);
-        }
-
-        #endregion
-
-        public new IXLRangeRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            base.Clear(clearOptions);
-            return this;
-        }
-
-        public IXLRangeRow RowUsed(Boolean includeFormats = false)
-        {
-            return Row(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeRows.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeRows.cs
deleted file mode 100644
index 76dd6f7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeRows.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    internal class XLRangeRows : IXLRangeRows, IXLStylized
-    {
-        public Boolean StyleChanged { get; set; }
-        private readonly List<XLRangeRow> _ranges = new List<XLRangeRow>();
-        private IXLStyle _style;
-
-        public XLRangeRows()
-        {
-            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
-        }
-
-        #region IXLRangeRows Members
-
-        public IXLRangeRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            _ranges.ForEach(c => c.Clear(clearOptions));
-            return this;
-        }
-
-        public void Delete()
-        {
-            _ranges.OrderByDescending(r => r.RowNumber()).ForEach(r => r.Delete());
-            _ranges.Clear();
-        }
-
-        public void Add(IXLRangeRow range)
-        {
-            _ranges.Add((XLRangeRow)range);
-        }
-
-        public IEnumerator<IXLRangeRow> GetEnumerator()
-        {
-            return _ranges.Cast<IXLRangeRow>()
-                          .OrderBy(r=>r.Worksheet.Position)
-                          .ThenBy(r => r.RowNumber())
-                          .GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLStyle Style
-        {
-            get { return _style; }
-            set
-            {
-                _style = new XLStyle(this, value);
-                _ranges.ForEach(r => r.Style = value);
-            }
-        }
-
-        public IXLCells Cells()
-        {
-            var cells = new XLCells(false, false);
-            foreach (XLRangeRow container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed()
-        {
-            var cells = new XLCells(true, false);
-            foreach (XLRangeRow container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Boolean includeFormats)
-        {
-            var cells = new XLCells(true, includeFormats);
-            foreach (XLRangeRow container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLRangeRows SetDataType(XLCellValues dataType)
-        {
-            _ranges.ForEach(c => c.DataType = dataType);
-            return this;
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return _style;
-                foreach (XLRangeRow rng in _ranges)
-                {
-                    yield return rng.Style;
-                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
-                        rng.RangeAddress.FirstAddress.RowNumber,
-                        rng.RangeAddress.FirstAddress.ColumnNumber,
-                        rng.RangeAddress.LastAddress.RowNumber,
-                        rng.RangeAddress.LastAddress.ColumnNumber))
-                        yield return r.Style;
-                }
-                UpdatingStyle = false;
-            }
-        }
-
-        public Boolean UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return _style; }
-            set { _style = new XLStyle(this, value); }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges();
-                this.ForEach(c => retVal.Add(c.AsRange()));
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        public void Dispose()
-        {
-            if (_ranges != null)
-                _ranges.ForEach(r => r.Dispose());
-        }
-
-        public void Select()
-        {
-            foreach (var range in this)
-                range.Select();
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRanges.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRanges.cs
deleted file mode 100644
index a3b5940..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRanges.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    internal class XLRanges : IXLRanges, IXLStylized
-    {
-        private readonly List<XLRange> _ranges = new List<XLRange>();
-        private IXLStyle _style;
-
-        public XLRanges()
-        {
-            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
-        }
-
-        #region IXLRanges Members
-
-        public IXLRanges Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            _ranges.ForEach(c => c.Clear(clearOptions));
-            return this;
-        }
-
-        public void Add(XLRange range)
-        {
-            Count++;
-            _ranges.Add(range);
-        }
-
-        public void Add(IXLRangeBase range)
-        {
-            Count++;
-            _ranges.Add(range.AsRange() as XLRange);
-        }
-
-        public void Add(IXLCell cell)
-        {
-            Add(cell.AsRange());
-        }
-
-        public void Remove(IXLRange range)
-        {
-            Count--;
-            _ranges.RemoveAll(r => r.ToString() == range.ToString());
-        }
-
-        public int Count { get; private set; }
-
-        public IEnumerator<IXLRange> GetEnumerator()
-        {
-            var retList = new List<IXLRange>();
-            retList.AddRange(_ranges.Where(r => XLHelper.IsValidRangeAddress(r.RangeAddress)).Cast<IXLRange>());
-            return retList.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLStyle Style
-        {
-            get { return _style; }
-            set
-            {
-                _style = new XLStyle(this, value);
-                foreach (XLRange rng in _ranges)
-                    rng.Style = value;
-            }
-        }
-
-        public Boolean Contains(IXLRange range)
-        {
-            return _ranges.Any(r => !r.RangeAddress.IsInvalid && r.Contains(range));
-        }
-
-        public IXLDataValidation DataValidation
-        {
-            get
-            {
-                foreach (XLRange range in _ranges)
-                {
-                    foreach (IXLDataValidation dv in range.Worksheet.DataValidations)
-                    {
-                        foreach (IXLRange dvRange in dv.Ranges.Where(dvRange => dvRange.Intersects(range)))
-                        {
-                            dv.Ranges.Remove(dvRange);
-                            foreach (IXLCell c in dvRange.Cells().Where(c => !range.Contains(c.Address.ToString())))
-                            {
-                                var r = c.AsRange();
-                                r.Dispose();
-                                dv.Ranges.Add(r);
-                            }
-                        }
-                    }
-                }
-                var dataValidation = new XLDataValidation(this);
-
-                _ranges.First().Worksheet.DataValidations.Add(dataValidation);
-                return dataValidation;
-            }
-        }
-
-        public IXLRanges AddToNamed(String rangeName)
-        {
-            return AddToNamed(rangeName, XLScope.Workbook);
-        }
-
-        public IXLRanges AddToNamed(String rangeName, XLScope scope)
-        {
-            return AddToNamed(rangeName, XLScope.Workbook, null);
-        }
-
-        public IXLRanges AddToNamed(String rangeName, XLScope scope, String comment)
-        {
-            _ranges.ForEach(r => r.AddToNamed(rangeName, scope, comment));
-            return this;
-        }
-
-        public Object Value
-        {
-            set { _ranges.ForEach(r => r.Value = value); }
-        }
-
-        public IXLRanges SetValue<T>(T value)
-        {
-            _ranges.ForEach(r => r.SetValue(value));
-            return this;
-        }
-
-        public IXLCells Cells()
-        {
-            var cells = new XLCells(false, false);
-            foreach (XLRange container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed()
-        {
-            var cells = new XLCells(true, false);
-            foreach (XLRange container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Boolean includeFormats)
-        {
-            var cells = new XLCells(true, includeFormats);
-            foreach (XLRange container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLRanges SetDataType(XLCellValues dataType)
-        {
-            _ranges.ForEach(c => c.DataType = dataType);
-            return this;
-        }
-
-        public void Dispose()
-        {
-            _ranges.ForEach(r => r.Dispose());
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public Boolean StyleChanged { get; set; }
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return _style;
-                foreach (XLRange rng in _ranges)
-                {
-                    yield return rng.Style;
-                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
-                        rng.RangeAddress.FirstAddress.RowNumber,
-                        rng.RangeAddress.FirstAddress.ColumnNumber,
-                        rng.RangeAddress.LastAddress.RowNumber,
-                        rng.RangeAddress.LastAddress.ColumnNumber))
-                        yield return r.Style;
-                }
-                UpdatingStyle = false;
-            }
-        }
-
-        public Boolean UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return _style; }
-            set { _style = new XLStyle(this, value); }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get { return this; }
-        }
-
-        #endregion
-
-        public override string ToString()
-        {
-            String retVal = _ranges.Aggregate(String.Empty, (agg, r) => agg + (r.ToString() + ","));
-            if (retVal.Length > 0) retVal = retVal.Substring(0, retVal.Length - 1);
-            return retVal;
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = (XLRanges)obj;
-
-            return _ranges.Count == other._ranges.Count &&
-                   _ranges.Select(thisRange => Enumerable.Contains(other._ranges, thisRange)).All(foundOne => foundOne);
-        }
-
-        public override int GetHashCode()
-        {
-            return _ranges.Aggregate(0, (current, r) => current ^ r.GetHashCode());
-        }
-
-        public IXLDataValidation SetDataValidation()
-        {
-            return DataValidation;
-        }
-
-        public void Select()
-        {
-            foreach (var range in this)
-                range.Select();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLFormattedText.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLFormattedText.cs
deleted file mode 100644
index b17836c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLFormattedText.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLFormattedText<T> : IEnumerable<IXLRichString>, IEquatable<IXLFormattedText<T>>, IXLWithRichString
-    {
-        Boolean Bold { set; }
-        Boolean Italic { set; }
-        XLFontUnderlineValues Underline { set; }
-        Boolean Strikethrough { set; }
-        XLFontVerticalTextAlignmentValues VerticalAlignment { set; }
-        Boolean Shadow { set; }
-        Double FontSize { set; }
-        XLColor FontColor { set; }
-        String FontName { set; }
-        XLFontFamilyNumberingValues FontFamilyNumbering { set; }
-
-        IXLFormattedText<T> SetBold(); IXLFormattedText<T> SetBold(Boolean value);
-        IXLFormattedText<T> SetItalic(); IXLFormattedText<T> SetItalic(Boolean value);
-        IXLFormattedText<T> SetUnderline(); IXLFormattedText<T> SetUnderline(XLFontUnderlineValues value);
-        IXLFormattedText<T> SetStrikethrough(); IXLFormattedText<T> SetStrikethrough(Boolean value);
-        IXLFormattedText<T> SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
-        IXLFormattedText<T> SetShadow(); IXLFormattedText<T> SetShadow(Boolean value);
-        IXLFormattedText<T> SetFontSize(Double value);
-        IXLFormattedText<T> SetFontColor(XLColor value);
-        IXLFormattedText<T> SetFontName(String value);
-        IXLFormattedText<T> SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
-
-        IXLRichString AddText(String text, IXLFontBase font);
-        IXLFormattedText<T> ClearText();
-        IXLFormattedText<T> ClearFont();
-        IXLFormattedText<T> Substring(Int32 index);
-        IXLFormattedText<T> Substring(Int32 index, Int32 length);
-        Int32 Count { get; }
-        Int32 Length { get; }
-
-        String Text { get; }
-        IXLPhonetics Phonetics { get; }
-        Boolean HasPhonetics { get; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLPhonetic.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLPhonetic.cs
deleted file mode 100644
index a38a5c1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLPhonetic.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLPhonetic: IEquatable<IXLPhonetic>
-    {
-        String Text { get; set; }
-        Int32 Start { get; set; }
-        Int32 End { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLPhonetics.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLPhonetics.cs
deleted file mode 100644
index 7a14614..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLPhonetics.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public enum XLPhoneticAlignment { Center, Distributed, Left, NoControl }
-    public enum XLPhoneticType { FullWidthKatakana, HalfWidthKatakana, Hiragana, NoConversion }
-    public interface IXLPhonetics : IXLFontBase, IEnumerable<IXLPhonetic>, IEquatable<IXLPhonetics>
-    {
-        IXLPhonetics SetBold(); IXLPhonetics SetBold(Boolean value);
-        IXLPhonetics SetItalic(); IXLPhonetics SetItalic(Boolean value);
-        IXLPhonetics SetUnderline(); IXLPhonetics SetUnderline(XLFontUnderlineValues value);
-        IXLPhonetics SetStrikethrough(); IXLPhonetics SetStrikethrough(Boolean value);
-        IXLPhonetics SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
-        IXLPhonetics SetShadow(); IXLPhonetics SetShadow(Boolean value);
-        IXLPhonetics SetFontSize(Double value);
-        IXLPhonetics SetFontColor(XLColor value);
-        IXLPhonetics SetFontName(String value);
-        IXLPhonetics SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
-
-        IXLPhonetics Add(String text, Int32 start, Int32 end);
-        IXLPhonetics ClearText();
-        IXLPhonetics ClearFont();
-        Int32 Count { get; }
-
-        XLPhoneticAlignment Alignment { get; set; }
-        XLPhoneticType Type { get; set; }
-
-        IXLPhonetics SetAlignment(XLPhoneticAlignment phoneticAlignment);
-        IXLPhonetics SetType(XLPhoneticType phoneticType);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLRichString.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLRichString.cs
deleted file mode 100644
index 3d97406..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLRichString.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLWithRichString
-    {
-        IXLRichString AddText(String text);
-        IXLRichString AddNewLine();
-    }
-    public interface IXLRichString: IXLFontBase, IEquatable<IXLRichString>, IXLWithRichString
-    {
-        String Text { get; set; }
-        
-
-        IXLRichString SetBold(); IXLRichString SetBold(Boolean value);
-        IXLRichString SetItalic(); IXLRichString SetItalic(Boolean value);
-        IXLRichString SetUnderline(); IXLRichString SetUnderline(XLFontUnderlineValues value);
-        IXLRichString SetStrikethrough(); IXLRichString SetStrikethrough(Boolean value);
-        IXLRichString SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
-        IXLRichString SetShadow(); IXLRichString SetShadow(Boolean value);
-        IXLRichString SetFontSize(Double value);
-        IXLRichString SetFontColor(XLColor value);
-        IXLRichString SetFontName(String value);
-        IXLRichString SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLRichText.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLRichText.cs
deleted file mode 100644
index 36ac6fc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/IXLRichText.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRichText : IXLFormattedText<IXLRichText>
-    {
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLFormattedText.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLFormattedText.cs
deleted file mode 100644
index aa21ed7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLFormattedText.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLFormattedText<T>: IXLFormattedText<T>
-    {
-        List<IXLRichString> _richTexts = new List<IXLRichString>();
-
-        protected T Container;
-        readonly IXLFontBase _defaultFont;
-        public XLFormattedText(IXLFontBase defaultFont)
-        {
-            Length = 0;
-            _defaultFont = defaultFont;
-        }
-
-        public XLFormattedText(IXLFormattedText<T> defaultRichText, IXLFontBase defaultFont)
-            : this(defaultFont)
-        {
-            foreach (var rt in defaultRichText)
-                AddText(rt.Text, rt);
-            if (defaultRichText.HasPhonetics)
-            {
-                _phonetics = new XLPhonetics(defaultRichText.Phonetics, defaultFont);
-            }
-        }
-
-        public XLFormattedText(String text, IXLFontBase defaultFont)
-            :this(defaultFont)
-        {
-            AddText(text);
-        }
-
-        public Int32 Count { get { return _richTexts.Count; } }
-        public int Length { get; private set; }
-
-        public IXLRichString AddText(String text)
-        {
-            return AddText(text, _defaultFont);
-        }
-        public IXLRichString AddText(String text, IXLFontBase font)
-        {
-            var richText = new XLRichString(text, font, this);
-            return AddText(richText);
-        }
-
-        public IXLRichString AddText(IXLRichString richText)
-        {
-            _richTexts.Add(richText);
-            Length += richText.Text.Length;
-            return richText;
-        }
-
-        public IXLRichString AddNewLine()
-        {
-            return AddText(Environment.NewLine);
-        }
-
-        public IXLFormattedText<T> ClearText()
-        {
-            _richTexts.Clear();
-            Length = 0;
-            return this;
-        }
-        public IXLFormattedText<T> ClearFont()
-        {
-            String text = Text;
-            ClearText();
-            AddText(text);
-            return this;
-        }
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder(_richTexts.Count);
-            _richTexts.ForEach(rt => sb.Append(rt.Text));
-            return sb.ToString();
-        }
-
-        public IXLFormattedText<T> Substring(Int32 index)
-        {
-            return Substring(index, Length - index);
-        }
-        public IXLFormattedText<T> Substring(Int32 index, Int32 length)
-        {
-            if (index + 1 > Length || (Length - index + 1) < length || length <= 0)
-                throw new IndexOutOfRangeException("Index and length must refer to a location within the string.");
-
-            List<IXLRichString> newRichTexts = new List<IXLRichString>();
-            var retVal = new XLFormattedText<T>(_defaultFont);
-
-            Int32 lastPosition = 0;
-            foreach (var rt in _richTexts)
-            {
-                if (lastPosition >= index + 1 + length) // We already have what we need
-                {
-                    newRichTexts.Add(rt);
-                }
-                else if (lastPosition + rt.Text.Length >= index + 1) // Eureka!
-                {
-                    Int32 startIndex = index - lastPosition;
-
-                    if (startIndex > 0)
-                        newRichTexts.Add(new XLRichString(rt.Text.Substring(0, startIndex), rt, this));
-                    else if (startIndex < 0)
-                        startIndex = 0;
-
-                    Int32 leftToTake = length - retVal.Length;
-                    if (leftToTake > rt.Text.Length - startIndex)
-                        leftToTake = rt.Text.Length - startIndex;
-
-                    XLRichString newRt = new XLRichString(rt.Text.Substring(startIndex, leftToTake), rt, this);
-                    newRichTexts.Add(newRt);
-                    retVal.AddText(newRt);
-
-                    if (startIndex + leftToTake < rt.Text.Length)
-                        newRichTexts.Add(new XLRichString(rt.Text.Substring(startIndex + leftToTake), rt, this));
-                }
-                else // We haven't reached the desired position yet
-                {
-                    newRichTexts.Add(rt);
-                }
-                lastPosition += rt.Text.Length;
-            }
-            _richTexts = newRichTexts;
-            return retVal;
-        }
-
-        public IEnumerator<IXLRichString> GetEnumerator()
-        {
-            return _richTexts.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public Boolean Bold { set { _richTexts.ForEach(rt => rt.Bold = value); } }
-        public Boolean Italic { set { _richTexts.ForEach(rt => rt.Italic = value); } }
-        public XLFontUnderlineValues Underline { set { _richTexts.ForEach(rt => rt.Underline = value); } }
-        public Boolean Strikethrough { set { _richTexts.ForEach(rt => rt.Strikethrough = value); } }
-        public XLFontVerticalTextAlignmentValues VerticalAlignment { set { _richTexts.ForEach(rt => rt.VerticalAlignment = value); } }
-        public Boolean Shadow { set { _richTexts.ForEach(rt => rt.Shadow = value); } }
-        public Double FontSize { set { _richTexts.ForEach(rt => rt.FontSize = value); } }
-        public XLColor FontColor { set { _richTexts.ForEach(rt => rt.FontColor = value); } }
-        public String FontName { set { _richTexts.ForEach(rt => rt.FontName = value); } }
-        public XLFontFamilyNumberingValues FontFamilyNumbering { set { _richTexts.ForEach(rt => rt.FontFamilyNumbering = value); } }
-
-        public IXLFormattedText<T> SetBold() { Bold = true; return this; }	public IXLFormattedText<T> SetBold(Boolean value) { Bold = value; return this; }
-        public IXLFormattedText<T> SetItalic() { Italic = true; return this; }	public IXLFormattedText<T> SetItalic(Boolean value) { Italic = value; return this; }
-        public IXLFormattedText<T> SetUnderline() { Underline = XLFontUnderlineValues.Single; return this; }	public IXLFormattedText<T> SetUnderline(XLFontUnderlineValues value) { Underline = value; return this; }
-        public IXLFormattedText<T> SetStrikethrough() { Strikethrough = true; return this; }	public IXLFormattedText<T> SetStrikethrough(Boolean value) { Strikethrough = value; return this; }
-        public IXLFormattedText<T> SetVerticalAlignment(XLFontVerticalTextAlignmentValues value) { VerticalAlignment = value; return this; }
-        public IXLFormattedText<T> SetShadow() { Shadow = true; return this; }	public IXLFormattedText<T> SetShadow(Boolean value) { Shadow = value; return this; }
-        public IXLFormattedText<T> SetFontSize(Double value) { FontSize = value; return this; }
-        public IXLFormattedText<T> SetFontColor(XLColor value) { FontColor = value; return this; }
-        public IXLFormattedText<T> SetFontName(String value) { FontName = value; return this; }
-        public IXLFormattedText<T> SetFontFamilyNumbering(XLFontFamilyNumberingValues value) { FontFamilyNumbering = value; return this; }
-
-        public bool Equals(IXLFormattedText<T> other)
-        {
-            Int32 count = Count;
-            if (count != other.Count)
-                return false;
-
-            for (Int32 i = 0; i < count; i++)
-            {
-                if (_richTexts.ElementAt(i) != other.ElementAt(i))
-                    return false;
-            }
-
-            return _phonetics == null || Phonetics.Equals(other.Phonetics);
-        }
-
-        public String Text { get { return ToString(); } }
-
-        private IXLPhonetics _phonetics;
-        public IXLPhonetics Phonetics 
-        {
-            get { return _phonetics ?? (_phonetics = new XLPhonetics(_defaultFont)); }
-        }
-
-        public Boolean HasPhonetics { get { return _phonetics != null; } }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLPhonetic.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLPhonetic.cs
deleted file mode 100644
index 73118c4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLPhonetic.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPhonetic: IXLPhonetic
-    {
-        public XLPhonetic(String text, Int32 start, Int32 end)
-        {
-            Text = text;
-            Start = start;
-            End = end;
-        }
-        public String Text { get; set; }
-        public Int32 Start { get; set; }
-        public Int32 End { get; set; }
-
-        public bool Equals(IXLPhonetic other)
-        {
-            if (other == null)
-                return false;
-
-            return Text == other.Text && Start == other.Start && End == other.End;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLPhonetics.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLPhonetics.cs
deleted file mode 100644
index afc4e45..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLPhonetics.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    internal class XLPhonetics : IXLPhonetics
-    {
-        private readonly List<IXLPhonetic> _phonetics = new List<IXLPhonetic>();
-
-        readonly IXLFontBase _defaultFont;
-        public XLPhonetics(IXLFontBase defaultFont)
-        {
-            _defaultFont = defaultFont;
-            Type = XLPhoneticType.FullWidthKatakana;
-            Alignment = XLPhoneticAlignment.Left;
-            this.CopyFont(_defaultFont);
-        }
-
-        public XLPhonetics(IXLPhonetics defaultPhonetics, IXLFontBase defaultFont)
-        {
-            _defaultFont = defaultFont;
-            Type = defaultPhonetics.Type;
-            Alignment = defaultPhonetics.Alignment;
-            
-            this.CopyFont(defaultPhonetics);
-        }
-
-        public Boolean Bold { get; set; }
-        public Boolean Italic { get; set; }
-        public XLFontUnderlineValues Underline { get; set; }
-        public Boolean Strikethrough { get; set; }
-        public XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
-        public Boolean Shadow { get; set; }
-        public Double FontSize { get; set; }
-        public XLColor FontColor { get; set; }
-        public String FontName { get; set; }
-        public XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
-
-        public IXLPhonetics SetBold() { Bold = true; return this; }	public IXLPhonetics SetBold(Boolean value) { Bold = value; return this; }
-        public IXLPhonetics SetItalic() { Italic = true; return this; }	public IXLPhonetics SetItalic(Boolean value) { Italic = value; return this; }
-        public IXLPhonetics SetUnderline() { Underline = XLFontUnderlineValues.Single; return this; }	public IXLPhonetics SetUnderline(XLFontUnderlineValues value) { Underline = value; return this; }
-        public IXLPhonetics SetStrikethrough() { Strikethrough = true; return this; }	public IXLPhonetics SetStrikethrough(Boolean value) { Strikethrough = value; return this; }
-        public IXLPhonetics SetVerticalAlignment(XLFontVerticalTextAlignmentValues value) { VerticalAlignment = value; return this; }
-        public IXLPhonetics SetShadow() { Shadow = true; return this; }	public IXLPhonetics SetShadow(Boolean value) { Shadow = value; return this; }
-        public IXLPhonetics SetFontSize(Double value) { FontSize = value; return this; }
-        public IXLPhonetics SetFontColor(XLColor value) { FontColor = value; return this; }
-        public IXLPhonetics SetFontName(String value) { FontName = value; return this; }
-        public IXLPhonetics SetFontFamilyNumbering(XLFontFamilyNumberingValues value) { FontFamilyNumbering = value; return this; }
-
-        public IXLPhonetics Add(String text, Int32 start, Int32 end)
-        {
-            _phonetics.Add(new XLPhonetic(text, start, end));
-            return this;
-        }
-        public IXLPhonetics ClearText()
-        {
-            _phonetics.Clear();
-            return this;
-        }
-        public IXLPhonetics ClearFont()
-        {
-            this.CopyFont(_defaultFont);
-            return this;
-        }
-
-        public Int32 Count { get { return _phonetics.Count; } }
-
-        public XLPhoneticAlignment Alignment { get; set; }
-        public XLPhoneticType Type { get; set; }
-
-        public IXLPhonetics SetAlignment(XLPhoneticAlignment phoneticAlignment) { Alignment = phoneticAlignment; return this; }
-        public IXLPhonetics SetType(XLPhoneticType phoneticType) { Type = phoneticType; return this; }
-
-        public IEnumerator<IXLPhonetic> GetEnumerator()
-        {
-            return _phonetics.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public bool Equals(IXLPhonetics other)
-        {
-            if (other == null)
-                return false;
-
-            Int32 phoneticsCount = _phonetics.Count;
-            for (Int32 i = 0; i < phoneticsCount; i++)
-            {
-                if (!_phonetics[i].Equals(other.ElementAt(i)))
-                    return false;
-            }
-
-            return
-                   Bold == other.Bold
-                && Italic == other.Italic
-                && Underline == other.Underline
-                && Strikethrough == other.Strikethrough
-                && VerticalAlignment == other.VerticalAlignment
-                && Shadow == other.Shadow
-                && FontSize == other.FontSize
-                && FontColor.Equals(other.FontColor)
-                && FontName == other.FontName
-                && FontFamilyNumbering == other.FontFamilyNumbering
-    ;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLRichString.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLRichString.cs
deleted file mode 100644
index 6500758..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLRichString.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLRichString: IXLRichString
-    {
-        IXLWithRichString _withRichString;
-        public XLRichString(String text, IXLFontBase font, IXLWithRichString withRichString)
-        {
-            Text = text;
-            this.CopyFont(font);
-            _withRichString = withRichString;
-        }
-
-        public String Text { get; set; }
-        public IXLRichString AddText(String text)
-        {
-            return _withRichString.AddText(text);
-        }
-
-        public IXLRichString AddNewLine()
-        {
-            return AddText(Environment.NewLine);
-        }
-
-        public Boolean Bold { get; set; }
-        public Boolean Italic { get; set; }
-        public XLFontUnderlineValues Underline { get; set; }
-        public Boolean Strikethrough { get; set; }
-        public XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
-        public Boolean Shadow { get; set; }
-        public Double FontSize { get; set; }
-        public XLColor FontColor { get; set; }
-        public String FontName { get; set; }
-        public XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
-
-        public IXLRichString SetBold() { Bold = true; return this; }	public IXLRichString SetBold(Boolean value) { Bold = value; return this; }
-        public IXLRichString SetItalic() { Italic = true; return this; }	public IXLRichString SetItalic(Boolean value) { Italic = value; return this; }
-        public IXLRichString SetUnderline() { Underline = XLFontUnderlineValues.Single; return this; }	public IXLRichString SetUnderline(XLFontUnderlineValues value) { Underline = value; return this; }
-        public IXLRichString SetStrikethrough() { Strikethrough = true; return this; }	public IXLRichString SetStrikethrough(Boolean value) { Strikethrough = value; return this; }
-        public IXLRichString SetVerticalAlignment(XLFontVerticalTextAlignmentValues value) { VerticalAlignment = value; return this; }
-        public IXLRichString SetShadow() { Shadow = true; return this; }	public IXLRichString SetShadow(Boolean value) { Shadow = value; return this; }
-        public IXLRichString SetFontSize(Double value) { FontSize = value; return this; }
-        public IXLRichString SetFontColor(XLColor value) { FontColor = value; return this; }
-        public IXLRichString SetFontName(String value) { FontName = value; return this; }
-        public IXLRichString SetFontFamilyNumbering(XLFontFamilyNumberingValues value) { FontFamilyNumbering = value; return this; }
-
-        public Boolean Equals(IXLRichString other)
-        {
-            return
-                    Text == other.Text
-                && Bold.Equals(other.Bold)
-                && Italic.Equals(other.Italic)
-                && Underline.Equals(other.Underline)
-                && Strikethrough.Equals(other.Strikethrough)
-                && VerticalAlignment.Equals(other.VerticalAlignment)
-                && Shadow.Equals(other.Shadow)
-                && FontSize.Equals(other.FontSize)
-                && FontColor.Equals(other.FontColor)
-                && FontName.Equals(other.FontName)
-                && FontFamilyNumbering.Equals(other.FontFamilyNumbering)
-                ;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLRichString)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return Text.GetHashCode()
-                ^ Bold.GetHashCode()
-                ^ Italic.GetHashCode()
-                ^ (Int32)Underline
-                ^ Strikethrough.GetHashCode()
-                ^ (Int32)VerticalAlignment
-                ^ Shadow.GetHashCode()
-                ^ FontSize.GetHashCode()
-                ^ FontColor.GetHashCode()
-                ^ FontName.GetHashCode()
-                ^ (Int32)FontFamilyNumbering;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLRichText.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLRichText.cs
deleted file mode 100644
index 7d4c65b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/RichText/XLRichText.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLRichText: XLFormattedText<IXLRichText>, IXLRichText
-    {
-        
-        public XLRichText(IXLFontBase defaultFont)
-            :base(defaultFont)
-        {
-            Container = this;
-        }
-
-        public XLRichText(XLFormattedText<IXLRichText> defaultRichText, IXLFontBase defaultFont)
-            :base(defaultRichText, defaultFont)
-        {
-            Container = this;
-        }
-
-        public XLRichText(String text, IXLFontBase defaultFont)
-            :base(text, defaultFont)
-        {
-            Container = this;
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/IXLRow.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/IXLRow.cs
deleted file mode 100644
index e77686d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/IXLRow.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRow : IXLRangeBase
-    {
-        
-
-        /// <summary>
-        /// Gets or sets the height of this row.
-        /// </summary>
-        /// <value>
-        /// The width of this row.
-        /// </value>
-        Double Height { get; set; }
-
-        /// <summary>
-        /// Deletes this row and shifts the rows below this one accordingly.
-        /// </summary>
-        void Delete();
-
-        /// <summary>
-        /// Gets this row's number
-        /// </summary>
-        Int32 RowNumber();
-
-        /// <summary>
-        /// Inserts X number of rows below this one.
-        /// <para>All rows below will be shifted accordingly.</para>
-        /// </summary>
-        /// <param name="numberOfRows">The number of rows to insert.</param>
-        IXLRows InsertRowsBelow(Int32 numberOfRows);
-
-        /// <summary>
-        /// Inserts X number of rows above this one.
-        /// <para>This row and all below will be shifted accordingly.</para>
-        /// </summary>
-        /// <param name="numberOfRows">The number of rows to insert.</param>
-        IXLRows InsertRowsAbove(Int32 numberOfRows);
-
-        IXLRow AdjustToContents();
-
-        /// <summary>
-        /// Adjusts the height of the row based on its contents, starting from the startColumn.
-        /// </summary>
-        /// <param name="startColumn">The column to start calculating the row height.</param>
-        IXLRow AdjustToContents(Int32 startColumn);
-        /// <summary>
-        /// Adjusts the height of the row based on its contents, starting from the startColumn and ending at endColumn.
-        /// </summary>
-        /// <param name="startColumn">The column to start calculating the row height.</param>
-        /// <param name="endColumn">The column to end calculating the row height.</param>
-        IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn);
-
-
-        IXLRow AdjustToContents(Double minHeight, Double maxHeight);
-        IXLRow AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight);
-        IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight);
-
-        /// <summary>Hides this row.</summary>
-        IXLRow Hide();
-
-        /// <summary>Unhides this row.</summary>
-        IXLRow Unhide();
-
-        /// <summary>
-        /// Gets a value indicating whether this row is hidden or not.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if this row is hidden; otherwise, <c>false</c>.
-        /// </value>
-        Boolean IsHidden { get; }
-
-        /// <summary>
-        /// Gets or sets the outline level of this row.
-        /// </summary>
-        /// <value>
-        /// The outline level of this row.
-        /// </value>
-        Int32 OutlineLevel { get; set; }
-
-        /// <summary>
-        /// Adds this row to the next outline level (Increments the outline level for this row by 1).
-        /// </summary>
-        IXLRow Group();
-
-        /// <summary>
-        /// Adds this row to the next outline level (Increments the outline level for this row by 1).
-        /// </summary>
-        /// <param name="collapse">If set to <c>true</c> the row will be shown collapsed.</param>
-        IXLRow Group(Boolean collapse);
-
-        /// <summary>
-        /// Sets outline level for this row.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        IXLRow Group(Int32 outlineLevel);
-
-        /// <summary>
-        /// Sets outline level for this row.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        /// <param name="collapse">If set to <c>true</c> the row will be shown collapsed.</param>
-        IXLRow Group(Int32 outlineLevel, Boolean collapse);
-
-        /// <summary>
-        /// Adds this row to the previous outline level (decrements the outline level for this row by 1).
-        /// </summary>
-        IXLRow Ungroup();
-
-
-        /// <summary>
-        /// Adds this row to the previous outline level (decrements the outline level for this row by 1).
-        /// </summary>
-        /// <param name="fromAll">If set to <c>true</c> it will remove this row from all outline levels.</param>
-        IXLRow Ungroup(Boolean fromAll);
-
-        /// <summary>
-        /// Show this row as collapsed.
-        /// </summary>
-        IXLRow Collapse();
-
-        /// <summary>
-        /// Gets the cell in the specified column.
-        /// </summary>
-        /// <param name="columnNumber">The cell's column.</param>
-        IXLCell Cell(Int32 columnNumber);
-
-        /// <summary>
-        /// Gets the cell in the specified column.
-        /// </summary>
-        /// <param name="columnLetter">The cell's column.</param>
-        IXLCell Cell(String columnLetter);
-
-        /// <summary>
-        /// Returns the specified group of cells, separated by commas.
-        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1,3:5")</para>
-        /// </summary>
-        /// <param name="cellsInRow">The row's cells to return.</param>
-        new IXLCells Cells(String cellsInRow);
-        /// <summary>
-        /// Returns the specified group of cells.
-        /// </summary>
-        /// <param name="firstColumn">The first column in the group of cells to return.</param>
-        /// <param name="lastColumn">The last column in the group of cells to return.</param>
-        IXLCells Cells(Int32 firstColumn, Int32 lastColumn);
-        /// <summary>
-        /// Returns the specified group of cells.
-        /// </summary>
-        /// <param name="firstColumn">The first column in the group of cells to return.</param>
-        /// <param name="lastColumn">The last column in the group of cells to return.</param>
-        IXLCells Cells(String firstColumn, String lastColumn);
-
-        /// <summary>Expands this row (if it's collapsed).</summary>
-        IXLRow Expand();
-
-        Int32 CellCount();
-
-        IXLRangeRow CopyTo(IXLCell cell);
-        IXLRangeRow CopyTo(IXLRangeBase range);
-        IXLRow CopyTo(IXLRow row);
-
-        IXLRow Sort();
-        IXLRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-
-        IXLRangeRow Row(Int32 start, Int32 end);
-        IXLRangeRow Row(IXLCell start, IXLCell end);
-        IXLRangeRows Rows(String columns);
-
-        /// <summary>
-        /// Adds a horizontal page break after this row.
-        /// </summary>
-        IXLRow AddHorizontalPageBreak();
-
-        IXLRow SetDataType(XLCellValues dataType);
-
-        IXLRow RowAbove();
-        IXLRow RowAbove(Int32 step);
-        IXLRow RowBelow();
-        IXLRow RowBelow(Int32 step);
-
-        /// <summary>
-        /// Clears the contents of this row.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        new IXLRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        IXLRangeRow RowUsed(Boolean includeFormats = false);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/IXLRows.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/IXLRows.cs
deleted file mode 100644
index fd5a1ca..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/IXLRows.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLRows: IEnumerable<IXLRow>, IDisposable
-    {
-        /// <summary>
-        /// Sets the height of all rows.
-        /// </summary>
-        /// <value>
-        /// The height of all rows.
-        /// </value>
-        Double Height { set; }
-
-        /// <summary>
-        /// Deletes all rows and shifts the rows below them accordingly.
-        /// </summary>
-        void Delete();
-
-        /// <summary>
-        /// Adjusts the height of all rows based on its contents.
-        /// </summary>
-        IXLRows AdjustToContents();
-        /// <summary>
-        /// Adjusts the height of all rows based on its contents, starting from the startColumn.
-        /// </summary>
-        /// <param name="startColumn">The column to start calculating the row height.</param>
-        IXLRows AdjustToContents(Int32 startColumn);
-        /// <summary>
-        /// Adjusts the height of all rows based on its contents, starting from the startColumn and ending at endColumn.
-        /// </summary>
-        /// <param name="startColumn">The column to start calculating the row height.</param>
-        /// <param name="endColumn">The column to end calculating the row height.</param>
-        IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn);
-
-        IXLRows AdjustToContents(Double minHeight, Double maxHeight);
-        IXLRows AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight);
-        IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight);
-
-        /// <summary>
-        /// Hides all rows.
-        /// </summary>
-        void Hide();
-
-        /// <summary>Unhides all rows.</summary>
-        void Unhide();
-
-        /// <summary>
-        /// Increments the outline level of all rows by 1.
-        /// </summary>
-        void Group();
-
-        /// <summary>
-        /// Increments the outline level of all rows by 1.
-        /// </summary>
-        /// <param name="collapse">If set to <c>true</c> the rows will be shown collapsed.</param>
-        void Group(Boolean collapse);
-
-        /// <summary>
-        /// Sets outline level for all rows.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        void Group(Int32 outlineLevel);
-
-        /// <summary>
-        /// Sets outline level for all rows.
-        /// </summary>
-        /// <param name="outlineLevel">The outline level.</param>
-        /// <param name="collapse">If set to <c>true</c> the rows will be shown collapsed.</param>
-        void Group(Int32 outlineLevel, Boolean collapse);
-
-        /// <summary>
-        /// Decrements the outline level of all rows by 1.
-        /// </summary>
-        void Ungroup();
-
-        /// <summary>
-        /// Decrements the outline level of all rows by 1.
-        /// </summary>
-        /// <param name="fromAll">If set to <c>true</c> it will remove the rows from all outline levels.</param>
-        void Ungroup(Boolean fromAll);
-
-        /// <summary>
-        /// Show all rows as collapsed.
-        /// </summary>
-        void Collapse();
-
-        /// <summary>Expands all rows (if they're collapsed).</summary>
-        void Expand();
-
-        /// <summary>
-        /// Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-        
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        IXLStyle Style { get; set; }
-
-        /// <summary>
-        /// Adds a horizontal page break after these rows.
-        /// </summary>
-        IXLRows AddHorizontalPageBreaks();
-
-        IXLRows SetDataType(XLCellValues dataType);
-
-        /// <summary>
-        /// Clears the contents of these rows.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        void Select();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRow.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRow.cs
deleted file mode 100644
index c431481..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRow.cs
+++ /dev/null
@@ -1,712 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Drawing;
-
-
-namespace ClosedXML.Excel
-{
-    internal class XLRow : XLRangeBase, IXLRow
-    {
-        #region Private fields
-
-        private Boolean _collapsed;
-        private Double _height;
-        private Boolean _isHidden;
-        private Int32 _outlineLevel;
-
-        #endregion
-
-        #region Constructor
-
-        public XLRow(Int32 row, XLRowParameters xlRowParameters)
-            : base(new XLRangeAddress(new XLAddress(xlRowParameters.Worksheet, row, 1, false, false),
-                                      new XLAddress(xlRowParameters.Worksheet, row, XLHelper.MaxColumnNumber, false,
-                                                    false)))
-        {
-            SetRowNumber(row);
-
-            IsReference = xlRowParameters.IsReference;
-            if (IsReference)
-                SubscribeToShiftedRows((range, rowShifted) => this.WorksheetRangeShiftedRows(range, rowShifted));
-            else
-            {
-                SetStyle(xlRowParameters.DefaultStyleId);
-                _height = xlRowParameters.Worksheet.RowHeight;
-            }
-        }
-
-        public XLRow(XLRow row)
-            : base(new XLRangeAddress(new XLAddress(row.Worksheet, row.RowNumber(), 1, false, false),
-                                      new XLAddress(row.Worksheet, row.RowNumber(), XLHelper.MaxColumnNumber, false,
-                                                    false)))
-        {
-            _height = row._height;
-            IsReference = row.IsReference;
-            if (IsReference)
-				SubscribeToShiftedRows((range, rowShifted) => this.WorksheetRangeShiftedRows(range, rowShifted));
-
-            _collapsed = row._collapsed;
-            _isHidden = row._isHidden;
-            _outlineLevel = row._outlineLevel;
-            HeightChanged = row.HeightChanged;
-            SetStyle(row.GetStyleId());
-        }
-
-        #endregion
-
-        public Boolean IsReference { get; private set; }
-
-        public override IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-
-                yield return Style;
-
-                int row = RowNumber();
-
-                foreach (XLCell cell in Worksheet.Internals.CellsCollection.GetCellsInRow(row))
-                    yield return cell.Style;
-
-                UpdatingStyle = false;
-            }
-        }
-
-        public override Boolean UpdatingStyle { get; set; }
-
-        public override IXLStyle InnerStyle
-        {
-            get
-            {
-                return IsReference
-                           ? Worksheet.Internals.RowsCollection[RowNumber()].InnerStyle
-                           : GetStyle();
-            }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.RowsCollection[RowNumber()].InnerStyle = value;
-                else
-                    SetStyle(value);
-            }
-        }
-
-        public Boolean Collapsed
-        {
-            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Collapsed : _collapsed; }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.RowsCollection[RowNumber()].Collapsed = value;
-                else
-                    _collapsed = value;
-            }
-        }
-
-        #region IXLRow Members
-
-        private Boolean _loading;
-        public Boolean Loading
-        {
-            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Loading : _loading; }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.RowsCollection[RowNumber()].Loading = value;
-                else
-                    _loading = value;
-            }
-        }
-
-        public Boolean HeightChanged { get; private set; }
-        public Double Height
-        {
-            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Height : _height; }
-            set
-            {
-                if (!Loading)
-                    HeightChanged = true;
-
-                if (IsReference)
-                    Worksheet.Internals.RowsCollection[RowNumber()].Height = value;
-                else
-                    _height = value;
-            }
-        }
-
-        public void Delete()
-        {
-            int rowNumber = RowNumber();
-            using (var asRange = AsRange())
-                asRange.Delete(XLShiftDeletedCells.ShiftCellsUp);
-
-            Worksheet.Internals.RowsCollection.Remove(rowNumber);
-            var rowsToMove = new List<Int32>();
-            rowsToMove.AddRange(Worksheet.Internals.RowsCollection.Where(c => c.Key > rowNumber).Select(c => c.Key));
-            foreach (int row in rowsToMove.OrderBy(r => r))
-            {
-                Worksheet.Internals.RowsCollection.Add(row - 1, Worksheet.Internals.RowsCollection[row]);
-                Worksheet.Internals.RowsCollection.Remove(row);
-            }
-        }
-
-        public new IXLRows InsertRowsBelow(Int32 numberOfRows)
-        {
-            int rowNum = RowNumber();
-            Worksheet.Internals.RowsCollection.ShiftRowsDown(rowNum + 1, numberOfRows);
-            using (var row = Worksheet.Row(rowNum))
-            {
-                using (var asRange = row.AsRange())
-                {
-                    asRange.InsertRowsBelowVoid(true, numberOfRows);
-                }
-            }
-            var newRows = Worksheet.Rows(rowNum + 1, rowNum + numberOfRows);
-
-            CopyRows(newRows);
-
-            return newRows;
-        }
-
-        private void CopyRows(IXLRows newRows)
-        {
-            foreach (var newRow in newRows)
-            {
-                var internalRow = Worksheet.Internals.RowsCollection[newRow.RowNumber()];
-                internalRow._height = Height;
-                internalRow.SetStyle(Style);
-                internalRow._collapsed = Collapsed;
-                internalRow._isHidden = IsHidden;
-                internalRow._outlineLevel = OutlineLevel;
-            }
-        }
-
-        public new IXLRows InsertRowsAbove(Int32 numberOfRows)
-        {
-            int rowNum = RowNumber();
-            if (rowNum > 1)
-            {
-                using (var row = Worksheet.Row(rowNum - 1))
-                {
-                    return row.InsertRowsBelow(numberOfRows);
-                }
-            }
-
-            Worksheet.Internals.RowsCollection.ShiftRowsDown(rowNum, numberOfRows);
-            using (var row = Worksheet.Row(rowNum))
-            {
-                using (var asRange = row.AsRange())
-                {
-                    asRange.InsertRowsAboveVoid(true, numberOfRows);
-                }
-            }
-
-            return Worksheet.Rows(rowNum, rowNum + numberOfRows - 1);
-        }
-
-        public new IXLRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            base.Clear(clearOptions);
-            return this;
-        }
-
-        public IXLCell Cell(Int32 columnNumber)
-        {
-            return Cell(1, columnNumber);
-        }
-
-        public new IXLCell Cell(String columnLetter)
-        {
-            return Cell(1, columnLetter);
-        }
-
-        public new IXLCells Cells()
-        {
-            return CellsUsed(true);
-        }
-
-        public new IXLCells Cells(String cellsInRow)
-        {
-            var retVal = new XLCells(false, false);
-            var rangePairs = cellsInRow.Split(',');
-            foreach (string pair in rangePairs)
-                retVal.Add(Range(pair.Trim()).RangeAddress);
-            return retVal;
-        }
-
-        public IXLCells Cells(Int32 firstColumn, Int32 lastColumn)
-        {
-            return Cells(firstColumn + ":" + lastColumn);
-        }
-
-        public IXLCells Cells(String firstColumn, String lastColumn)
-        {
-            return Cells(XLHelper.GetColumnNumberFromLetter(firstColumn) + ":"
-                         + XLHelper.GetColumnNumberFromLetter(lastColumn));
-        }
-
-        public IXLRow AdjustToContents(Int32 startColumn)
-        {
-            return AdjustToContents(startColumn, XLHelper.MaxColumnNumber);
-        }
-
-        public IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn)
-        {
-            return AdjustToContents(startColumn, endColumn, 0, Double.MaxValue);
-        }
-
-        public IXLRow AdjustToContents(Double minHeight, Double maxHeight)
-        {
-            return AdjustToContents(1, XLHelper.MaxColumnNumber, minHeight, maxHeight);
-        }
-
-        public IXLRow AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight)
-        {
-            return AdjustToContents(startColumn, XLHelper.MaxColumnNumber, minHeight, maxHeight);
-        }
-
-        public IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight)
-        {
-            var fontCache = new Dictionary<IXLFontBase, Font>();
-            Double rowMaxHeight = minHeight;
-            foreach (XLCell c in from XLCell c in Row(startColumn, endColumn).CellsUsed() where !c.IsMerged() select c)
-            {
-                Double thisHeight;
-                Int32 textRotation = c.Style.Alignment.TextRotation;
-                if (c.HasRichText || textRotation != 0 || c.InnerText.Contains(Environment.NewLine))
-                {
-                    var kpList = new List<KeyValuePair<IXLFontBase, string>>();
-                    if (c.HasRichText)
-                    {
-                        foreach (IXLRichString rt in c.RichText)
-                        {
-                            String formattedString = rt.Text;
-                            var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
-                            Int32 arrCount = arr.Count();
-                            for (Int32 i = 0; i < arrCount; i++)
-                            {
-                                String s = arr[i];
-                                if (i < arrCount - 1)
-                                    s += Environment.NewLine;
-                                kpList.Add(new KeyValuePair<IXLFontBase, String>(rt, s));
-                            }
-                        }
-                    }
-                    else
-                    {
-                        String formattedString = c.GetFormattedString();
-                        var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
-                        Int32 arrCount = arr.Count();
-                        for (Int32 i = 0; i < arrCount; i++)
-                        {
-                            String s = arr[i];
-                            if (i < arrCount - 1)
-                                s += Environment.NewLine;
-                            kpList.Add(new KeyValuePair<IXLFontBase, String>(c.Style.Font, s));
-                        }
-                    }
-
-                    Double maxLongCol = kpList.Max(kp => kp.Value.Length);
-                    Double maxHeightCol = kpList.Max(kp => kp.Key.GetHeight(fontCache));
-                    Int32 lineCount = kpList.Count(kp => kp.Value.Contains(Environment.NewLine)) + 1;
-                    if (textRotation == 0)
-                        thisHeight = maxHeightCol * lineCount;
-                    else
-                    {
-                        if (textRotation == 255)
-                            thisHeight = maxLongCol * maxHeightCol;
-                        else
-                        {
-                            Double rotation;
-                            if (textRotation == 90 || textRotation == 180 || textRotation == 255)
-                                rotation = 90;
-                            else
-                                rotation = textRotation % 90;
-
-                            thisHeight = (rotation / 90.0) * maxHeightCol * maxLongCol * 0.5;
-                        }
-                    }
-                }
-                else
-                    thisHeight = c.Style.Font.GetHeight( fontCache);
-
-                if (thisHeight >= maxHeight)
-                {
-                    rowMaxHeight = maxHeight;
-                    break;
-                }
-                if (thisHeight > rowMaxHeight)
-                    rowMaxHeight = thisHeight;
-            }
-
-            if (rowMaxHeight <= 0)
-                rowMaxHeight = Worksheet.RowHeight;
-
-            Height = rowMaxHeight;
-
-            foreach (IDisposable font in fontCache.Values)
-            {
-                font.Dispose();
-            }
-            return this;
-        }
-
-        public IXLRow Hide()
-        {
-            IsHidden = true;
-            return this;
-        }
-
-        public IXLRow Unhide()
-        {
-            IsHidden = false;
-            return this;
-        }
-
-        public Boolean IsHidden
-        {
-            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].IsHidden : _isHidden; }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.RowsCollection[RowNumber()].IsHidden = value;
-                else
-                    _isHidden = value;
-            }
-        }
-
-        public override IXLStyle Style
-        {
-            get
-            {
-                return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Style : GetStyle();
-            }
-            set
-            {
-                if (IsReference)
-                    Worksheet.Internals.RowsCollection[RowNumber()].Style = value;
-                else
-                {
-                    SetStyle(value);
-
-                    Int32 minColumn = 1;
-                    Int32 maxColumn = 0;
-                    int row = RowNumber();
-                    if (Worksheet.Internals.CellsCollection.RowsUsed.ContainsKey(row))
-                    {
-                        minColumn = Worksheet.Internals.CellsCollection.MinColumnInRow(row);
-                        maxColumn = Worksheet.Internals.CellsCollection.MaxColumnInRow(row);
-                    }
-
-                    if (Worksheet.Internals.ColumnsCollection.Count > 0)
-                    {
-                        Int32 minInCollection = Worksheet.Internals.ColumnsCollection.Keys.Min();
-                        Int32 maxInCollection = Worksheet.Internals.ColumnsCollection.Keys.Max();
-                        if (minInCollection < minColumn)
-                            minColumn = minInCollection;
-                        if (maxInCollection > maxColumn)
-                            maxColumn = maxInCollection;
-                    }
-                    if (minColumn > 0 && maxColumn > 0)
-                    {
-                        for (Int32 co = minColumn; co <= maxColumn; co++)
-                            Worksheet.Cell(row, co).Style = value;
-                    }
-                }
-            }
-        }
-
-        public Int32 OutlineLevel
-        {
-            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].OutlineLevel : _outlineLevel; }
-            set
-            {
-                if (value < 0 || value > 8)
-                    throw new ArgumentOutOfRangeException("value", "Outline level must be between 0 and 8.");
-
-                if (IsReference)
-                    Worksheet.Internals.RowsCollection[RowNumber()].OutlineLevel = value;
-                else
-                {
-                    Worksheet.IncrementColumnOutline(value);
-                    Worksheet.DecrementColumnOutline(_outlineLevel);
-                    _outlineLevel = value;
-                }
-            }
-        }
-
-        public IXLRow Group()
-        {
-            return Group(false);
-        }
-
-        public IXLRow Group(Int32 outlineLevel)
-        {
-            return Group(outlineLevel, false);
-        }
-
-        public IXLRow Ungroup()
-        {
-            return Ungroup(false);
-        }
-
-        public IXLRow Group(Boolean collapse)
-        {
-            if (OutlineLevel < 8)
-                OutlineLevel += 1;
-
-            Collapsed = collapse;
-            return this;
-        }
-
-        public IXLRow Group(Int32 outlineLevel, Boolean collapse)
-        {
-            OutlineLevel = outlineLevel;
-            Collapsed = collapse;
-            return this;
-        }
-
-        public IXLRow Ungroup(Boolean ungroupFromAll)
-        {
-            if (ungroupFromAll)
-                OutlineLevel = 0;
-            else
-            {
-                if (OutlineLevel > 0)
-                    OutlineLevel -= 1;
-            }
-            return this;
-        }
-
-        public IXLRow Collapse()
-        {
-            Collapsed = true;
-            return Hide();
-        }
-
-        public IXLRow Expand()
-        {
-            Collapsed = false;
-            return Unhide();
-        }
-
-        public Int32 CellCount()
-        {
-            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
-        }
-
-        public new IXLRow Sort()
-        {
-            return SortLeftToRight();
-        }
-
-        public new IXLRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false,
-                                          Boolean ignoreBlanks = true)
-        {
-            base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
-            return this;
-        }
-
-        IXLRangeRow IXLRow.CopyTo(IXLCell target)
-        {
-            using (var asRange = AsRange())
-                using (var copy = asRange.CopyTo(target))
-                    return copy.Row(1);
-        }
-
-        IXLRangeRow IXLRow.CopyTo(IXLRangeBase target)
-        {
-            using (var asRange = AsRange())
-                using (var copy = asRange.CopyTo(target))
-                    return copy.Row(1);
-        }
-
-        public IXLRow CopyTo(IXLRow row)
-        {
-            row.Clear();
-            var newRow = (XLRow)row;
-            newRow._height = _height;
-            newRow.Style = GetStyle();
-
-            using (var asRange = AsRange())
-                asRange.CopyTo(row).Dispose();
-
-            return newRow;
-        }
-
-        public IXLRangeRow Row(Int32 start, Int32 end)
-        {
-            return Range(1, start, 1, end).Row(1);
-        }
-
-        public IXLRangeRow Row(IXLCell start, IXLCell end)
-        {
-            return Row(start.Address.ColumnNumber, end.Address.ColumnNumber);
-        }
-
-        public IXLRangeRows Rows(String rows)
-        {
-            var retVal = new XLRangeRows();
-            var rowPairs = rows.Split(',');
-            foreach (string pair in rowPairs)
-                using (var asRange = AsRange())
-                    asRange.Rows(pair.Trim()).ForEach(retVal.Add);
-            return retVal;
-        }
-
-        public IXLRow AddHorizontalPageBreak()
-        {
-            Worksheet.PageSetup.AddHorizontalPageBreak(RowNumber());
-            return this;
-        }
-
-        public IXLRow SetDataType(XLCellValues dataType)
-        {
-            DataType = dataType;
-            return this;
-        }
-
-        public IXLRangeRow RowUsed(Boolean includeFormats = false)
-        {
-            return Row(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
-        }
-
-        #endregion
-
-        public override XLRange AsRange()
-        {
-            return Range(1, 1, 1, XLHelper.MaxColumnNumber);
-        }
-
-        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
-        {
-            if (range.RangeAddress.FirstAddress.RowNumber <= RowNumber())
-                SetRowNumber(RowNumber() + rowsShifted);
-        }
-
-        private void SetRowNumber(Int32 row)
-        {
-            if (row <= 0)
-                RangeAddress.IsInvalid = false;
-            else
-            {
-                RangeAddress.FirstAddress = new XLAddress(Worksheet, row, 1, RangeAddress.FirstAddress.FixedRow,
-                                                          RangeAddress.FirstAddress.FixedColumn);
-                RangeAddress.LastAddress = new XLAddress(Worksheet,
-                                                         row,
-                                                         XLHelper.MaxColumnNumber,
-                                                         RangeAddress.LastAddress.FixedRow,
-                                                         RangeAddress.LastAddress.FixedColumn);
-            }
-        }
-
-        public override XLRange Range(String rangeAddressStr)
-        {
-            String rangeAddressToUse;
-            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
-            {
-                if (rangeAddressStr.Contains('-'))
-                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
-
-                var arrRange = rangeAddressStr.Split(':');
-                string firstPart = arrRange[0];
-                string secondPart = arrRange[1];
-                rangeAddressToUse = FixRowAddress(firstPart) + ":" + FixRowAddress(secondPart);
-            }
-            else
-                rangeAddressToUse = FixRowAddress(rangeAddressStr);
-
-            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
-            return Range(rangeAddress);
-        }
-
-        public IXLRow AdjustToContents()
-        {
-            return AdjustToContents(1);
-        }
-
-        internal void SetStyleNoColumns(IXLStyle value)
-        {
-            if (IsReference)
-                Worksheet.Internals.RowsCollection[RowNumber()].SetStyleNoColumns(value);
-            else
-            {
-                SetStyle(value);
-
-                int row = RowNumber();
-                foreach (XLCell c in Worksheet.Internals.CellsCollection.GetCellsInRow(row))
-                    c.Style = value;
-            }
-        }
-
-        private XLRow RowShift(Int32 rowsToShift)
-        {
-            return Worksheet.Row(RowNumber() + rowsToShift);
-        }
-
-        #region XLRow Above
-
-        IXLRow IXLRow.RowAbove()
-        {
-            return RowAbove();
-        }
-
-        IXLRow IXLRow.RowAbove(Int32 step)
-        {
-            return RowAbove(step);
-        }
-
-        public XLRow RowAbove()
-        {
-            return RowAbove(1);
-        }
-
-        public XLRow RowAbove(Int32 step)
-        {
-            return RowShift(step * -1);
-        }
-
-        #endregion
-
-        #region XLRow Below
-
-        IXLRow IXLRow.RowBelow()
-        {
-            return RowBelow();
-        }
-
-        IXLRow IXLRow.RowBelow(Int32 step)
-        {
-            return RowBelow(step);
-        }
-
-        public XLRow RowBelow()
-        {
-            return RowBelow(1);
-        }
-
-        public XLRow RowBelow(Int32 step)
-        {
-            return RowShift(step);
-        }
-
-        #endregion
-
-        public new Boolean IsEmpty()
-        {
-            return IsEmpty(false);
-        }
-
-        public new Boolean IsEmpty(Boolean includeFormats)
-        {
-            if (includeFormats && !Style.Equals(Worksheet.Style))
-                return false;
-
-            return base.IsEmpty(includeFormats);
-        }
-
-        
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRowCollection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRowCollection.cs
deleted file mode 100644
index 96be962..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRowCollection.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    internal class XLRowsCollection : IDictionary<Int32, XLRow>, IDisposable
-    {
-        private readonly Dictionary<Int32, XLRow> _deleted = new Dictionary<Int32, XLRow>();
-        private readonly Dictionary<Int32, XLRow> _dictionary = new Dictionary<Int32, XLRow>();
-
-        public Dictionary<Int32, XLRow> Deleted
-        {
-            get { return _deleted; }
-        }
-
-        public Int32 MaxRowUsed;
-
-        #region IDictionary<int,XLRow> Members
-
-        public void Add(int key, XLRow value)
-        {
-            if (key > MaxRowUsed) MaxRowUsed = key;
-
-            if (_deleted.ContainsKey(key))
-                _deleted.Remove(key);
-
-            _dictionary.Add(key, value);
-        }
-
-        public bool ContainsKey(int key)
-        {
-            return _dictionary.ContainsKey(key);
-        }
-
-        public ICollection<int> Keys
-        {
-            get { return _dictionary.Keys; }
-        }
-
-        public bool Remove(int key)
-        {
-            if (!_deleted.ContainsKey(key))
-                _deleted.Add(key, _dictionary[key]);
-
-            return _dictionary.Remove(key);
-        }
-
-        public bool TryGetValue(int key, out XLRow value)
-        {
-            return _dictionary.TryGetValue(key, out value);
-        }
-
-        public ICollection<XLRow> Values
-        {
-            get { return _dictionary.Values; }
-        }
-
-        public XLRow this[int key]
-        {
-            get { return _dictionary[key]; }
-            set { _dictionary[key] = value; }
-        }
-
-        public void Add(KeyValuePair<int, XLRow> item)
-        {
-            if (item.Key > MaxRowUsed) MaxRowUsed = item.Key;
-
-            if (_deleted.ContainsKey(item.Key))
-                _deleted.Remove(item.Key);
-
-            _dictionary.Add(item.Key, item.Value);
-        }
-
-        public void Clear()
-        {
-            foreach (KeyValuePair<int, XLRow> kp in _dictionary.Where(kp => !_deleted.ContainsKey(kp.Key)))
-            {
-                _deleted.Add(kp.Key, kp.Value);
-            }
-
-            _dictionary.Clear();
-        }
-
-        public bool Contains(KeyValuePair<int, XLRow> item)
-        {
-            return _dictionary.Contains(item);
-        }
-
-        public void CopyTo(KeyValuePair<int, XLRow>[] array, int arrayIndex)
-        {
-            throw new NotImplementedException();
-        }
-
-        public int Count
-        {
-            get { return _dictionary.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        public bool Remove(KeyValuePair<int, XLRow> item)
-        {
-            if (!_deleted.ContainsKey(item.Key))
-                _deleted.Add(item.Key, _dictionary[item.Key]);
-
-            return _dictionary.Remove(item.Key);
-        }
-
-        public IEnumerator<KeyValuePair<int, XLRow>> GetEnumerator()
-        {
-            return _dictionary.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return _dictionary.GetEnumerator();
-        }
-
-        #endregion
-
-        public void ShiftRowsDown(Int32 startingRow, Int32 rowsToShift)
-        {
-            foreach (int ro in _dictionary.Keys.Where(k => k >= startingRow).OrderByDescending(k => k))
-            {
-                var rowToMove = _dictionary[ro];
-                Int32 newRowNum = ro + rowsToShift;
-                if (newRowNum <= XLHelper.MaxRowNumber)
-                {
-                    var newRow = new XLRow(rowToMove)
-                                     {
-                                         RangeAddress =
-                                             {
-                                                 FirstAddress = new XLAddress(newRowNum, 1, false, false),
-                                                 LastAddress =
-                                                     new XLAddress(newRowNum, XLHelper.MaxColumnNumber, false, false)
-                                             }
-                                     };
-                    _dictionary.Add(newRowNum, newRow);
-                }
-                _dictionary.Remove(ro);
-            }
-        }
-
-        public void RemoveAll(Func<XLRow, Boolean> predicate)
-        {
-            foreach (XLRow kp in _dictionary.Values.Where(predicate).Select(c => c).Where(kp => !_deleted.ContainsKey(kp.RowNumber())))
-            {
-                _deleted.Add(kp.RowNumber(), kp);
-            }
-
-            _dictionary.RemoveAll(predicate);
-        }
-
-        public void Dispose()
-        {
-            _dictionary.Values.ForEach(r=>r.Dispose());
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRowParameters.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRowParameters.cs
deleted file mode 100644
index 99d1603..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRowParameters.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-
-namespace ClosedXML.Excel
-{
-    internal class XLRowParameters
-    {
-        public XLRowParameters(XLWorksheet worksheet, Int32 defaultStyleId, Boolean isReference = true)
-        {
-            Worksheet = worksheet;
-            DefaultStyleId = defaultStyleId;
-            IsReference = isReference;
-        }
-
-        public Int32 DefaultStyleId { get; set; }
-        public XLWorksheet Worksheet { get; private set; }
-        public Boolean IsReference { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRows.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRows.cs
deleted file mode 100644
index 728395c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Rows/XLRows.cs
+++ /dev/null
@@ -1,278 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    internal class XLRows : IXLRows, IXLStylized
-    {
-        public Boolean StyleChanged { get; set; }
-        private readonly List<XLRow> _rows = new List<XLRow>();
-        private readonly XLWorksheet _worksheet;
-        internal IXLStyle style;
-
-        public XLRows(XLWorksheet worksheet)
-        {
-            _worksheet = worksheet;
-            style = new XLStyle(this, XLWorkbook.DefaultStyle);
-        }
-
-        #region IXLRows Members
-
-        public IEnumerator<IXLRow> GetEnumerator()
-        {
-            return _rows.Cast<IXLRow>().OrderBy(r=>r.RowNumber()).GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLStyle Style
-        {
-            get { return style; }
-            set
-            {
-                style = new XLStyle(this, value);
-
-                if (_worksheet != null)
-                    _worksheet.Style = value;
-                else
-                {
-                    foreach (XLRow row in _rows)
-                        row.Style = value;
-                }
-            }
-        }
-
-        public double Height
-        {
-            set
-            {
-                _rows.ForEach(c => c.Height = value);
-                if (_worksheet == null) return;
-                _worksheet.RowHeight = value;
-                _worksheet.Internals.RowsCollection.ForEach(r => r.Value.Height = value);
-            }
-        }
-
-        public void Delete()
-        {
-            if (_worksheet != null)
-            {
-                _worksheet.Internals.RowsCollection.Clear();
-                _worksheet.Internals.CellsCollection.Clear();
-            }
-            else
-            {
-                var toDelete = new Dictionary<IXLWorksheet, List<Int32>>();
-                foreach (XLRow r in _rows)
-                {
-                    if (!toDelete.ContainsKey(r.Worksheet))
-                        toDelete.Add(r.Worksheet, new List<Int32>());
-
-                    toDelete[r.Worksheet].Add(r.RowNumber());
-                }
-
-                foreach (KeyValuePair<IXLWorksheet, List<int>> kp in toDelete)
-                {
-                    foreach (int r in kp.Value.OrderByDescending(r => r))
-                        kp.Key.Row(r).Delete();
-                }
-            }
-        }
-
-        public IXLRows AdjustToContents()
-        {
-            _rows.ForEach(r => r.AdjustToContents());
-            return this;
-        }
-
-        public IXLRows AdjustToContents(Int32 startColumn)
-        {
-            _rows.ForEach(r => r.AdjustToContents(startColumn));
-            return this;
-        }
-
-        public IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn)
-        {
-            _rows.ForEach(r => r.AdjustToContents(startColumn, endColumn));
-            return this;
-        }
-
-        public IXLRows AdjustToContents(Double minHeight, Double maxHeight)
-        {
-            _rows.ForEach(r => r.AdjustToContents(minHeight, maxHeight));
-            return this;
-        }
-
-        public IXLRows AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight)
-        {
-            _rows.ForEach(r => r.AdjustToContents(startColumn, minHeight, maxHeight));
-            return this;
-        }
-
-        public IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight)
-        {
-            _rows.ForEach(r => r.AdjustToContents(startColumn, endColumn, minHeight, maxHeight));
-            return this;
-        }
-
-
-        public void Hide()
-        {
-            _rows.ForEach(r => r.Hide());
-        }
-
-        public void Unhide()
-        {
-            _rows.ForEach(r => r.Unhide());
-        }
-
-        public void Group()
-        {
-            Group(false);
-        }
-
-        public void Group(Int32 outlineLevel)
-        {
-            Group(outlineLevel, false);
-        }
-
-        public void Ungroup()
-        {
-            Ungroup(false);
-        }
-
-        public void Group(Boolean collapse)
-        {
-            _rows.ForEach(r => r.Group(collapse));
-        }
-
-        public void Group(Int32 outlineLevel, Boolean collapse)
-        {
-            _rows.ForEach(r => r.Group(outlineLevel, collapse));
-        }
-
-        public void Ungroup(Boolean ungroupFromAll)
-        {
-            _rows.ForEach(r => r.Ungroup(ungroupFromAll));
-        }
-
-        public void Collapse()
-        {
-            _rows.ForEach(r => r.Collapse());
-        }
-
-        public void Expand()
-        {
-            _rows.ForEach(r => r.Expand());
-        }
-
-        public IXLCells Cells()
-        {
-            var cells = new XLCells(false, false);
-            foreach (XLRow container in _rows)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed()
-        {
-            var cells = new XLCells(true, false);
-            foreach (XLRow container in _rows)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Boolean includeFormats)
-        {
-            var cells = new XLCells(true, includeFormats);
-            foreach (XLRow container in _rows)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLRows AddHorizontalPageBreaks()
-        {
-            foreach (XLRow row in _rows)
-                row.Worksheet.PageSetup.AddHorizontalPageBreak(row.RowNumber());
-            return this;
-        }
-
-        public IXLRows SetDataType(XLCellValues dataType)
-        {
-            _rows.ForEach(c => c.DataType = dataType);
-            return this;
-        }
-
-        #endregion
-
-        #region IXLStylized Members
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return style;
-                if (_worksheet != null)
-                    yield return _worksheet.Style;
-                else
-                {
-                    foreach (IXLStyle s in _rows.SelectMany(row => row.Styles))
-                    {
-                        yield return s;
-                    }
-                }
-                UpdatingStyle = false;
-            }
-        }
-
-        public Boolean UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return style; }
-            set { style = new XLStyle(this, value); }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges();
-                this.ForEach(c => retVal.Add(c.AsRange()));
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        public void Add(XLRow row)
-        {
-            _rows.Add(row);
-        }
-
-        public IXLRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            _rows.ForEach(c => c.Clear(clearOptions));
-            return this;
-        }
-
-        public void Dispose()
-        {
-            if (_rows != null)
-                _rows.ForEach(r => r.Dispose());
-        }
-
-        public void Select()
-        {
-            foreach (var range in this)
-                range.Select();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs
deleted file mode 100644
index 003742c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Drawing;
-
-namespace ClosedXML.Excel
-{
-    public partial class XLColor
-    {
-        private XLColor(XLColor defaultColor)
-        {
-            var dColor = defaultColor;
-            if (dColor._colorType == XLColorType.Color)
-                _color = dColor._color;
-            else if (dColor._colorType == XLColorType.Theme)
-            {
-                _themeColor = dColor._themeColor;
-                _themeTint = dColor._themeTint;
-            }
-            else
-            {
-                _indexed = dColor._indexed;
-            }
-
-            HasValue = true;
-            _hashCode = dColor._hashCode;
-            _colorType = dColor._colorType;
-        }
-
-        private XLColor()
-        {
-            HasValue = false;
-            _hashCode = 0;
-        }
-
-        private XLColor(Color color)
-        {
-            _color = color;
-            _hashCode = 13 ^ color.ToArgb();
-            HasValue = true;
-            _colorType = XLColorType.Color;
-        }
-
-        private XLColor(Int32 index)
-        {
-            _indexed = index;
-            _hashCode = 11 ^ _indexed;
-            HasValue = true;
-            _colorType = XLColorType.Indexed;
-        }
-
-        private XLColor(XLThemeColor themeColor)
-        {
-            _themeColor = themeColor;
-            _themeTint = 0;
-            _hashCode = 7 ^ _themeColor.GetHashCode() ^ _themeTint.GetHashCode();
-            HasValue = true;
-            _colorType = XLColorType.Theme;
-        }
-
-        private XLColor(XLThemeColor themeColor, Double themeTint)
-        {
-            _themeColor = themeColor;
-            _themeTint = themeTint;
-            _hashCode = 7 ^ _themeColor.GetHashCode() ^ _themeTint.GetHashCode();
-            HasValue = true;
-            _colorType = XLColorType.Theme;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs
deleted file mode 100644
index d212e81..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Drawing;
-
-namespace ClosedXML.Excel
-{
-    public enum XLColorType
-    {
-        Color,
-        Theme,
-        Indexed
-    }
-
-    public enum XLThemeColor
-    {
-        Background1,
-        Text1,
-        Background2,
-        Text2,
-        Accent1,
-        Accent2,
-        Accent3,
-        Accent4,
-        Accent5,
-        Accent6,
-        Hyperlink,
-        FollowedHyperlink
-    }
-
-    public partial class XLColor : IEquatable<XLColor>
-    {
-        private readonly XLColorType _colorType;
-        private int _hashCode;
-        private readonly Int32 _indexed;
-        private readonly XLThemeColor _themeColor;
-        private readonly Double _themeTint;
-
-        private Color _color;
-        public Boolean HasValue { get; private set; }
-
-        public XLColorType ColorType
-        {
-            get { return _colorType; }
-        }
-
-        public Color Color
-        {
-            get
-            {
-                if (_colorType == XLColorType.Theme)
-                    throw new Exception("Cannot convert theme color to Color.");
-
-                if (_colorType == XLColorType.Indexed)
-                    return IndexedColors[_indexed].Color;
-
-                return _color;
-            }
-        }
-
-        public Int32 Indexed
-        {
-            get
-            {
-                if (ColorType == XLColorType.Theme)
-                    throw new Exception("Cannot convert theme color to indexed color.");
-
-                if (ColorType == XLColorType.Indexed)
-                    return _indexed;
-
-                throw new Exception("Cannot convert Color to indexed color.");
-            }
-        }
-
-        public XLThemeColor ThemeColor
-        {
-            get
-            {
-                if (ColorType == XLColorType.Theme)
-                    return _themeColor;
-
-                if (ColorType == XLColorType.Indexed)
-                    throw new Exception("Cannot convert indexed color to theme color.");
-
-                throw new Exception("Cannot convert Color to theme color.");
-            }
-        }
-
-        public Double ThemeTint
-        {
-            get
-            {
-                if (ColorType == XLColorType.Theme)
-                    return _themeTint;
-
-                if (ColorType == XLColorType.Indexed)
-                    throw new Exception("Cannot extract theme tint from an indexed color.");
-
-                return _color.A/255.0;
-            }
-        }
-
-        #region IEquatable<XLColor> Members
-
-        public bool Equals(XLColor other)
-        {
-            if (_colorType == other._colorType)
-            {
-                if (_colorType == XLColorType.Color)
-                {
-                    return _color == other._color;
-                }
-                if (_colorType == XLColorType.Theme)
-                {
-                    return _themeColor == other._themeColor
-                           && Math.Abs(_themeTint - other._themeTint) < XLHelper.Epsilon;
-                }
-                return _indexed == other._indexed;
-            }
-
-            return false;
-        }
-
-        #endregion
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLColor) obj);
-        }
-
-        public override int GetHashCode()
-        {
-            if (_hashCode == 0)
-            {
-                if (_colorType == XLColorType.Color)
-                    _hashCode = _color.GetHashCode();
-                else if (_colorType == XLColorType.Theme)
-                    _hashCode = _themeColor.GetHashCode() ^ _themeTint.GetHashCode();
-                else
-                    _hashCode = _indexed;
-            }
-
-            return _hashCode;
-        }
-
-        public override string ToString()
-        {
-            if (_colorType == XLColorType.Color)
-                return Color.ToHex();
-
-            if (_colorType == XLColorType.Theme)
-                return String.Format("Color Theme: {0}, Tint: {1}", _themeColor.ToString(), _themeTint.ToString());
-
-            return "Color Index: " + _indexed;
-        }
-
-        public static Boolean operator ==(XLColor left, XLColor right)
-        {
-            // If both are null, or both are same instance, return true.
-            if (ReferenceEquals(left, right)) return true;
-
-            // If one is null, but not both, return false.
-            if ((left as object) == null || (right as Object) == null) return false;
-
-            return left.Equals(right);
-        }
-
-        public static Boolean operator !=(XLColor left, XLColor right)
-        {
-            return !(left == right);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Static.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Static.cs
deleted file mode 100644
index d66e191..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Static.cs
+++ /dev/null
@@ -1,934 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using DocumentFormat.OpenXml.Presentation;
-
-namespace ClosedXML.Excel
-{
-    public partial class XLColor
-    {
-        private static readonly Dictionary<Color, XLColor> ByColor = new Dictionary<Color, XLColor>();
-        private static readonly Object ByColorLock = new Object();
-
-        public static XLColor FromColor(Color color)
-        {
-            XLColor ret;
-            lock (ByColorLock)
-            {
-                if (!ByColor.TryGetValue(color, out ret))
-                {
-                    ret = new XLColor(color);
-                    ByColor.Add(color, ret);
-                }
-            }
-            return ret;
-        }
-
-        public static XLColor FromArgb(Int32 argb)
-        {
-            return FromColor(Color.FromArgb(argb));
-        }
-        public static XLColor FromArgb(Int32 r, Int32 g, Int32 b)
-        {
-            return FromColor(Color.FromArgb(r, g, b));
-        }
-        public static XLColor FromArgb(Int32 a, Int32 r, Int32 g, Int32 b)
-        {
-            return FromColor(Color.FromArgb(a, r, g, b));
-        }
-        public static XLColor FromKnownColor(KnownColor color)
-        {
-            return FromColor(Color.FromKnownColor(color));
-        }
-        public static XLColor FromName(String name)
-        {
-            return FromColor(Color.FromName(name));
-        }
-        public static XLColor FromHtml(String htmlColor)
-        {
-            return FromColor(ColorTranslator.FromHtml(htmlColor));
-        }
-
-        private static readonly Dictionary<Int32, XLColor> ByIndex = new Dictionary<Int32, XLColor>();
-        private static readonly Object ByIndexLock = new Object();
-
-        public static XLColor FromIndex(Int32 index)
-        {
-            XLColor ret;
-            lock (ByIndexLock)
-            {
-                if (!ByIndex.TryGetValue(index, out ret))
-                {
-                    ret = new XLColor(index);
-                    ByIndex.Add(index, ret);
-                }
-            }
-            return ret;
-        }
-
-        private static readonly Dictionary<XLThemeColor, XLColor> ByTheme = new Dictionary<XLThemeColor, XLColor>();
-        private static readonly Object ByThemeLock = new Object();
-
-        public static XLColor FromTheme(XLThemeColor themeColor)
-        {
-            XLColor ret;
-            lock (ByThemeLock)
-            {
-                if (!ByTheme.TryGetValue(themeColor, out ret))
-                {
-                    ret = new XLColor(themeColor);
-                    ByTheme.Add(themeColor, ret);
-                }
-            }
-            return ret;
-        }
-
-        private static readonly Dictionary<XLThemeColor, Dictionary<Double, XLColor>> ByThemeTint = new Dictionary<XLThemeColor, Dictionary<double, XLColor>>();
-        private static readonly Object ByThemeTintLock = new Object();
-
-        public static XLColor FromTheme(XLThemeColor themeColor, Double themeTint)
-        {
-            XLColor ret;
-            lock (ByThemeTintLock)
-            {
-                Dictionary<Double, XLColor> themeTints;
-                if (ByThemeTint.TryGetValue(themeColor, out themeTints))
-                {
-                    if (!themeTints.TryGetValue(themeTint, out ret))
-                    {
-                        ret = new XLColor(themeColor, themeTint);
-                        themeTints.Add(themeTint, ret);
-                    }
-                }
-                else
-                {
-                    themeTints = new Dictionary<double, XLColor>();
-                    ret = new XLColor(themeColor, themeTint);
-                    themeTints.Add(themeTint, ret);
-
-                    ByThemeTint.Add(themeColor, themeTints);
-                }
-            }
-            return ret;
-        }
-
-        private static Dictionary<Int32, XLColor> _indexedColors;
-        public static Dictionary<Int32, XLColor> IndexedColors
-        {
-            get
-            {
-                if (_indexedColors == null)
-                {
-                    var retVal = new Dictionary<Int32, XLColor>
-                        {
-                            {0, FromHtml("#FF000000")},
-                            {1, FromHtml("#FFFFFFFF")},
-                            {2, FromHtml("#FFFF0000")},
-                            {3, FromHtml("#FF00FF00")},
-                            {4, FromHtml("#FF0000FF")},
-                            {5, FromHtml("#FFFFFF00")},
-                            {6, FromHtml("#FFFF00FF")},
-                            {7, FromHtml("#FF00FFFF")},
-                            {8, FromHtml("#FF000000")},
-                            {9, FromHtml("#FFFFFFFF")},
-                            {10, FromHtml("#FFFF0000")},
-                            {11, FromHtml("#FF00FF00")},
-                            {12, FromHtml("#FF0000FF")},
-                            {13, FromHtml("#FFFFFF00")},
-                            {14, FromHtml("#FFFF00FF")},
-                            {15, FromHtml("#FF00FFFF")},
-                            {16, FromHtml("#FF800000")},
-                            {17, FromHtml("#FF008000")},
-                            {18, FromHtml("#FF000080")},
-                            {19, FromHtml("#FF808000")},
-                            {20, FromHtml("#FF800080")},
-                            {21, FromHtml("#FF008080")},
-                            {22, FromHtml("#FFC0C0C0")},
-                            {23, FromHtml("#FF808080")},
-                            {24, FromHtml("#FF9999FF")},
-                            {25, FromHtml("#FF993366")},
-                            {26, FromHtml("#FFFFFFCC")},
-                            {27, FromHtml("#FFCCFFFF")},
-                            {28, FromHtml("#FF660066")},
-                            {29, FromHtml("#FFFF8080")},
-                            {30, FromHtml("#FF0066CC")},
-                            {31, FromHtml("#FFCCCCFF")},
-                            {32, FromHtml("#FF000080")},
-                            {33, FromHtml("#FFFF00FF")},
-                            {34, FromHtml("#FFFFFF00")},
-                            {35, FromHtml("#FF00FFFF")},
-                            {36, FromHtml("#FF800080")},
-                            {37, FromHtml("#FF800000")},
-                            {38, FromHtml("#FF008080")},
-                            {39, FromHtml("#FF0000FF")},
-                            {40, FromHtml("#FF00CCFF")},
-                            {41, FromHtml("#FFCCFFFF")},
-                            {42, FromHtml("#FFCCFFCC")},
-                            {43, FromHtml("#FFFFFF99")},
-                            {44, FromHtml("#FF99CCFF")},
-                            {45, FromHtml("#FFFF99CC")},
-                            {46, FromHtml("#FFCC99FF")},
-                            {47, FromHtml("#FFFFCC99")},
-                            {48, FromHtml("#FF3366FF")},
-                            {49, FromHtml("#FF33CCCC")},
-                            {50, FromHtml("#FF99CC00")},
-                            {51, FromHtml("#FFFFCC00")},
-                            {52, FromHtml("#FFFF9900")},
-                            {53, FromHtml("#FFFF6600")},
-                            {54, FromHtml("#FF666699")},
-                            {55, FromHtml("#FF969696")},
-                            {56, FromHtml("#FF003366")},
-                            {57, FromHtml("#FF339966")},
-                            {58, FromHtml("#FF003300")},
-                            {59, FromHtml("#FF333300")},
-                            {60, FromHtml("#FF993300")},
-                            {61, FromHtml("#FF993366")},
-                            {62, FromHtml("#FF333399")},
-                            {63, FromHtml("#FF333333")},
-                            {64, FromColor(Color.Transparent)}
-                        };
-                    _indexedColors = retVal;
-                }
-                return _indexedColors;
-            }
-        }
-
-        private static XLColor noColor = new XLColor();
-        public static XLColor NoColor { get { return noColor; } }
-
-        public static XLColor AliceBlue { get { return FromColor(Color.AliceBlue); } }
-        public static XLColor AntiqueWhite { get { return FromColor(Color.AntiqueWhite); } }
-        public static XLColor Aqua { get { return FromColor(Color.Aqua); } }
-        public static XLColor Aquamarine { get { return FromColor(Color.Aquamarine); } }
-        public static XLColor Azure { get { return FromColor(Color.Azure); } }
-        public static XLColor Beige { get { return FromColor(Color.Beige); } }
-        public static XLColor Bisque { get { return FromColor(Color.Bisque); } }
-        public static XLColor Black { get { return FromColor(Color.Black); } }
-        public static XLColor BlanchedAlmond { get { return FromColor(Color.BlanchedAlmond); } }
-        public static XLColor Blue { get { return FromColor(Color.Blue); } }
-        public static XLColor BlueViolet { get { return FromColor(Color.BlueViolet); } }
-        public static XLColor Brown { get { return FromColor(Color.Brown); } }
-        public static XLColor BurlyWood { get { return FromColor(Color.BurlyWood); } }
-        public static XLColor CadetBlue { get { return FromColor(Color.CadetBlue); } }
-        public static XLColor Chartreuse { get { return FromColor(Color.Chartreuse); } }
-        public static XLColor Chocolate { get { return FromColor(Color.Chocolate); } }
-        public static XLColor Coral { get { return FromColor(Color.Coral); } }
-        public static XLColor CornflowerBlue { get { return FromColor(Color.CornflowerBlue); } }
-        public static XLColor Cornsilk { get { return FromColor(Color.Cornsilk); } }
-        public static XLColor Crimson { get { return FromColor(Color.Crimson); } }
-        public static XLColor Cyan { get { return FromColor(Color.Cyan); } }
-        public static XLColor DarkBlue { get { return FromColor(Color.DarkBlue); } }
-        public static XLColor DarkCyan { get { return FromColor(Color.DarkCyan); } }
-        public static XLColor DarkGoldenrod { get { return FromColor(Color.DarkGoldenrod); } }
-        public static XLColor DarkGray { get { return FromColor(Color.DarkGray); } }
-        public static XLColor DarkGreen { get { return FromColor(Color.DarkGreen); } }
-        public static XLColor DarkKhaki { get { return FromColor(Color.DarkKhaki); } }
-        public static XLColor DarkMagenta { get { return FromColor(Color.DarkMagenta); } }
-        public static XLColor DarkOliveGreen { get { return FromColor(Color.DarkOliveGreen); } }
-        public static XLColor DarkOrange { get { return FromColor(Color.DarkOrange); } }
-        public static XLColor DarkOrchid { get { return FromColor(Color.DarkOrchid); } }
-        public static XLColor DarkRed { get { return FromColor(Color.DarkRed); } }
-        public static XLColor DarkSalmon { get { return FromColor(Color.DarkSalmon); } }
-        public static XLColor DarkSeaGreen { get { return FromColor(Color.DarkSeaGreen); } }
-        public static XLColor DarkSlateBlue { get { return FromColor(Color.DarkSlateBlue); } }
-        public static XLColor DarkSlateGray { get { return FromColor(Color.DarkSlateGray); } }
-        public static XLColor DarkTurquoise { get { return FromColor(Color.DarkTurquoise); } }
-        public static XLColor DarkViolet { get { return FromColor(Color.DarkViolet); } }
-        public static XLColor DeepPink { get { return FromColor(Color.DeepPink); } }
-        public static XLColor DeepSkyBlue { get { return FromColor(Color.DeepSkyBlue); } }
-        public static XLColor DimGray { get { return FromColor(Color.DimGray); } }
-        public static XLColor DodgerBlue { get { return FromColor(Color.DodgerBlue); } }
-        public static XLColor Firebrick { get { return FromColor(Color.Firebrick); } }
-        public static XLColor FloralWhite { get { return FromColor(Color.FloralWhite); } }
-        public static XLColor ForestGreen { get { return FromColor(Color.ForestGreen); } }
-        public static XLColor Fuchsia { get { return FromColor(Color.Fuchsia); } }
-        public static XLColor Gainsboro { get { return FromColor(Color.Gainsboro); } }
-        public static XLColor GhostWhite { get { return FromColor(Color.GhostWhite); } }
-        public static XLColor Gold { get { return FromColor(Color.Gold); } }
-        public static XLColor Goldenrod { get { return FromColor(Color.Goldenrod); } }
-        public static XLColor Gray { get { return FromColor(Color.Gray); } }
-        public static XLColor Green { get { return FromColor(Color.Green); } }
-        public static XLColor GreenYellow { get { return FromColor(Color.GreenYellow); } }
-        public static XLColor Honeydew { get { return FromColor(Color.Honeydew); } }
-        public static XLColor HotPink { get { return FromColor(Color.HotPink); } }
-        public static XLColor IndianRed { get { return FromColor(Color.IndianRed); } }
-        public static XLColor Indigo { get { return FromColor(Color.Indigo); } }
-        public static XLColor Ivory { get { return FromColor(Color.Ivory); } }
-        public static XLColor Khaki { get { return FromColor(Color.Khaki); } }
-        public static XLColor Lavender { get { return FromColor(Color.Lavender); } }
-        public static XLColor LavenderBlush { get { return FromColor(Color.LavenderBlush); } }
-        public static XLColor LawnGreen { get { return FromColor(Color.LawnGreen); } }
-        public static XLColor LemonChiffon { get { return FromColor(Color.LemonChiffon); } }
-        public static XLColor LightBlue { get { return FromColor(Color.LightBlue); } }
-        public static XLColor LightCoral { get { return FromColor(Color.LightCoral); } }
-        public static XLColor LightCyan { get { return FromColor(Color.LightCyan); } }
-        public static XLColor LightGoldenrodYellow { get { return FromColor(Color.LightGoldenrodYellow); } }
-        public static XLColor LightGray { get { return FromColor(Color.LightGray); } }
-        public static XLColor LightGreen { get { return FromColor(Color.LightGreen); } }
-        public static XLColor LightPink { get { return FromColor(Color.LightPink); } }
-        public static XLColor LightSalmon { get { return FromColor(Color.LightSalmon); } }
-        public static XLColor LightSeaGreen { get { return FromColor(Color.LightSeaGreen); } }
-        public static XLColor LightSkyBlue { get { return FromColor(Color.LightSkyBlue); } }
-        public static XLColor LightSlateGray { get { return FromColor(Color.LightSlateGray); } }
-        public static XLColor LightSteelBlue { get { return FromColor(Color.LightSteelBlue); } }
-        public static XLColor LightYellow { get { return FromColor(Color.LightYellow); } }
-        public static XLColor Lime { get { return FromColor(Color.Lime); } }
-        public static XLColor LimeGreen { get { return FromColor(Color.LimeGreen); } }
-        public static XLColor Linen { get { return FromColor(Color.Linen); } }
-        public static XLColor Magenta { get { return FromColor(Color.Magenta); } }
-        public static XLColor Maroon { get { return FromColor(Color.Maroon); } }
-        public static XLColor MediumAquamarine { get { return FromColor(Color.MediumAquamarine); } }
-        public static XLColor MediumBlue { get { return FromColor(Color.MediumBlue); } }
-        public static XLColor MediumOrchid { get { return FromColor(Color.MediumOrchid); } }
-        public static XLColor MediumPurple { get { return FromColor(Color.MediumPurple); } }
-        public static XLColor MediumSeaGreen { get { return FromColor(Color.MediumSeaGreen); } }
-        public static XLColor MediumSlateBlue { get { return FromColor(Color.MediumSlateBlue); } }
-        public static XLColor MediumSpringGreen { get { return FromColor(Color.MediumSpringGreen); } }
-        public static XLColor MediumTurquoise { get { return FromColor(Color.MediumTurquoise); } }
-        public static XLColor MediumVioletRed { get { return FromColor(Color.MediumVioletRed); } }
-        public static XLColor MidnightBlue { get { return FromColor(Color.MidnightBlue); } }
-        public static XLColor MintCream { get { return FromColor(Color.MintCream); } }
-        public static XLColor MistyRose { get { return FromColor(Color.MistyRose); } }
-        public static XLColor Moccasin { get { return FromColor(Color.Moccasin); } }
-        public static XLColor NavajoWhite { get { return FromColor(Color.NavajoWhite); } }
-        public static XLColor Navy { get { return FromColor(Color.Navy); } }
-        public static XLColor OldLace { get { return FromColor(Color.OldLace); } }
-        public static XLColor Olive { get { return FromColor(Color.Olive); } }
-        public static XLColor OliveDrab { get { return FromColor(Color.OliveDrab); } }
-        public static XLColor Orange { get { return FromColor(Color.Orange); } }
-        public static XLColor OrangeRed { get { return FromColor(Color.OrangeRed); } }
-        public static XLColor Orchid { get { return FromColor(Color.Orchid); } }
-        public static XLColor PaleGoldenrod { get { return FromColor(Color.PaleGoldenrod); } }
-        public static XLColor PaleGreen { get { return FromColor(Color.PaleGreen); } }
-        public static XLColor PaleTurquoise { get { return FromColor(Color.PaleTurquoise); } }
-        public static XLColor PaleVioletRed { get { return FromColor(Color.PaleVioletRed); } }
-        public static XLColor PapayaWhip { get { return FromColor(Color.PapayaWhip); } }
-        public static XLColor PeachPuff { get { return FromColor(Color.PeachPuff); } }
-        public static XLColor Peru { get { return FromColor(Color.Peru); } }
-        public static XLColor Pink { get { return FromColor(Color.Pink); } }
-        public static XLColor Plum { get { return FromColor(Color.Plum); } }
-        public static XLColor PowderBlue { get { return FromColor(Color.PowderBlue); } }
-        public static XLColor Purple { get { return FromColor(Color.Purple); } }
-        public static XLColor Red { get { return FromColor(Color.Red); } }
-        public static XLColor RosyBrown { get { return FromColor(Color.RosyBrown); } }
-        public static XLColor RoyalBlue { get { return FromColor(Color.RoyalBlue); } }
-        public static XLColor SaddleBrown { get { return FromColor(Color.SaddleBrown); } }
-        public static XLColor Salmon { get { return FromColor(Color.Salmon); } }
-        public static XLColor SandyBrown { get { return FromColor(Color.SandyBrown); } }
-        public static XLColor SeaGreen { get { return FromColor(Color.SeaGreen); } }
-        public static XLColor SeaShell { get { return FromColor(Color.SeaShell); } }
-        public static XLColor Sienna { get { return FromColor(Color.Sienna); } }
-        public static XLColor Silver { get { return FromColor(Color.Silver); } }
-        public static XLColor SkyBlue { get { return FromColor(Color.SkyBlue); } }
-        public static XLColor SlateBlue { get { return FromColor(Color.SlateBlue); } }
-        public static XLColor SlateGray { get { return FromColor(Color.SlateGray); } }
-        public static XLColor Snow { get { return FromColor(Color.Snow); } }
-        public static XLColor SpringGreen { get { return FromColor(Color.SpringGreen); } }
-        public static XLColor SteelBlue { get { return FromColor(Color.SteelBlue); } }
-        public static XLColor Tan { get { return FromColor(Color.Tan); } }
-        public static XLColor Teal { get { return FromColor(Color.Teal); } }
-        public static XLColor Thistle { get { return FromColor(Color.Thistle); } }
-        public static XLColor Tomato { get { return FromColor(Color.Tomato); } }
-        public static XLColor Turquoise { get { return FromColor(Color.Turquoise); } }
-        public static XLColor Violet { get { return FromColor(Color.Violet); } }
-        public static XLColor Wheat { get { return FromColor(Color.Wheat); } }
-        public static XLColor White { get { return FromColor(Color.White); } }
-        public static XLColor WhiteSmoke { get { return FromColor(Color.WhiteSmoke); } }
-        public static XLColor Yellow { get { return FromColor(Color.Yellow); } }
-        public static XLColor YellowGreen { get { return FromColor(Color.YellowGreen); } }
-        public static XLColor AirForceBlue { get { return FromHtml("#FF5D8AA8"); } }
-        public static XLColor Alizarin { get { return FromHtml("#FFE32636"); } }
-        public static XLColor Almond { get { return FromHtml("#FFEFDECD"); } }
-        public static XLColor Amaranth { get { return FromHtml("#FFE52B50"); } }
-        public static XLColor Amber { get { return FromHtml("#FFFFBF00"); } }
-        public static XLColor AmberSaeEce { get { return FromHtml("#FFFF7E00"); } }
-        public static XLColor AmericanRose { get { return FromHtml("#FFFF033E"); } }
-        public static XLColor Amethyst { get { return FromHtml("#FF9966CC"); } }
-        public static XLColor AntiFlashWhite { get { return FromHtml("#FFF2F3F4"); } }
-        public static XLColor AntiqueBrass { get { return FromHtml("#FFCD9575"); } }
-        public static XLColor AntiqueFuchsia { get { return FromHtml("#FF915C83"); } }
-        public static XLColor AppleGreen { get { return FromHtml("#FF8DB600"); } }
-        public static XLColor Apricot { get { return FromHtml("#FFFBCEB1"); } }
-        public static XLColor Aquamarine1 { get { return FromHtml("#FF7FFFD0"); } }
-        public static XLColor ArmyGreen { get { return FromHtml("#FF4B5320"); } }
-        public static XLColor Arsenic { get { return FromHtml("#FF3B444B"); } }
-        public static XLColor ArylideYellow { get { return FromHtml("#FFE9D66B"); } }
-        public static XLColor AshGrey { get { return FromHtml("#FFB2BEB5"); } }
-        public static XLColor Asparagus { get { return FromHtml("#FF87A96B"); } }
-        public static XLColor AtomicTangerine { get { return FromHtml("#FFFF9966"); } }
-        public static XLColor Auburn { get { return FromHtml("#FF6D351A"); } }
-        public static XLColor Aureolin { get { return FromHtml("#FFFDEE00"); } }
-        public static XLColor Aurometalsaurus { get { return FromHtml("#FF6E7F80"); } }
-        public static XLColor Awesome { get { return FromHtml("#FFFF2052"); } }
-        public static XLColor AzureColorWheel { get { return FromHtml("#FF007FFF"); } }
-        public static XLColor BabyBlue { get { return FromHtml("#FF89CFF0"); } }
-        public static XLColor BabyBlueEyes { get { return FromHtml("#FFA1CAF1"); } }
-        public static XLColor BabyPink { get { return FromHtml("#FFF4C2C2"); } }
-        public static XLColor BallBlue { get { return FromHtml("#FF21ABCD"); } }
-        public static XLColor BananaMania { get { return FromHtml("#FFFAE7B5"); } }
-        public static XLColor BattleshipGrey { get { return FromHtml("#FF848482"); } }
-        public static XLColor Bazaar { get { return FromHtml("#FF98777B"); } }
-        public static XLColor BeauBlue { get { return FromHtml("#FFBCD4E6"); } }
-        public static XLColor Beaver { get { return FromHtml("#FF9F8170"); } }
-        public static XLColor Bistre { get { return FromHtml("#FF3D2B1F"); } }
-        public static XLColor Bittersweet { get { return FromHtml("#FFFE6F5E"); } }
-        public static XLColor BleuDeFrance { get { return FromHtml("#FF318CE7"); } }
-        public static XLColor BlizzardBlue { get { return FromHtml("#FFACE5EE"); } }
-        public static XLColor Blond { get { return FromHtml("#FFFAF0BE"); } }
-        public static XLColor BlueBell { get { return FromHtml("#FFA2A2D0"); } }
-        public static XLColor BlueGray { get { return FromHtml("#FF6699CC"); } }
-        public static XLColor BlueGreen { get { return FromHtml("#FF00DDDD"); } }
-        public static XLColor BluePigment { get { return FromHtml("#FF333399"); } }
-        public static XLColor BlueRyb { get { return FromHtml("#FF0247FE"); } }
-        public static XLColor Blush { get { return FromHtml("#FFDE5D83"); } }
-        public static XLColor Bole { get { return FromHtml("#FF79443B"); } }
-        public static XLColor BondiBlue { get { return FromHtml("#FF0095B6"); } }
-        public static XLColor BostonUniversityRed { get { return FromHtml("#FFCC0000"); } }
-        public static XLColor BrandeisBlue { get { return FromHtml("#FF0070FF"); } }
-        public static XLColor Brass { get { return FromHtml("#FFB5A642"); } }
-        public static XLColor BrickRed { get { return FromHtml("#FFCB4154"); } }
-        public static XLColor BrightCerulean { get { return FromHtml("#FF1DACD6"); } }
-        public static XLColor BrightGreen { get { return FromHtml("#FF66FF00"); } }
-        public static XLColor BrightLavender { get { return FromHtml("#FFBF94E4"); } }
-        public static XLColor BrightMaroon { get { return FromHtml("#FFC32148"); } }
-        public static XLColor BrightPink { get { return FromHtml("#FFFF007F"); } }
-        public static XLColor BrightTurquoise { get { return FromHtml("#FF08E8DE"); } }
-        public static XLColor BrightUbe { get { return FromHtml("#FFD19FE8"); } }
-        public static XLColor BrilliantLavender { get { return FromHtml("#FFF4BBFF"); } }
-        public static XLColor BrilliantRose { get { return FromHtml("#FFFF55A3"); } }
-        public static XLColor BrinkPink { get { return FromHtml("#FFFB607F"); } }
-        public static XLColor BritishRacingGreen { get { return FromHtml("#FF004225"); } }
-        public static XLColor Bronze { get { return FromHtml("#FFCD7F32"); } }
-        public static XLColor BrownTraditional { get { return FromHtml("#FF964B00"); } }
-        public static XLColor BubbleGum { get { return FromHtml("#FFFFC1CC"); } }
-        public static XLColor Bubbles { get { return FromHtml("#FFE7FEFF"); } }
-        public static XLColor Buff { get { return FromHtml("#FFF0DC82"); } }
-        public static XLColor BulgarianRose { get { return FromHtml("#FF480607"); } }
-        public static XLColor Burgundy { get { return FromHtml("#FF800020"); } }
-        public static XLColor BurntOrange { get { return FromHtml("#FFCC5500"); } }
-        public static XLColor BurntSienna { get { return FromHtml("#FFE97451"); } }
-        public static XLColor BurntUmber { get { return FromHtml("#FF8A3324"); } }
-        public static XLColor Byzantine { get { return FromHtml("#FFBD33A4"); } }
-        public static XLColor Byzantium { get { return FromHtml("#FF702963"); } }
-        public static XLColor Cadet { get { return FromHtml("#FF536872"); } }
-        public static XLColor CadetGrey { get { return FromHtml("#FF91A3B0"); } }
-        public static XLColor CadmiumGreen { get { return FromHtml("#FF006B3C"); } }
-        public static XLColor CadmiumOrange { get { return FromHtml("#FFED872D"); } }
-        public static XLColor CadmiumRed { get { return FromHtml("#FFE30022"); } }
-        public static XLColor CadmiumYellow { get { return FromHtml("#FFFFF600"); } }
-        public static XLColor CalPolyPomonaGreen { get { return FromHtml("#FF1E4D2B"); } }
-        public static XLColor CambridgeBlue { get { return FromHtml("#FFA3C1AD"); } }
-        public static XLColor Camel { get { return FromHtml("#FFC19A6B"); } }
-        public static XLColor CamouflageGreen { get { return FromHtml("#FF78866B"); } }
-        public static XLColor CanaryYellow { get { return FromHtml("#FFFFEF00"); } }
-        public static XLColor CandyAppleRed { get { return FromHtml("#FFFF0800"); } }
-        public static XLColor CandyPink { get { return FromHtml("#FFE4717A"); } }
-        public static XLColor CaputMortuum { get { return FromHtml("#FF592720"); } }
-        public static XLColor Cardinal { get { return FromHtml("#FFC41E3A"); } }
-        public static XLColor CaribbeanGreen { get { return FromHtml("#FF00CC99"); } }
-        public static XLColor Carmine { get { return FromHtml("#FF960018"); } }
-        public static XLColor CarminePink { get { return FromHtml("#FFEB4C42"); } }
-        public static XLColor CarmineRed { get { return FromHtml("#FFFF0038"); } }
-        public static XLColor CarnationPink { get { return FromHtml("#FFFFA6C9"); } }
-        public static XLColor Carnelian { get { return FromHtml("#FFB31B1B"); } }
-        public static XLColor CarolinaBlue { get { return FromHtml("#FF99BADD"); } }
-        public static XLColor CarrotOrange { get { return FromHtml("#FFED9121"); } }
-        public static XLColor Ceil { get { return FromHtml("#FF92A1CF"); } }
-        public static XLColor Celadon { get { return FromHtml("#FFACE1AF"); } }
-        public static XLColor CelestialBlue { get { return FromHtml("#FF4997D0"); } }
-        public static XLColor Cerise { get { return FromHtml("#FFDE3163"); } }
-        public static XLColor CerisePink { get { return FromHtml("#FFEC3B83"); } }
-        public static XLColor Cerulean { get { return FromHtml("#FF007BA7"); } }
-        public static XLColor CeruleanBlue { get { return FromHtml("#FF2A52BE"); } }
-        public static XLColor Chamoisee { get { return FromHtml("#FFA0785A"); } }
-        public static XLColor Champagne { get { return FromHtml("#FFF7E7CE"); } }
-        public static XLColor Charcoal { get { return FromHtml("#FF36454F"); } }
-        public static XLColor ChartreuseTraditional { get { return FromHtml("#FFDFFF00"); } }
-        public static XLColor CherryBlossomPink { get { return FromHtml("#FFFFB7C5"); } }
-        public static XLColor Chocolate1 { get { return FromHtml("#FF7B3F00"); } }
-        public static XLColor ChromeYellow { get { return FromHtml("#FFFFA700"); } }
-        public static XLColor Cinereous { get { return FromHtml("#FF98817B"); } }
-        public static XLColor Cinnabar { get { return FromHtml("#FFE34234"); } }
-        public static XLColor Citrine { get { return FromHtml("#FFE4D00A"); } }
-        public static XLColor ClassicRose { get { return FromHtml("#FFFBCCE7"); } }
-        public static XLColor Cobalt { get { return FromHtml("#FF0047AB"); } }
-        public static XLColor ColumbiaBlue { get { return FromHtml("#FF9BDDFF"); } }
-        public static XLColor CoolBlack { get { return FromHtml("#FF002E63"); } }
-        public static XLColor CoolGrey { get { return FromHtml("#FF8C92AC"); } }
-        public static XLColor Copper { get { return FromHtml("#FFB87333"); } }
-        public static XLColor CopperRose { get { return FromHtml("#FF996666"); } }
-        public static XLColor Coquelicot { get { return FromHtml("#FFFF3800"); } }
-        public static XLColor CoralPink { get { return FromHtml("#FFF88379"); } }
-        public static XLColor CoralRed { get { return FromHtml("#FFFF4040"); } }
-        public static XLColor Cordovan { get { return FromHtml("#FF893F45"); } }
-        public static XLColor Corn { get { return FromHtml("#FFFBEC5D"); } }
-        public static XLColor CornellRed { get { return FromHtml("#FFB31B1B"); } }
-        public static XLColor CosmicLatte { get { return FromHtml("#FFFFF8E7"); } }
-        public static XLColor CottonCandy { get { return FromHtml("#FFFFBCD9"); } }
-        public static XLColor Cream { get { return FromHtml("#FFFFFDD0"); } }
-        public static XLColor CrimsonGlory { get { return FromHtml("#FFBE0032"); } }
-        public static XLColor CyanProcess { get { return FromHtml("#FF00B7EB"); } }
-        public static XLColor Daffodil { get { return FromHtml("#FFFFFF31"); } }
-        public static XLColor Dandelion { get { return FromHtml("#FFF0E130"); } }
-        public static XLColor DarkBrown { get { return FromHtml("#FF654321"); } }
-        public static XLColor DarkByzantium { get { return FromHtml("#FF5D3954"); } }
-        public static XLColor DarkCandyAppleRed { get { return FromHtml("#FFA40000"); } }
-        public static XLColor DarkCerulean { get { return FromHtml("#FF08457E"); } }
-        public static XLColor DarkChampagne { get { return FromHtml("#FFC2B280"); } }
-        public static XLColor DarkChestnut { get { return FromHtml("#FF986960"); } }
-        public static XLColor DarkCoral { get { return FromHtml("#FFCD5B45"); } }
-        public static XLColor DarkElectricBlue { get { return FromHtml("#FF536878"); } }
-        public static XLColor DarkGreen1 { get { return FromHtml("#FF013220"); } }
-        public static XLColor DarkJungleGreen { get { return FromHtml("#FF1A2421"); } }
-        public static XLColor DarkLava { get { return FromHtml("#FF483C32"); } }
-        public static XLColor DarkLavender { get { return FromHtml("#FF734F96"); } }
-        public static XLColor DarkMidnightBlue { get { return FromHtml("#FF003366"); } }
-        public static XLColor DarkPastelBlue { get { return FromHtml("#FF779ECB"); } }
-        public static XLColor DarkPastelGreen { get { return FromHtml("#FF03C03C"); } }
-        public static XLColor DarkPastelPurple { get { return FromHtml("#FF966FD6"); } }
-        public static XLColor DarkPastelRed { get { return FromHtml("#FFC23B22"); } }
-        public static XLColor DarkPink { get { return FromHtml("#FFE75480"); } }
-        public static XLColor DarkPowderBlue { get { return FromHtml("#FF003399"); } }
-        public static XLColor DarkRaspberry { get { return FromHtml("#FF872657"); } }
-        public static XLColor DarkScarlet { get { return FromHtml("#FF560319"); } }
-        public static XLColor DarkSienna { get { return FromHtml("#FF3C1414"); } }
-        public static XLColor DarkSpringGreen { get { return FromHtml("#FF177245"); } }
-        public static XLColor DarkTan { get { return FromHtml("#FF918151"); } }
-        public static XLColor DarkTangerine { get { return FromHtml("#FFFFA812"); } }
-        public static XLColor DarkTaupe { get { return FromHtml("#FF483C32"); } }
-        public static XLColor DarkTerraCotta { get { return FromHtml("#FFCC4E5C"); } }
-        public static XLColor DartmouthGreen { get { return FromHtml("#FF00693E"); } }
-        public static XLColor DavysGrey { get { return FromHtml("#FF555555"); } }
-        public static XLColor DebianRed { get { return FromHtml("#FFD70A53"); } }
-        public static XLColor DeepCarmine { get { return FromHtml("#FFA9203E"); } }
-        public static XLColor DeepCarminePink { get { return FromHtml("#FFEF3038"); } }
-        public static XLColor DeepCarrotOrange { get { return FromHtml("#FFE9692C"); } }
-        public static XLColor DeepCerise { get { return FromHtml("#FFDA3287"); } }
-        public static XLColor DeepChampagne { get { return FromHtml("#FFFAD6A5"); } }
-        public static XLColor DeepChestnut { get { return FromHtml("#FFB94E48"); } }
-        public static XLColor DeepFuchsia { get { return FromHtml("#FFC154C1"); } }
-        public static XLColor DeepJungleGreen { get { return FromHtml("#FF004B49"); } }
-        public static XLColor DeepLilac { get { return FromHtml("#FF9955BB"); } }
-        public static XLColor DeepMagenta { get { return FromHtml("#FFCC00CC"); } }
-        public static XLColor DeepPeach { get { return FromHtml("#FFFFCBA4"); } }
-        public static XLColor DeepSaffron { get { return FromHtml("#FFFF9933"); } }
-        public static XLColor Denim { get { return FromHtml("#FF1560BD"); } }
-        public static XLColor Desert { get { return FromHtml("#FFC19A6B"); } }
-        public static XLColor DesertSand { get { return FromHtml("#FFEDC9AF"); } }
-        public static XLColor DogwoodRose { get { return FromHtml("#FFD71868"); } }
-        public static XLColor DollarBill { get { return FromHtml("#FF85BB65"); } }
-        public static XLColor Drab { get { return FromHtml("#FF967117"); } }
-        public static XLColor DukeBlue { get { return FromHtml("#FF00009C"); } }
-        public static XLColor EarthYellow { get { return FromHtml("#FFE1A95F"); } }
-        public static XLColor Ecru { get { return FromHtml("#FFC2B280"); } }
-        public static XLColor Eggplant { get { return FromHtml("#FF614051"); } }
-        public static XLColor Eggshell { get { return FromHtml("#FFF0EAD6"); } }
-        public static XLColor EgyptianBlue { get { return FromHtml("#FF1034A6"); } }
-        public static XLColor ElectricBlue { get { return FromHtml("#FF7DF9FF"); } }
-        public static XLColor ElectricCrimson { get { return FromHtml("#FFFF003F"); } }
-        public static XLColor ElectricIndigo { get { return FromHtml("#FF6F00FF"); } }
-        public static XLColor ElectricLavender { get { return FromHtml("#FFF4BBFF"); } }
-        public static XLColor ElectricLime { get { return FromHtml("#FFCCFF00"); } }
-        public static XLColor ElectricPurple { get { return FromHtml("#FFBF00FF"); } }
-        public static XLColor ElectricUltramarine { get { return FromHtml("#FF3F00FF"); } }
-        public static XLColor ElectricViolet { get { return FromHtml("#FF8F00FF"); } }
-        public static XLColor Emerald { get { return FromHtml("#FF50C878"); } }
-        public static XLColor EtonBlue { get { return FromHtml("#FF96C8A2"); } }
-        public static XLColor Fallow { get { return FromHtml("#FFC19A6B"); } }
-        public static XLColor FaluRed { get { return FromHtml("#FF801818"); } }
-        public static XLColor Fandango { get { return FromHtml("#FFB53389"); } }
-        public static XLColor FashionFuchsia { get { return FromHtml("#FFF400A1"); } }
-        public static XLColor Fawn { get { return FromHtml("#FFE5AA70"); } }
-        public static XLColor Feldgrau { get { return FromHtml("#FF4D5D53"); } }
-        public static XLColor FernGreen { get { return FromHtml("#FF4F7942"); } }
-        public static XLColor FerrariRed { get { return FromHtml("#FFFF2800"); } }
-        public static XLColor FieldDrab { get { return FromHtml("#FF6C541E"); } }
-        public static XLColor FireEngineRed { get { return FromHtml("#FFCE2029"); } }
-        public static XLColor Flame { get { return FromHtml("#FFE25822"); } }
-        public static XLColor FlamingoPink { get { return FromHtml("#FFFC8EAC"); } }
-        public static XLColor Flavescent { get { return FromHtml("#FFF7E98E"); } }
-        public static XLColor Flax { get { return FromHtml("#FFEEDC82"); } }
-        public static XLColor FluorescentOrange { get { return FromHtml("#FFFFBF00"); } }
-        public static XLColor FluorescentYellow { get { return FromHtml("#FFCCFF00"); } }
-        public static XLColor Folly { get { return FromHtml("#FFFF004F"); } }
-        public static XLColor ForestGreenTraditional { get { return FromHtml("#FF014421"); } }
-        public static XLColor FrenchBeige { get { return FromHtml("#FFA67B5B"); } }
-        public static XLColor FrenchBlue { get { return FromHtml("#FF0072BB"); } }
-        public static XLColor FrenchLilac { get { return FromHtml("#FF86608E"); } }
-        public static XLColor FrenchRose { get { return FromHtml("#FFF64A8A"); } }
-        public static XLColor FuchsiaPink { get { return FromHtml("#FFFF77FF"); } }
-        public static XLColor Fulvous { get { return FromHtml("#FFE48400"); } }
-        public static XLColor FuzzyWuzzy { get { return FromHtml("#FFCC6666"); } }
-        public static XLColor Gamboge { get { return FromHtml("#FFE49B0F"); } }
-        public static XLColor Ginger { get { return FromHtml("#FFF9F9FF"); } }
-        public static XLColor Glaucous { get { return FromHtml("#FF6082B6"); } }
-        public static XLColor GoldenBrown { get { return FromHtml("#FF996515"); } }
-        public static XLColor GoldenPoppy { get { return FromHtml("#FFFCC200"); } }
-        public static XLColor GoldenYellow { get { return FromHtml("#FFFFDF00"); } }
-        public static XLColor GoldMetallic { get { return FromHtml("#FFD4AF37"); } }
-        public static XLColor GrannySmithApple { get { return FromHtml("#FFA8E4A0"); } }
-        public static XLColor GrayAsparagus { get { return FromHtml("#FF465945"); } }
-        public static XLColor GreenPigment { get { return FromHtml("#FF00A550"); } }
-        public static XLColor GreenRyb { get { return FromHtml("#FF66B032"); } }
-        public static XLColor Grullo { get { return FromHtml("#FFA99A86"); } }
-        public static XLColor HalayaUbe { get { return FromHtml("#FF663854"); } }
-        public static XLColor HanBlue { get { return FromHtml("#FF446CCF"); } }
-        public static XLColor HanPurple { get { return FromHtml("#FF5218FA"); } }
-        public static XLColor HansaYellow { get { return FromHtml("#FFE9D66B"); } }
-        public static XLColor Harlequin { get { return FromHtml("#FF3FFF00"); } }
-        public static XLColor HarvardCrimson { get { return FromHtml("#FFC90016"); } }
-        public static XLColor HarvestGold { get { return FromHtml("#FFDA9100"); } }
-        public static XLColor Heliotrope { get { return FromHtml("#FFDF73FF"); } }
-        public static XLColor HollywoodCerise { get { return FromHtml("#FFF400A1"); } }
-        public static XLColor HookersGreen { get { return FromHtml("#FF007000"); } }
-        public static XLColor HotMagenta { get { return FromHtml("#FFFF1DCE"); } }
-        public static XLColor HunterGreen { get { return FromHtml("#FF355E3B"); } }
-        public static XLColor Iceberg { get { return FromHtml("#FF71A6D2"); } }
-        public static XLColor Icterine { get { return FromHtml("#FFFCF75E"); } }
-        public static XLColor Inchworm { get { return FromHtml("#FFB2EC5D"); } }
-        public static XLColor IndiaGreen { get { return FromHtml("#FF138808"); } }
-        public static XLColor IndianYellow { get { return FromHtml("#FFE3A857"); } }
-        public static XLColor IndigoDye { get { return FromHtml("#FF00416A"); } }
-        public static XLColor InternationalKleinBlue { get { return FromHtml("#FF002FA7"); } }
-        public static XLColor InternationalOrange { get { return FromHtml("#FFFF4F00"); } }
-        public static XLColor Iris { get { return FromHtml("#FF5A4FCF"); } }
-        public static XLColor Isabelline { get { return FromHtml("#FFF4F0EC"); } }
-        public static XLColor IslamicGreen { get { return FromHtml("#FF009000"); } }
-        public static XLColor Jade { get { return FromHtml("#FF00A86B"); } }
-        public static XLColor Jasper { get { return FromHtml("#FFD73B3E"); } }
-        public static XLColor JazzberryJam { get { return FromHtml("#FFA50B5E"); } }
-        public static XLColor Jonquil { get { return FromHtml("#FFFADA5E"); } }
-        public static XLColor JuneBud { get { return FromHtml("#FFBDDA57"); } }
-        public static XLColor JungleGreen { get { return FromHtml("#FF29AB87"); } }
-        public static XLColor KellyGreen { get { return FromHtml("#FF4CBB17"); } }
-        public static XLColor KhakiHtmlCssKhaki { get { return FromHtml("#FFC3B091"); } }
-        public static XLColor LanguidLavender { get { return FromHtml("#FFD6CADD"); } }
-        public static XLColor LapisLazuli { get { return FromHtml("#FF26619C"); } }
-        public static XLColor LaSalleGreen { get { return FromHtml("#FF087830"); } }
-        public static XLColor LaserLemon { get { return FromHtml("#FFFEFE22"); } }
-        public static XLColor Lava { get { return FromHtml("#FFCF1020"); } }
-        public static XLColor LavenderBlue { get { return FromHtml("#FFCCCCFF"); } }
-        public static XLColor LavenderFloral { get { return FromHtml("#FFB57EDC"); } }
-        public static XLColor LavenderGray { get { return FromHtml("#FFC4C3D0"); } }
-        public static XLColor LavenderIndigo { get { return FromHtml("#FF9457EB"); } }
-        public static XLColor LavenderPink { get { return FromHtml("#FFFBAED2"); } }
-        public static XLColor LavenderPurple { get { return FromHtml("#FF967BB6"); } }
-        public static XLColor LavenderRose { get { return FromHtml("#FFFBA0E3"); } }
-        public static XLColor Lemon { get { return FromHtml("#FFFFF700"); } }
-        public static XLColor LightApricot { get { return FromHtml("#FFFDD5B1"); } }
-        public static XLColor LightBrown { get { return FromHtml("#FFB5651D"); } }
-        public static XLColor LightCarminePink { get { return FromHtml("#FFE66771"); } }
-        public static XLColor LightCornflowerBlue { get { return FromHtml("#FF93CCEA"); } }
-        public static XLColor LightFuchsiaPink { get { return FromHtml("#FFF984EF"); } }
-        public static XLColor LightMauve { get { return FromHtml("#FFDCD0FF"); } }
-        public static XLColor LightPastelPurple { get { return FromHtml("#FFB19CD9"); } }
-        public static XLColor LightSalmonPink { get { return FromHtml("#FFFF9999"); } }
-        public static XLColor LightTaupe { get { return FromHtml("#FFB38B6D"); } }
-        public static XLColor LightThulianPink { get { return FromHtml("#FFE68FAC"); } }
-        public static XLColor LightYellow1 { get { return FromHtml("#FFFFFFED"); } }
-        public static XLColor Lilac { get { return FromHtml("#FFC8A2C8"); } }
-        public static XLColor LimeColorWheel { get { return FromHtml("#FFBFFF00"); } }
-        public static XLColor LincolnGreen { get { return FromHtml("#FF195905"); } }
-        public static XLColor Liver { get { return FromHtml("#FF534B4F"); } }
-        public static XLColor Lust { get { return FromHtml("#FFE62020"); } }
-        public static XLColor MacaroniAndCheese { get { return FromHtml("#FFFFBD88"); } }
-        public static XLColor MagentaDye { get { return FromHtml("#FFCA1F7B"); } }
-        public static XLColor MagentaProcess { get { return FromHtml("#FFFF0090"); } }
-        public static XLColor MagicMint { get { return FromHtml("#FFAAF0D1"); } }
-        public static XLColor Magnolia { get { return FromHtml("#FFF8F4FF"); } }
-        public static XLColor Mahogany { get { return FromHtml("#FFC04000"); } }
-        public static XLColor Maize { get { return FromHtml("#FFFBEC5D"); } }
-        public static XLColor MajorelleBlue { get { return FromHtml("#FF6050DC"); } }
-        public static XLColor Malachite { get { return FromHtml("#FF0BDA51"); } }
-        public static XLColor Manatee { get { return FromHtml("#FF979AAA"); } }
-        public static XLColor MangoTango { get { return FromHtml("#FFFF8243"); } }
-        public static XLColor MaroonX11 { get { return FromHtml("#FFB03060"); } }
-        public static XLColor Mauve { get { return FromHtml("#FFE0B0FF"); } }
-        public static XLColor Mauvelous { get { return FromHtml("#FFEF98AA"); } }
-        public static XLColor MauveTaupe { get { return FromHtml("#FF915F6D"); } }
-        public static XLColor MayaBlue { get { return FromHtml("#FF73C2FB"); } }
-        public static XLColor MeatBrown { get { return FromHtml("#FFE5B73B"); } }
-        public static XLColor MediumAquamarine1 { get { return FromHtml("#FF66DDAA"); } }
-        public static XLColor MediumCandyAppleRed { get { return FromHtml("#FFE2062C"); } }
-        public static XLColor MediumCarmine { get { return FromHtml("#FFAF4035"); } }
-        public static XLColor MediumChampagne { get { return FromHtml("#FFF3E5AB"); } }
-        public static XLColor MediumElectricBlue { get { return FromHtml("#FF035096"); } }
-        public static XLColor MediumJungleGreen { get { return FromHtml("#FF1C352D"); } }
-        public static XLColor MediumPersianBlue { get { return FromHtml("#FF0067A5"); } }
-        public static XLColor MediumRedViolet { get { return FromHtml("#FFBB3385"); } }
-        public static XLColor MediumSpringBud { get { return FromHtml("#FFC9DC87"); } }
-        public static XLColor MediumTaupe { get { return FromHtml("#FF674C47"); } }
-        public static XLColor Melon { get { return FromHtml("#FFFDBCB4"); } }
-        public static XLColor MidnightGreenEagleGreen { get { return FromHtml("#FF004953"); } }
-        public static XLColor MikadoYellow { get { return FromHtml("#FFFFC40C"); } }
-        public static XLColor Mint { get { return FromHtml("#FF3EB489"); } }
-        public static XLColor MintGreen { get { return FromHtml("#FF98FF98"); } }
-        public static XLColor ModeBeige { get { return FromHtml("#FF967117"); } }
-        public static XLColor MoonstoneBlue { get { return FromHtml("#FF73A9C2"); } }
-        public static XLColor MordantRed19 { get { return FromHtml("#FFAE0C00"); } }
-        public static XLColor MossGreen { get { return FromHtml("#FFADDFAD"); } }
-        public static XLColor MountainMeadow { get { return FromHtml("#FF30BA8F"); } }
-        public static XLColor MountbattenPink { get { return FromHtml("#FF997A8D"); } }
-        public static XLColor MsuGreen { get { return FromHtml("#FF18453B"); } }
-        public static XLColor Mulberry { get { return FromHtml("#FFC54B8C"); } }
-        public static XLColor Mustard { get { return FromHtml("#FFFFDB58"); } }
-        public static XLColor Myrtle { get { return FromHtml("#FF21421E"); } }
-        public static XLColor NadeshikoPink { get { return FromHtml("#FFF6ADC6"); } }
-        public static XLColor NapierGreen { get { return FromHtml("#FF2A8000"); } }
-        public static XLColor NaplesYellow { get { return FromHtml("#FFFADA5E"); } }
-        public static XLColor NeonCarrot { get { return FromHtml("#FFFFA343"); } }
-        public static XLColor NeonFuchsia { get { return FromHtml("#FFFE59C2"); } }
-        public static XLColor NeonGreen { get { return FromHtml("#FF39FF14"); } }
-        public static XLColor NonPhotoBlue { get { return FromHtml("#FFA4DDED"); } }
-        public static XLColor OceanBoatBlue { get { return FromHtml("#FFCC7422"); } }
-        public static XLColor Ochre { get { return FromHtml("#FFCC7722"); } }
-        public static XLColor OldGold { get { return FromHtml("#FFCFB53B"); } }
-        public static XLColor OldLavender { get { return FromHtml("#FF796878"); } }
-        public static XLColor OldMauve { get { return FromHtml("#FF673147"); } }
-        public static XLColor OldRose { get { return FromHtml("#FFC08081"); } }
-        public static XLColor OliveDrab7 { get { return FromHtml("#FF3C341F"); } }
-        public static XLColor Olivine { get { return FromHtml("#FF9AB973"); } }
-        public static XLColor Onyx { get { return FromHtml("#FF0F0F0F"); } }
-        public static XLColor OperaMauve { get { return FromHtml("#FFB784A7"); } }
-        public static XLColor OrangeColorWheel { get { return FromHtml("#FFFF7F00"); } }
-        public static XLColor OrangePeel { get { return FromHtml("#FFFF9F00"); } }
-        public static XLColor OrangeRyb { get { return FromHtml("#FFFB9902"); } }
-        public static XLColor OtterBrown { get { return FromHtml("#FF654321"); } }
-        public static XLColor OuCrimsonRed { get { return FromHtml("#FF990000"); } }
-        public static XLColor OuterSpace { get { return FromHtml("#FF414A4C"); } }
-        public static XLColor OutrageousOrange { get { return FromHtml("#FFFF6E4A"); } }
-        public static XLColor OxfordBlue { get { return FromHtml("#FF002147"); } }
-        public static XLColor PakistanGreen { get { return FromHtml("#FF00421B"); } }
-        public static XLColor PalatinateBlue { get { return FromHtml("#FF273BE2"); } }
-        public static XLColor PalatinatePurple { get { return FromHtml("#FF682860"); } }
-        public static XLColor PaleAqua { get { return FromHtml("#FFBCD4E6"); } }
-        public static XLColor PaleBrown { get { return FromHtml("#FF987654"); } }
-        public static XLColor PaleCarmine { get { return FromHtml("#FFAF4035"); } }
-        public static XLColor PaleCerulean { get { return FromHtml("#FF9BC4E2"); } }
-        public static XLColor PaleChestnut { get { return FromHtml("#FFDDADAF"); } }
-        public static XLColor PaleCopper { get { return FromHtml("#FFDA8A67"); } }
-        public static XLColor PaleCornflowerBlue { get { return FromHtml("#FFABCDEF"); } }
-        public static XLColor PaleGold { get { return FromHtml("#FFE6BE8A"); } }
-        public static XLColor PaleMagenta { get { return FromHtml("#FFF984E5"); } }
-        public static XLColor PalePink { get { return FromHtml("#FFFADADD"); } }
-        public static XLColor PaleRobinEggBlue { get { return FromHtml("#FF96DED1"); } }
-        public static XLColor PaleSilver { get { return FromHtml("#FFC9C0BB"); } }
-        public static XLColor PaleSpringBud { get { return FromHtml("#FFECEBBD"); } }
-        public static XLColor PaleTaupe { get { return FromHtml("#FFBC987E"); } }
-        public static XLColor PansyPurple { get { return FromHtml("#FF78184A"); } }
-        public static XLColor ParisGreen { get { return FromHtml("#FF50C878"); } }
-        public static XLColor PastelBlue { get { return FromHtml("#FFAEC6CF"); } }
-        public static XLColor PastelBrown { get { return FromHtml("#FF836953"); } }
-        public static XLColor PastelGray { get { return FromHtml("#FFCFCFC4"); } }
-        public static XLColor PastelGreen { get { return FromHtml("#FF77DD77"); } }
-        public static XLColor PastelMagenta { get { return FromHtml("#FFF49AC2"); } }
-        public static XLColor PastelOrange { get { return FromHtml("#FFFFB347"); } }
-        public static XLColor PastelPink { get { return FromHtml("#FFFFD1DC"); } }
-        public static XLColor PastelPurple { get { return FromHtml("#FFB39EB5"); } }
-        public static XLColor PastelRed { get { return FromHtml("#FFFF6961"); } }
-        public static XLColor PastelViolet { get { return FromHtml("#FFCB99C9"); } }
-        public static XLColor PastelYellow { get { return FromHtml("#FFFDFD96"); } }
-        public static XLColor PaynesGrey { get { return FromHtml("#FF40404F"); } }
-        public static XLColor Peach { get { return FromHtml("#FFFFE5B4"); } }
-        public static XLColor PeachOrange { get { return FromHtml("#FFFFCC99"); } }
-        public static XLColor PeachYellow { get { return FromHtml("#FFFADFAD"); } }
-        public static XLColor Pear { get { return FromHtml("#FFD1E231"); } }
-        public static XLColor Pearl { get { return FromHtml("#FFF0EAD6"); } }
-        public static XLColor Peridot { get { return FromHtml("#FFE6E200"); } }
-        public static XLColor Periwinkle { get { return FromHtml("#FFCCCCFF"); } }
-        public static XLColor PersianBlue { get { return FromHtml("#FF1C39BB"); } }
-        public static XLColor PersianGreen { get { return FromHtml("#FF00A693"); } }
-        public static XLColor PersianIndigo { get { return FromHtml("#FF32127A"); } }
-        public static XLColor PersianOrange { get { return FromHtml("#FFD99058"); } }
-        public static XLColor PersianPink { get { return FromHtml("#FFF77FBE"); } }
-        public static XLColor PersianPlum { get { return FromHtml("#FF701C1C"); } }
-        public static XLColor PersianRed { get { return FromHtml("#FFCC3333"); } }
-        public static XLColor PersianRose { get { return FromHtml("#FFFE28A2"); } }
-        public static XLColor Persimmon { get { return FromHtml("#FFEC5800"); } }
-        public static XLColor Phlox { get { return FromHtml("#FFDF00FF"); } }
-        public static XLColor PhthaloBlue { get { return FromHtml("#FF000F89"); } }
-        public static XLColor PhthaloGreen { get { return FromHtml("#FF123524"); } }
-        public static XLColor PiggyPink { get { return FromHtml("#FFFDDDE6"); } }
-        public static XLColor PineGreen { get { return FromHtml("#FF01796F"); } }
-        public static XLColor PinkOrange { get { return FromHtml("#FFFF9966"); } }
-        public static XLColor PinkPearl { get { return FromHtml("#FFE7ACCF"); } }
-        public static XLColor PinkSherbet { get { return FromHtml("#FFF78FA7"); } }
-        public static XLColor Pistachio { get { return FromHtml("#FF93C572"); } }
-        public static XLColor Platinum { get { return FromHtml("#FFE5E4E2"); } }
-        public static XLColor PlumTraditional { get { return FromHtml("#FF8E4585"); } }
-        public static XLColor PortlandOrange { get { return FromHtml("#FFFF5A36"); } }
-        public static XLColor PrincetonOrange { get { return FromHtml("#FFFF8F00"); } }
-        public static XLColor Prune { get { return FromHtml("#FF701C1C"); } }
-        public static XLColor PrussianBlue { get { return FromHtml("#FF003153"); } }
-        public static XLColor PsychedelicPurple { get { return FromHtml("#FFDF00FF"); } }
-        public static XLColor Puce { get { return FromHtml("#FFCC8899"); } }
-        public static XLColor Pumpkin { get { return FromHtml("#FFFF7518"); } }
-        public static XLColor PurpleHeart { get { return FromHtml("#FF69359C"); } }
-        public static XLColor PurpleMountainMajesty { get { return FromHtml("#FF9678B6"); } }
-        public static XLColor PurpleMunsell { get { return FromHtml("#FF9F00C5"); } }
-        public static XLColor PurplePizzazz { get { return FromHtml("#FFFE4EDA"); } }
-        public static XLColor PurpleTaupe { get { return FromHtml("#FF50404D"); } }
-        public static XLColor PurpleX11 { get { return FromHtml("#FFA020F0"); } }
-        public static XLColor RadicalRed { get { return FromHtml("#FFFF355E"); } }
-        public static XLColor Raspberry { get { return FromHtml("#FFE30B5D"); } }
-        public static XLColor RaspberryGlace { get { return FromHtml("#FF915F6D"); } }
-        public static XLColor RaspberryPink { get { return FromHtml("#FFE25098"); } }
-        public static XLColor RaspberryRose { get { return FromHtml("#FFB3446C"); } }
-        public static XLColor RawUmber { get { return FromHtml("#FF826644"); } }
-        public static XLColor RazzleDazzleRose { get { return FromHtml("#FFFF33CC"); } }
-        public static XLColor Razzmatazz { get { return FromHtml("#FFE3256B"); } }
-        public static XLColor RedMunsell { get { return FromHtml("#FFF2003C"); } }
-        public static XLColor RedNcs { get { return FromHtml("#FFC40233"); } }
-        public static XLColor RedPigment { get { return FromHtml("#FFED1C24"); } }
-        public static XLColor RedRyb { get { return FromHtml("#FFFE2712"); } }
-        public static XLColor Redwood { get { return FromHtml("#FFAB4E52"); } }
-        public static XLColor Regalia { get { return FromHtml("#FF522D80"); } }
-        public static XLColor RichBlack { get { return FromHtml("#FF004040"); } }
-        public static XLColor RichBrilliantLavender { get { return FromHtml("#FFF1A7FE"); } }
-        public static XLColor RichCarmine { get { return FromHtml("#FFD70040"); } }
-        public static XLColor RichElectricBlue { get { return FromHtml("#FF0892D0"); } }
-        public static XLColor RichLavender { get { return FromHtml("#FFA76BCF"); } }
-        public static XLColor RichLilac { get { return FromHtml("#FFB666D2"); } }
-        public static XLColor RichMaroon { get { return FromHtml("#FFB03060"); } }
-        public static XLColor RifleGreen { get { return FromHtml("#FF414833"); } }
-        public static XLColor RobinEggBlue { get { return FromHtml("#FF00CCCC"); } }
-        public static XLColor Rose { get { return FromHtml("#FFFF007F"); } }
-        public static XLColor RoseBonbon { get { return FromHtml("#FFF9429E"); } }
-        public static XLColor RoseEbony { get { return FromHtml("#FF674846"); } }
-        public static XLColor RoseGold { get { return FromHtml("#FFB76E79"); } }
-        public static XLColor RoseMadder { get { return FromHtml("#FFE32636"); } }
-        public static XLColor RosePink { get { return FromHtml("#FFFF66CC"); } }
-        public static XLColor RoseQuartz { get { return FromHtml("#FFAA98A9"); } }
-        public static XLColor RoseTaupe { get { return FromHtml("#FF905D5D"); } }
-        public static XLColor RoseVale { get { return FromHtml("#FFAB4E52"); } }
-        public static XLColor Rosewood { get { return FromHtml("#FF65000B"); } }
-        public static XLColor RossoCorsa { get { return FromHtml("#FFD40000"); } }
-        public static XLColor RoyalAzure { get { return FromHtml("#FF0038A8"); } }
-        public static XLColor RoyalBlueTraditional { get { return FromHtml("#FF002366"); } }
-        public static XLColor RoyalFuchsia { get { return FromHtml("#FFCA2C92"); } }
-        public static XLColor RoyalPurple { get { return FromHtml("#FF7851A9"); } }
-        public static XLColor Ruby { get { return FromHtml("#FFE0115F"); } }
-        public static XLColor Ruddy { get { return FromHtml("#FFFF0028"); } }
-        public static XLColor RuddyBrown { get { return FromHtml("#FFBB6528"); } }
-        public static XLColor RuddyPink { get { return FromHtml("#FFE18E96"); } }
-        public static XLColor Rufous { get { return FromHtml("#FFA81C07"); } }
-        public static XLColor Russet { get { return FromHtml("#FF80461B"); } }
-        public static XLColor Rust { get { return FromHtml("#FFB7410E"); } }
-        public static XLColor SacramentoStateGreen { get { return FromHtml("#FF00563F"); } }
-        public static XLColor SafetyOrangeBlazeOrange { get { return FromHtml("#FFFF6700"); } }
-        public static XLColor Saffron { get { return FromHtml("#FFF4C430"); } }
-        public static XLColor Salmon1 { get { return FromHtml("#FFFF8C69"); } }
-        public static XLColor SalmonPink { get { return FromHtml("#FFFF91A4"); } }
-        public static XLColor Sand { get { return FromHtml("#FFC2B280"); } }
-        public static XLColor SandDune { get { return FromHtml("#FF967117"); } }
-        public static XLColor Sandstorm { get { return FromHtml("#FFECD540"); } }
-        public static XLColor SandyTaupe { get { return FromHtml("#FF967117"); } }
-        public static XLColor Sangria { get { return FromHtml("#FF92000A"); } }
-        public static XLColor SapGreen { get { return FromHtml("#FF507D2A"); } }
-        public static XLColor Sapphire { get { return FromHtml("#FF082567"); } }
-        public static XLColor SatinSheenGold { get { return FromHtml("#FFCBA135"); } }
-        public static XLColor Scarlet { get { return FromHtml("#FFFF2000"); } }
-        public static XLColor SchoolBusYellow { get { return FromHtml("#FFFFD800"); } }
-        public static XLColor ScreaminGreen { get { return FromHtml("#FF76FF7A"); } }
-        public static XLColor SealBrown { get { return FromHtml("#FF321414"); } }
-        public static XLColor SelectiveYellow { get { return FromHtml("#FFFFBA00"); } }
-        public static XLColor Sepia { get { return FromHtml("#FF704214"); } }
-        public static XLColor Shadow { get { return FromHtml("#FF8A795D"); } }
-        public static XLColor ShamrockGreen { get { return FromHtml("#FF009E60"); } }
-        public static XLColor ShockingPink { get { return FromHtml("#FFFC0FC0"); } }
-        public static XLColor Sienna1 { get { return FromHtml("#FF882D17"); } }
-        public static XLColor Sinopia { get { return FromHtml("#FFCB410B"); } }
-        public static XLColor Skobeloff { get { return FromHtml("#FF007474"); } }
-        public static XLColor SkyMagenta { get { return FromHtml("#FFCF71AF"); } }
-        public static XLColor SmaltDarkPowderBlue { get { return FromHtml("#FF003399"); } }
-        public static XLColor SmokeyTopaz { get { return FromHtml("#FF933D41"); } }
-        public static XLColor SmokyBlack { get { return FromHtml("#FF100C08"); } }
-        public static XLColor SpiroDiscoBall { get { return FromHtml("#FF0FC0FC"); } }
-        public static XLColor SplashedWhite { get { return FromHtml("#FFFEFDFF"); } }
-        public static XLColor SpringBud { get { return FromHtml("#FFA7FC00"); } }
-        public static XLColor StPatricksBlue { get { return FromHtml("#FF23297A"); } }
-        public static XLColor StilDeGrainYellow { get { return FromHtml("#FFFADA5E"); } }
-        public static XLColor Straw { get { return FromHtml("#FFE4D96F"); } }
-        public static XLColor Sunglow { get { return FromHtml("#FFFFCC33"); } }
-        public static XLColor Sunset { get { return FromHtml("#FFFAD6A5"); } }
-        public static XLColor Tangelo { get { return FromHtml("#FFF94D00"); } }
-        public static XLColor Tangerine { get { return FromHtml("#FFF28500"); } }
-        public static XLColor TangerineYellow { get { return FromHtml("#FFFFCC00"); } }
-        public static XLColor Taupe { get { return FromHtml("#FF483C32"); } }
-        public static XLColor TaupeGray { get { return FromHtml("#FF8B8589"); } }
-        public static XLColor TeaGreen { get { return FromHtml("#FFD0F0C0"); } }
-        public static XLColor TealBlue { get { return FromHtml("#FF367588"); } }
-        public static XLColor TealGreen { get { return FromHtml("#FF006D5B"); } }
-        public static XLColor TeaRoseOrange { get { return FromHtml("#FFF88379"); } }
-        public static XLColor TeaRoseRose { get { return FromHtml("#FFF4C2C2"); } }
-        public static XLColor TennéTawny { get { return FromHtml("#FFCD5700"); } }
-        public static XLColor TerraCotta { get { return FromHtml("#FFE2725B"); } }
-        public static XLColor ThulianPink { get { return FromHtml("#FFDE6FA1"); } }
-        public static XLColor TickleMePink { get { return FromHtml("#FFFC89AC"); } }
-        public static XLColor TiffanyBlue { get { return FromHtml("#FF0ABAB5"); } }
-        public static XLColor TigersEye { get { return FromHtml("#FFE08D3C"); } }
-        public static XLColor Timberwolf { get { return FromHtml("#FFDBD7D2"); } }
-        public static XLColor TitaniumYellow { get { return FromHtml("#FFEEE600"); } }
-        public static XLColor Toolbox { get { return FromHtml("#FF746CC0"); } }
-        public static XLColor TractorRed { get { return FromHtml("#FFFD0E35"); } }
-        public static XLColor TropicalRainForest { get { return FromHtml("#FF00755E"); } }
-        public static XLColor TuftsBlue { get { return FromHtml("#FF417DC1"); } }
-        public static XLColor Tumbleweed { get { return FromHtml("#FFDEAA88"); } }
-        public static XLColor TurkishRose { get { return FromHtml("#FFB57281"); } }
-        public static XLColor Turquoise1 { get { return FromHtml("#FF30D5C8"); } }
-        public static XLColor TurquoiseBlue { get { return FromHtml("#FF00FFEF"); } }
-        public static XLColor TurquoiseGreen { get { return FromHtml("#FFA0D6B4"); } }
-        public static XLColor TuscanRed { get { return FromHtml("#FF823535"); } }
-        public static XLColor TwilightLavender { get { return FromHtml("#FF8A496B"); } }
-        public static XLColor TyrianPurple { get { return FromHtml("#FF66023C"); } }
-        public static XLColor UaBlue { get { return FromHtml("#FF0033AA"); } }
-        public static XLColor UaRed { get { return FromHtml("#FFD9004C"); } }
-        public static XLColor Ube { get { return FromHtml("#FF8878C3"); } }
-        public static XLColor UclaBlue { get { return FromHtml("#FF536895"); } }
-        public static XLColor UclaGold { get { return FromHtml("#FFFFB300"); } }
-        public static XLColor UfoGreen { get { return FromHtml("#FF3CD070"); } }
-        public static XLColor Ultramarine { get { return FromHtml("#FF120A8F"); } }
-        public static XLColor UltramarineBlue { get { return FromHtml("#FF4166F5"); } }
-        public static XLColor UltraPink { get { return FromHtml("#FFFF6FFF"); } }
-        public static XLColor Umber { get { return FromHtml("#FF635147"); } }
-        public static XLColor UnitedNationsBlue { get { return FromHtml("#FF5B92E5"); } }
-        public static XLColor UnmellowYellow { get { return FromHtml("#FFFFFF66"); } }
-        public static XLColor UpForestGreen { get { return FromHtml("#FF014421"); } }
-        public static XLColor UpMaroon { get { return FromHtml("#FF7B1113"); } }
-        public static XLColor UpsdellRed { get { return FromHtml("#FFAE2029"); } }
-        public static XLColor Urobilin { get { return FromHtml("#FFE1AD21"); } }
-        public static XLColor UscCardinal { get { return FromHtml("#FF990000"); } }
-        public static XLColor UscGold { get { return FromHtml("#FFFFCC00"); } }
-        public static XLColor UtahCrimson { get { return FromHtml("#FFD3003F"); } }
-        public static XLColor Vanilla { get { return FromHtml("#FFF3E5AB"); } }
-        public static XLColor VegasGold { get { return FromHtml("#FFC5B358"); } }
-        public static XLColor VenetianRed { get { return FromHtml("#FFC80815"); } }
-        public static XLColor Verdigris { get { return FromHtml("#FF43B3AE"); } }
-        public static XLColor Vermilion { get { return FromHtml("#FFE34234"); } }
-        public static XLColor Veronica { get { return FromHtml("#FFA020F0"); } }
-        public static XLColor Violet1 { get { return FromHtml("#FF8F00FF"); } }
-        public static XLColor VioletColorWheel { get { return FromHtml("#FF7F00FF"); } }
-        public static XLColor VioletRyb { get { return FromHtml("#FF8601AF"); } }
-        public static XLColor Viridian { get { return FromHtml("#FF40826D"); } }
-        public static XLColor VividAuburn { get { return FromHtml("#FF922724"); } }
-        public static XLColor VividBurgundy { get { return FromHtml("#FF9F1D35"); } }
-        public static XLColor VividCerise { get { return FromHtml("#FFDA1D81"); } }
-        public static XLColor VividTangerine { get { return FromHtml("#FFFFA089"); } }
-        public static XLColor VividViolet { get { return FromHtml("#FF9F00FF"); } }
-        public static XLColor WarmBlack { get { return FromHtml("#FF004242"); } }
-        public static XLColor Wenge { get { return FromHtml("#FF645452"); } }
-        public static XLColor WildBlueYonder { get { return FromHtml("#FFA2ADD0"); } }
-        public static XLColor WildStrawberry { get { return FromHtml("#FFFF43A4"); } }
-        public static XLColor WildWatermelon { get { return FromHtml("#FFFC6C85"); } }
-        public static XLColor Wisteria { get { return FromHtml("#FFC9A0DC"); } }
-        public static XLColor Xanadu { get { return FromHtml("#FF738678"); } }
-        public static XLColor YaleBlue { get { return FromHtml("#FF0F4D92"); } }
-        public static XLColor YellowMunsell { get { return FromHtml("#FFEFCC00"); } }
-        public static XLColor YellowNcs { get { return FromHtml("#FFFFD300"); } }
-        public static XLColor YellowProcess { get { return FromHtml("#FFFFEF00"); } }
-        public static XLColor YellowRyb { get { return FromHtml("#FFFEFE33"); } }
-        public static XLColor Zaffre { get { return FromHtml("#FF0014A8"); } }
-        public static XLColor ZinnwalditeBrown { get { return FromHtml("#FF2C1608"); } }
-        public static XLColor Transparent { get { return FromColor(Color.Transparent); } }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Dictionary.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Dictionary.cs
deleted file mode 100644
index b866775..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Dictionary.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel.Style
-{
-    class Dictionary
-    {
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLAlignment.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLAlignment.cs
deleted file mode 100644
index 9298ada..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLAlignment.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLAlignmentReadingOrderValues
-    {
-        ContextDependent,
-        LeftToRight,
-        RightToLeft
-    }
-
-    public enum XLAlignmentHorizontalValues
-    {
-        Center,
-        CenterContinuous,
-        Distributed,
-        Fill,
-        General,
-        Justify,
-        Left,
-        Right
-    }
-
-    public enum XLAlignmentVerticalValues
-    {
-        Bottom,
-        Center,
-        Distributed,
-        Justify,
-        Top
-    }
-
-    public interface IXLAlignment: IEquatable<IXLAlignment>
-    {
-        /// <summary>
-        /// Gets or sets the cell's horizontal alignment.
-        /// </summary>
-        XLAlignmentHorizontalValues Horizontal { get; set; }
-
-        /// <summary>
-        /// Gets or sets the cell's vertical alignment.
-        /// </summary>
-        XLAlignmentVerticalValues Vertical { get; set; }
-
-        /// <summary>
-        /// Gets or sets the cell's text indentation.
-        /// </summary>
-        Int32 Indent { get; set; }
-        /// <summary>
-        /// Gets or sets whether the cell's last line is justified or not.
-        /// </summary>
-        Boolean JustifyLastLine { get; set; }
-        /// <summary>
-        /// Gets or sets the cell's reading order.
-        /// </summary>
-        XLAlignmentReadingOrderValues ReadingOrder { get; set; }
-        /// <summary>
-        /// Gets or sets the cell's relative indent.
-        /// </summary>
-        Int32 RelativeIndent { get; set; }
-        /// <summary>
-        /// Gets or sets whether the cell's font size should decrease to fit the contents.
-        /// </summary>
-        Boolean ShrinkToFit { get; set; }
-        /// <summary>
-        /// Gets or sets the cell's text rotation.
-        /// </summary>
-        Int32 TextRotation { get; set; }
-        /// <summary>
-        /// Gets or sets whether the cell's text should wrap if it doesn't fit.
-        /// </summary>
-        Boolean WrapText { get; set; }
-        /// <summary>
-        /// Gets or sets wheter the cell's text should be displayed from to to bottom
-        /// <para>(as opposed to the normal left to right).</para>
-        /// </summary>
-        Boolean TopToBottom { get; set; }
-
-        IXLStyle SetHorizontal(XLAlignmentHorizontalValues value);
-        IXLStyle SetVertical(XLAlignmentVerticalValues value);
-        IXLStyle SetIndent(Int32 value);
-        IXLStyle SetJustifyLastLine(); IXLStyle SetJustifyLastLine(Boolean value);
-        IXLStyle SetReadingOrder(XLAlignmentReadingOrderValues value);
-        IXLStyle SetRelativeIndent(Int32 value);
-        IXLStyle SetShrinkToFit(); IXLStyle SetShrinkToFit(Boolean value);
-        IXLStyle SetTextRotation(Int32 value);
-        IXLStyle SetWrapText(); IXLStyle SetWrapText(Boolean value);
-        IXLStyle SetTopToBottom(); IXLStyle SetTopToBottom(Boolean value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLBorder.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLBorder.cs
deleted file mode 100644
index ed98ffe..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLBorder.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLBorderStyleValues
-    {
-        DashDot,
-        DashDotDot,
-        Dashed,
-        Dotted,
-        Double,
-        Hair,
-        Medium,
-        MediumDashDot,
-        MediumDashDotDot,
-        MediumDashed,
-        None,
-        SlantDashDot,
-        Thick,
-        Thin
-    }
-    public interface IXLBorder: IEquatable<IXLBorder>
-    {
-        XLBorderStyleValues OutsideBorder { set; }
-        XLColor OutsideBorderColor { set; }
-        XLBorderStyleValues InsideBorder { set; }
-        XLColor InsideBorderColor { set; }
-
-        XLBorderStyleValues LeftBorder { get; set; }
-        XLColor LeftBorderColor { get; set; }
-        XLBorderStyleValues RightBorder { get; set; }
-        XLColor RightBorderColor { get; set; }
-        XLBorderStyleValues TopBorder { get; set; }
-        XLColor TopBorderColor { get; set; }
-        XLBorderStyleValues BottomBorder { get; set; }
-        XLColor BottomBorderColor { get; set; }
-        Boolean DiagonalUp { get; set; }
-        Boolean DiagonalDown { get; set; }
-        XLBorderStyleValues DiagonalBorder { get; set; }
-        XLColor DiagonalBorderColor { get; set; }
-
-        IXLStyle SetOutsideBorder(XLBorderStyleValues value);
-        IXLStyle SetOutsideBorderColor(XLColor value);
-        IXLStyle SetInsideBorder(XLBorderStyleValues value);
-        IXLStyle SetInsideBorderColor(XLColor value);
-
-        IXLStyle SetLeftBorder(XLBorderStyleValues value);
-        IXLStyle SetLeftBorderColor(XLColor value);
-        IXLStyle SetRightBorder(XLBorderStyleValues value);
-        IXLStyle SetRightBorderColor(XLColor value);
-        IXLStyle SetTopBorder(XLBorderStyleValues value);
-        IXLStyle SetTopBorderColor(XLColor value);
-        IXLStyle SetBottomBorder(XLBorderStyleValues value);
-        IXLStyle SetBottomBorderColor(XLColor value);
-        IXLStyle SetDiagonalUp(); IXLStyle SetDiagonalUp(Boolean value);
-        IXLStyle SetDiagonalDown(); IXLStyle SetDiagonalDown(Boolean value);
-        IXLStyle SetDiagonalBorder(XLBorderStyleValues value);
-        IXLStyle SetDiagonalBorderColor(XLColor value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFill.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFill.cs
deleted file mode 100644
index 79e495c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFill.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLFillPatternValues
-    {
-        DarkDown,
-        DarkGray,
-        DarkGrid,
-        DarkHorizontal,
-        DarkTrellis,
-        DarkUp,
-        DarkVertical,
-        Gray0625,
-        Gray125,
-        LightDown,
-        LightGray,
-        LightGrid,
-        LightHorizontal,
-        LightTrellis,
-        LightUp,
-        LightVertical,
-        MediumGray,
-        None,
-        Solid
-    }
-
-    public interface IXLFill:IEquatable<IXLFill>
-    {
-        XLColor BackgroundColor { get; set; }
-        XLColor PatternColor { get; set; }
-        XLColor PatternBackgroundColor { get; set; }
-        XLFillPatternValues PatternType { get; set; }
-
-        IXLStyle SetBackgroundColor(XLColor value);
-        IXLStyle SetPatternColor(XLColor value);
-        IXLStyle SetPatternBackgroundColor(XLColor value);
-        IXLStyle SetPatternType(XLFillPatternValues value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFont.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFont.cs
deleted file mode 100644
index 3364a58..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFont.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLFontUnderlineValues
-    {
-        Double,
-        DoubleAccounting,
-        None,
-        Single,
-        SingleAccounting
-    }
-
-    public enum XLFontVerticalTextAlignmentValues
-    {
-        Baseline,
-        Subscript,
-        Superscript
-    }
-
-    public enum XLFontFamilyNumberingValues
-    { 
-        NotApplicable = 0,
-        Roman = 1,
-        Swiss = 2,
-        Modern = 3,
-        Script = 4,
-        Decorative = 5
-    }
-
-    public interface IXLFont : IXLFontBase, IEquatable<IXLFont>
-    {
-        IXLStyle SetBold(); IXLStyle SetBold(Boolean value);
-        IXLStyle SetItalic(); IXLStyle SetItalic(Boolean value);
-        IXLStyle SetUnderline(); IXLStyle SetUnderline(XLFontUnderlineValues value);
-        IXLStyle SetStrikethrough(); IXLStyle SetStrikethrough(Boolean value);
-        IXLStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
-        IXLStyle SetShadow(); IXLStyle SetShadow(Boolean value);
-        IXLStyle SetFontSize(Double value);
-        IXLStyle SetFontColor(XLColor value);
-        IXLStyle SetFontName(String value);
-        IXLStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFontBase.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFontBase.cs
deleted file mode 100644
index 1e5b6cf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFontBase.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-   
-
-    public interface IXLFontBase
-    {
-        Boolean Bold { get; set; }
-        Boolean Italic { get; set; }
-        XLFontUnderlineValues Underline { get; set; }
-        Boolean Strikethrough { get; set; }
-        XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
-        Boolean Shadow { get; set; }
-        Double FontSize { get; set; }
-        XLColor FontColor { get; set; }
-        String FontName { get; set; }
-        XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
-
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLNumberFormat.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLNumberFormat.cs
deleted file mode 100644
index 1490413..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLNumberFormat.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLNumberFormat: IXLNumberFormatBase, IEquatable<IXLNumberFormat>
-    {
-        IXLStyle SetNumberFormatId(Int32 value);
-        IXLStyle SetFormat(String value);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLNumberFormatBase.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLNumberFormatBase.cs
deleted file mode 100644
index d162a90..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLNumberFormatBase.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLNumberFormatBase
-    {
-        Int32 NumberFormatId { get; set; }
-        String Format { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLProtection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLProtection.cs
deleted file mode 100644
index fd4578d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLProtection.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLProtection : IEquatable<IXLProtection>
-    {
-        Boolean Locked { get; set; }
-        Boolean Hidden { get; set; }
-
-        IXLStyle SetLocked(); IXLStyle SetLocked(Boolean value);
-        IXLStyle SetHidden(); IXLStyle SetHidden(Boolean value);
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLStyle.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLStyle.cs
deleted file mode 100644
index 8472baf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLStyle.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLStyle: IEquatable<IXLStyle>
-    {
-        IXLAlignment Alignment { get; set; }
-        IXLBorder Border { get; set; }
-        IXLFill Fill { get; set; }
-        IXLFont Font { get; set; }
-        IXLNumberFormat NumberFormat { get; set; }
-        IXLNumberFormat DateFormat { get; }
-        IXLProtection Protection { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLStylized.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLStylized.cs
deleted file mode 100644
index 45d1287..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLStylized.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    internal interface IXLStylized
-    {
-        IXLStyle Style { get; set; }
-        IEnumerable<IXLStyle> Styles { get; }
-        Boolean UpdatingStyle { get; set; }
-        IXLStyle InnerStyle { get; set; }
-        IXLRanges RangesUsed { get; }
-        Boolean StyleChanged { get; set; }
-        //Boolean IsDefault { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLAlignment.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLAlignment.cs
deleted file mode 100644
index 2efb995..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLAlignment.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-#region
-
-using System;
-using System.Text;
-
-#endregion
-
-namespace ClosedXML.Excel
-{
-    internal class XLAlignment : IXLAlignment
-    {
-        private readonly IXLStylized _container;
-        private XLAlignmentHorizontalValues _horizontal;
-        private Int32 _indent;
-        private Boolean _justifyLastLine;
-        private XLAlignmentReadingOrderValues _readingOrder;
-        private Int32 _relativeIndent;
-        private Boolean _shrinkToFit;
-        private Int32 _textRotation;
-        private XLAlignmentVerticalValues _vertical;
-        private Boolean _wrapText;
-
-        public XLAlignment() : this(null, XLWorkbook.DefaultStyle.Alignment)
-        {
-        }
-
-        public XLAlignment(IXLStylized container, IXLAlignment d = null)
-        {
-            _container = container;
-            if (d == null) return;
-
-            _horizontal = d.Horizontal;
-            _vertical = d.Vertical;
-            _indent = d.Indent;
-            _justifyLastLine = d.JustifyLastLine;
-            _readingOrder = d.ReadingOrder;
-            _relativeIndent = d.RelativeIndent;
-            _shrinkToFit = d.ShrinkToFit;
-            _textRotation = d.TextRotation;
-            _wrapText = d.WrapText;
-        }
-
-        #region IXLAlignment Members
-
-        public XLAlignmentHorizontalValues Horizontal
-        {
-            get { return _horizontal; }
-            set
-            {
-                SetStyleChanged();
-                Boolean updateIndent = !(
-                                            value == XLAlignmentHorizontalValues.Left
-                                            || value == XLAlignmentHorizontalValues.Right
-                                            || value == XLAlignmentHorizontalValues.Distributed
-                                        );
-
-                if (_container != null && !_container.UpdatingStyle)
-                {
-                    _container.Styles.ForEach(s =>
-                                                  {
-                                                      s.Alignment.Horizontal = value;
-                                                      if (updateIndent) s.Alignment.Indent = 0;
-                                                  });
-                }
-                else
-                {
-                    _horizontal = value;
-                    if (updateIndent)
-                        _indent = 0;
-                }
-            }
-        }
-
-        public XLAlignmentVerticalValues Vertical
-        {
-            get { return _vertical; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.Vertical = value);
-                else
-                    _vertical = value;
-            }
-        }
-
-        public Int32 Indent
-        {
-            get { return _indent; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.Indent = value);
-                else
-                {
-                    if (_indent != value)
-                    {
-                        if (_horizontal == XLAlignmentHorizontalValues.General)
-                            _horizontal = XLAlignmentHorizontalValues.Left;
-
-                        if (value > 0 && !(
-                                              _horizontal == XLAlignmentHorizontalValues.Left
-                                              || _horizontal == XLAlignmentHorizontalValues.Right
-                                              || _horizontal == XLAlignmentHorizontalValues.Distributed
-                                          ))
-                        {
-                            throw new ArgumentException(
-                                "For indents, only left, right, and distributed horizontal alignments are supported.");
-                        }
-
-                        _indent = value;
-                    }
-                }
-            }
-        }
-
-        public Boolean JustifyLastLine
-        {
-            get { return _justifyLastLine; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.JustifyLastLine = value);
-                else
-                    _justifyLastLine = value;
-            }
-        }
-
-        public XLAlignmentReadingOrderValues ReadingOrder
-        {
-            get { return _readingOrder; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.ReadingOrder = value);
-                else
-                    _readingOrder = value;
-            }
-        }
-
-        public Int32 RelativeIndent
-        {
-            get { return _relativeIndent; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.RelativeIndent = value);
-                else
-                    _relativeIndent = value;
-            }
-        }
-
-        public Boolean ShrinkToFit
-        {
-            get { return _shrinkToFit; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.ShrinkToFit = value);
-                else
-                    _shrinkToFit = value;
-            }
-        }
-
-        public Int32 TextRotation
-        {
-            get { return _textRotation; }
-            set
-            {
-                SetStyleChanged();
-                Int32 rotation = value;
-
-                if (rotation != 255 && (rotation < -90 || rotation > 180))
-                    throw new ArgumentException("TextRotation must be between -90 and 180 degrees, or 255.");
-
-                if (rotation < 0)
-                    rotation = 90 + (rotation * -1);
-
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.TextRotation = rotation);
-                else
-                    _textRotation = rotation;
-            }
-        }
-
-        public Boolean WrapText
-        {
-            get { return _wrapText; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.WrapText = value);
-                else
-                    _wrapText = value;
-            }
-        }
-
-        public Boolean TopToBottom
-        {
-            get { return _textRotation == 255; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Alignment.TextRotation = value ? 255 : 0);
-                else
-                    _textRotation = value ? 255 : 0;
-            }
-        }
-
-
-        public bool Equals(IXLAlignment other)
-        {
-            if (other == null)
-                return false;
-
-            var otherA = other as XLAlignment;
-            if (otherA == null)
-                return false;
-
-            return
-                _horizontal == otherA._horizontal
-                && _vertical == otherA._vertical
-                && _indent == otherA._indent
-                && _justifyLastLine == otherA._justifyLastLine
-                && _readingOrder == otherA._readingOrder
-                && _relativeIndent == otherA._relativeIndent
-                && _shrinkToFit == otherA._shrinkToFit
-                && _textRotation == otherA._textRotation
-                && _wrapText == otherA._wrapText
-                ;
-        }
-
-        public IXLStyle SetHorizontal(XLAlignmentHorizontalValues value)
-        {
-            Horizontal = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetVertical(XLAlignmentVerticalValues value)
-        {
-            Vertical = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetIndent(Int32 value)
-        {
-            Indent = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetJustifyLastLine()
-        {
-            JustifyLastLine = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetJustifyLastLine(Boolean value)
-        {
-            JustifyLastLine = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetReadingOrder(XLAlignmentReadingOrderValues value)
-        {
-            ReadingOrder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetRelativeIndent(Int32 value)
-        {
-            RelativeIndent = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetShrinkToFit()
-        {
-            ShrinkToFit = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetShrinkToFit(Boolean value)
-        {
-            ShrinkToFit = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetTextRotation(Int32 value)
-        {
-            TextRotation = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetWrapText()
-        {
-            WrapText = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetWrapText(Boolean value)
-        {
-            WrapText = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetTopToBottom()
-        {
-            TopToBottom = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetTopToBottom(Boolean value)
-        {
-            TopToBottom = value;
-            return _container.Style;
-        }
-
-        #endregion
-
-        private void SetStyleChanged()
-        {
-            if (_container != null) _container.StyleChanged = true;
-        }
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append(Horizontal);
-            sb.Append("-");
-            sb.Append(Vertical);
-            sb.Append("-");
-            sb.Append(Indent);
-            sb.Append("-");
-            sb.Append(JustifyLastLine);
-            sb.Append("-");
-            sb.Append(ReadingOrder);
-            sb.Append("-");
-            sb.Append(RelativeIndent);
-            sb.Append("-");
-            sb.Append(ShrinkToFit);
-            sb.Append("-");
-            sb.Append(TextRotation);
-            sb.Append("-");
-            sb.Append(WrapText);
-            sb.Append("-");
-            return sb.ToString();
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLAlignment)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return (Int32)Horizontal
-                   ^ (Int32)Vertical
-                   ^ Indent
-                   ^ JustifyLastLine.GetHashCode()
-                   ^ (Int32)ReadingOrder
-                   ^ RelativeIndent
-                   ^ ShrinkToFit.GetHashCode()
-                   ^ TextRotation
-                   ^ WrapText.GetHashCode();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs
deleted file mode 100644
index 387e431..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs
+++ /dev/null
@@ -1,628 +0,0 @@
-using System;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections.Generic;
-
-    internal class XLBorder : IXLBorder
-    {
-        private readonly IXLStylized _container;
-        private XLBorderStyleValues _bottomBorder;
-        private XLColor _bottomBorderColor;
-        private XLBorderStyleValues _diagonalBorder;
-        private XLColor _diagonalBorderColor;
-        private Boolean _diagonalDown;
-        private Boolean _diagonalUp;
-        private XLBorderStyleValues _leftBorder;
-        private XLColor _leftBorderColor;
-        private XLBorderStyleValues _rightBorder;
-        private XLColor _rightBorderColor;
-        private XLBorderStyleValues _topBorder;
-        private XLColor _topBorderColor;
-
-        public XLBorder() : this(null, XLWorkbook.DefaultStyle.Border)
-        {
-        }
-
-        public XLBorder(IXLStylized container, IXLBorder defaultBorder, Boolean useDefaultModify = true)
-        {
-            _container = container;
-            if (defaultBorder == null) return;
-
-            _leftBorder = defaultBorder.LeftBorder;
-            _leftBorderColor = defaultBorder.LeftBorderColor;
-            _rightBorder = defaultBorder.RightBorder;
-            _rightBorderColor = defaultBorder.RightBorderColor;
-            _topBorder = defaultBorder.TopBorder;
-            _topBorderColor = defaultBorder.TopBorderColor;
-            _bottomBorder = defaultBorder.BottomBorder;
-            _bottomBorderColor = defaultBorder.BottomBorderColor;
-            _diagonalBorder = defaultBorder.DiagonalBorder;
-            _diagonalBorderColor = defaultBorder.DiagonalBorderColor;
-            _diagonalUp = defaultBorder.DiagonalUp;
-            _diagonalDown = defaultBorder.DiagonalDown;
-
-            if (useDefaultModify)
-            {
-                var d = defaultBorder as XLBorder;
-                BottomBorderColorModified = d.BottomBorderColorModified;
-                BottomBorderModified = d.BottomBorderModified;
-                DiagonalBorderColorModified = d.DiagonalBorderColorModified;
-                DiagonalBorderModified = d.DiagonalBorderModified;
-                DiagonalDownModified = d.DiagonalDownModified;
-                DiagonalUpModified = d.DiagonalUpModified;
-                LeftBorderColorModified = d.LeftBorderColorModified;
-                LeftBorderModified = d.LeftBorderModified;
-                RightBorderColorModified = d.RightBorderColorModified;
-                RightBorderModified = d.RightBorderModified;
-                TopBorderColorModified = d.TopBorderColorModified;
-                TopBorderModified = d.TopBorderModified;
-            }
-        }
-
-        #region IXLBorder Members
-
-        public XLBorderStyleValues OutsideBorder
-        {
-            set
-            {
-                if (_container == null || _container.UpdatingStyle) return;
-
-                if (_container is XLWorksheet || _container is XLConditionalFormat)
-                {
-                    _container.Style.Border.SetTopBorder(value);
-                    _container.Style.Border.SetBottomBorder(value);
-                    _container.Style.Border.SetLeftBorder(value);
-                    _container.Style.Border.SetRightBorder(value);
-                }
-                else
-                {
-                    foreach (IXLRange r in _container.RangesUsed)
-                    {
-                        r.FirstColumn().Style.Border.LeftBorder = value;
-                        r.LastColumn().Style.Border.RightBorder = value;
-                        r.FirstRow().Style.Border.TopBorder = value;
-                        r.LastRow().Style.Border.BottomBorder = value;
-                    }
-                }
-            }
-        }
-
-
-        public XLColor OutsideBorderColor
-        {
-            set
-            {
-                if (_container == null || _container.UpdatingStyle) return;
-
-                if (_container is XLWorksheet || _container is XLConditionalFormat)
-                {
-                    _container.Style.Border.SetTopBorderColor(value);
-                    _container.Style.Border.SetBottomBorderColor(value);
-                    _container.Style.Border.SetLeftBorderColor(value);
-                    _container.Style.Border.SetRightBorderColor(value);
-                }
-                else
-                {
-                    foreach (IXLRange r in _container.RangesUsed)
-                    {
-                        r.FirstColumn().Style.Border.LeftBorderColor = value;
-                        r.LastColumn().Style.Border.RightBorderColor = value;
-                        r.FirstRow().Style.Border.TopBorderColor = value;
-                        r.LastRow().Style.Border.BottomBorderColor = value;
-                    }
-                }
-            }
-        }
-
-        public XLBorderStyleValues InsideBorder
-        {
-            set
-            {
-                if (_container == null || _container.UpdatingStyle) return;
-
-                var wsContainer = _container as XLWorksheet;
-                if (wsContainer != null)
-                {
-                    //wsContainer.CellsUsed().Style.Border.SetOutsideBorder(value);
-                    //wsContainer.UpdatingStyle = true;
-                    wsContainer.Style.Border.SetTopBorder(value);
-                    wsContainer.Style.Border.SetBottomBorder(value);
-                    wsContainer.Style.Border.SetLeftBorder(value);
-                    wsContainer.Style.Border.SetRightBorder(value);
-                    //wsContainer.UpdatingStyle = false;
-                }
-                else
-                {
-                    foreach (IXLRange r in _container.RangesUsed)
-                    {
-                        Dictionary<Int32, XLBorderStyleValues> topBorders = new Dictionary<int, XLBorderStyleValues>();
-                        r.FirstRow().Cells().ForEach(
-                            c =>
-                            topBorders.Add(c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
-                                           c.Style.Border.TopBorder));
-
-                        Dictionary<Int32, XLBorderStyleValues> bottomBorders =
-                            new Dictionary<int, XLBorderStyleValues>();
-                        r.LastRow().Cells().ForEach(
-                            c =>
-                            bottomBorders.Add(c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
-                                              c.Style.Border.BottomBorder));
-
-                        Dictionary<Int32, XLBorderStyleValues> leftBorders = new Dictionary<int, XLBorderStyleValues>();
-                        r.FirstColumn().Cells().ForEach(
-                            c =>
-                            leftBorders.Add(c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
-                                            c.Style.Border.LeftBorder));
-
-                        Dictionary<Int32, XLBorderStyleValues> rightBorders = new Dictionary<int, XLBorderStyleValues>();
-                        r.LastColumn().Cells().ForEach(
-                            c =>
-                            rightBorders.Add(c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
-                                             c.Style.Border.RightBorder));
-
-                        r.Cells().Style.Border.OutsideBorder = value;
-
-                        topBorders.ForEach(kp => r.FirstRow().Cell(kp.Key).Style.Border.TopBorder = kp.Value);
-                        bottomBorders.ForEach(kp => r.LastRow().Cell(kp.Key).Style.Border.BottomBorder = kp.Value);
-                        leftBorders.ForEach(kp => r.FirstColumn().Cell(kp.Key).Style.Border.LeftBorder = kp.Value);
-                        rightBorders.ForEach(kp => r.LastColumn().Cell(kp.Key).Style.Border.RightBorder = kp.Value);
-                    }
-                }
-            }
-        }
-
-        public XLColor InsideBorderColor
-        {
-            set
-            {
-                if (_container == null || _container.UpdatingStyle) return;
-
-                var wsContainer = _container as XLWorksheet;
-                if (wsContainer != null)
-                {
-                    //wsContainer.CellsUsed().Style.Border.SetOutsideBorderColor(value);
-                    //wsContainer.UpdatingStyle = true;
-                    wsContainer.Style.Border.SetTopBorderColor(value);
-                    wsContainer.Style.Border.SetBottomBorderColor(value);
-                    wsContainer.Style.Border.SetLeftBorderColor(value);
-                    wsContainer.Style.Border.SetRightBorderColor(value);
-                    //wsContainer.UpdatingStyle = false;
-                }
-                else
-                {
-                    foreach (IXLRange r in _container.RangesUsed)
-                    {
-                        Dictionary<Int32, XLColor> topBorders = new Dictionary<int, XLColor>();
-                        r.FirstRow().Cells().ForEach(
-                            c =>
-                            topBorders.Add(
-                                c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
-                                c.Style.Border.TopBorderColor));
-
-                        Dictionary<Int32, XLColor> bottomBorders = new Dictionary<int, XLColor>();
-                        r.LastRow().Cells().ForEach(
-                            c =>
-                            bottomBorders.Add(
-                                c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
-                                c.Style.Border.BottomBorderColor));
-
-                        Dictionary<Int32, XLColor> leftBorders = new Dictionary<int, XLColor>();
-                        r.FirstColumn().Cells().ForEach(
-                            c =>
-                            leftBorders.Add(
-                                c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
-                                c.Style.Border.LeftBorderColor));
-
-                        Dictionary<Int32, XLColor> rightBorders = new Dictionary<int, XLColor>();
-                        r.LastColumn().Cells().ForEach(
-                            c =>
-                            rightBorders.Add(
-                                c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
-                                c.Style.Border.RightBorderColor));
-
-                        r.Cells().Style.Border.OutsideBorderColor = value;
-
-                        topBorders.ForEach(
-                            kp => r.FirstRow().Cell(kp.Key).Style.Border.TopBorderColor = kp.Value);
-                        bottomBorders.ForEach(
-                            kp => r.LastRow().Cell(kp.Key).Style.Border.BottomBorderColor = kp.Value);
-                        leftBorders.ForEach(
-                            kp => r.FirstColumn().Cell(kp.Key).Style.Border.LeftBorderColor = kp.Value);
-                        rightBorders.ForEach(
-                            kp => r.LastColumn().Cell(kp.Key).Style.Border.RightBorderColor = kp.Value);
-                    }
-                }
-            }
-        }
-
-        public Boolean LeftBorderModified;
-        public XLBorderStyleValues LeftBorder
-        {
-            get { return _leftBorder; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.LeftBorder = value);
-                else
-                {
-                    _leftBorder = value;
-                    LeftBorderModified = true;
-                }
-            }
-        }
-
-        public Boolean LeftBorderColorModified;
-        public XLColor LeftBorderColor
-        {
-            get { return _leftBorderColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.LeftBorderColor = value);
-                else
-                {
-                    _leftBorderColor = value;
-                    LeftBorderColorModified = true;
-                }
-            }
-        }
-
-        public Boolean RightBorderModified;
-        public XLBorderStyleValues RightBorder
-        {
-            get { return _rightBorder; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.RightBorder = value);
-                else
-                {
-                    _rightBorder = value;
-                    RightBorderModified = true;
-                }
-            }
-        }
-
-        public Boolean RightBorderColorModified;
-        public XLColor RightBorderColor
-        {
-            get { return _rightBorderColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.RightBorderColor = value);
-                else
-                {
-                    _rightBorderColor = value;
-                    RightBorderColorModified = true;
-                }
-            }
-        }
-
-        public Boolean TopBorderModified;
-        public XLBorderStyleValues TopBorder
-        {
-            get { return _topBorder; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.TopBorder = value);
-                else
-                {
-                    _topBorder = value;
-                    TopBorderModified = true;
-                }
-            }
-        }
-
-        public Boolean TopBorderColorModified;
-        public XLColor TopBorderColor
-        {
-            get { return _topBorderColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.TopBorderColor = value);
-                else
-                {
-                    _topBorderColor = value;
-                    TopBorderColorModified = true;
-                }
-            }
-        }
-
-        public Boolean BottomBorderModified;
-        public XLBorderStyleValues BottomBorder
-        {
-            get { return _bottomBorder; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.BottomBorder = value);
-                else
-                {
-                    _bottomBorder = value;
-                    BottomBorderModified = true;
-                }
-            }
-        }
-
-        public Boolean BottomBorderColorModified;
-        public XLColor BottomBorderColor
-        {
-            get { return _bottomBorderColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.BottomBorderColor = value);
-                else
-                {
-                    _bottomBorderColor = value;
-                    BottomBorderColorModified = true;
-                }
-            }
-        }
-
-        public Boolean DiagonalBorderModified;
-        public XLBorderStyleValues DiagonalBorder
-        {
-            get { return _diagonalBorder; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.DiagonalBorder = value);
-                else
-                {
-                    _diagonalBorder = value;
-                    DiagonalBorderModified = true;
-                }
-            }
-        }
-
-        public Boolean DiagonalBorderColorModified;
-        public XLColor DiagonalBorderColor
-        {
-            get { return _diagonalBorderColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.DiagonalBorderColor = value);
-                else
-                {
-                    _diagonalBorderColor = value;
-                    DiagonalBorderColorModified = true;
-                }
-            }
-        }
-
-        public Boolean DiagonalUpModified;
-        public Boolean DiagonalUp
-        {
-            get { return _diagonalUp; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.DiagonalUp = value);
-                else
-                {
-                    _diagonalUp = value;
-                    DiagonalUpModified = true;
-                }
-            }
-        }
-
-        public Boolean DiagonalDownModified;
-        public Boolean DiagonalDown
-        {
-            get { return _diagonalDown; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Border.DiagonalDown = value);
-                else
-                {
-                    _diagonalDown = value;
-                    DiagonalDownModified = true;
-                }
-            }
-        }
-
-        public bool Equals(IXLBorder other)
-        {
-            var otherB = other as XLBorder;
-            return
-                _leftBorder == otherB._leftBorder
-                && _leftBorderColor.Equals(otherB._leftBorderColor)
-                && _rightBorder == otherB._rightBorder
-                && _rightBorderColor.Equals(otherB._rightBorderColor)
-                && _topBorder == otherB._topBorder
-                && _topBorderColor.Equals(otherB._topBorderColor)
-                && _bottomBorder == otherB._bottomBorder
-                && _bottomBorderColor.Equals(otherB._bottomBorderColor)
-                && _diagonalBorder == otherB._diagonalBorder
-                && _diagonalBorderColor.Equals(otherB._diagonalBorderColor)
-                && _diagonalUp == otherB._diagonalUp
-                && _diagonalDown == otherB._diagonalDown
-                ;
-        }
-
-        public IXLStyle SetOutsideBorder(XLBorderStyleValues value)
-        {
-            OutsideBorder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetOutsideBorderColor(XLColor value)
-        {
-            OutsideBorderColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetInsideBorder(XLBorderStyleValues value)
-        {
-            InsideBorder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetInsideBorderColor(XLColor value)
-        {
-            InsideBorderColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetLeftBorder(XLBorderStyleValues value)
-        {
-            LeftBorder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetLeftBorderColor(XLColor value)
-        {
-            LeftBorderColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetRightBorder(XLBorderStyleValues value)
-        {
-            RightBorder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetRightBorderColor(XLColor value)
-        {
-            RightBorderColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetTopBorder(XLBorderStyleValues value)
-        {
-            TopBorder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetTopBorderColor(XLColor value)
-        {
-            TopBorderColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetBottomBorder(XLBorderStyleValues value)
-        {
-            BottomBorder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetBottomBorderColor(XLColor value)
-        {
-            BottomBorderColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetDiagonalUp()
-        {
-            DiagonalUp = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetDiagonalUp(Boolean value)
-        {
-            DiagonalUp = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetDiagonalDown()
-        {
-            DiagonalDown = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetDiagonalDown(Boolean value)
-        {
-            DiagonalDown = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetDiagonalBorder(XLBorderStyleValues value)
-        {
-            DiagonalBorder = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetDiagonalBorderColor(XLColor value)
-        {
-            DiagonalBorderColor = value;
-            return _container.Style;
-        }
-
-        #endregion
-
-        private void SetStyleChanged()
-        {
-            if (_container != null) _container.StyleChanged = true;
-        }
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append(LeftBorder.ToString());
-            sb.Append("-");
-            sb.Append(LeftBorderColor);
-            sb.Append("-");
-            sb.Append(RightBorder.ToString());
-            sb.Append("-");
-            sb.Append(RightBorderColor);
-            sb.Append("-");
-            sb.Append(TopBorder.ToString());
-            sb.Append("-");
-            sb.Append(TopBorderColor);
-            sb.Append("-");
-            sb.Append(BottomBorder.ToString());
-            sb.Append("-");
-            sb.Append(BottomBorderColor);
-            sb.Append("-");
-            sb.Append(DiagonalBorder.ToString());
-            sb.Append("-");
-            sb.Append(DiagonalBorderColor);
-            sb.Append("-");
-            sb.Append(DiagonalUp.ToString());
-            sb.Append("-");
-            sb.Append(DiagonalDown.ToString());
-            return sb.ToString();
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLBorder)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return (Int32)LeftBorder
-                   ^ LeftBorderColor.GetHashCode()
-                   ^ (Int32)RightBorder
-                   ^ RightBorderColor.GetHashCode()
-                   ^ (Int32)TopBorder
-                   ^ TopBorderColor.GetHashCode()
-                   ^ (Int32)BottomBorder
-                   ^ BottomBorderColor.GetHashCode()
-                   ^ (Int32)DiagonalBorder
-                   ^ DiagonalBorderColor.GetHashCode()
-                   ^ DiagonalUp.GetHashCode()
-                   ^ DiagonalDown.GetHashCode();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs
deleted file mode 100644
index 0a1c0d7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using System;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLFill : IXLFill
-    {
-        #region IXLFill Members
-
-        public bool Equals(IXLFill other)
-        {
-            return
-                _patternType == other.PatternType
-                && _patternColor.Equals(other.PatternColor)
-                && _patternBackgroundColor.Equals(other.PatternBackgroundColor)
-                ;
-        }
-
-        #endregion
-
-        private void SetStyleChanged()
-        {
-            if (_container != null) _container.StyleChanged = true;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLFill)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return BackgroundColor.GetHashCode()
-                   ^ (Int32)PatternType
-                   ^ PatternColor.GetHashCode();
-        }
-
-        #region Properties
-
-        private XLColor _patternBackgroundColor;
-        private XLColor _patternColor;
-        private XLFillPatternValues _patternType;
-
-        public XLColor BackgroundColor
-        {
-            get { return _patternColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Fill.BackgroundColor = value);
-                else
-                {
-                    _patternType = value.HasValue ? XLFillPatternValues.Solid : XLFillPatternValues.None;
-                    _patternColor = value;
-                    _patternBackgroundColor = value;
-
-                    PatternTypeModified = true;
-                    PatternColorModified = true;
-                    PatternBackgroundColorModified = true;
-                }
-            }
-        }
-
-        public Boolean PatternColorModified;
-        public XLColor PatternColor
-        {
-            get { return _patternColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Fill.PatternColor = value);
-                else
-                {
-                    _patternColor = value;
-                    PatternColorModified = true;
-                }
-            }
-        }
-
-        public Boolean PatternBackgroundColorModified;
-        public XLColor PatternBackgroundColor
-        {
-            get { return _patternBackgroundColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Fill.PatternBackgroundColor = value);
-                else
-                {
-                    _patternBackgroundColor = value;
-                    PatternBackgroundColorModified = true;
-                }
-            }
-        }
-
-        public Boolean PatternTypeModified;
-        public XLFillPatternValues PatternType
-        {
-            get { return _patternType; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Fill.PatternType = value);
-                else
-                {
-                    _patternType = value;
-                    PatternTypeModified = true;
-                }
-            }
-        }
-
-        public IXLStyle SetBackgroundColor(XLColor value)
-        {
-            BackgroundColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetPatternColor(XLColor value)
-        {
-            PatternColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetPatternBackgroundColor(XLColor value)
-        {
-            PatternBackgroundColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetPatternType(XLFillPatternValues value)
-        {
-            PatternType = value;
-            return _container.Style;
-        }
-
-        #endregion
-
-        #region Constructors
-
-        private readonly IXLStylized _container;
-
-        public XLFill() : this(null, XLWorkbook.DefaultStyle.Fill)
-        {
-        }
-
-        public XLFill(IXLStylized container, IXLFill defaultFill = null, Boolean useDefaultModify = true)
-        {
-            _container = container;
-            if (defaultFill == null) return;
-            _patternType = defaultFill.PatternType;
-            _patternColor = defaultFill.PatternColor;
-            _patternBackgroundColor = defaultFill.PatternBackgroundColor;
-
-            if (useDefaultModify)
-            {
-                var d = defaultFill as XLFill;
-                PatternBackgroundColorModified = d.PatternBackgroundColorModified;
-                PatternColorModified = d.PatternColorModified;
-                PatternTypeModified = d.PatternTypeModified;
-            }
-        }
-
-        #endregion
-
-        #region Overridden
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append(BackgroundColor);
-            sb.Append("-");
-            sb.Append(PatternType.ToString());
-            sb.Append("-");
-            sb.Append(PatternColor);
-            return sb.ToString();
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs
deleted file mode 100644
index 8338ceb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-using System;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLFont : IXLFont
-    {
-        private readonly IXLStylized _container;
-        private Boolean _bold;
-        private XLColor _fontColor;
-        private XLFontFamilyNumberingValues _fontFamilyNumbering;
-        private String _fontName;
-        private Double _fontSize;
-        private Boolean _italic;
-        private Boolean _shadow;
-        private Boolean _strikethrough;
-        private XLFontUnderlineValues _underline;
-        private XLFontVerticalTextAlignmentValues _verticalAlignment;
-
-        public XLFont()
-            : this(null, XLWorkbook.DefaultStyle.Font)
-        {
-        }
-
-        public XLFont(IXLStylized container, IXLFontBase defaultFont, Boolean useDefaultModify = true)
-        {
-            _container = container;
-            if (defaultFont == null) return;
-
-            _bold = defaultFont.Bold;
-            _italic = defaultFont.Italic;
-            _underline = defaultFont.Underline;
-            _strikethrough = defaultFont.Strikethrough;
-            _verticalAlignment = defaultFont.VerticalAlignment;
-            _shadow = defaultFont.Shadow;
-            _fontSize = defaultFont.FontSize;
-            _fontColor = defaultFont.FontColor;
-            _fontName = defaultFont.FontName;
-            _fontFamilyNumbering = defaultFont.FontFamilyNumbering;
-
-            if (useDefaultModify)
-            {
-                var d = defaultFont as XLFont;
-                if (d == null) return;
-                BoldModified = d.BoldModified;
-                ItalicModified = d.ItalicModified;
-                UnderlineModified = d.UnderlineModified;
-                StrikethroughModified = d.StrikethroughModified;
-                VerticalAlignmentModified = d.VerticalAlignmentModified;
-                ShadowModified = d.ShadowModified;
-                FontSizeModified = d.FontSizeModified;
-                FontColorModified = d.FontColorModified;
-                FontNameModified = d.FontNameModified;
-                FontFamilyNumberingModified = d.FontFamilyNumberingModified;
-            }
-        }
-
-        #region IXLFont Members
-
-        public Boolean BoldModified { get; set; }
-        public Boolean Bold
-        {
-            get { return _bold; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.Bold = value);
-                else
-                {
-                    _bold = value;
-                    BoldModified = true;
-                }
-            }
-        }
-
-        public Boolean ItalicModified { get; set; }
-        public Boolean Italic
-        {
-            get { return _italic; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.Italic = value);
-                else
-                {
-                    _italic = value;
-                    ItalicModified = true;
-                }
-            }
-        }
-
-        public Boolean UnderlineModified { get; set; }
-        public XLFontUnderlineValues Underline
-        {
-            get { return _underline; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.Underline = value);
-                else
-                {
-                    _underline = value;
-                    UnderlineModified = true;
-                }
-                    
-            }
-        }
-
-        public Boolean StrikethroughModified { get; set; }
-        public Boolean Strikethrough
-        {
-            get { return _strikethrough; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.Strikethrough = value);
-                else
-                {
-                    _strikethrough = value;
-                    StrikethroughModified = true;
-                }
-            }
-        }
-
-        public Boolean VerticalAlignmentModified { get; set; }
-        public XLFontVerticalTextAlignmentValues VerticalAlignment
-        {
-            get { return _verticalAlignment; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.VerticalAlignment = value);
-                else
-                {
-                    _verticalAlignment = value;
-                    VerticalAlignmentModified = true;
-                }
-            }
-        }
-
-        public Boolean ShadowModified { get; set; }
-        public Boolean Shadow
-        {
-            get { return _shadow; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.Shadow = value);
-                else
-                {
-                    _shadow = value;
-                    ShadowModified = true;
-                }
-            }
-        }
-
-        public Boolean FontSizeModified { get; set; }
-        public Double FontSize
-        {
-            get { return _fontSize; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.FontSize = value);
-                else
-                {
-                    _fontSize = value;
-                    FontSizeModified = true;
-                }
-            }
-        }
-
-        private Boolean _fontColorModified;
-        public Boolean FontColorModified
-        {
-            get { return _fontColorModified; }
-            set
-            {
-                _fontColorModified = value;
-            }
-        }
-        public XLColor FontColor
-        {
-            get { return _fontColor; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.FontColor = value);
-                else
-                {
-                    _fontColor = value;
-                    FontColorModified = true;
-                }
-            }
-        }
-
-        public Boolean FontNameModified { get; set; }
-        public String FontName
-        {
-            get { return _fontName; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.FontName = value);
-                else
-                {
-                    _fontName = value;
-                    FontNameModified = true;
-                }
-            }
-        }
-
-        public Boolean FontFamilyNumberingModified { get; set; }
-        public XLFontFamilyNumberingValues FontFamilyNumbering
-        {
-            get { return _fontFamilyNumbering; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Font.FontFamilyNumbering = value);
-                else
-                {
-                    _fontFamilyNumbering = value;
-                    FontFamilyNumberingModified = true;
-                }
-            }
-        }
-
-        public IXLStyle SetBold()
-        {
-            Bold = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetBold(Boolean value)
-        {
-            Bold = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetItalic()
-        {
-            Italic = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetItalic(Boolean value)
-        {
-            Italic = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetUnderline()
-        {
-            Underline = XLFontUnderlineValues.Single;
-            return _container.Style;
-        }
-
-        public IXLStyle SetUnderline(XLFontUnderlineValues value)
-        {
-            Underline = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetStrikethrough()
-        {
-            Strikethrough = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetStrikethrough(Boolean value)
-        {
-            Strikethrough = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value)
-        {
-            VerticalAlignment = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetShadow()
-        {
-            Shadow = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetShadow(Boolean value)
-        {
-            Shadow = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetFontSize(Double value)
-        {
-            FontSize = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetFontColor(XLColor value)
-        {
-            FontColor = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetFontName(String value)
-        {
-            FontName = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value)
-        {
-            FontFamilyNumbering = value;
-            return _container.Style;
-        }
-
-        public Boolean Equals(IXLFont other)
-        {
-            var otherF = other as XLFont;
-            if (otherF == null)
-                return false;
-
-            return
-                _bold == otherF._bold
-                && _italic == otherF._italic
-                && _underline == otherF._underline
-                && _strikethrough == otherF._strikethrough
-                && _verticalAlignment == otherF._verticalAlignment
-                && _shadow == otherF._shadow
-                && _fontSize == otherF._fontSize
-                && _fontColor.Equals(otherF._fontColor)
-                && _fontName == otherF._fontName
-                && _fontFamilyNumbering == otherF._fontFamilyNumbering
-                ;
-        }
-
-        #endregion
-
-        private void SetStyleChanged()
-        {
-            if (_container != null) _container.StyleChanged = true;
-        }
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append(Bold.ToString());
-            sb.Append("-");
-            sb.Append(Italic.ToString());
-            sb.Append("-");
-            sb.Append(Underline.ToString());
-            sb.Append("-");
-            sb.Append(Strikethrough.ToString());
-            sb.Append("-");
-            sb.Append(VerticalAlignment.ToString());
-            sb.Append("-");
-            sb.Append(Shadow.ToString());
-            sb.Append("-");
-            sb.Append(FontSize.ToString());
-            sb.Append("-");
-            sb.Append(FontColor);
-            sb.Append("-");
-            sb.Append(FontName);
-            sb.Append("-");
-            sb.Append(FontFamilyNumbering.ToString());
-            return sb.ToString();
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLFont)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return Bold.GetHashCode()
-                   ^ Italic.GetHashCode()
-                   ^ (Int32)Underline
-                   ^ Strikethrough.GetHashCode()
-                   ^ (Int32)VerticalAlignment
-                   ^ Shadow.GetHashCode()
-                   ^ FontSize.GetHashCode()
-                   ^ FontColor.GetHashCode()
-                   ^ FontName.GetHashCode()
-                   ^ (Int32)FontFamilyNumbering;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLNumberFormat.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLNumberFormat.cs
deleted file mode 100644
index 1b6620a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLNumberFormat.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLNumberFormat : IXLNumberFormat
-    {
-        #region IXLNumberFormat Members
-
-        public bool Equals(IXLNumberFormat other)
-        {
-            var otherNf = other as XLNumberFormat;
-
-            return
-                _numberFormatId == otherNf._numberFormatId
-                && _format == otherNf._format
-                ;
-        }
-
-        #endregion
-
-        private void SetStyleChanged()
-        {
-            if (_container != null) _container.StyleChanged = true;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLNumberFormat)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return NumberFormatId
-                   ^ Format.GetHashCode();
-        }
-
-        #region Properties
-
-        private readonly IXLStylized _container;
-        private String _format = String.Empty;
-
-        private Int32 _numberFormatId;
-
-        public Int32 NumberFormatId
-        {
-            get { return _numberFormatId; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.NumberFormat.NumberFormatId = value);
-                else
-                {
-                    _numberFormatId = value;
-                    _format = String.Empty;
-                }
-            }
-        }
-
-        public String Format
-        {
-            get { return _format; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.NumberFormat.Format = value);
-                else
-                {
-                    _format = value;
-                    _numberFormatId = -1;
-                }
-            }
-        }
-
-        public IXLStyle SetNumberFormatId(Int32 value)
-        {
-            NumberFormatId = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetFormat(String value)
-        {
-            Format = value;
-            return _container.Style;
-        }
-
-        #endregion
-
-        #region Constructors
-
-        public XLNumberFormat()
-            : this(null, XLWorkbook.DefaultStyle.NumberFormat)
-        {
-        }
-
-
-        public XLNumberFormat(IXLStylized container, IXLNumberFormat defaultNumberFormat)
-        {
-            _container = container;
-            if (defaultNumberFormat == null) return;
-            _numberFormatId = defaultNumberFormat.NumberFormatId;
-            _format = defaultNumberFormat.Format;
-        }
-
-        #endregion
-
-        #region Overridden
-
-        public override string ToString()
-        {
-            return _numberFormatId + "-" + _format;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLProtection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLProtection.cs
deleted file mode 100644
index 7d0c2ef..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLProtection.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLProtection : IXLProtection
-    {
-        private readonly IXLStylized _container;
-        private Boolean _hidden;
-
-        private Boolean _locked;
-
-        #region IXLProtection Members
-
-        public Boolean Locked
-        {
-            get { return _locked; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Protection.Locked = value);
-                else
-                    _locked = value;
-            }
-        }
-
-        public Boolean Hidden
-        {
-            get { return _hidden; }
-            set
-            {
-                SetStyleChanged();
-                if (_container != null && !_container.UpdatingStyle)
-                    _container.Styles.ForEach(s => s.Protection.Hidden = value);
-                else
-                    _hidden = value;
-            }
-        }
-
-        public bool Equals(IXLProtection other)
-        {
-            var otherP = other as XLProtection;
-            if (otherP == null)
-                return false;
-
-            return _locked == otherP._locked
-                   && _hidden == otherP._hidden;
-        }
-
-        public IXLStyle SetLocked()
-        {
-            Locked = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetLocked(Boolean value)
-        {
-            Locked = value;
-            return _container.Style;
-        }
-
-        public IXLStyle SetHidden()
-        {
-            Hidden = true;
-            return _container.Style;
-        }
-
-        public IXLStyle SetHidden(Boolean value)
-        {
-            Hidden = value;
-            return _container.Style;
-        }
-
-        #endregion
-
-        #region Constructors
-
-        public XLProtection()
-            : this(null, XLWorkbook.DefaultStyle.Protection)
-        {
-        }
-
-        public XLProtection(IXLStylized container, IXLProtection defaultProtection = null)
-        {
-            _container = container;
-            if (defaultProtection == null) return;
-
-            _locked = defaultProtection.Locked;
-            _hidden = defaultProtection.Hidden;
-        }
-
-        #endregion
-
-        private void SetStyleChanged()
-        {
-            if (_container != null) _container.StyleChanged = true;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((IXLProtection)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            if (Locked)
-                return Hidden ? 11 : 10;
-
-            return Hidden ? 1 : 0;
-        }
-
-        public override string ToString()
-        {
-            if (Locked)
-                return Hidden ? "Locked-Hidden" : "Locked";
-
-            return Hidden ? "Hidden" : "None";
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStyle.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStyle.cs
deleted file mode 100644
index 5f67dd7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStyle.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLStyle : IXLStyle
-    {
-        public XLStyle(IXLStylized container, IXLStyle initialStyle = null, Boolean useDefaultModify = true)
-        {
-            if (initialStyle != null)
-            {
-                Font = new XLFont(container, initialStyle.Font, useDefaultModify);
-                Alignment = new XLAlignment(container, initialStyle.Alignment);
-                Border = new XLBorder(container, initialStyle.Border, useDefaultModify);
-                Fill = new XLFill(container, initialStyle.Fill, useDefaultModify);
-                NumberFormat = new XLNumberFormat(container, initialStyle.NumberFormat);
-                Protection = new XLProtection(container, initialStyle.Protection);
-            }
-            else
-            {
-                Font = new XLFont(container, null);
-                Alignment = new XLAlignment(container);
-                Border = new XLBorder(container, null);
-                Fill = new XLFill(container);
-                NumberFormat = new XLNumberFormat(container, null);
-                Protection = new XLProtection(container);
-            }
-
-            DateFormat = NumberFormat;
-        }
-
-        public IXLFont Font { get; set; }
-
-        public IXLAlignment Alignment { get; set; }
-
-        public IXLBorder Border { get; set; }
-
-        public IXLFill Fill { get; set; }
-
-        private IXLNumberFormat numberFormat;
-        public IXLNumberFormat NumberFormat 
-        {
-            get
-            {
-                return numberFormat;
-            }
-            set
-            {
-                numberFormat = value;
-                DateFormat = numberFormat;
-            }
-        }
-
-        public IXLProtection Protection { get; set; }
-
-        public IXLNumberFormat DateFormat { get; private set; }
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("Font:");
-            sb.Append(Font);
-            sb.Append(" Fill:");
-            sb.Append(Fill);
-            sb.Append(" Border:");
-            sb.Append(Border);
-            sb.Append(" NumberFormat: ");
-            sb.Append(NumberFormat);
-            sb.Append(" Alignment: ");
-            sb.Append(Alignment);
-            sb.Append(" Protection: ");
-            sb.Append(Protection);
-            return sb.ToString();
-        }
-
-        public bool Equals(IXLStyle other)
-        {
-            return
-                Font.Equals(other.Font)
-            &&  Fill.Equals(other.Fill)
-            &&  Border.Equals(other.Border)
-            &&  NumberFormat.Equals(other.NumberFormat)
-            &&  Alignment.Equals(other.Alignment)
-            &&  Protection.Equals(other.Protection)
-            ;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals((XLStyle)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return Font.GetHashCode()
-                ^ Fill.GetHashCode()
-                ^ Border.GetHashCode()
-                ^ NumberFormat.GetHashCode()
-                ^ Alignment.GetHashCode()
-                ^ Protection.GetHashCode();
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStylizedContainer.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStylizedContainer.cs
deleted file mode 100644
index a404485..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStylizedContainer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    using System;
-
-    internal class XLStylizedContainer: IXLStylized
-    {
-        public Boolean StyleChanged { get; set; }
-        readonly IXLStylized _container;
-        public XLStylizedContainer(IXLStyle style, IXLStylized container)
-        {
-            Style = style;
-            _container = container;
-            RangesUsed = container.RangesUsed;
-        }
-
-        public IXLStyle Style { get; set; }
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get 
-            {
-                _container.UpdatingStyle = true;
-                yield return Style;
-                _container.UpdatingStyle = false;
-            }
-        }
-
-        public bool UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle { get; set; }
-
-        public IXLRanges RangesUsed { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStylizedEmpty.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStylizedEmpty.cs
deleted file mode 100644
index 10aff35..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStylizedEmpty.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLStylizedEmpty: IXLStylized
-    {
-        public XLStylizedEmpty(IXLStyle defaultStyle)
-        {
-            Style = new XLStyle(this, defaultStyle);
-        }
-        public IXLStyle Style { get; set; }
-        
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return Style;
-                UpdatingStyle = false;
-            }
-        }
-
-        public bool UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle { get; set; }
-
-        public IXLRanges RangesUsed
-        {
-            get { return new XLRanges(); }
-        }
-
-        public bool StyleChanged { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTable.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTable.cs
deleted file mode 100644
index ded04e3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTable.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-namespace ClosedXML.Excel
-{
-    public enum XLTableTheme
-    {
-        TableStyleMedium28, 
-        TableStyleMedium27, 
-        TableStyleMedium26, 
-        TableStyleMedium25, 
-        TableStyleMedium24, 
-        TableStyleMedium23, 
-        TableStyleMedium22, 
-        TableStyleMedium21, 
-        TableStyleMedium20, 
-        TableStyleMedium19, 
-        TableStyleMedium18, 
-        TableStyleMedium17, 
-        TableStyleMedium16, 
-        TableStyleMedium15, 
-        TableStyleMedium14, 
-        TableStyleMedium13, 
-        TableStyleMedium12, 
-        TableStyleMedium11, 
-        TableStyleMedium10, 
-        TableStyleMedium9, 
-        TableStyleMedium8, 
-        TableStyleMedium7, 
-        TableStyleMedium6, 
-        TableStyleMedium5, 
-        TableStyleMedium4, 
-        TableStyleMedium3, 
-        TableStyleMedium2, 
-        TableStyleMedium1, 
-        TableStyleLight21, 
-        TableStyleLight20, 
-        TableStyleLight19, 
-        TableStyleLight18, 
-        TableStyleLight17, 
-        TableStyleLight16, 
-        TableStyleLight15, 
-        TableStyleLight14, 
-        TableStyleLight13, 
-        TableStyleLight12, 
-        TableStyleLight11, 
-        TableStyleLight10, 
-        TableStyleLight9, 
-        TableStyleLight8, 
-        TableStyleLight7, 
-        TableStyleLight6, 
-        TableStyleLight5, 
-        TableStyleLight4, 
-        TableStyleLight3, 
-        TableStyleLight2, 
-        TableStyleLight1, 
-        TableStyleDark11, 
-        TableStyleDark10, 
-        TableStyleDark9, 
-        TableStyleDark8, 
-        TableStyleDark7, 
-        TableStyleDark6, 
-        TableStyleDark5, 
-        TableStyleDark4, 
-        TableStyleDark3, 
-        TableStyleDark2, 
-        TableStyleDark1,
-        None
-    }
-
-    public interface IXLTable : IXLRange
-    {
-        string Name { get; set; }
-        Boolean EmphasizeFirstColumn { get; set; }
-        Boolean EmphasizeLastColumn { get; set; }
-        Boolean ShowRowStripes { get; set; }
-        Boolean ShowColumnStripes { get; set; }
-        Boolean ShowTotalsRow { get; set; }
-        Boolean ShowAutoFilter { get; set; }
-        XLTableTheme Theme { get; set; }
-        IXLRangeRow HeadersRow();
-        IXLRangeRow TotalsRow();
-        IXLTableField Field(string fieldName);
-        IXLTableField Field(int fieldIndex);
-        IEnumerable<IXLTableField> Fields { get; }
-
-       
-
-        IXLTable SetEmphasizeFirstColumn(); IXLTable SetEmphasizeFirstColumn(Boolean value);
-        IXLTable SetEmphasizeLastColumn(); IXLTable SetEmphasizeLastColumn(Boolean value);
-        IXLTable SetShowRowStripes(); IXLTable SetShowRowStripes(Boolean value);
-        IXLTable SetShowColumnStripes(); IXLTable SetShowColumnStripes(Boolean value);
-        IXLTable SetShowTotalsRow(); IXLTable SetShowTotalsRow(Boolean value);
-        IXLTable SetShowAutoFilter(); IXLTable SetShowAutoFilter(Boolean value);
-
-        /// <summary>
-        /// Clears the contents of this table.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        new IXLTable Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        IXLBaseAutoFilter AutoFilter { get; }
-
-        new IXLBaseAutoFilter SetAutoFilter();
-
-        Boolean ShowHeaderRow { get; set; }
-        IXLTable SetShowHeaderRow(); IXLTable SetShowHeaderRow(Boolean value);
-
-        IXLTableRange DataRange { get; }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableField.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableField.cs
deleted file mode 100644
index 5898961..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableField.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public enum XLTotalsRowFunction
-    {
-        None,
-        Sum,
-        Minimum,
-        Maximum,
-        Average,
-        Count,
-        CountNumbers,
-        StandardDeviation,
-        Variance,
-        Custom
-    }
-
-    public interface IXLTableField
-    {
-        Int32 Index { get; }
-        String Name { get; set; }
-        String TotalsRowLabel { get; set; }
-        String TotalsRowFormulaA1 { get; set; }
-        String TotalsRowFormulaR1C1 { get; set; }
-        XLTotalsRowFunction TotalsRowFunction { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRange.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRange.cs
deleted file mode 100644
index 4c21627..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRange.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-namespace ClosedXML.Excel
-{
-
-    public interface IXLTableRange : IXLRange
-    {
-        IXLTableRow FirstRow(Func<IXLTableRow, Boolean> predicate = null);
-        IXLTableRow FirstRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null);
-        IXLTableRow FirstRowUsed(Func<IXLTableRow, Boolean> predicate = null);
-        IXLTableRow LastRow(Func<IXLTableRow, Boolean> predicate = null);
-        IXLTableRow LastRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null);
-        IXLTableRow LastRowUsed(Func<IXLTableRow, Boolean> predicate = null);
-
-        new IXLTableRow Row(int row);
-        IXLTableRows Rows(Func<IXLTableRow, Boolean> predicate = null);
-        new IXLTableRows Rows(int firstRow, int lastRow);
-        new IXLTableRows Rows(string rows);
-        IXLTableRows RowsUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null);
-        IXLTableRows RowsUsed(Func<IXLTableRow, Boolean> predicate = null);
-
-        IXLTable Table { get; }
-
-        new IXLTableRows InsertRowsAbove(int numberOfRows);
-        new IXLTableRows InsertRowsBelow(int numberOfRows);
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRow.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRow.cs
deleted file mode 100644
index ac3ce9c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRow.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLTableRow: IXLRangeRow
-    {
-        IXLCell Field(Int32 index);
-        IXLCell Field(String name);
-
-        new IXLTableRow Sort();
-        new IXLTableRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
-
-        new IXLTableRow RowAbove();
-        new IXLTableRow RowAbove(Int32 step);
-        new IXLTableRow RowBelow();
-        new IXLTableRow RowBelow(Int32 step);
-
-        /// <summary>
-        /// Clears the contents of this row.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        new IXLTableRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        new IXLTableRows InsertRowsAbove(int numberOfRows);
-        new IXLTableRows InsertRowsBelow(int numberOfRows);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRows.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRows.cs
deleted file mode 100644
index fea7075..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTableRows.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLTableRows: IEnumerable<IXLTableRow>
-    {
-        /// <summary>
-        /// Adds a table row to this group.
-        /// </summary>
-        /// <param name="tableRow">The row table to add.</param>
-        void Add(IXLTableRow tableRow);
-
-        /// <summary>
-        /// Returns the collection of cells.
-        /// </summary>
-        IXLCells Cells();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        IXLCells CellsUsed();
-
-        /// <summary>
-        /// Returns the collection of cells that have a value.
-        /// </summary>
-        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
-        IXLCells CellsUsed(Boolean includeFormats);
-
-        IXLStyle Style { get; set; }
-
-        /// <summary>
-        /// Clears the contents of these rows.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLTableRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        void Select();
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTables.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTables.cs
deleted file mode 100644
index 8411ce1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/IXLTables.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    public interface IXLTables: IEnumerable<IXLTable>
-    {
-        void Add(IXLTable table);
-        IXLTable Table(Int32 index);
-        IXLTable Table(String name);
-
-        /// <summary>
-        /// Clears the contents of these tables.
-        /// </summary>
-        /// <param name="clearOptions">Specify what you want to clear.</param>
-        IXLTables Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
-
-        void Remove(Int32 index);
-        void Remove(String name);
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTable.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTable.cs
deleted file mode 100644
index a090dfc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTable.cs
+++ /dev/null
@@ -1,532 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLTable : XLRange, IXLTable
-    {
-        #region Private fields
-
-        private string _name;
-        internal bool _showTotalsRow;
-        internal HashSet<String> _uniqueNames;
-
-        #endregion
-
-        #region Constructor
-
-        public XLTable(XLRange range, Boolean addToTables, Boolean setAutofilter = true)
-            : base(new XLRangeParameters(range.RangeAddress, range.Style ))
-        {
-            InitializeValues(setAutofilter);
-
-            Int32 id = 1;
-            while (true)
-            {
-                string tableName = String.Format("Table{0}", id);
-                if (!Worksheet.Tables.Any(t => t.Name == tableName))
-                {
-                    Name = tableName;
-                    AddToTables(range, addToTables);
-                    break;
-                }
-                id++;
-            }
-        }
-
-        public XLTable(XLRange range, String name, Boolean addToTables, Boolean setAutofilter = true)
-            : base(new XLRangeParameters(range.RangeAddress, range.Style))
-        {
-            InitializeValues(setAutofilter);
-
-            Name = name;
-            AddToTables(range, addToTables);
-        }
-
-        #endregion
-
-        private IXLRangeAddress _lastRangeAddress;
-        private Dictionary<String, IXLTableField> _fieldNames = null;
-        public Dictionary<String, IXLTableField> FieldNames
-        {
-            get
-            {
-                if (_fieldNames != null && _lastRangeAddress != null && _lastRangeAddress.Equals(RangeAddress)) return _fieldNames;
-
-                _fieldNames = new Dictionary<String, IXLTableField>();
-                _lastRangeAddress = RangeAddress;
-
-                if (ShowHeaderRow)
-                {
-                    var headersRow = HeadersRow();
-                    Int32 cellPos = 0;
-                    foreach (var cell in headersRow.Cells())
-                    {
-                        var name = cell.GetString();
-                        if (XLHelper.IsNullOrWhiteSpace(name)) 
-                        {
-                            name = "Column" + (cellPos + 1);
-                            cell.SetValue(name);
-                        }
-                        if (_fieldNames.ContainsKey(name))
-                            throw new ArgumentException("The header row contains more than one field name '" + name + "'.");
-
-                        _fieldNames.Add(name, new XLTableField(this) {Index = cellPos++ });
-                    }
-                }
-                else
-                {
-                    if (_fieldNames == null) _fieldNames = new Dictionary<String, IXLTableField>();
-
-                    Int32 colCount = ColumnCount();
-                    for (Int32 i = 1; i <= colCount; i++)
-                    {
-                        if (!_fieldNames.Values.Any(f => f.Index == i - 1))
-                        {
-                            var name = "Column" + i;
-
-                            _fieldNames.Add(name, new XLTableField(this) {Index = i - 1 });
-                        }
-                    }
-                }
-                return _fieldNames;
-            }
-        }
-
-        internal void AddFields(IEnumerable<String> fieldNames)
-        {
-            _fieldNames = new Dictionary<String, IXLTableField>();
-
-            Int32 cellPos = 0;
-            foreach(var name in fieldNames)
-            {
-                _fieldNames.Add(name, new XLTableField(this) { Index = cellPos++, Name = name });
-            }
-        }
-
-
-        public String RelId { get; set; }
-
-        public IXLTableRange DataRange
-        {
-            get
-            {
-                XLRange range;
-                //var ws = Worksheet;
-                //var tracking = ws.EventTrackingEnabled;
-                //ws.EventTrackingEnabled = false;
-
-                if (_showHeaderRow)
-                {
-                    range = _showTotalsRow
-                                ? Range(2, 1,RowCount() - 1,ColumnCount())
-                                : Range(2, 1, RowCount(), ColumnCount());
-                }
-                else
-                {
-                    range = _showTotalsRow
-                                ? Range(1, 1, RowCount() - 1, ColumnCount())
-                                : Range(1, 1, RowCount(), ColumnCount());
-                }
-                //ws.EventTrackingEnabled = tracking;
-                return new XLTableRange(range, this);
-            }
-        }
-
-        private XLAutoFilter _autoFilter;
-        public XLAutoFilter AutoFilter
-        {
-            get
-            {
-                using (var asRange = ShowTotalsRow ? Range(1, 1, RowCount() - 1, ColumnCount()) : AsRange())
-                {
-                    if (_autoFilter == null)
-                        _autoFilter = new XLAutoFilter();
-
-                    _autoFilter.Range = asRange;
-                }
-                return _autoFilter;
-            }
-        }
-
-        public new IXLBaseAutoFilter SetAutoFilter()
-        {
-            return AutoFilter;
-        }
-
-        #region IXLTable Members
-
-        public Boolean EmphasizeFirstColumn { get; set; }
-        public Boolean EmphasizeLastColumn { get; set; }
-        public Boolean ShowRowStripes { get; set; }
-        public Boolean ShowColumnStripes { get; set; }
-
-        private Boolean _showAutoFilter;
-        public Boolean ShowAutoFilter { 
-            get { return _showHeaderRow && _showAutoFilter; } 
-            set { _showAutoFilter = value; }
-            }
-        public XLTableTheme Theme { get; set; }
-
-        public String Name
-        {
-            get { return _name; }
-            set
-            {
-                if (Worksheet.Tables.Any(t => t.Name == value))
-                {
-                    throw new ArgumentException(String.Format("This worksheet already contains a table named '{0}'",
-                                                              value));
-                }
-
-                _name = value;
-            }
-        }
-
-        public Boolean ShowTotalsRow
-        {
-            get { return _showTotalsRow; }
-            set
-            {
-                if (value && !_showTotalsRow)
-                    InsertRowsBelow(1);
-                else if (!value && _showTotalsRow)
-                    TotalsRow().Delete();
-
-                _showTotalsRow = value;
-
-                if (_showTotalsRow)
-                {
-                    AutoFilter.Range = Worksheet.Range(
-                        RangeAddress.FirstAddress.RowNumber, RangeAddress.FirstAddress.ColumnNumber,
-                        RangeAddress.LastAddress.RowNumber - 1, RangeAddress.LastAddress.ColumnNumber);
-                }
-                else
-                    AutoFilter.Range = Worksheet.Range(RangeAddress);
-            }
-        }
-
-        public IXLRangeRow HeadersRow()
-        {
-            if (!ShowHeaderRow) return null;
-
-            var m = FieldNames;
-            return FirstRow();
-        }
-
-        public IXLRangeRow TotalsRow()
-        {
-            return ShowTotalsRow ? LastRow() : null;
-        }
-
-        public IXLTableField Field(String fieldName)
-        {
-            return Field(GetFieldIndex(fieldName));
-        }
-
-        public IXLTableField Field(Int32 fieldIndex)
-        {
-            return FieldNames.Values.First(f => f.Index == fieldIndex);
-        }
-
-        public IEnumerable<IXLTableField> Fields
-        {
-            get
-            {
-                Int32 columnCount = ColumnCount();
-                for (int co = 0; co < columnCount; co++)
-                    yield return Field(co);
-            }
-        }
-
-        public IXLTable SetEmphasizeFirstColumn()
-        {
-            EmphasizeFirstColumn = true;
-            return this;
-        }
-
-        public IXLTable SetEmphasizeFirstColumn(Boolean value)
-        {
-            EmphasizeFirstColumn = value;
-            return this;
-        }
-
-        public IXLTable SetEmphasizeLastColumn()
-        {
-            EmphasizeLastColumn = true;
-            return this;
-        }
-
-        public IXLTable SetEmphasizeLastColumn(Boolean value)
-        {
-            EmphasizeLastColumn = value;
-            return this;
-        }
-
-        public IXLTable SetShowRowStripes()
-        {
-            ShowRowStripes = true;
-            return this;
-        }
-
-        public IXLTable SetShowRowStripes(Boolean value)
-        {
-            ShowRowStripes = value;
-            return this;
-        }
-
-        public IXLTable SetShowColumnStripes()
-        {
-            ShowColumnStripes = true;
-            return this;
-        }
-
-        public IXLTable SetShowColumnStripes(Boolean value)
-        {
-            ShowColumnStripes = value;
-            return this;
-        }
-
-        public IXLTable SetShowTotalsRow()
-        {
-            ShowTotalsRow = true;
-            return this;
-        }
-
-        public IXLTable SetShowTotalsRow(Boolean value)
-        {
-            ShowTotalsRow = value;
-            return this;
-        }
-
-        public IXLTable SetShowAutoFilter()
-        {
-            ShowAutoFilter = true;
-            return this;
-        }
-
-        public IXLTable SetShowAutoFilter(Boolean value)
-        {
-            ShowAutoFilter = value;
-            return this;
-        }
-
-        public new IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending,
-                                 Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            var toSortBy = new StringBuilder();
-            foreach (string coPairTrimmed in columnsToSortBy.Split(',').Select(coPair => coPair.Trim()))
-            {
-                String coString;
-                String order;
-                if (coPairTrimmed.Contains(' '))
-                {
-                    var pair = coPairTrimmed.Split(' ');
-                    coString = pair[0];
-                    order = pair[1];
-                }
-                else
-                {
-                    coString = coPairTrimmed;
-                    order = "ASC";
-                }
-
-                Int32 co;
-                if (!Int32.TryParse(coString, out co))
-                    co = Field(coString).Index + 1;
-
-                toSortBy.Append(co);
-                toSortBy.Append(" ");
-                toSortBy.Append(order);
-                toSortBy.Append(",");
-            }
-            return DataRange.Sort(toSortBy.ToString(0, toSortBy.Length - 1), sortOrder, matchCase, ignoreBlanks);
-        }
-
-        public new IXLTable Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            base.Clear(clearOptions);
-            return this;
-        }
-
-        IXLBaseAutoFilter IXLTable.AutoFilter
-        {
-            get { return AutoFilter; }
-        }
-
-        public new void Dispose()
-        {
-            if (AutoFilter != null)
-                AutoFilter.Dispose();
-
-            base.Dispose();
-        }
-
-        #endregion
-
-
-
-        private void InitializeValues(Boolean setAutofilter)
-        {
-            ShowRowStripes = true;
-            _showHeaderRow = true;
-            Theme = XLTableTheme.TableStyleLight9;
-            if (setAutofilter)
-                InitializeAutoFilter();
-
-            HeadersRow().DataType = XLCellValues.Text;
-
-            if (RowCount() == 1)
-                InsertRowsBelow(1);
-        }
-
-        public void InitializeAutoFilter()
-        {
-            ShowAutoFilter = true;
-        }
-
-        private void AddToTables(XLRange range, Boolean addToTables)
-        {
-            if (!addToTables) return;
-
-            _uniqueNames = new HashSet<string>();
-            Int32 co = 1;
-            foreach (IXLCell c in range.Row(1).Cells())
-            {
-                if (XLHelper.IsNullOrWhiteSpace(((XLCell)c).InnerText))
-                    c.Value = GetUniqueName("Column" + co.ToInvariantString());
-                _uniqueNames.Add(c.GetString());
-                co++;
-            }
-            Worksheet.Tables.Add(this);
-        }
-
-
-        private String GetUniqueName(String originalName)
-        {
-            String name = originalName;
-            if (_uniqueNames.Contains(name))
-            {
-                Int32 i = 1;
-                name = originalName + i.ToInvariantString();
-                while (_uniqueNames.Contains(name))
-                {
-                    i++;
-                    name = originalName + i.ToInvariantString();
-                }
-            }
-
-            _uniqueNames.Add(name);
-            return name;
-        }
-
-        public Int32 GetFieldIndex(String name)
-        {
-            if (FieldNames.ContainsKey(name))
-                return FieldNames[name].Index;
-
-            throw new ArgumentOutOfRangeException("The header row doesn't contain field name '" + name + "'.");
-        }
-
-        internal Boolean _showHeaderRow;
-        public Boolean ShowHeaderRow
-        {
-            get { return _showHeaderRow; }
-            set
-            {
-                if (_showHeaderRow == value) return;
-
-                if (_showHeaderRow)
-                {
-                    var headersRow = HeadersRow();
-                    _uniqueNames = new HashSet<string>();
-                    Int32 co = 1;
-                    foreach (IXLCell c in headersRow.Cells())
-                    {
-                        if (XLHelper.IsNullOrWhiteSpace(((XLCell)c).InnerText))
-                            c.Value = GetUniqueName("Column" + co.ToInvariantString());
-                        _uniqueNames.Add(c.GetString());
-                        co++;
-                    }
-                    
-                    headersRow.Clear();
-                    RangeAddress.FirstAddress = new XLAddress(Worksheet, RangeAddress.FirstAddress.RowNumber + 1,
-                                          RangeAddress.FirstAddress.ColumnNumber,
-                                          RangeAddress.FirstAddress.FixedRow,
-                                          RangeAddress.FirstAddress.FixedColumn);
-
-                    HeadersRow().DataType = XLCellValues.Text;
-                }
-                else
-                {
-                    using(var asRange = Worksheet.Range(
-                        RangeAddress.FirstAddress.RowNumber - 1 , 
-                        RangeAddress.FirstAddress.ColumnNumber,
-                        RangeAddress.LastAddress.RowNumber,
-                        RangeAddress.LastAddress.ColumnNumber
-                        ))
-                        using (var firstRow = asRange.FirstRow())
-                            {
-                                IXLRangeRow rangeRow;
-                                if (firstRow.IsEmpty(true))
-                                {
-                                    rangeRow = firstRow;
-                                    RangeAddress.FirstAddress = new XLAddress(Worksheet, 
-                                          RangeAddress.FirstAddress.RowNumber - 1,
-                                          RangeAddress.FirstAddress.ColumnNumber,
-                                          RangeAddress.FirstAddress.FixedRow,
-                                          RangeAddress.FirstAddress.FixedColumn);
-                                }
-                                else
-                                {
-                                    var fAddress = RangeAddress.FirstAddress;
-                                    var lAddress = RangeAddress.LastAddress;
-
-                                    rangeRow = firstRow.InsertRowsBelow(1, false).First();
-
-
-                                    RangeAddress.FirstAddress = new XLAddress(Worksheet, fAddress.RowNumber,
-                                                                              fAddress.ColumnNumber,
-                                                                              fAddress.FixedRow,
-                                                                              fAddress.FixedColumn);
-
-                                    RangeAddress.LastAddress = new XLAddress(Worksheet, lAddress.RowNumber + 1,
-                                                                             lAddress.ColumnNumber,
-                                                                             lAddress.FixedRow,
-                                                                             lAddress.FixedColumn);
-                                }
-
-                                Int32 co = 1;
-                                foreach (var name in FieldNames.Keys)
-                                {
-                                    rangeRow.Cell(co).SetValue(name);
-                                    co++;
-                                }
-
-                            }
-                }
-                _showHeaderRow = value;
-            }
-        }
-        public IXLTable SetShowHeaderRow()
-        {
-            return SetShowHeaderRow(true);
-        } 
-        public IXLTable SetShowHeaderRow(Boolean value)
-        {
-            ShowHeaderRow = value;
-            return this;
-        }
-
-        public void ExpandTableRows(Int32 rows)
-        {
-            RangeAddress.LastAddress = new XLAddress(Worksheet, RangeAddress.LastAddress.RowNumber + rows,
-                                                     RangeAddress.LastAddress.ColumnNumber,
-                                                     RangeAddress.LastAddress.FixedRow,
-                                                     RangeAddress.LastAddress.FixedColumn);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableField.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableField.cs
deleted file mode 100644
index 0f98646..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableField.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLTableField: IXLTableField
-    {
-        private XLTable table;
-        public XLTableField(XLTable table)
-        {
-            this.table = table;
-        }
-
-        public Int32 Index { get; internal set; }
-
-        public String Name 
-        {
-            get
-            {
-                return table.HeadersRow().Cell(Index + 1).GetString();
-            }
-            set
-            {
-                table.HeadersRow().Cell(Index + 1).SetValue(value);
-            }
-        }
-
-        internal String totalsRowLabel;
-        public String TotalsRowLabel
-        {
-            get { return totalsRowLabel; }
-            set 
-            {
-                totalsRowFunction = XLTotalsRowFunction.None;
-                table.TotalsRow().Cell(Index + 1).SetValue(value);
-                totalsRowLabel = value; 
-            }
-        }
-
-        public String TotalsRowFormulaA1
-        {
-            get { return table.TotalsRow().Cell(Index + 1).FormulaA1; }
-            set 
-            {
-                totalsRowFunction = XLTotalsRowFunction.Custom;
-                table.TotalsRow().Cell(Index + 1).FormulaA1 = value;
-            }
-        }
-        public String TotalsRowFormulaR1C1
-        {
-            get { return table.TotalsRow().Cell(Index + 1).FormulaR1C1; }
-            set
-            {
-                totalsRowFunction = XLTotalsRowFunction.Custom;
-                table.TotalsRow().Cell(Index + 1).FormulaR1C1 = value;
-            }
-        }
-
-        internal XLTotalsRowFunction totalsRowFunction;
-        public XLTotalsRowFunction TotalsRowFunction
-        {
-            get { return totalsRowFunction; }
-            set 
-            {
-                if (value != XLTotalsRowFunction.None && value != XLTotalsRowFunction.Custom)
-                {
-                    var cell = table.TotalsRow().Cell(Index + 1);
-                    String formula = String.Empty;
-                    switch (value)
-                    {
-                        case XLTotalsRowFunction.Sum: formula = "109"; break;
-                        case XLTotalsRowFunction.Minimum: formula = "105"; break;
-                        case XLTotalsRowFunction.Maximum: formula = "104"; break;
-                        case XLTotalsRowFunction.Average: formula = "101"; break;
-                        case XLTotalsRowFunction.Count: formula = "103"; break;
-                        case XLTotalsRowFunction.CountNumbers: formula = "102"; break;
-                        case XLTotalsRowFunction.StandardDeviation: formula = "107"; break;
-                        case XLTotalsRowFunction.Variance: formula = "110"; break;
-                    }
-
-                    cell.FormulaA1 = "SUBTOTAL(" + formula + ",[" + Name + "])";
-                    var lastCell = table.LastRow().Cell(Index + 1);
-                    if (lastCell.DataType != XLCellValues.Text)
-                    {
-                        cell.DataType = lastCell.DataType;
-                        cell.Style.NumberFormat = lastCell.Style.NumberFormat;
-                    }
-                }
-                totalsRowFunction = value; 
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRange.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRange.cs
deleted file mode 100644
index 39d5289..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRange.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    using System.Linq;
-
-    internal class XLTableRange : XLRange, IXLTableRange
-    {
-        private readonly XLTable _table;
-        private readonly XLRange _range;
-        public XLTableRange(XLRange range, XLTable table):base(range.RangeParameters)
-        {
-            _table = table;
-            _range = range;
-        }
-
-        IXLTableRow IXLTableRange.FirstRow(Func<IXLTableRow, Boolean> predicate)
-        {
-            return FirstRow(predicate);
-        }
-        public XLTableRow FirstRow(Func<IXLTableRow, Boolean> predicate = null)
-        {
-            if (predicate == null)
-                return new XLTableRow(this, (_range.FirstRow()));
-
-            Int32 rowCount = _range.RowCount();
-
-            for (Int32 ro = 1; ro <= rowCount; ro++)
-            {
-                var row = new XLTableRow(this, (_range.Row(ro)));
-                if (predicate(row)) return row;
-
-                row.Dispose();
-            }
-
-            return null;
-        }
-
-        IXLTableRow IXLTableRange.FirstRowUsed(Func<IXLTableRow, Boolean> predicate)
-        {
-            return FirstRowUsed(false, predicate);
-        }
-        public XLTableRow FirstRowUsed(Func<IXLTableRow, Boolean> predicate = null)
-        {
-            return FirstRowUsed(false, predicate);
-        }
-
-        IXLTableRow IXLTableRange.FirstRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate)
-        {
-            return FirstRowUsed(includeFormats, predicate);
-        }
-        public XLTableRow FirstRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null)
-        {
-            if (predicate == null)
-                return new XLTableRow(this, (_range.FirstRowUsed(includeFormats)));
-
-            Int32 rowCount = _range.RowCount();
-
-            for (Int32 ro = 1; ro <= rowCount; ro++)
-            {
-                var row = new XLTableRow(this, (_range.Row(ro)));
-
-                if (!row.IsEmpty(includeFormats) && predicate(row))
-                    return row;
-                row.Dispose();
-            }
-
-            return null;
-        }
-
-
-        IXLTableRow IXLTableRange.LastRow(Func<IXLTableRow, Boolean> predicate)
-        {
-            return LastRow(predicate);
-        }
-        public XLTableRow LastRow(Func<IXLTableRow, Boolean> predicate = null)
-        {
-            if (predicate == null)
-                return new XLTableRow(this, (_range.LastRow()));
-
-            Int32 rowCount = _range.RowCount();
-
-            for (Int32 ro = rowCount; ro >= 1; ro--)
-            {
-                var row = new XLTableRow(this, (_range.Row(ro)));
-                if (predicate(row)) return row;
-
-                row.Dispose();
-            }
-            return null;
-        }
-
-        IXLTableRow IXLTableRange.LastRowUsed(Func<IXLTableRow, Boolean> predicate)
-        {
-            return LastRowUsed(false, predicate);
-        }
-        public XLTableRow LastRowUsed(Func<IXLTableRow, Boolean> predicate = null)
-        {
-            return LastRowUsed(false, predicate);
-        }
-
-        IXLTableRow IXLTableRange.LastRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate)
-        {
-            return LastRowUsed(includeFormats, predicate);
-        }
-        public XLTableRow LastRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null)
-        {
-            if (predicate == null)
-                return new XLTableRow(this, (_range.LastRowUsed(includeFormats)));
-
-            Int32 rowCount = _range.RowCount();
-
-            for (Int32 ro = rowCount; ro >= 1; ro--)
-            {
-                var row = new XLTableRow(this, (_range.Row(ro)));
-
-                if (!row.IsEmpty(includeFormats) && predicate(row))
-                    return row;
-                row.Dispose();
-            }
-
-            return null;
-        }
-
-        IXLTableRow IXLTableRange.Row(int row)
-        {
-            return Row(row);
-        }
-        public new XLTableRow Row(int row)
-        {
-            if (row <= 0 || row > XLHelper.MaxRowNumber)
-            {
-                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}",
-                                                                 XLHelper.MaxRowNumber));
-            }
-
-            return new XLTableRow(this, base.Row(row));
-        }
-
-        public IXLTableRows Rows(Func<IXLTableRow, Boolean> predicate = null)
-        {
-            var retVal = new XLTableRows(Worksheet.Style);
-            Int32 rowCount = _range.RowCount();
-
-            for (int r = 1; r <= rowCount; r++)
-            {
-                var row = Row(r);
-                if (predicate == null || predicate(row))
-                    retVal.Add(row);
-                else
-                    row.Dispose();
-            }
-            return retVal;
-        }
-
-        public new IXLTableRows Rows(int firstRow, int lastRow)
-        {
-            var retVal = new XLTableRows(Worksheet.Style);
-
-            for (int ro = firstRow; ro <= lastRow; ro++)
-                retVal.Add(Row(ro));
-            return retVal;
-        }
-
-        public new IXLTableRows Rows(string rows)
-        {
-            var retVal = new XLTableRows(Worksheet.Style);
-            var rowPairs = rows.Split(',');
-            foreach (string tPair in rowPairs.Select(pair => pair.Trim()))
-            {
-                String firstRow;
-                String lastRow;
-                if (tPair.Contains(':') || tPair.Contains('-'))
-                {
-                    var rowRange = XLHelper.SplitRange(tPair);
-
-                    firstRow = rowRange[0];
-                    lastRow = rowRange[1];
-                }
-                else
-                {
-                    firstRow = tPair;
-                    lastRow = tPair;
-                }
-                foreach (IXLTableRow row in Rows(Int32.Parse(firstRow), Int32.Parse(lastRow)))
-                    retVal.Add(row);
-            }
-            return retVal;
-        }
-
-        IXLTableRows IXLTableRange.RowsUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate)
-        {
-            return RowsUsed(includeFormats, predicate);
-        }
-        public IXLTableRows RowsUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null)
-        {
-            var rows = new XLTableRows(Worksheet.Style);
-            Int32 rowCount = RowCount();
-
-            for (Int32 ro = 1; ro <= rowCount; ro++)
-            {
-                var row = Row(ro);
-
-                if (!row.IsEmpty(includeFormats) && (predicate == null || predicate(row)))
-                    rows.Add(row);
-                else
-                    row.Dispose();
-            }
-            return rows;
-        }
-
-        IXLTableRows IXLTableRange.RowsUsed(Func<IXLTableRow, Boolean> predicate)
-        {
-            return RowsUsed(predicate);
-        }
-        public IXLTableRows RowsUsed(Func<IXLTableRow, Boolean> predicate = null)
-        {
-            return RowsUsed(false, predicate);
-        }
-
-        IXLTable IXLTableRange.Table { get { return _table; } }
-        public XLTable Table { get { return _table; } }
-
-        public new IXLTableRows InsertRowsAbove(int numberOfRows)
-        {
-            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsAbove, this, numberOfRows, !Table.ShowTotalsRow );
-        }
-        public new IXLTableRows InsertRowsBelow(int numberOfRows)
-        {
-            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsBelow, this, numberOfRows, !Table.ShowTotalsRow);
-        }
-
-
-        public new IXLRangeColumn Column(String column)
-        {
-            if (XLHelper.IsValidColumn(column))
-            {
-                Int32 coNum = XLHelper.GetColumnNumberFromLetter(column);
-                return coNum > ColumnCount() ? Column(_table.GetFieldIndex(column) + 1) : Column(coNum);
-            }
-
-            return Column(_table.GetFieldIndex(column) + 1);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRow.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRow.cs
deleted file mode 100644
index 9fbd73c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRow.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLTableRow : XLRangeRow, IXLTableRow
-    {
-        private readonly XLTableRange _tableRange;
-
-        public XLTableRow(XLTableRange tableRange, XLRangeRow rangeRow)
-            : base(rangeRow.RangeParameters, false)
-        {
-            _tableRange = tableRange;
-        }
-
-        #region IXLTableRow Members
-
-        public IXLCell Field(Int32 index)
-        {
-            return Cell(index + 1);
-        }
-
-        public IXLCell Field(String name)
-        {
-            Int32 fieldIndex = _tableRange.Table.GetFieldIndex(name);
-            return Cell(fieldIndex + 1);
-        }
-
-        public new IXLTableRow Sort()
-        {
-            return SortLeftToRight();
-        }
-
-        public new IXLTableRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
-            return this;
-        }
-
-        #endregion
-
-        private XLTableRow RowShift(Int32 rowsToShift)
-        {
-            return _tableRange.Row(RowNumber() + rowsToShift);
-        }
-
-        #region XLTableRow Above
-
-        IXLTableRow IXLTableRow.RowAbove()
-        {
-            return RowAbove();
-        }
-
-        IXLTableRow IXLTableRow.RowAbove(Int32 step)
-        {
-            return RowAbove(step);
-        }
-
-        public new XLTableRow RowAbove()
-        {
-            return RowAbove(1);
-        }
-
-        public new XLTableRow RowAbove(Int32 step)
-        {
-            return RowShift(step * -1);
-        }
-
-        #endregion
-
-        #region XLTableRow Below
-
-        IXLTableRow IXLTableRow.RowBelow()
-        {
-            return RowBelow();
-        }
-
-        IXLTableRow IXLTableRow.RowBelow(Int32 step)
-        {
-            return RowBelow(step);
-        }
-
-        public new XLTableRow RowBelow()
-        {
-            return RowBelow(1);
-        }
-
-        public new XLTableRow RowBelow(Int32 step)
-        {
-            return RowShift(step);
-        }
-
-        #endregion
-
-        public new IXLTableRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            base.Clear(clearOptions);
-            return this;
-        }
-
-        public new IXLTableRows InsertRowsAbove(int numberOfRows)
-        {
-            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsAbove, _tableRange, numberOfRows, !_tableRange.Table.ShowTotalsRow);
-        }
-        public new IXLTableRows InsertRowsBelow(int numberOfRows)
-        {
-            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsBelow, _tableRange, numberOfRows, !_tableRange.Table.ShowTotalsRow);
-        }
-
-        public new void Delete()
-        {
-            Delete(XLShiftDeletedCells.ShiftCellsUp);
-            _tableRange.Table.ExpandTableRows(-1);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRows.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRows.cs
deleted file mode 100644
index e5905c4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTableRows.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    internal class XLTableRows : IXLTableRows, IXLStylized
-    {
-        public Boolean StyleChanged { get; set; }
-        private readonly List<XLTableRow> _ranges = new List<XLTableRow>();
-        private IXLStyle _style;
-        
-
-        public XLTableRows(IXLStyle defaultStyle)
-        {
-            _style = new XLStyle(this, defaultStyle);
-        }
-
-        #region IXLStylized Members
-
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return _style;
-                foreach (XLTableRow rng in _ranges)
-                {
-                    yield return rng.Style;
-                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
-                        rng.RangeAddress.FirstAddress.RowNumber,
-                        rng.RangeAddress.FirstAddress.ColumnNumber,
-                        rng.RangeAddress.LastAddress.RowNumber,
-                        rng.RangeAddress.LastAddress.ColumnNumber))
-                        yield return r.Style;
-                }
-                UpdatingStyle = false;
-            }
-        }
-
-        public Boolean UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle
-        {
-            get { return _style; }
-            set { _style = new XLStyle(this, value); }
-        }
-
-        public IXLRanges RangesUsed
-        {
-            get
-            {
-                var retVal = new XLRanges();
-                this.ForEach(c => retVal.Add(c.AsRange()));
-                return retVal;
-            }
-        }
-
-        #endregion
-
-        #region IXLTableRows Members
-
-        public IXLTableRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            _ranges.ForEach(r => r.Clear(clearOptions));
-            return this;
-        }
-
-        public void Add(IXLTableRow range)
-        {
-            _ranges.Add((XLTableRow)range);
-        }
-
-        public IEnumerator<IXLTableRow> GetEnumerator()
-        {
-            var retList = new List<IXLTableRow>();
-            _ranges.ForEach(retList.Add);
-            return retList.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLStyle Style
-        {
-            get { return _style; }
-            set
-            {
-                _style = new XLStyle(this, value);
-                _ranges.ForEach(r => r.Style = value);
-            }
-        }
-
-        public IXLCells Cells()
-        {
-            var cells = new XLCells(false, false);
-            foreach (XLTableRow container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed()
-        {
-            var cells = new XLCells(true, false);
-            foreach (XLTableRow container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        public IXLCells CellsUsed(Boolean includeFormats)
-        {
-            var cells = new XLCells(false, includeFormats);
-            foreach (XLTableRow container in _ranges)
-                cells.Add(container.RangeAddress);
-            return cells;
-        }
-
-        #endregion
-
-        public void Select()
-        {
-            foreach (var range in this)
-                range.Select();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTables.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTables.cs
deleted file mode 100644
index e301539..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/Tables/XLTables.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    using System.Collections;
-
-    public class XLTables : IXLTables
-    {
-        private readonly Dictionary<String, IXLTable> _tables = new Dictionary<String, IXLTable>();
-
-        #region IXLTables Members
-
-        public IEnumerator<IXLTable> GetEnumerator()
-        {
-            return _tables.Values.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Add(IXLTable table)
-        {
-            _tables.Add(table.Name, table);
-        }
-
-        public IXLTable Table(Int32 index)
-        {
-            return _tables.ElementAt(index).Value;
-        }
-
-        public IXLTable Table(String name)
-        {
-            return _tables[name];
-        }
-
-        #endregion
-
-        public IXLTables Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
-        {
-            _tables.Values.ForEach(t => t.Clear(clearOptions));
-            return this;
-        }
-
-        public void Remove(Int32 index)
-        {
-            _tables.Remove(_tables.ElementAt(index).Key);
-        }
-        public void Remove(String name)
-        {
-            _tables.Remove(name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLAddressLight.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLAddressLight.cs
deleted file mode 100644
index 68c2fd0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLAddressLight.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal struct XLAddressLight
-    {
-        public XLAddressLight(Int32 rowNumber, Int32 columnNumber)
-        {
-            RowNumber = rowNumber;
-            ColumnNumber = columnNumber;
-        }
-        public Int32 RowNumber;
-        public Int32 ColumnNumber;
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLConstants.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLConstants.cs
deleted file mode 100644
index f01f06e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLConstants.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-namespace ClosedXML.Excel
-{
-    //Use the class to store magic strings or variables.
-    internal static class XLConstants
-    {
-        internal static class Comment
-        {
-            internal const string ShapeTypeId = "#_x0000_t202";
-            internal const string AlternateShapeTypeId = "#_xssf_cell_comment";
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLOutline.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLOutline.cs
deleted file mode 100644
index f86e0b5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLOutline.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-
-namespace ClosedXML.Excel
-{
-    internal class XLOutline:IXLOutline
-    {
-        public XLOutline(IXLOutline outline)
-        {
-            if (outline != null)
-            {
-                SummaryHLocation = outline.SummaryHLocation;
-                SummaryVLocation = outline.SummaryVLocation;
-            }
-        }
-        public XLOutlineSummaryVLocation SummaryVLocation { get; set; }
-        public XLOutlineSummaryHLocation SummaryHLocation { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLSheetProtection.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLSheetProtection.cs
deleted file mode 100644
index a9cfc61..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLSheetProtection.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLSheetProtection: IXLSheetProtection
-    {
-        public XLSheetProtection()
-        {
-            SelectLockedCells = true;
-            SelectUnlockedCells = true;
-        }
-
-        public Boolean Protected { get; set; }
-        internal String PasswordHash { get; set; }
-        public String Password 
-        {
-            set
-            {
-                PasswordHash = GetPasswordHash(value);
-            }
-        }
-
-        public Boolean AutoFilter { get; set; }
-        public Boolean DeleteColumns { get; set; }
-        public Boolean DeleteRows { get; set; }
-        public Boolean FormatCells { get; set; }
-        public Boolean FormatColumns { get; set; }
-        public Boolean FormatRows { get; set; }
-        public Boolean InsertColumns { get; set; }
-        public Boolean InsertHyperlinks { get; set; }
-        public Boolean InsertRows { get; set; }
-        public Boolean Objects { get; set; }
-        public Boolean PivotTables { get; set; }
-        public Boolean Scenarios { get; set; }
-        public Boolean SelectLockedCells { get; set; }
-        public Boolean SelectUnlockedCells { get; set; }
-        public Boolean Sort { get; set; }
-
-        public IXLSheetProtection SetAutoFilter() { AutoFilter = true; return this; }	public IXLSheetProtection SetAutoFilter(Boolean value) { AutoFilter = value; return this; }
-        public IXLSheetProtection SetDeleteColumns() { DeleteColumns = true; return this; }	public IXLSheetProtection SetDeleteColumns(Boolean value) { DeleteColumns = value; return this; }
-        public IXLSheetProtection SetDeleteRows() { DeleteRows = true; return this; }	public IXLSheetProtection SetDeleteRows(Boolean value) { DeleteRows = value; return this; }
-        public IXLSheetProtection SetFormatCells() { FormatCells = true; return this; }	public IXLSheetProtection SetFormatCells(Boolean value) { FormatCells = value; return this; }
-        public IXLSheetProtection SetFormatColumns() { FormatColumns = true; return this; }	public IXLSheetProtection SetFormatColumns(Boolean value) { FormatColumns = value; return this; }
-        public IXLSheetProtection SetFormatRows() { FormatRows = true; return this; }	public IXLSheetProtection SetFormatRows(Boolean value) { FormatRows = value; return this; }
-        public IXLSheetProtection SetInsertColumns() { InsertColumns = true; return this; }	public IXLSheetProtection SetInsertColumns(Boolean value) { InsertColumns = value; return this; }
-        public IXLSheetProtection SetInsertHyperlinks() { InsertHyperlinks = true; return this; }	public IXLSheetProtection SetInsertHyperlinks(Boolean value) { InsertHyperlinks = value; return this; }
-        public IXLSheetProtection SetInsertRows() { InsertRows = true; return this; }	public IXLSheetProtection SetInsertRows(Boolean value) { InsertRows = value; return this; }
-        public IXLSheetProtection SetObjects() { Objects = true; return this; }	public IXLSheetProtection SetObjects(Boolean value) { Objects = value; return this; }
-        public IXLSheetProtection SetPivotTables() { PivotTables = true; return this; }	public IXLSheetProtection SetPivotTables(Boolean value) { PivotTables = value; return this; }
-        public IXLSheetProtection SetScenarios() { Scenarios = true; return this; }	public IXLSheetProtection SetScenarios(Boolean value) { Scenarios = value; return this; }
-        public IXLSheetProtection SetSelectLockedCells() { SelectLockedCells = true; return this; }	public IXLSheetProtection SetSelectLockedCells(Boolean value) { SelectLockedCells = value; return this; }
-        public IXLSheetProtection SetSelectUnlockedCells() { SelectUnlockedCells = true; return this; }	public IXLSheetProtection SetSelectUnlockedCells(Boolean value) { SelectUnlockedCells = value; return this; }
-        public IXLSheetProtection SetSort() { Sort = true; return this; }	public IXLSheetProtection SetSort(Boolean value) { Sort = value; return this; }
-
-        public IXLSheetProtection Protect()
-        {
-            return Protect(String.Empty);
-        }
-
-        public IXLSheetProtection Protect(String password)
-        {
-            if (Protected)
-            {
-                throw new InvalidOperationException("The worksheet is already protected");
-            }
-            else
-            {
-                Protected = true;
-                PasswordHash = GetPasswordHash(password);
-            }
-            return this;
-        }
-
-        public IXLSheetProtection Unprotect()
-        {
-            return Unprotect(String.Empty);
-        }
-
-        public IXLSheetProtection Unprotect(String password)
-        {
-            if (Protected)
-            {
-                String hash = GetPasswordHash(password);
-                if (hash != PasswordHash)
-                    throw new ArgumentException("Invalid password");
-                else
-                {
-                    Protected = false;
-                    PasswordHash = String.Empty;
-                }
-            }
-
-            return this;
-        }
-
-        private String GetPasswordHash(String password)
-        {
-            Int32 pLength = password.Length;
-            Int32 hash = 0;
-            if (pLength == 0) return String.Empty;
-
-            for (Int32 i = pLength - 1; i >= 0; i--)
-            {
-                hash ^= password[i];
-                hash = hash >> 14 & 0x01 | hash << 1 & 0x7fff;
-            }
-            hash ^= 0x8000 | 'N' << 8 | 'K';
-            hash ^= pLength;
-            return hash.ToString("X");
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLSheetView.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLSheetView.cs
deleted file mode 100644
index 2d7b22d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLSheetView.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    internal class XLSheetView: IXLSheetView
-    {
-        public XLSheetView() {
-            View = XLSheetViewOptions.Normal;
-        }
-        public XLSheetView(IXLSheetView sheetView):this()
-        {
-            this.SplitRow = sheetView.SplitRow;
-            this.SplitColumn = sheetView.SplitColumn;
-            this.FreezePanes = ((XLSheetView)sheetView).FreezePanes;
-        }
-
-        public Int32 SplitRow { get; set; }
-        public Int32 SplitColumn { get; set; }
-        public Boolean FreezePanes { get; set; }
-        public void FreezeRows(Int32 rows)
-        {
-            SplitRow = rows;
-            FreezePanes = true;
-        }
-        public void FreezeColumns(Int32 columns)
-        {
-            SplitColumn = columns;
-            FreezePanes = true;
-        }
-        public void Freeze(Int32 rows, Int32 columns)
-        {
-            SplitRow = rows;
-            SplitColumn = columns;
-            FreezePanes = true;
-        }
-
-
-        public XLSheetViewOptions View { get; set; }
-
-        public IXLSheetView SetView(XLSheetViewOptions value)
-        {
-            View = value;
-            return this;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLTheme.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLTheme.cs
deleted file mode 100644
index 288b063..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLTheme.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-namespace ClosedXML.Excel
-{
-    internal class XLTheme: IXLTheme
-    {
-        public XLColor Background1 { get; set; }
-        public XLColor Text1 { get; set; }
-        public XLColor Background2 { get; set; }
-        public XLColor Text2 { get; set; }
-        public XLColor Accent1 { get; set; }
-        public XLColor Accent2 { get; set; }
-        public XLColor Accent3 { get; set; }
-        public XLColor Accent4 { get; set; }
-        public XLColor Accent5 { get; set; }
-        public XLColor Accent6 { get; set; }
-        public XLColor Hyperlink { get; set; }
-        public XLColor FollowedHyperlink { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWSContentManager.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWSContentManager.cs
deleted file mode 100644
index 9b2f7ee..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWSContentManager.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Spreadsheet;
-
-namespace ClosedXML.Excel
-{
-    internal class XLWSContentManager
-    {
-        public enum XLWSContents
-        {
-            SheetProperties = 1,
-            SheetDimension = 2,
-            SheetViews = 3,
-            SheetFormatProperties = 4,
-            Columns = 5,
-            SheetData = 6,
-            SheetCalculationProperties = 7,
-            SheetProtection = 8,
-            ProtectedRanges = 9,
-            Scenarios = 10,
-            AutoFilter = 11,
-            SortState = 12,
-            DataConsolidate = 13,
-            CustomSheetViews = 14,
-            MergeCells = 15,
-            PhoneticProperties = 16,
-            ConditionalFormatting = 17,
-            DataValidations = 18,
-            Hyperlinks = 19,
-            PrintOptions = 20,
-            PageMargins = 21,
-            PageSetup = 22,
-            HeaderFooter = 23,
-            RowBreaks = 24,
-            ColumnBreaks = 25,
-            CustomProperties = 26,
-            CellWatches = 27,
-            IgnoredErrors = 28,
-            SmartTags = 29,
-            Drawing = 30,
-            LegacyDrawing = 31,
-            LegacyDrawingHeaderFooter = 32,
-            DrawingHeaderFooter = 33,
-            Picture = 34,
-            OleObjects = 35,
-            Controls = 36,
-            AlternateContent = 37,
-            WebPublishItems = 38,
-            TableParts = 39,
-            WorksheetExtensionList = 40
-        }
-        private Dictionary<XLWSContents, OpenXmlElement> contents = new Dictionary<XLWSContents, OpenXmlElement>();
-
-        public XLWSContentManager(Worksheet opWorksheet)
-        {
-            contents.Add(XLWSContents.SheetProperties, opWorksheet.Elements<SheetProperties>().LastOrDefault());
-            contents.Add(XLWSContents.SheetDimension, opWorksheet.Elements<SheetDimension>().LastOrDefault());
-            contents.Add(XLWSContents.SheetViews, opWorksheet.Elements<SheetViews>().LastOrDefault());
-            contents.Add(XLWSContents.SheetFormatProperties, opWorksheet.Elements<SheetFormatProperties>().LastOrDefault());
-            contents.Add(XLWSContents.Columns, opWorksheet.Elements<Columns>().LastOrDefault());
-            contents.Add(XLWSContents.SheetData, opWorksheet.Elements<SheetData>().LastOrDefault());
-            contents.Add(XLWSContents.SheetCalculationProperties, opWorksheet.Elements<SheetCalculationProperties>().LastOrDefault());
-            contents.Add(XLWSContents.SheetProtection, opWorksheet.Elements<SheetProtection>().LastOrDefault());
-            contents.Add(XLWSContents.ProtectedRanges, opWorksheet.Elements<ProtectedRanges>().LastOrDefault());
-            contents.Add(XLWSContents.Scenarios, opWorksheet.Elements<Scenarios>().LastOrDefault());
-            contents.Add(XLWSContents.AutoFilter, opWorksheet.Elements<AutoFilter>().LastOrDefault());
-            contents.Add(XLWSContents.SortState, opWorksheet.Elements<SortState>().LastOrDefault());
-            contents.Add(XLWSContents.DataConsolidate, opWorksheet.Elements<DataConsolidate>().LastOrDefault());
-            contents.Add(XLWSContents.CustomSheetViews, opWorksheet.Elements<CustomSheetViews>().LastOrDefault());
-            contents.Add(XLWSContents.MergeCells, opWorksheet.Elements<MergeCells>().LastOrDefault());
-            contents.Add(XLWSContents.PhoneticProperties, opWorksheet.Elements<PhoneticProperties>().LastOrDefault());
-            contents.Add(XLWSContents.ConditionalFormatting, opWorksheet.Elements<ConditionalFormatting>().LastOrDefault());
-            contents.Add(XLWSContents.DataValidations, opWorksheet.Elements<DataValidations>().LastOrDefault());
-            contents.Add(XLWSContents.Hyperlinks, opWorksheet.Elements<Hyperlinks>().LastOrDefault());
-            contents.Add(XLWSContents.PrintOptions, opWorksheet.Elements<PrintOptions>().LastOrDefault());
-            contents.Add(XLWSContents.PageMargins, opWorksheet.Elements<PageMargins>().LastOrDefault());
-            contents.Add(XLWSContents.PageSetup, opWorksheet.Elements<PageSetup>().LastOrDefault());
-            contents.Add(XLWSContents.HeaderFooter, opWorksheet.Elements<HeaderFooter>().LastOrDefault());
-            contents.Add(XLWSContents.RowBreaks, opWorksheet.Elements<RowBreaks>().LastOrDefault());
-            contents.Add(XLWSContents.ColumnBreaks, opWorksheet.Elements<ColumnBreaks>().LastOrDefault());
-            contents.Add(XLWSContents.CustomProperties, opWorksheet.Elements<CustomProperties>().LastOrDefault());
-            contents.Add(XLWSContents.CellWatches, opWorksheet.Elements<CellWatches>().LastOrDefault());
-            contents.Add(XLWSContents.IgnoredErrors, opWorksheet.Elements<IgnoredErrors>().LastOrDefault());
-            //contents.Add(XLWSContents.SmartTags, opWorksheet.Elements<SmartTags>().LastOrDefault());
-            contents.Add(XLWSContents.Drawing, opWorksheet.Elements<Drawing>().LastOrDefault());
-            contents.Add(XLWSContents.LegacyDrawing, opWorksheet.Elements<LegacyDrawing>().LastOrDefault());
-            contents.Add(XLWSContents.LegacyDrawingHeaderFooter, opWorksheet.Elements<LegacyDrawingHeaderFooter>().LastOrDefault());
-            contents.Add(XLWSContents.DrawingHeaderFooter, opWorksheet.Elements<DrawingHeaderFooter>().LastOrDefault());
-            contents.Add(XLWSContents.Picture, opWorksheet.Elements<Picture>().LastOrDefault());
-            contents.Add(XLWSContents.OleObjects, opWorksheet.Elements<OleObjects>().LastOrDefault());
-            contents.Add(XLWSContents.Controls, opWorksheet.Elements<Controls>().LastOrDefault());
-            contents.Add(XLWSContents.AlternateContent, opWorksheet.Elements<AlternateContent>().LastOrDefault());
-            contents.Add(XLWSContents.WebPublishItems, opWorksheet.Elements<WebPublishItems>().LastOrDefault());
-            contents.Add(XLWSContents.TableParts, opWorksheet.Elements<TableParts>().LastOrDefault());
-            contents.Add(XLWSContents.WorksheetExtensionList, opWorksheet.Elements<WorksheetExtensionList>().LastOrDefault());
-        }
-
-        public void SetElement(XLWSContents content, OpenXmlElement element)
-        {
-            contents[content] = element;
-        }
-
-        public OpenXmlElement GetPreviousElementFor(XLWSContents content)
-        {
-            var max = contents.Where(kp => (Int32)kp.Key < (Int32)content && kp.Value != null).Max(kp => kp.Key);
-            return contents[max];
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook.cs
deleted file mode 100644
index 405623a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook.cs
+++ /dev/null
@@ -1,811 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security.AccessControl;
-using ClosedXML.Excel.CalcEngine;
-using DocumentFormat.OpenXml;
-
-namespace ClosedXML.Excel
-{
-    using System.Linq;
-    using System.Data;
-
-    public enum XLEventTracking { Enabled, Disabled }
-    public enum XLCalculateMode
-    {
-        Auto,
-        AutoNoTable,
-        Manual,
-        Default
-    };
-
-    public enum XLReferenceStyle
-    {
-        R1C1,
-        A1,
-        Default
-    };
-
-    public enum XLCellSetValueBehavior
-    {
-        /// <summary>
-        ///   Analyze input string and convert value. For avoid analyzing use escape symbol '
-        /// </summary>
-        Smart = 0,
-
-        /// <summary>
-        ///   Direct set value. If value has unsupported type - value will be stored as string returned by <see
-        ///    cref = "object.ToString()" />
-        /// </summary>
-        Simple = 1,
-    }
-
-    public partial class XLWorkbook: IDisposable
-    {
-        #region Static
-
-        private static IXLStyle _defaultStyle;
-
-        public static IXLStyle DefaultStyle
-        {
-            get
-            {
-                return _defaultStyle ?? (_defaultStyle = new XLStyle(null)
-                                                             {
-                                                                 Font = new XLFont(null, null)
-                                                                            {
-                                                                                Bold = false,
-                                                                                Italic = false,
-                                                                                Underline = XLFontUnderlineValues.None,
-                                                                                Strikethrough = false,
-                                                                                VerticalAlignment =
-                                                                                    XLFontVerticalTextAlignmentValues.
-                                                                                    Baseline,
-                                                                                FontSize = 11,
-                                                                                FontColor = XLColor.FromArgb(0, 0, 0),
-                                                                                FontName = "Calibri",
-                                                                                FontFamilyNumbering =
-                                                                                    XLFontFamilyNumberingValues.Swiss
-                                                                            },
-                                                                 Fill = new XLFill(null)
-                                                                            {
-                                                                                BackgroundColor = XLColor.FromIndex(64),
-                                                                                PatternType = XLFillPatternValues.None,
-                                                                                PatternColor = XLColor.FromIndex(64)
-                                                                            },
-                                                                 Border = new XLBorder(null, null)
-                                                                              {
-                                                                                  BottomBorder =
-                                                                                      XLBorderStyleValues.None,
-                                                                                  DiagonalBorder =
-                                                                                      XLBorderStyleValues.None,
-                                                                                  DiagonalDown = false,
-                                                                                  DiagonalUp = false,
-                                                                                  LeftBorder = XLBorderStyleValues.None,
-                                                                                  RightBorder = XLBorderStyleValues.None,
-                                                                                  TopBorder = XLBorderStyleValues.None,
-                                                                                  BottomBorderColor = XLColor.Black,
-                                                                                  DiagonalBorderColor = XLColor.Black,
-                                                                                  LeftBorderColor = XLColor.Black,
-                                                                                  RightBorderColor = XLColor.Black,
-                                                                                  TopBorderColor = XLColor.Black
-                                                                              },
-                                                                 NumberFormat =
-                                                                     new XLNumberFormat(null, null) {NumberFormatId = 0},
-                                                                 Alignment = new XLAlignment(null)
-                                                                                 {
-                                                                                     Indent = 0,
-                                                                                     Horizontal =
-                                                                                         XLAlignmentHorizontalValues.
-                                                                                         General,
-                                                                                     JustifyLastLine = false,
-                                                                                     ReadingOrder =
-                                                                                         XLAlignmentReadingOrderValues.
-                                                                                         ContextDependent,
-                                                                                     RelativeIndent = 0,
-                                                                                     ShrinkToFit = false,
-                                                                                     TextRotation = 0,
-                                                                                     Vertical =
-                                                                                         XLAlignmentVerticalValues.
-                                                                                         Bottom,
-                                                                                     WrapText = false
-                                                                                 },
-                                                                 Protection = new XLProtection(null)
-                                                                                  {
-                                                                                      Locked = true,
-                                                                                      Hidden = false
-                                                                                  }
-                                                             });
-            }
-        }
-
-        public static Double DefaultRowHeight { get; private set; }
-        public static Double DefaultColumnWidth { get; private set; }
-
-        public static IXLPageSetup DefaultPageOptions
-        {
-            get
-            {
-                var defaultPageOptions = new XLPageSetup(null, null)
-                                             {
-                                                 PageOrientation = XLPageOrientation.Default,
-                                                 Scale = 100,
-                                                 PaperSize = XLPaperSize.LetterPaper,
-                                                 Margins = new XLMargins
-                                                               {
-                                                                   Top = 0.75,
-                                                                   Bottom = 0.5,
-                                                                   Left = 0.75,
-                                                                   Right = 0.75,
-                                                                   Header = 0.5,
-                                                                   Footer = 0.75
-                                                               },
-                                                 ScaleHFWithDocument = true,
-                                                 AlignHFWithMargins = true,
-                                                 PrintErrorValue = XLPrintErrorValues.Displayed,
-                                                 ShowComments = XLShowCommentsValues.None
-                                             };
-                return defaultPageOptions;
-            }
-        }
-
-        public static IXLOutline DefaultOutline
-        {
-            get
-            {
-                return new XLOutline(null)
-                           {
-                               SummaryHLocation = XLOutlineSummaryHLocation.Right,
-                               SummaryVLocation = XLOutlineSummaryVLocation.Bottom
-                           };
-            }
-        }
-
-        /// <summary>
-        ///   Behavior for <see cref = "IXLCell.set_Value" />
-        /// </summary>
-        public static XLCellSetValueBehavior CellSetValueBehavior { get; set; }
-
-        #endregion
-
-        internal readonly List<UnsupportedSheet> UnsupportedSheets =
-            new List<UnsupportedSheet>();
-
-        private readonly Dictionary<Int32, IXLStyle> _stylesById = new Dictionary<int, IXLStyle>();
-        private readonly Dictionary<IXLStyle, Int32> _stylesByStyle = new Dictionary<IXLStyle, Int32>();
-
-        public XLEventTracking EventTracking { get; set; }
-       
-        internal Int32 GetStyleId(IXLStyle style)
-        {
-            Int32 cached;
-            if (_stylesByStyle.TryGetValue(style, out cached))
-                return cached;
-
-            var count = _stylesByStyle.Count;
-            var styleToUse = new XLStyle(null, style);
-            _stylesByStyle.Add(styleToUse, count);
-            _stylesById.Add(count, styleToUse);
-            return count;
-        }
-
-        internal IXLStyle GetStyleById(Int32 id)
-        {
-            return _stylesById[id];
-        }
-
-        #region  Nested Type: XLLoadSource
-
-        private enum XLLoadSource
-        {
-            New,
-            File,
-            Stream
-        };
-
-        #endregion
-
-        internal XLWorksheets WorksheetsInternal { get; private set; }
-
-        /// <summary>
-        ///   Gets an object to manipulate the worksheets.
-        /// </summary>
-        public IXLWorksheets Worksheets
-        {
-            get { return WorksheetsInternal; }
-        }
-
-        /// <summary>
-        ///   Gets an object to manipulate this workbook's named ranges.
-        /// </summary>
-        public IXLNamedRanges NamedRanges { get; private set; }
-
-        /// <summary>
-        ///   Gets an object to manipulate this workbook's theme.
-        /// </summary>
-        public IXLTheme Theme { get; private set; }
-
-        /// <summary>
-        ///   Gets or sets the default style for the workbook.
-        ///   <para>All new worksheets will use this style.</para>
-        /// </summary>
-        public IXLStyle Style { get; set; }
-
-        /// <summary>
-        ///   Gets or sets the default row height for the workbook.
-        ///   <para>All new worksheets will use this row height.</para>
-        /// </summary>
-        public Double RowHeight { get; set; }
-
-        /// <summary>
-        ///   Gets or sets the default column width for the workbook.
-        ///   <para>All new worksheets will use this column width.</para>
-        /// </summary>
-        public Double ColumnWidth { get; set; }
-
-        /// <summary>
-        ///   Gets or sets the default page options for the workbook.
-        ///   <para>All new worksheets will use these page options.</para>
-        /// </summary>
-        public IXLPageSetup PageOptions { get; set; }
-
-        /// <summary>
-        ///   Gets or sets the default outline options for the workbook.
-        ///   <para>All new worksheets will use these outline options.</para>
-        /// </summary>
-        public IXLOutline Outline { get; set; }
-
-        /// <summary>
-        ///   Gets or sets the workbook's properties.
-        /// </summary>
-        public XLWorkbookProperties Properties { get; set; }
-
-        /// <summary>
-        ///   Gets or sets the workbook's calculation mode.
-        /// </summary>
-        public XLCalculateMode CalculateMode { get; set; }
-
-        /// <summary>
-        ///   Gets or sets the workbook's reference style.
-        /// </summary>
-        public XLReferenceStyle ReferenceStyle { get; set; }
-
-        public IXLCustomProperties CustomProperties { get; private set; }
-
-        public Boolean ShowFormulas { get; set; }
-        public Boolean ShowGridLines { get; set; }
-        public Boolean ShowOutlineSymbols { get; set; }
-        public Boolean ShowRowColHeaders { get; set; }
-        public Boolean ShowRuler { get; set; }
-        public Boolean ShowWhiteSpace { get; set; }
-        public Boolean ShowZeros { get; set; }
-        public Boolean RightToLeft { get; set; }
-
-        public Boolean DefaultShowFormulas
-        {
-            get { return false; }
-        }
-
-        public Boolean DefaultShowGridLines
-        {
-            get { return true; }
-        }
-
-        public Boolean DefaultShowOutlineSymbols
-        {
-            get { return true; }
-        }
-
-        public Boolean DefaultShowRowColHeaders
-        {
-            get { return true; }
-        }
-
-        public Boolean DefaultShowRuler
-        {
-            get { return true; }
-        }
-
-        public Boolean DefaultShowWhiteSpace
-        {
-            get { return true; }
-        }
-
-        public Boolean DefaultShowZeros
-        {
-            get { return true; }
-        }
-
-        public Boolean DefaultRightToLeft
-        {
-            get { return false; }
-        }
-
-        private void InitializeTheme()
-        {
-            Theme = new XLTheme
-                        {
-                            Text1 = XLColor.FromHtml("#FF000000"),
-                            Background1 = XLColor.FromHtml("#FFFFFFFF"),
-                            Text2 = XLColor.FromHtml("#FF1F497D"),
-                            Background2 = XLColor.FromHtml("#FFEEECE1"),
-                            Accent1 = XLColor.FromHtml("#FF4F81BD"),
-                            Accent2 = XLColor.FromHtml("#FFC0504D"),
-                            Accent3 = XLColor.FromHtml("#FF9BBB59"),
-                            Accent4 = XLColor.FromHtml("#FF8064A2"),
-                            Accent5 = XLColor.FromHtml("#FF4BACC6"),
-                            Accent6 = XLColor.FromHtml("#FFF79646"),
-                            Hyperlink = XLColor.FromHtml("#FF0000FF"),
-                            FollowedHyperlink = XLColor.FromHtml("#FF800080")
-                        };
-        }
-
-        internal XLColor GetXLColor(XLThemeColor themeColor)
-        {
-            switch (themeColor)
-            {
-                case XLThemeColor.Text1:
-                    return Theme.Text1;
-                case XLThemeColor.Background1:
-                    return Theme.Background1;
-                case XLThemeColor.Text2:
-                    return Theme.Text2;
-                case XLThemeColor.Background2:
-                    return Theme.Background2;
-                case XLThemeColor.Accent1:
-                    return Theme.Accent1;
-                case XLThemeColor.Accent2:
-                    return Theme.Accent2;
-                case XLThemeColor.Accent3:
-                    return Theme.Accent3;
-                case XLThemeColor.Accent4:
-                    return Theme.Accent4;
-                case XLThemeColor.Accent5:
-                    return Theme.Accent5;
-                case XLThemeColor.Accent6:
-                    return Theme.Accent6;
-                default:
-                    throw new ArgumentException("Invalid theme color");
-            }
-        }
-
-        public IXLNamedRange NamedRange(String rangeName)
-        {
-            if (rangeName.Contains("!"))
-            {
-                var split = rangeName.Split('!');
-                var first = split[0];
-                var wsName = first.StartsWith("'") ? first.Substring(1, first.Length - 2) : first;
-                var name = split[1];
-                IXLWorksheet ws;
-                if (TryGetWorksheet(wsName, out ws))
-                {
-                    var range = ws.NamedRange(name);
-                    return range ?? NamedRange(name);
-                }
-                return null;
-            }
-            return NamedRanges.NamedRange(rangeName);
-        }
-
-        public Boolean TryGetWorksheet(String name, out IXLWorksheet worksheet)
-        {
-            if (Worksheets.Any(w => w.Name.ToLower().Equals(name.ToLower())))
-            {
-                worksheet = Worksheet(name);
-                return true;
-            }
-
-            worksheet = null;
-            return false;
-        }
-
-        /// <summary>
-        ///   Saves the current workbook.
-        /// </summary>
-        public void Save()
-        {
-            checkForWorksheetsPresent();
-            if (_loadSource == XLLoadSource.New)
-                throw new Exception("This is a new file, please use one of the SaveAs methods.");
-
-            if (_loadSource == XLLoadSource.Stream)
-            {
-                CreatePackage(_originalStream, false, _spreadsheetDocumentType);
-            }
-            else
-                CreatePackage(_originalFile, _spreadsheetDocumentType);
-        }
-
-        /// <summary>
-        ///   Saves the current workbook to a file.
-        /// </summary>
-        public void SaveAs(String file)
-        {
-            checkForWorksheetsPresent();
-            PathHelper.CreateDirectory(Path.GetDirectoryName(file));
-            if (_loadSource == XLLoadSource.New)
-            {
-                if (File.Exists(file))
-                    File.Delete(file);
-
-                CreatePackage(file, GetSpreadsheetDocumentType(file));
-            }
-            else if (_loadSource == XLLoadSource.File)
-            {
-                if (String.Compare(_originalFile.Trim(), file.Trim(), true) != 0)
-                    File.Copy(_originalFile, file, true);
-
-                CreatePackage(file, GetSpreadsheetDocumentType(file));
-            }
-            else if (_loadSource == XLLoadSource.Stream)
-            {
-                _originalStream.Position = 0;
-
-                using (var fileStream = File.Create(file))
-                {
-                    CopyStream(_originalStream, fileStream);
-                    //fileStream.Position = 0;
-                    CreatePackage(fileStream, false, _spreadsheetDocumentType);
-                    fileStream.Close();
-                }
-            }
-        }
-
-        private static SpreadsheetDocumentType GetSpreadsheetDocumentType(string filePath)
-        {
-            var extension = Path.GetExtension(filePath);
-
-            if (extension == null) throw new Exception("Empty extension is not supported.");
-
-            if (extension.ToLowerInvariant().Equals(".xlsm")) return SpreadsheetDocumentType.MacroEnabledWorkbook;
-
-            if (extension.ToLowerInvariant().Equals(".xlsx")) return SpreadsheetDocumentType.Workbook;
-
-            throw new Exception(String.Format("Extension '{0}' is not supported. Supported extensions are '.xlsx' and '.xslm'.", extension));
-        }
-        private void checkForWorksheetsPresent()
-        {
-            if (Worksheets.Count() == 0)
-                throw new Exception("Workbooks need at least one worksheet.");
-        }
-
-        /// <summary>
-        ///   Saves the current workbook to a stream.
-        /// </summary>
-        public void SaveAs(Stream stream)
-        {
-            checkForWorksheetsPresent();
-            if (_loadSource == XLLoadSource.New)
-            {
-                // dm 20130422, this method or better the method SpreadsheetDocument.Create which is called
-                // inside of 'CreatePackage' need a stream which CanSeek & CanRead
-                // and an ordinary Response stream of a webserver can't do this
-                // so we have to ask and provide a way around this
-                if (stream.CanRead && stream.CanSeek && stream.CanWrite)
-                {
-                    // all is fine the package can be created in a direct way
-                    CreatePackage(stream, true, _spreadsheetDocumentType);
-                }
-                else
-                {
-                    // the harder way
-                    MemoryStream ms = new MemoryStream();
-                    CreatePackage(ms, true, _spreadsheetDocumentType);
-                    // not really nessesary, because I changed CopyStream too.
-                    // but for better understanding and if somebody in the future
-                    // provide an changed version of CopyStream
-                    ms.Position = 0;
-                    CopyStream(ms, stream);
-                }
-            }
-            else if (_loadSource == XLLoadSource.File)
-            {
-                using (var fileStream = new FileStream(_originalFile, FileMode.Open, FileAccess.Read))
-                {
-                    CopyStream(fileStream, stream);
-                    fileStream.Close();
-                }
-                CreatePackage(stream, false, _spreadsheetDocumentType);
-            }
-            else if (_loadSource == XLLoadSource.Stream)
-            {
-                _originalStream.Position = 0;
-                if (_originalStream != stream)
-                    CopyStream(_originalStream, stream);
-
-                CreatePackage(stream, false, _spreadsheetDocumentType);
-            }
-        }
-
-        internal static void CopyStream(Stream input, Stream output)
-        {
-            var buffer = new byte[8 * 1024];
-            int len;
-            // dm 20130422, it is always a good idea to rewind the input stream, or not?
-            if (input.CanSeek)
-                input.Seek(0, SeekOrigin.Begin);
-            while ((len = input.Read(buffer, 0, buffer.Length)) > 0)
-                output.Write(buffer, 0, len);
-            // dm 20130422, and flushing the output after write
-            output.Flush();
-
-        }
-
-        public IXLWorksheet Worksheet(String name)
-        {
-            return WorksheetsInternal.Worksheet(name);
-        }
-
-        public IXLWorksheet Worksheet(Int32 position)
-        {
-            return WorksheetsInternal.Worksheet(position);
-        }
-
-        public IXLCustomProperty CustomProperty(String name)
-        {
-            return CustomProperties.CustomProperty(name);
-        }
-
-        public IXLCells FindCells(Func<IXLCell, Boolean> predicate)
-        {
-            var cells = new XLCells(false, false);
-            foreach (XLWorksheet ws in WorksheetsInternal)
-            {
-                foreach (XLCell cell in ws.CellsUsed(true))
-                {
-                    if (predicate(cell))
-                        cells.Add(cell);
-                }
-            }
-            return cells;
-        }
-
-        public IXLRows FindRows(Func<IXLRow, Boolean> predicate)
-        {
-            var rows = new XLRows(null);
-            foreach (XLWorksheet ws in WorksheetsInternal)
-            {
-                foreach (IXLRow row in ws.Rows().Where(predicate))
-                    rows.Add(row as XLRow);
-            }
-            return rows;
-        }
-
-        public IXLColumns FindColumns(Func<IXLColumn, Boolean> predicate)
-        {
-            var columns = new XLColumns(null);
-            foreach (XLWorksheet ws in WorksheetsInternal)
-            {
-                foreach (IXLColumn column in ws.Columns().Where(predicate))
-                    columns.Add(column as XLColumn);
-            }
-            return columns;
-        }
-
-        #region Fields
-
-        private readonly XLLoadSource _loadSource = XLLoadSource.New;
-        private readonly String _originalFile;
-        private readonly Stream _originalStream;
-
-        #endregion
-
-        #region Constructor
-
-        
-        /// <summary>
-        ///   Creates a new Excel workbook.
-        /// </summary>
-        public XLWorkbook()
-            :this(XLEventTracking.Enabled)
-        {
-            
-        }
-
-        public XLWorkbook(XLEventTracking eventTracking)
-        {
-            EventTracking = eventTracking;
-            DefaultRowHeight = 15;
-            DefaultColumnWidth = 8.43;
-            Style = new XLStyle(null, DefaultStyle);
-            RowHeight = DefaultRowHeight;
-            ColumnWidth = DefaultColumnWidth;
-            PageOptions = DefaultPageOptions;
-            Outline = DefaultOutline;
-            Properties = new XLWorkbookProperties();
-            CalculateMode = XLCalculateMode.Default;
-            ReferenceStyle = XLReferenceStyle.Default;
-            InitializeTheme();
-            ShowFormulas = DefaultShowFormulas;
-            ShowGridLines = DefaultShowGridLines;
-            ShowOutlineSymbols = DefaultShowOutlineSymbols;
-            ShowRowColHeaders = DefaultShowRowColHeaders;
-            ShowRuler = DefaultShowRuler;
-            ShowWhiteSpace = DefaultShowWhiteSpace;
-            ShowZeros = DefaultShowZeros;
-            RightToLeft = DefaultRightToLeft;
-            WorksheetsInternal = new XLWorksheets(this);
-            NamedRanges = new XLNamedRanges(this);
-            CustomProperties = new XLCustomProperties(this);
-            ShapeIdManager = new XLIdManager();
-            Author = Environment.UserName;
-        }
-
-        /// <summary>
-        ///   Opens an existing workbook from a file.
-        /// </summary>
-        /// <param name = "file">The file to open.</param>
-        public XLWorkbook(String file)
-            : this(file, XLEventTracking.Enabled)
-        {
-
-        }
-
-        public XLWorkbook(String file, XLEventTracking eventTracking)
-            : this(eventTracking)
-        {
-            _loadSource = XLLoadSource.File;
-            _originalFile = file;
-            _spreadsheetDocumentType = GetSpreadsheetDocumentType(_originalFile);
-            Load(file);
-        }
-
-
-
-        /// <summary>
-        ///   Opens an existing workbook from a stream.
-        /// </summary>
-        /// <param name = "stream">The stream to open.</param>
-        public XLWorkbook(Stream stream):this(stream, XLEventTracking.Enabled)
-        {
-            
-        }
-
-        public XLWorkbook(Stream stream, XLEventTracking eventTracking)
-            : this(eventTracking)
-        {
-            _loadSource = XLLoadSource.Stream;
-            _originalStream = stream;
-            Load(stream);
-        }
-
-        #endregion
-
-        #region Nested type: UnsupportedSheet
-
-        internal sealed class UnsupportedSheet
-        {
-            public Boolean IsActive;
-            public UInt32 SheetId;
-            public Int32 Position;
-        }
-
-        #endregion
-
-        public IXLCell Cell(String namedCell)
-        {
-            var namedRange = NamedRange(namedCell);
-            if (namedRange == null) return null;
-            var range = namedRange.Ranges.FirstOrDefault();
-            if (range == null) return null;
-            return range.FirstCell();
-        }
-
-        public IXLCells Cells(String namedCells)
-        {
-            return Ranges(namedCells).Cells();
-        }
-
-        public IXLRange Range(String namedRange)
-        {
-            var range = NamedRange(namedRange);
-            if (range == null) return null;
-            return range.Ranges.FirstOrDefault();
-        }
-
-        public IXLRanges Ranges(String namedRanges)
-        {
-            var retVal = new XLRanges();
-            var rangePairs = namedRanges.Split(',');
-            foreach (var range in rangePairs.Select(r => Range(r.Trim())).Where(range => range != null))
-            {
-                retVal.Add(range);
-            }
-            return retVal;
-        }
-
-        internal XLIdManager ShapeIdManager { get; private set; }
-
-
-        public void Dispose()
-        {
-            Worksheets.ForEach(w => w.Dispose());
-        }
-
-        public Boolean Use1904DateSystem { get; set; }
-        public XLWorkbook SetUse1904DateSystem()
-        {
-            return SetUse1904DateSystem(true);
-        }
-
-        public XLWorkbook SetUse1904DateSystem(Boolean value)
-        {
-            Use1904DateSystem = value;
-            return this;
-        }
-
-        public IXLWorksheet AddWorksheet(String sheetName)
-        {
-            return Worksheets.Add(sheetName);
-        }
-
-        public IXLWorksheet AddWorksheet(String sheetName, Int32 position)
-        {
-            return Worksheets.Add(sheetName, position);
-        }
-        public IXLWorksheet AddWorksheet(DataTable dataTable)
-        {
-            return Worksheets.Add(dataTable);
-        }
-        public void AddWorksheet(DataSet dataSet)
-        {
-            Worksheets.Add(dataSet);
-        }
-
-        public void AddWorksheet(IXLWorksheet worksheet)
-        {
-            worksheet.CopyTo(this, worksheet.Name);
-        }
-
-        public IXLWorksheet AddWorksheet(DataTable dataTable, String sheetName)
-        {
-            return Worksheets.Add(dataTable, sheetName);
-        }
-
-        private XLCalcEngine _calcEngine;
-        private XLCalcEngine CalcEngine
-        {
-            get { return _calcEngine ?? (_calcEngine = new XLCalcEngine(this)); }
-        }
-        public Object Evaluate(String expression)
-        {
-            return CalcEngine.Evaluate(expression);
-        }
-
-        private static XLCalcEngine _calcEngineExpr;
-        private SpreadsheetDocumentType _spreadsheetDocumentType;
-
-        private static XLCalcEngine CalcEngineExpr
-        {
-            get { return _calcEngineExpr ?? (_calcEngineExpr = new XLCalcEngine()); }
-        }
-        public static Object EvaluateExpr(String expression)
-        {
-            return CalcEngineExpr.Evaluate(expression);
-        }
-
-        public String Author { get; set; }
-
-        public Boolean LockStructure { get; set; }
-        public XLWorkbook SetLockStructure(Boolean value) { LockStructure = value; return this; }
-        public Boolean LockWindows { get; set; }
-        public XLWorkbook SetLockWindows(Boolean value) { LockWindows = value; return this; }
-
-        public void Protect()
-        {
-            Protect(true);
-        }
-
-        public void Protect(Boolean lockStructure)
-        {
-            Protect(lockStructure, false);
-        }
-
-        public void Protect(Boolean lockStructure, Boolean lockWindows)
-        {
-            LockStructure = lockStructure;
-            LockWindows = LockWindows;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbookProperties.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbookProperties.cs
deleted file mode 100644
index b35f4b6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbookProperties.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-
-namespace ClosedXML.Excel
-{
-    public class XLWorkbookProperties
-    {
-        public XLWorkbookProperties()
-        { 
-            Company = null;
-            Manager = null;
-        }
-        public String Author { get; set; }
-        public String Title { get; set; }
-        public String Subject { get; set; }
-        public String Category { get; set; }
-        public String Keywords { get; set; }
-        public String Comments { get; set; }
-        public String Status { get; set; }
-        public DateTime Created { get; set; }
-        public DateTime Modified { get; set; }
-        public String LastModifiedBy { get; set; }
-        public String Company { get; set; }
-        public String Manager { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs
deleted file mode 100644
index f0f0c40..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs
+++ /dev/null
@@ -1,2004 +0,0 @@
-#region
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Spreadsheet;
-using Ap = DocumentFormat.OpenXml.ExtendedProperties;
-using Op = DocumentFormat.OpenXml.CustomProperties;
-using Vml = DocumentFormat.OpenXml.Vml;
-using Ss = DocumentFormat.OpenXml.Vml.Spreadsheet;
-
-#endregion
-
-namespace ClosedXML.Excel
-{
-    #region
-
-    using System.Drawing;
-    using Ap;
-    using Op;
-    using System.Xml.Linq;
-    using System.Text.RegularExpressions;
-
-    #endregion
-
-    public partial class XLWorkbook
-    {
-        private readonly Dictionary<String, Color> _colorList = new Dictionary<string, Color>();
-
-        private void Load(String file)
-        {
-            LoadSheets(file);
-        }
-
-        private void Load(Stream stream)
-        {
-            LoadSheets(stream);
-        }
-
-        private void LoadSheets(String fileName)
-        {
-            using (var dSpreadsheet = SpreadsheetDocument.Open(fileName, false))
-                LoadSpreadsheetDocument(dSpreadsheet);
-        }
-
-        private void LoadSheets(Stream stream)
-        {
-            using (var dSpreadsheet = SpreadsheetDocument.Open(stream, false))
-                LoadSpreadsheetDocument(dSpreadsheet);
-        }
-
-        private void LoadSpreadsheetDocument(SpreadsheetDocument dSpreadsheet)
-        {
-            ShapeIdManager = new XLIdManager();
-            SetProperties(dSpreadsheet);
-            //var sharedStrings = dSpreadsheet.WorkbookPart.SharedStringTablePart.SharedStringTable.Elements<SharedStringItem>();
-            SharedStringItem[] sharedStrings = null;
-            if (dSpreadsheet.WorkbookPart.GetPartsOfType<SharedStringTablePart>().Count() > 0)
-            {
-                var shareStringPart = dSpreadsheet.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First();
-                sharedStrings = shareStringPart.SharedStringTable.Elements<SharedStringItem>().ToArray();
-            }
-
-            if (dSpreadsheet.CustomFilePropertiesPart != null)
-            {
-                foreach (var m in dSpreadsheet.CustomFilePropertiesPart.Properties.Elements<CustomDocumentProperty>())
-                {
-                    String name = m.Name.Value;
-                    if (m.VTLPWSTR != null)
-                        CustomProperties.Add(name, m.VTLPWSTR.Text);
-                    else if (m.VTFileTime != null)
-                    {
-                        CustomProperties.Add(name,
-                                             DateTime.ParseExact(m.VTFileTime.Text, "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'",
-                                                                 CultureInfo.InvariantCulture));
-                    }
-                    else if (m.VTDouble != null)
-                        CustomProperties.Add(name, Double.Parse(m.VTDouble.Text, CultureInfo.InvariantCulture));
-                    else if (m.VTBool != null)
-                        CustomProperties.Add(name, m.VTBool.Text == "true");
-                }
-            }
-
-            var wbProps = dSpreadsheet.WorkbookPart.Workbook.WorkbookProperties;
-            Use1904DateSystem = wbProps != null && wbProps.Date1904 != null && wbProps.Date1904.Value;
-
-            var wbProtection = dSpreadsheet.WorkbookPart.Workbook.WorkbookProtection;
-            if (wbProtection != null)
-            {
-                if (wbProtection.LockStructure != null)
-                    LockStructure = wbProtection.LockStructure.Value;
-                if (wbProtection.LockWindows != null)
-                    LockWindows = wbProtection.LockWindows.Value;
-            }
-
-            var calculationProperties = dSpreadsheet.WorkbookPart.Workbook.CalculationProperties;
-            if (calculationProperties != null)
-            {
-                var referenceMode = calculationProperties.ReferenceMode;
-                if (referenceMode != null)
-                    ReferenceStyle = referenceMode.Value.ToClosedXml();
-
-                var calculateMode = calculationProperties.CalculationMode;
-                if (calculateMode != null)
-                    CalculateMode = calculateMode.Value.ToClosedXml();
-            }
-
-            var efp = dSpreadsheet.ExtendedFilePropertiesPart;
-            if (efp != null && efp.Properties != null)
-            {
-                if (efp.Properties.Elements<Company>().Any())
-                    Properties.Company = efp.Properties.GetFirstChild<Company>().Text;
-
-                if (efp.Properties.Elements<Manager>().Any())
-                    Properties.Manager = efp.Properties.GetFirstChild<Manager>().Text;
-            }
-
-            Stylesheet s = null;
-            if (dSpreadsheet.WorkbookPart.WorkbookStylesPart != null &&
-                dSpreadsheet.WorkbookPart.WorkbookStylesPart.Stylesheet != null)
-            {
-                s = dSpreadsheet.WorkbookPart.WorkbookStylesPart.Stylesheet;
-            }
-
-            NumberingFormats numberingFormats = s == null ? null : s.NumberingFormats;
-            Fills fills = s == null ? null : s.Fills;
-            Borders borders = s == null ? null : s.Borders;
-            Fonts fonts = s == null ? null : s.Fonts;
-            Int32 dfCount = 0;
-            Dictionary<Int32, DifferentialFormat> differentialFormats;
-            if (s != null &&s.DifferentialFormats != null)
-                differentialFormats = s.DifferentialFormats.Elements<DifferentialFormat>().ToDictionary(k => dfCount++);
-            else
-                differentialFormats = new Dictionary<Int32, DifferentialFormat>();
-                
-            var sheets = dSpreadsheet.WorkbookPart.Workbook.Sheets;
-            Int32 position = 0;
-            foreach (Sheet dSheet in sheets.OfType<Sheet>())
-            {
-                position++;
-                var sharedFormulasR1C1 = new Dictionary<UInt32, String>();
-
-                var wsPart = dSpreadsheet.WorkbookPart.GetPartById(dSheet.Id) as WorksheetPart;
-
-                if (wsPart == null)
-                {
-                    UnsupportedSheets.Add(new UnsupportedSheet {SheetId = dSheet.SheetId.Value, Position = position});
-                    continue;
-                }
-
-                var sheetName = dSheet.Name;
-
-                var ws = (XLWorksheet) WorksheetsInternal.Add(sheetName, position);
-                ws.RelId = dSheet.Id;
-                ws.SheetId = (Int32) dSheet.SheetId.Value;
-
-
-                if (dSheet.State != null)
-                    ws.Visibility = dSheet.State.Value.ToClosedXml();
-
-                var styleList = new Dictionary<int, IXLStyle>();// {{0, ws.Style}};
-
-                using (var reader = OpenXmlReader.Create(wsPart))
-                {
-                    while (reader.Read())
-                    {
-                        if (reader.ElementType == typeof(SheetFormatProperties))
-                        {
-                            var sheetFormatProperties = (SheetFormatProperties)reader.LoadCurrentElement();
-                            if (sheetFormatProperties != null)
-                            {
-                                if (sheetFormatProperties.DefaultRowHeight != null)
-                                    ws.RowHeight = sheetFormatProperties.DefaultRowHeight;
-
-                                ws.RowHeightChanged = (sheetFormatProperties.CustomHeight != null &&
-                                                       sheetFormatProperties.CustomHeight.Value);
-
-                                if (sheetFormatProperties.DefaultColumnWidth != null)
-                                {
-                                    ws.ColumnWidth = sheetFormatProperties.DefaultColumnWidth;
-                                }
-                            }
-                        }
-                        else if (reader.ElementType == typeof(SheetViews))
-                            LoadSheetViews((SheetViews)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(MergeCells))
-                        {
-                            var mergedCells = (MergeCells)reader.LoadCurrentElement();
-                            if (mergedCells != null)
-                            {
-                                foreach (MergeCell mergeCell in mergedCells.Elements<MergeCell>())
-                                    ws.Range(mergeCell.Reference).Merge(false);
-                            }
-                        }
-                        else if (reader.ElementType == typeof(Columns))
-                            LoadColumns(s, numberingFormats, fills, borders, fonts, ws,
-                                        (Columns)reader.LoadCurrentElement());
-                        else if (reader.ElementType == typeof(Row))
-                        {
-                            lastRow = 0;
-                            LoadRows(s, numberingFormats, fills, borders, fonts, ws, sharedStrings, sharedFormulasR1C1,
-                                     styleList, (Row)reader.LoadCurrentElement());
-                        }
-                        else if (reader.ElementType == typeof(AutoFilter))
-                            LoadAutoFilter((AutoFilter)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(SheetProtection))
-                            LoadSheetProtection((SheetProtection)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(DataValidations))
-                            LoadDataValidations((DataValidations)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(ConditionalFormatting))
-                            LoadConditionalFormatting((ConditionalFormatting)reader.LoadCurrentElement(), ws, differentialFormats);
-                        else if (reader.ElementType == typeof(Hyperlinks))
-                            LoadHyperlinks((Hyperlinks)reader.LoadCurrentElement(), wsPart, ws);
-                        else if (reader.ElementType == typeof(PrintOptions))
-                            LoadPrintOptions((PrintOptions)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(PageMargins))
-                            LoadPageMargins((PageMargins)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(PageSetup))
-                            LoadPageSetup((PageSetup)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(HeaderFooter))
-                            LoadHeaderFooter((HeaderFooter)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(SheetProperties))
-                            LoadSheetProperties((SheetProperties)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(RowBreaks))
-                            LoadRowBreaks((RowBreaks)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(ColumnBreaks))
-                            LoadColumnBreaks((ColumnBreaks)reader.LoadCurrentElement(), ws);
-                        else if (reader.ElementType == typeof(LegacyDrawing))
-                            ws.LegacyDrawingId = (reader.LoadCurrentElement() as LegacyDrawing).Id.Value;
-
-                    }
-                    reader.Close();
-                }
-
-                #region LoadTables
-
-                foreach (TableDefinitionPart tablePart in wsPart.TableDefinitionParts)
-                {
-                    var dTable = tablePart.Table;
-                    string reference = dTable.Reference.Value;
-                    XLTable xlTable = ws.Range(reference).CreateTable(dTable.Name, false) as XLTable;
-                    if (dTable.HeaderRowCount != null && dTable.HeaderRowCount == 0)
-                    {
-                        xlTable._showHeaderRow = false;
-                        //foreach (var tableColumn in dTable.TableColumns.Cast<TableColumn>())
-                        xlTable.AddFields(dTable.TableColumns.Cast<TableColumn>().Select(t=>GetTableColumnName(t.Name.Value)));
-                    }
-                    else
-                    {
-                        xlTable.InitializeAutoFilter();
-                    }
-
-                    if (dTable.TotalsRowCount != null && dTable.TotalsRowCount.Value > 0)
-                        ((XLTable) xlTable)._showTotalsRow = true;
-
-                    if (dTable.TableStyleInfo != null)
-                    {
-                        if (dTable.TableStyleInfo.ShowFirstColumn != null)
-                            xlTable.EmphasizeFirstColumn = dTable.TableStyleInfo.ShowFirstColumn.Value;
-                        if (dTable.TableStyleInfo.ShowLastColumn != null)
-                            xlTable.EmphasizeLastColumn = dTable.TableStyleInfo.ShowLastColumn.Value;
-                        if (dTable.TableStyleInfo.ShowRowStripes != null)
-                            xlTable.ShowRowStripes = dTable.TableStyleInfo.ShowRowStripes.Value;
-                        if (dTable.TableStyleInfo.ShowColumnStripes != null)
-                            xlTable.ShowColumnStripes = dTable.TableStyleInfo.ShowColumnStripes.Value;
-                        if (dTable.TableStyleInfo.Name != null)
-                            xlTable.Theme = (XLTableTheme) Enum.Parse(typeof (XLTableTheme), dTable.TableStyleInfo.Name.Value);
-                        else
-                            xlTable.Theme = XLTableTheme.None;
-                    }
-
-
-                    if (dTable.AutoFilter != null)
-                    {
-                        xlTable.ShowAutoFilter = true;
-                        LoadAutoFilterColumns( dTable.AutoFilter, (xlTable as XLTable).AutoFilter);
-                    }
-                    else
-                        xlTable.ShowAutoFilter = false;
-                    
-
-                    if (xlTable.ShowTotalsRow)
-                    {
-                        foreach (var tableColumn in dTable.TableColumns.Cast<TableColumn>())
-                        {
-                            var tableColumnName = GetTableColumnName(tableColumn.Name.Value);
-                            if (tableColumn.TotalsRowFunction != null)
-                                xlTable.Field(tableColumnName).TotalsRowFunction =
-                                    tableColumn.TotalsRowFunction.Value.ToClosedXml();
-
-                            if (tableColumn.TotalsRowFormula != null)
-                                xlTable.Field(tableColumnName).TotalsRowFormulaA1 =
-                                    tableColumn.TotalsRowFormula.Text;
-
-                            if (tableColumn.TotalsRowLabel != null)
-                                xlTable.Field(tableColumnName).TotalsRowLabel = tableColumn.TotalsRowLabel.Value;
-                        }
-                        if (xlTable.AutoFilter != null)
-                            xlTable.AutoFilter.Range = xlTable.Worksheet.Range(
-                                                    xlTable.RangeAddress.FirstAddress.RowNumber, xlTable.RangeAddress.FirstAddress.ColumnNumber,
-                                                    xlTable.RangeAddress.LastAddress.RowNumber - 1, xlTable.RangeAddress.LastAddress.ColumnNumber);
-                    }
-                    else if (xlTable.AutoFilter != null)
-                            xlTable.AutoFilter.Range = xlTable.Worksheet.Range(xlTable.RangeAddress);
-                }
-
-                #endregion
-
-                #region LoadComments
-
-                if (wsPart.WorksheetCommentsPart != null) {
-                    var root = wsPart.WorksheetCommentsPart.Comments;
-                    var authors = root.GetFirstChild<Authors>().ChildElements;
-                    var comments = root.GetFirstChild<CommentList>().ChildElements;
-
-                    // **** MAYBE FUTURE SHAPE SIZE SUPPORT
-                    XDocument xdoc = GetCommentVmlFile(wsPart);
-                    
-                    foreach (Comment c in comments) {
-                        // find cell by reference
-                        var cell = ws.Cell(c.Reference);
-                        
-                        XLComment xlComment = cell.Comment as XLComment;
-                        xlComment.Author = authors[(int)c.AuthorId.Value].InnerText;
-                        //xlComment.ShapeId = (Int32)c.ShapeId.Value;
-                        //ShapeIdManager.Add(xlComment.ShapeId);
-
-                        var runs = c.GetFirstChild<CommentText>().Elements<Run>();
-                        foreach (Run run in runs) {
-                            var runProperties = run.RunProperties;
-                            String text = run.Text.InnerText.FixNewLines();
-                            var rt = cell.Comment.AddText(text);
-                            LoadFont(runProperties, rt);
-                        }
-
-                      
-                        XElement shape = GetCommentShape(xdoc);
-                       
-                        LoadShapeProperties<IXLComment>(xlComment, shape);
-
-                        var clientData = shape.Elements().First(e => e.Name.LocalName == "ClientData");
-                        LoadClientData<IXLComment>(xlComment, clientData);
-
-                        var textBox = shape.Elements().First(e=>e.Name.LocalName == "textbox");
-                        LoadTextBox<IXLComment>(xlComment, textBox);
-
-                        var alt = shape.Attribute("alt");
-                        if (alt != null) xlComment.Style.Web.SetAlternateText(alt.Value);
-
-                        LoadColorsAndLines<IXLComment>(xlComment, shape);
-
-                        //var insetmode = (string)shape.Attributes().First(a=> a.Name.LocalName == "insetmode");
-                        //xlComment.Style.Margins.Automatic = insetmode != null && insetmode.Equals("auto");
-                        
-                        shape.Remove();
-                    }
-                }
-
-                #endregion
-            }
-
-            var workbook = dSpreadsheet.WorkbookPart.Workbook;
-
-            var bookViews = workbook.BookViews;
-            if (bookViews != null && bookViews.Any())
-            {
-                var workbookView = bookViews.First() as WorkbookView;
-                if (workbookView != null && workbookView.ActiveTab != null)
-                {
-                    UnsupportedSheet unsupportedSheet =
-                        UnsupportedSheets.FirstOrDefault(us => us.Position == (Int32) (workbookView.ActiveTab.Value + 1));
-                    if (unsupportedSheet != null)
-                        unsupportedSheet.IsActive = true;
-                    else
-                    {
-                        Worksheet((Int32) (workbookView.ActiveTab.Value + 1)).SetTabActive();
-                    }
-                }
-            }
-            LoadDefinedNames(workbook);
-        }
-
-        #region Comment Helpers
-
-        private XDocument GetCommentVmlFile(WorksheetPart wsPart)
-        {
-            XDocument xdoc = null;
-
-            foreach (var vmlPart in wsPart.VmlDrawingParts)
-            {
-                xdoc = XDocumentExtensions.Load(vmlPart.GetStream(FileMode.Open));
-
-                //Probe for comments
-                if (xdoc.Root == null) continue;
-                var shape = GetCommentShape(xdoc);
-                if (shape != null) break;
-            }
-
-            if (xdoc == null) throw new Exception("Could not load comments file");
-            return xdoc;
-        }
-
-        private static XElement GetCommentShape(XDocument xdoc)
-        {
-            var xml = xdoc.Root.Element("xml");
-
-            XElement shape;
-            if (xml != null)
-                shape =
-                    xml.Elements().FirstOrDefault(e => (string) e.Attribute("type") == XLConstants.Comment.ShapeTypeId);
-            else
-                shape = xdoc.Root.Elements().FirstOrDefault(e =>
-                                                            (string) e.Attribute("type") ==
-                                                            XLConstants.Comment.ShapeTypeId ||
-                                                            (string) e.Attribute("type") ==
-                                                            XLConstants.Comment.AlternateShapeTypeId);
-            return shape;
-        }
-
-        #endregion
-
-
-        private String GetTableColumnName(string name)
-        {
-            return name.Replace("_x000a_", Environment.NewLine).Replace("_x005f_x000a_", "_x000a_");
-        }
-
-        // This may be part of XLHelper or XLColor
-        // Leaving it here for now. Can't decide what to call it and where to put it.
-        private XLColor ExtractColor(String color)
-        {
-            if (color.IndexOf("[") >= 0)
-            {
-                int start = color.IndexOf("[") + 1;
-                int end = color.IndexOf("]", start);
-                return XLColor.FromIndex(Int32.Parse(color.Substring(start, end - start)));
-            }
-            else
-            {
-                return XLColor.FromHtml(color);
-            }
-            
-        }
-
-        private void LoadColorsAndLines<T>(IXLDrawing<T> drawing, XElement shape)
-        {
-            var strokeColor = shape.Attribute("strokecolor");
-            if (strokeColor != null) drawing.Style.ColorsAndLines.LineColor = ExtractColor(strokeColor.Value);
-
-            var strokeWeight = shape.Attribute("strokeweight");
-            if (strokeWeight != null)
-                drawing.Style.ColorsAndLines.LineWeight = GetPtValue(strokeWeight.Value);
-
-            var fillColor = shape.Attribute("fillcolor");
-            if (fillColor != null && !fillColor.Value.ToLower().Contains("infobackground")) drawing.Style.ColorsAndLines.FillColor = ExtractColor(fillColor.Value);
-
-            var fill = shape.Elements().FirstOrDefault(e => e.Name.LocalName == "fill");
-            if (fill != null)
-            {
-                var opacity = fill.Attribute("opacity");
-                if (opacity != null)
-                {
-                    String opacityVal = opacity.Value;
-                    if (opacityVal.EndsWith("f"))
-                        drawing.Style.ColorsAndLines.FillTransparency = 
-                            Double.Parse(opacityVal.Substring(0, opacityVal.Length - 1), CultureInfo.InvariantCulture) / 65536.0;
-                    else
-                        drawing.Style.ColorsAndLines.FillTransparency = Double.Parse(opacityVal, CultureInfo.InvariantCulture);
-                }
-            }
-
-            var stroke = shape.Elements().FirstOrDefault(e=>e.Name.LocalName == "stroke");
-            if (stroke != null)
-            {
-                var opacity = stroke.Attribute("opacity");
-                if (opacity != null)
-                {
-                    String opacityVal = opacity.Value;
-                    if (opacityVal.EndsWith("f"))
-                        drawing.Style.ColorsAndLines.LineTransparency = 
-                            Double.Parse(opacityVal.Substring(0, opacityVal.Length - 1), CultureInfo.InvariantCulture) / 65536.0;
-                    else
-                        drawing.Style.ColorsAndLines.LineTransparency = Double.Parse(opacityVal, CultureInfo.InvariantCulture);
-                }
-
-                var dashStyle = stroke.Attribute("dashstyle");
-                if (dashStyle != null)
-                {
-                    String dashStyleVal = dashStyle.Value.ToLower();
-                    if (dashStyleVal == "1 1" || dashStyleVal == "shortdot")
-                    {
-                        var endCap = stroke.Attribute("endcap");
-                        if (endCap != null && endCap.Value == "round")
-                            drawing.Style.ColorsAndLines.LineDash = XLDashStyle.RoundDot;
-                        else
-                            drawing.Style.ColorsAndLines.LineDash = XLDashStyle.SquareDot;
-                    }
-                    else 
-                    {
-                        switch (dashStyleVal)
-                        {
-                            case "dash": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.Dash; break;
-                            case "dashdot": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.DashDot; break;
-                            case "longdash": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.LongDash; break;
-                            case "longdashdot": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.LongDashDot; break;
-                            case "longdashdotdot": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.LongDashDotDot; break;
-                        }
-                    }
-                }
-
-                var lineStyle = stroke.Attribute("linestyle");
-                if (lineStyle != null)
-                {
-                    String lineStyleVal = lineStyle.Value.ToLower();
-                    switch (lineStyleVal)
-                    {
-                        case "single": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.Single ; break;
-                        case "thickbetweenthin": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThickBetweenThin; break;
-                        case "thickthin": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThickThin; break;
-                        case "thinthick": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThinThick; break;
-                        case "thinthin": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThinThin; break;
-                    }
-                }
-            }
-        }
-
-        private void LoadTextBox<T>(IXLDrawing<T> xlDrawing, XElement textBox)
-        {
-            var attStyle = textBox.Attribute("style");
-            if (attStyle != null) LoadTextBoxStyle<T>(xlDrawing, attStyle);
-
-            var attInset = textBox.Attribute("inset");
-            if (attInset != null) LoadTextBoxInset<T>(xlDrawing, attInset);
-        }
-
-        private void LoadTextBoxInset<T>(IXLDrawing<T> xlDrawing, XAttribute attInset)
-        {
-            var split = attInset.Value.Split(',');
-            xlDrawing.Style.Margins.Left = GetInsetValue(split[0]);
-            xlDrawing.Style.Margins.Top = GetInsetValue(split[1]);
-            xlDrawing.Style.Margins.Right = GetInsetValue(split[2]);
-            xlDrawing.Style.Margins.Bottom = GetInsetValue(split[3]);
-        }
-
-        private double GetInsetValue(string value)
-        {
-            String v = value.Trim();
-            if (v.EndsWith("pt"))
-                return Double.Parse(v.Substring(0, v.Length - 2), CultureInfo.InvariantCulture) / 72.0;
-            else
-                return Double.Parse(v.Substring(0, v.Length - 2), CultureInfo.InvariantCulture);
-        }
-
-        private static void LoadTextBoxStyle<T>(IXLDrawing<T> xlDrawing, XAttribute attStyle)
-        {
-            var style = attStyle.Value;
-            var attributes = style.Split(';');
-            foreach (String pair in attributes)
-            {
-                var split = pair.Split(':');
-                if (split.Length != 2) continue;
-
-                var attribute = split[0].Trim().ToLower();
-                var value = split[1].Trim();
-                Boolean isVertical = false;
-                switch (attribute)
-                {
-                    case "mso-fit-shape-to-text": xlDrawing.Style.Size.SetAutomaticSize(value.Equals("t")); break;
-                    case "mso-layout-flow-alt":
-                        if (value.Equals("bottom-to-top")) xlDrawing.Style.Alignment.SetOrientation(XLDrawingTextOrientation.BottomToTop);
-                        else if (value.Equals("top-to-bottom")) xlDrawing.Style.Alignment.SetOrientation(XLDrawingTextOrientation.Vertical);
-                        break;
-                    case "layout-flow": isVertical = value.Equals("vertical"); break;
-                    case "mso-direction-alt": if (value == "auto") xlDrawing.Style.Alignment.Direction = XLDrawingTextDirection.Context; break;
-                    case "direction": if (value == "RTL") xlDrawing.Style.Alignment.Direction = XLDrawingTextDirection.RightToLeft; break;
-                }
-                if (isVertical && xlDrawing.Style.Alignment.Orientation == XLDrawingTextOrientation.LeftToRight)
-                    xlDrawing.Style.Alignment.Orientation = XLDrawingTextOrientation.TopToBottom;
-            }
-        }
-
-        private void LoadClientData<T>(IXLDrawing<T> drawing, XElement clientData)
-        {
-            var anchor = clientData.Elements().FirstOrDefault(e=>e.Name.LocalName == "Anchor");
-            if (anchor != null) LoadClientDataAnchor<T>(drawing, anchor);
-
-            LoadDrawingPositioning<T>(drawing, clientData);
-            LoadDrawingProtection<T>(drawing, clientData);
-
-            var visible = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "Visible");
-            drawing.Visible = visible != null && visible.Value.ToLower().StartsWith("t");
-
-            LoadDrawingHAlignment<T>(drawing, clientData);
-            LoadDrawingVAlignment<T>(drawing, clientData);
-        }
-
-        private void LoadDrawingHAlignment<T>(IXLDrawing<T> drawing, XElement clientData)
-        {
-            var textHAlign = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "TextHAlign");
-            if (textHAlign != null)
-                drawing.Style.Alignment.Horizontal = (XLDrawingHorizontalAlignment)Enum.Parse(typeof(XLDrawingHorizontalAlignment), textHAlign.Value.ToProper());
-        }
-
-        private void LoadDrawingVAlignment<T>(IXLDrawing<T> drawing, XElement clientData)
-        {
-            var textVAlign = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "TextVAlign");
-            if (textVAlign != null)
-                drawing.Style.Alignment.Vertical = (XLDrawingVerticalAlignment)Enum.Parse(typeof(XLDrawingVerticalAlignment), textVAlign.Value.ToProper());
-        }
-
-        private void LoadDrawingProtection<T>(IXLDrawing<T> drawing, XElement clientData)
-        {
-            var lockedElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "Locked");
-            var lockTextElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "LockText");
-            Boolean locked = lockedElement != null && lockedElement.Value.ToLower() == "true";
-            Boolean lockText = lockTextElement != null && lockTextElement.Value.ToLower() == "true";
-            drawing.Style.Protection.Locked = locked;
-            drawing.Style.Protection.LockText = lockText;
-
-        }
-
-        private static void LoadDrawingPositioning<T>(IXLDrawing<T> drawing, XElement clientData)
-        {
-            var moveWithCellsElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "MoveWithCells");
-            var sizeWithCellsElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "SizeWithCells");
-            Boolean moveWithCells = !(moveWithCellsElement != null && moveWithCellsElement.Value.ToLower() == "true");
-            Boolean sizeWithCells = !(sizeWithCellsElement != null && sizeWithCellsElement.Value.ToLower() == "true");
-            if (moveWithCells && !sizeWithCells)
-                drawing.Style.Properties.Positioning = XLDrawingAnchor.MoveWithCells;
-            else if (moveWithCells && sizeWithCells)
-                drawing.Style.Properties.Positioning = XLDrawingAnchor.MoveAndSizeWithCells;
-            else
-                drawing.Style.Properties.Positioning = XLDrawingAnchor.Absolute;
-        }
-
-        private static void LoadClientDataAnchor<T>(IXLDrawing<T> drawing, XElement anchor)
-        {
-            var location = anchor.Value.Split(',');
-            drawing.Position.Column = int.Parse(location[0]) + 1;
-            drawing.Position.ColumnOffset = Double.Parse(location[1], CultureInfo.InvariantCulture) / 7.2;
-            drawing.Position.Row = int.Parse(location[2]) + 1;
-            drawing.Position.RowOffset = Double.Parse(location[3], CultureInfo.InvariantCulture);
-        }
-
-        private void LoadShapeProperties<T>(IXLDrawing<T> xlDrawing, XElement shape)
-        {
-            var attStyle = shape.Attribute("style");
-            if (attStyle == null) return;
-
-            var style = attStyle.Value;
-            var attributes = style.Split(';');
-            foreach (String pair in attributes)
-            {
-                var split = pair.Split(':');
-                if (split.Length != 2) continue;
-
-                var attribute = split[0].Trim().ToLower();
-                var value = split[1].Trim();
-
-                switch (attribute)
-                {
-                    case "visibility": xlDrawing.Visible = value.ToLower().Equals("visible"); break;
-                    case "width": xlDrawing.Style.Size.Width = GetPtValue(value) / 7.5; break;
-                    case "height": xlDrawing.Style.Size.Height = GetPtValue(value); break;
-                    case "z-index": xlDrawing.ZOrder = Int32.Parse(value); break;
-                }
-            }
-
-        }
-
-        private readonly Dictionary<string, double> knownUnits = new Dictionary<string, double>
-        {
-            {"pt", 1.0},
-            {"in", 72.0},
-            {"mm", 72.0/25.4}
-        };
-
-        private double GetPtValue(string value)
-        {
-            var knownUnit = knownUnits.FirstOrDefault(ku => value.Contains(ku.Key));
-
-            if (knownUnit.Key == null)
-                return Double.Parse(value);
-
-            return Double.Parse(value.Replace(knownUnit.Key, String.Empty), CultureInfo.InvariantCulture) * knownUnit.Value;
-        }
-        
-
-        private void LoadDefinedNames(Workbook workbook)
-        {
-            if (workbook.DefinedNames == null) return;
-
-            foreach (DefinedName definedName in workbook.DefinedNames)
-            {
-                var name = definedName.Name;
-                if (name == "_xlnm.Print_Area")
-                {
-                    foreach (string area in definedName.Text.Split(','))
-                    {
-                        if (area.Contains("["))
-                        {
-                            String tableName = area.Substring(0, area.IndexOf("["));
-                            var ws = Worksheets.FirstOrDefault(w => (w as XLWorksheet).SheetId == definedName.LocalSheetId + 1);
-                            if (ws != null)
-                            {
-                                ws.PageSetup.PrintAreas.Add(area);
-                            }
-                        }
-                        else
-                        {
-                            string sheetName, sheetArea;
-                            ParseReference(area, out sheetName, out sheetArea);
-                            if (!(sheetArea.Equals("#REF") || sheetArea.EndsWith("#REF!") || sheetArea.Length == 0))
-                                WorksheetsInternal.Worksheet(sheetName).PageSetup.PrintAreas.Add(sheetArea);
-                        }
-                    }
-                }
-                else if (name == "_xlnm.Print_Titles")
-                {
-                    LoadPrintTitles(definedName);
-                }
-                else
-                {
-                    string text = definedName.Text;
-
-                    if (!(text.Equals("#REF") || text.EndsWith("#REF!")))
-                    {
-                        var localSheetId = definedName.LocalSheetId;
-                        var comment = definedName.Comment;
-                        if (localSheetId == null)
-                        {
-                            if (!NamedRanges.Any(nr => nr.Name == name))
-                                NamedRanges.Add(name, text, comment);
-                        }
-                        else
-                        {
-                            if (!Worksheet(Int32.Parse(localSheetId) + 1).NamedRanges.Any(nr => nr.Name == name))
-                                Worksheet(Int32.Parse(localSheetId) + 1).NamedRanges.Add(name, text, comment);
-                        }
-                    }
-                }
-            }
-        }
-
-        private void LoadPrintTitles(DefinedName definedName)
-        {
-            var areas = definedName.Text.Split(',');
-            if (areas.Length > 0)
-            {
-                foreach (var item in areas)
-                {
-                    SetColumnsOrRowsToRepeat(item);
-                }
-                return;
-            }
-
-            SetColumnsOrRowsToRepeat(definedName.Text);
-        }
-
-        private void SetColumnsOrRowsToRepeat(string area)
-        {
-            string sheetName, sheetArea;
-            ParseReference(area, out sheetName, out sheetArea);
-            if (sheetArea.Equals("#REF")) return;
-            if (IsColReference(sheetArea))
-                WorksheetsInternal.Worksheet(sheetName).PageSetup.SetColumnsToRepeatAtLeft(sheetArea);
-            if (IsRowReference(sheetArea))
-                WorksheetsInternal.Worksheet(sheetName).PageSetup.SetRowsToRepeatAtTop(sheetArea);
-        }
-
-        // either $A:$X => true or $1:$99 => false
-        private static bool IsColReference(string sheetArea)
-        {
-            char c = sheetArea[0] == '$' ? sheetArea[1] : sheetArea[0];
-            return char.IsLetter(c);
-        }
-
-        private static bool IsRowReference(string sheetArea)
-        {
-            char c = sheetArea[0] == '$' ? sheetArea[1] : sheetArea[0];
-            return char.IsNumber(c);
-        }
-
-        private static void ParseReference(string item, out string sheetName, out string sheetArea)
-        {
-            var sections = item.Trim().Split('!');
-            sheetName = sections[0].Replace("\'", "");
-            sheetArea = sections[1];
-        }
-
-        private Int32 lastCell;
-        private void LoadCells(SharedStringItem[] sharedStrings, Stylesheet s, NumberingFormats numberingFormats,
-                               Fills fills, Borders borders, Fonts fonts, Dictionary<uint, string> sharedFormulasR1C1,
-                               XLWorksheet ws, Dictionary<Int32, IXLStyle> styleList, Cell cell, Int32 rowIndex)
-        {
-            Int32 styleIndex = cell.StyleIndex != null ? Int32.Parse(cell.StyleIndex.InnerText) : 0;
-
-            String cellReference = cell.CellReference == null
-                                       ? XLHelper.GetColumnLetterFromNumber(++lastCell) + rowIndex
-                                       : cell.CellReference.Value;
-            var xlCell = ws.CellFast(cellReference);
-
-            if (styleList.ContainsKey(styleIndex))
-            {
-                xlCell.Style = styleList[styleIndex];
-            }
-            else
-            {
-                ApplyStyle(xlCell, styleIndex, s, fills, borders, fonts, numberingFormats);
-                styleList.Add(styleIndex, xlCell.Style);
-            }
-
-
-            if (cell.CellFormula != null && cell.CellFormula.SharedIndex != null && cell.CellFormula.Reference != null)
-            {
-                String formula;
-                if (cell.CellFormula.FormulaType != null && cell.CellFormula.FormulaType == CellFormulaValues.Array)
-                    formula = "{" + cell.CellFormula.Text + "}";
-                else
-                    formula = cell.CellFormula.Text;
-
-                if (cell.CellFormula.Reference != null)
-                    xlCell.FormulaReference = ws.Range(cell.CellFormula.Reference.Value).RangeAddress;
-
-                xlCell.FormulaA1 = formula;
-                sharedFormulasR1C1.Add(cell.CellFormula.SharedIndex.Value, xlCell.FormulaR1C1);
-
-                if (cell.CellValue != null)
-                    xlCell.ValueCached = cell.CellValue.Text;
-            }
-            else if (cell.CellFormula != null)
-            {
-                if (cell.CellFormula.SharedIndex != null)
-                    xlCell.FormulaR1C1 = sharedFormulasR1C1[cell.CellFormula.SharedIndex.Value];
-                else
-                {
-                    String formula;
-                    if (cell.CellFormula.FormulaType != null && cell.CellFormula.FormulaType == CellFormulaValues.Array)
-                        formula = "{" + cell.CellFormula.Text + "}";
-                    else
-                        formula = cell.CellFormula.Text;
-
-                    xlCell.FormulaA1 = formula;
-                }
-
-                if (cell.CellFormula.Reference != null)
-                    xlCell.FormulaReference = ws.Range(cell.CellFormula.Reference.Value).RangeAddress;
-
-                if (cell.CellValue != null)
-                    xlCell.ValueCached = cell.CellValue.Text;
-            }
-            else if (cell.DataType != null)
-            {
-                if (cell.DataType == CellValues.InlineString)
-                {
-                    xlCell._cellValue = cell.InlineString != null && cell.InlineString.Text != null ? cell.InlineString.Text.Text.FixNewLines() : String.Empty;
-                    xlCell._dataType = XLCellValues.Text;
-                    xlCell.ShareString = false;
-                }
-                else if (cell.DataType == CellValues.SharedString)
-                {
-                    if (cell.CellValue != null)
-                    {
-                        if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
-                        {
-                            var sharedString = sharedStrings[Int32.Parse(cell.CellValue.Text)];
-
-                            var runs = sharedString.Elements<Run>();
-                            var phoneticRuns = sharedString.Elements<PhoneticRun>();
-                            var phoneticProperties = sharedString.Elements<PhoneticProperties>();
-                            Boolean hasRuns = false;
-                            foreach (Run run in runs)
-                            {
-                                var runProperties = run.RunProperties;
-                                String text = run.Text.InnerText.FixNewLines();
-
-                                if (runProperties == null)
-                                    xlCell.RichText.AddText(text, xlCell.Style.Font);
-                                else
-                                {
-                                    var rt = xlCell.RichText.AddText(text);
-                                    LoadFont(runProperties, rt);
-                                }
-                                if (!hasRuns)
-                                    hasRuns = true;
-                            }
-                        
-                            if(!hasRuns)
-                                xlCell._cellValue = sharedString.Text.InnerText;
-
-                            #region Load PhoneticProperties
-
-                            var pp = phoneticProperties.FirstOrDefault();
-                            if (pp != null)
-                            {
-                                if (pp.Alignment != null)
-                                    xlCell.RichText.Phonetics.Alignment = pp.Alignment.Value.ToClosedXml();
-                                if (pp.Type != null)
-                                    xlCell.RichText.Phonetics.Type = pp.Type.Value.ToClosedXml();
-
-                                LoadFont(pp, xlCell.RichText.Phonetics);
-                            }
-
-                            #endregion
-
-                            #region Load Phonetic Runs
-
-                            foreach (PhoneticRun pr in phoneticRuns)
-                            {
-                                xlCell.RichText.Phonetics.Add(pr.Text.InnerText.FixNewLines(), (Int32)pr.BaseTextStartIndex.Value,
-                                                              (Int32) pr.EndingBaseIndex.Value);
-                            }
-
-                            #endregion
-                        }
-                        else
-                            xlCell._cellValue = cell.CellValue.Text.FixNewLines();
-                    }
-                    else
-                        xlCell._cellValue = String.Empty;
-                    xlCell._dataType = XLCellValues.Text;
-                }
-                else if (cell.DataType == CellValues.Date)
-                {
-                    if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
-                        xlCell._cellValue = Double.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture).ToString();
-                    xlCell._dataType = XLCellValues.DateTime;
-                }
-                else if (cell.DataType == CellValues.Boolean)
-                {
-                    xlCell._cellValue = cell.CellValue.Text;
-                    xlCell._dataType = XLCellValues.Boolean;
-                }
-                else if (cell.DataType == CellValues.Number)
-                {
-                    if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
-                        xlCell._cellValue = Double.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture).ToString();
-                    if (s == null)
-                    {
-                        xlCell._dataType = XLCellValues.Number;
-                    }
-                    else
-                    {
-                        var numberFormatId = ((CellFormat)(s.CellFormats).ElementAt(styleIndex)).NumberFormatId;
-                        if (numberFormatId == 46U)
-                            xlCell.DataType = XLCellValues.TimeSpan;
-                        else
-                            xlCell._dataType = XLCellValues.Number;
-                    }
-                    
-                }
-            }
-            else if (cell.CellValue != null)
-            {
-                if (s == null)
-                {
-                    xlCell._dataType = XLCellValues.Number;
-                }
-                else
-                {
-                    var numberFormatId = ((CellFormat) (s.CellFormats).ElementAt(styleIndex)).NumberFormatId;
-                    if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
-                        xlCell._cellValue = Double.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture).ToString();
-                    if (s.NumberingFormats != null &&
-                        s.NumberingFormats.Any(nf => ((NumberingFormat) nf).NumberFormatId.Value == numberFormatId))
-                    {
-                        xlCell.Style.NumberFormat.Format =
-                            ((NumberingFormat) s.NumberingFormats
-                                                .First(
-                                                    nf => ((NumberingFormat) nf).NumberFormatId.Value == numberFormatId)
-                            ).FormatCode.Value;
-                    }
-                    else
-                        xlCell.Style.NumberFormat.NumberFormatId = Int32.Parse(numberFormatId);
-
-
-                    if (!XLHelper.IsNullOrWhiteSpace(xlCell.Style.NumberFormat.Format))
-                        xlCell._dataType = GetDataTypeFromFormat(xlCell.Style.NumberFormat.Format);
-                    else if ((numberFormatId >= 14 && numberFormatId <= 22) ||
-                             (numberFormatId >= 45 && numberFormatId <= 47))
-                        xlCell._dataType = XLCellValues.DateTime;
-                    else if (numberFormatId == 49)
-                        xlCell._dataType = XLCellValues.Text;
-                    else
-                        xlCell._dataType = XLCellValues.Number;
-                }
-            }
-        }
-
-        private void LoadNumberFormat(NumberingFormat nfSource, IXLNumberFormat nf)
-        {
-            if (nfSource == null) return;
-
-            if (nfSource.FormatCode != null)
-                nf.Format = nfSource.FormatCode.Value;
-            //if (nfSource.NumberFormatId != null)
-            //    nf.NumberFormatId = (Int32)nfSource.NumberFormatId.Value;
-        }
-
-        private void LoadBorder(Border borderSource, IXLBorder border)
-        {
-            if (borderSource == null) return;
-
-            LoadBorderValues(borderSource.DiagonalBorder, border.SetDiagonalBorder, border.SetDiagonalBorderColor);
-
-            if (borderSource.DiagonalUp != null )
-                border.DiagonalUp = borderSource.DiagonalUp.Value;
-            if (borderSource.DiagonalDown != null)
-                border.DiagonalDown = borderSource.DiagonalDown.Value;
-
-            LoadBorderValues(borderSource.LeftBorder, border.SetLeftBorder, border.SetLeftBorderColor);
-            LoadBorderValues(borderSource.RightBorder, border.SetRightBorder, border.SetRightBorderColor);
-            LoadBorderValues(borderSource.TopBorder, border.SetTopBorder, border.SetTopBorderColor);
-            LoadBorderValues(borderSource.BottomBorder, border.SetBottomBorder, border.SetBottomBorderColor);
-            
-        }
-
-        private void LoadBorderValues(BorderPropertiesType source, Func<XLBorderStyleValues, IXLStyle> setBorder, Func<XLColor, IXLStyle> setColor )
-        {
-            if (source != null)
-            {
-                if (source.Style != null)
-                    setBorder(source.Style.Value.ToClosedXml());
-                if (source.Color != null)
-                    setColor(GetColor(source.Color));
-            }
-        }
-
-        
-
-        private void LoadFill(Fill fillSource, IXLFill fill)
-        {
-            if (fillSource == null) return;
-
-            if(fillSource.PatternFill != null)
-            {
-                if (fillSource.PatternFill.PatternType != null)
-                    fill.PatternType = fillSource.PatternFill.PatternType.Value.ToClosedXml();
-                else
-                    fill.PatternType = XLFillPatternValues.Solid;
-
-                if (fillSource.PatternFill.ForegroundColor != null)
-                    fill.PatternColor = GetColor(fillSource.PatternFill.ForegroundColor);
-                if (fillSource.PatternFill.BackgroundColor != null)
-                    fill.PatternBackgroundColor = GetColor(fillSource.PatternFill.BackgroundColor);
-            }
-        }
-
-        private void LoadFont(OpenXmlElement fontSource, IXLFontBase fontBase)
-        {
-            if (fontSource == null) return;
-
-            fontBase.Bold = GetBoolean(fontSource.Elements<Bold>().FirstOrDefault());
-            var fontColor = GetColor(fontSource.Elements<DocumentFormat.OpenXml.Spreadsheet.Color>().FirstOrDefault());
-            if (fontColor.HasValue)
-                fontBase.FontColor = fontColor;
-
-            var fontFamilyNumbering =
-                fontSource.Elements<DocumentFormat.OpenXml.Spreadsheet.FontFamily>().FirstOrDefault();
-            if (fontFamilyNumbering != null && fontFamilyNumbering.Val != null)
-                fontBase.FontFamilyNumbering =
-                    (XLFontFamilyNumberingValues) Int32.Parse(fontFamilyNumbering.Val.ToString());
-            var runFont = fontSource.Elements<RunFont>().FirstOrDefault();
-            if (runFont != null)
-            {
-                if (runFont.Val != null)
-                    fontBase.FontName = runFont.Val;
-            }
-            var fontSize = fontSource.Elements<FontSize>().FirstOrDefault();
-            if (fontSize != null)
-            {
-                if ((fontSize).Val != null)
-                    fontBase.FontSize = (fontSize).Val;
-            }
-
-            fontBase.Italic = GetBoolean(fontSource.Elements<Italic>().FirstOrDefault());
-            fontBase.Shadow = GetBoolean(fontSource.Elements<Shadow>().FirstOrDefault());
-            fontBase.Strikethrough = GetBoolean(fontSource.Elements<Strike>().FirstOrDefault());
-
-            var underline = fontSource.Elements<Underline>().FirstOrDefault();
-            if (underline != null)
-            {
-                fontBase.Underline = underline.Val != null ? underline.Val.Value.ToClosedXml() : XLFontUnderlineValues.Single;
-            }
-
-            var verticalTextAlignment = fontSource.Elements<VerticalTextAlignment>().FirstOrDefault();
-            
-            if (verticalTextAlignment == null) return;
-
-            fontBase.VerticalAlignment = verticalTextAlignment.Val != null ? verticalTextAlignment.Val.Value.ToClosedXml() : XLFontVerticalTextAlignmentValues.Baseline;
-        }
-
-        private Int32 lastRow;
-        private void LoadRows(Stylesheet s, NumberingFormats numberingFormats, Fills fills, Borders borders, Fonts fonts,
-                              XLWorksheet ws, SharedStringItem[] sharedStrings,
-                              Dictionary<uint, string> sharedFormulasR1C1, Dictionary<Int32, IXLStyle> styleList,
-                              Row row)
-        {
-            Int32 rowIndex = row.RowIndex == null ? ++lastRow : (Int32) row.RowIndex.Value;
-            var xlRow = ws.Row(rowIndex, false);
-            
-            if (row.Height != null)
-                xlRow.Height = row.Height;
-            else
-            {
-                xlRow.Loading = true;
-                xlRow.Height = ws.RowHeight;
-                xlRow.Loading = false;
-            }
-
-            if (row.Hidden != null && row.Hidden)
-                xlRow.Hide();
-
-            if (row.Collapsed != null && row.Collapsed)
-                xlRow.Collapsed = true;
-
-            if (row.OutlineLevel != null && row.OutlineLevel > 0)
-                xlRow.OutlineLevel = row.OutlineLevel;
-
-            if (row.CustomFormat != null)
-            {
-                Int32 styleIndex = row.StyleIndex != null ? Int32.Parse(row.StyleIndex.InnerText) : -1;
-                if (styleIndex > 0)
-                {
-                        ApplyStyle(xlRow, styleIndex, s, fills, borders, fonts, numberingFormats);
-                }
-                else
-                {
-                    xlRow.Style = DefaultStyle;
-                }
-            }
-
-            lastCell = 0;
-            foreach (Cell cell in row.Elements<Cell>())
-                LoadCells(sharedStrings, s, numberingFormats, fills, borders, fonts, sharedFormulasR1C1, ws, styleList,
-                          cell, rowIndex);
-        }
-
-        private void LoadColumns(Stylesheet s, NumberingFormats numberingFormats, Fills fills, Borders borders,
-                                 Fonts fonts, XLWorksheet ws, Columns columns)
-        {
-            if (columns == null) return;
-
-            var wsDefaultColumn =
-                columns.Elements<Column>().Where(c => c.Max == XLHelper.MaxColumnNumber).FirstOrDefault();
-
-            if (wsDefaultColumn != null && wsDefaultColumn.Width != null)
-                ws.ColumnWidth = wsDefaultColumn.Width - ColumnWidthOffset;
-
-            Int32 styleIndexDefault = wsDefaultColumn != null && wsDefaultColumn.Style != null
-                                          ? Int32.Parse(wsDefaultColumn.Style.InnerText)
-                                          : -1;
-            if (styleIndexDefault >= 0)
-                ApplyStyle(ws, styleIndexDefault, s, fills, borders, fonts, numberingFormats);
-
-            foreach (Column col in columns.Elements<Column>())
-            {
-                //IXLStylized toApply;
-                if (col.Max == XLHelper.MaxColumnNumber) continue;
-
-                var xlColumns = (XLColumns) ws.Columns(col.Min, col.Max);
-                if (col.Width != null)
-                {
-                    Double width = col.Width - ColumnWidthOffset;
-                    //if (width < 0) width = 0;
-                    xlColumns.Width = width;
-                }
-                else
-                    xlColumns.Width = ws.ColumnWidth;
-
-                if (col.Hidden != null && col.Hidden)
-                    xlColumns.Hide();
-
-                if (col.Collapsed != null && col.Collapsed)
-                    xlColumns.CollapseOnly();
-
-                if (col.OutlineLevel != null)
-                {
-                    var outlineLevel = col.OutlineLevel;
-                    xlColumns.ForEach(c => c.OutlineLevel = outlineLevel);
-                }
-
-                Int32 styleIndex = col.Style != null ? Int32.Parse(col.Style.InnerText) : -1;
-                if (styleIndex > 0)
-                {
-                    ApplyStyle(xlColumns, styleIndex, s, fills, borders, fonts, numberingFormats);
-                }
-                else
-                {
-                    xlColumns.Style = DefaultStyle;
-                }
-            }
-        }
-
-        private static XLCellValues GetDataTypeFromFormat(String format)
-        {
-            int length = format.Length;
-            String f = format.ToLower();
-            for (Int32 i = 0; i < length; i++)
-            {
-                Char c = f[i];
-                if (c == '"')
-                    i = f.IndexOf('"', i + 1);
-                else if (c == '0' || c == '#' || c == '?')
-                    return XLCellValues.Number;
-                else if (c == 'y' || c == 'm' || c == 'd' || c == 'h' || c == 's')
-                    return XLCellValues.DateTime;
-            }
-            return XLCellValues.Text;
-        }
-
-        private static void LoadAutoFilter(AutoFilter af, XLWorksheet ws)
-        {
-            if (af != null)
-            {
-                ws.Range(af.Reference.Value).SetAutoFilter();
-                var autoFilter = ws.AutoFilter;
-                LoadAutoFilterSort(af, ws, autoFilter);
-                LoadAutoFilterColumns(af, autoFilter);
-            }
-        }
-
-        private static void LoadAutoFilterColumns(AutoFilter af, XLAutoFilter autoFilter)
-        {
-            foreach (var filterColumn in af.Elements<FilterColumn>())
-            {
-                Int32 column = (int)filterColumn.ColumnId.Value + 1;
-                if (filterColumn.CustomFilters != null)
-                {
-                    var filterList = new List<XLFilter>();
-                    autoFilter.Column(column).FilterType = XLFilterType.Custom;
-                    autoFilter.Filters.Add(column, filterList);
-                    XLConnector connector = filterColumn.CustomFilters.And != null && filterColumn.CustomFilters.And.Value ? XLConnector.And : XLConnector.Or;
-
-                    Boolean isText = false;
-                    foreach (CustomFilter filter in filterColumn.CustomFilters)
-                    {
-                        Double dTest;
-                        String val = filter.Val.Value;
-                        if (!Double.TryParse(val, out dTest))
-                        {
-                            isText = true;
-                            break;
-                        }
-                    }
-
-                    foreach (CustomFilter filter in filterColumn.CustomFilters)
-                    {
-                        var xlFilter = new XLFilter { Value = filter.Val.Value, Connector = connector };
-                        if (isText)
-                            xlFilter.Value = filter.Val.Value;
-                        else
-                            xlFilter.Value = Double.Parse(filter.Val.Value, CultureInfo.InvariantCulture);
-
-                        if (filter.Operator != null)
-                            xlFilter.Operator = filter.Operator.Value.ToClosedXml();
-                        else
-                            xlFilter.Operator = XLFilterOperator.Equal;
-
-                        Func<Object, Boolean> condition = null;
-                        switch (xlFilter.Operator)
-                        {
-                            case XLFilterOperator.Equal:
-                                if (isText)
-                                    condition = o => o.ToString().Equals(xlFilter.Value.ToString(), StringComparison.InvariantCultureIgnoreCase);
-                                else
-                                    condition = o => (o as IComparable).CompareTo(xlFilter.Value) == 0;
-                                break;
-                            case XLFilterOperator.EqualOrGreaterThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) >= 0; break;
-                            case XLFilterOperator.EqualOrLessThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) <= 0; break;
-                            case XLFilterOperator.GreaterThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) > 0; break;
-                            case XLFilterOperator.LessThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) < 0; break;
-                            case XLFilterOperator.NotEqual:
-                                if (isText)
-                                    condition = o => !o.ToString().Equals(xlFilter.Value.ToString(), StringComparison.InvariantCultureIgnoreCase);
-                                else
-                                    condition = o => (o as IComparable).CompareTo(xlFilter.Value) != 0;
-                                break;
-                        }
-
-                        xlFilter.Condition = condition;
-                        filterList.Add(xlFilter);
-                    }
-                }
-                else if (filterColumn.Filters != null)
-                {
-                    var filterList = new List<XLFilter>();
-                    autoFilter.Column(column).FilterType = XLFilterType.Regular;
-                    autoFilter.Filters.Add((int)filterColumn.ColumnId.Value + 1, filterList);
-
-                    Boolean isText = false;
-                    foreach (Filter filter in filterColumn.Filters.OfType<Filter>())
-                    {
-                        Double dTest;
-                        String val = filter.Val.Value;
-                        if (!Double.TryParse(val, out dTest))
-                        {
-                            isText = true;
-                            break;
-                        }
-                    }
-
-                    foreach (Filter filter in filterColumn.Filters.OfType<Filter>())
-                    {
-                        var xlFilter = new XLFilter { Connector = XLConnector.Or, Operator = XLFilterOperator.Equal };
-
-                        Func<Object, Boolean> condition;
-                        if (isText)
-                        {
-                            xlFilter.Value = filter.Val.Value;
-                            condition = o => o.ToString().Equals(xlFilter.Value.ToString(), StringComparison.InvariantCultureIgnoreCase);
-                        }
-                        else
-                        {
-                            xlFilter.Value = Double.Parse(filter.Val.Value, CultureInfo.InvariantCulture);
-                            condition = o => (o as IComparable).CompareTo(xlFilter.Value) == 0;
-                        }
-
-                        xlFilter.Condition = condition;
-                        filterList.Add(xlFilter);
-                    }
-
-                }
-                else if (filterColumn.Top10 != null)
-                {
-                    var xlFilterColumn = autoFilter.Column(column);
-                    autoFilter.Filters.Add(column, null);
-                    xlFilterColumn.FilterType = XLFilterType.TopBottom;
-                    if (filterColumn.Top10.Percent != null && filterColumn.Top10.Percent.Value)
-                        xlFilterColumn.TopBottomType = XLTopBottomType.Percent;
-                    else
-                        xlFilterColumn.TopBottomType = XLTopBottomType.Items;
-
-                    if (filterColumn.Top10.Top != null && !filterColumn.Top10.Top.Value)
-                        xlFilterColumn.TopBottomPart = XLTopBottomPart.Bottom;
-                    else
-                        xlFilterColumn.TopBottomPart = XLTopBottomPart.Top;
-
-                    xlFilterColumn.TopBottomValue = (int)filterColumn.Top10.Val.Value;
-                }
-                else if (filterColumn.DynamicFilter != null)
-                {
-                    autoFilter.Filters.Add(column, null);
-                    var xlFilterColumn = autoFilter.Column(column);
-                    xlFilterColumn.FilterType = XLFilterType.Dynamic;
-                    if (filterColumn.DynamicFilter.Type != null)
-                        xlFilterColumn.DynamicType = filterColumn.DynamicFilter.Type.Value.ToClosedXml();
-                    else
-                        xlFilterColumn.DynamicType = XLFilterDynamicType.AboveAverage;
-
-                    xlFilterColumn.DynamicValue = filterColumn.DynamicFilter.Val.Value;
-                }
-            }
-        }
-
-        private static void LoadAutoFilterSort(AutoFilter af, XLWorksheet ws, IXLBaseAutoFilter autoFilter)
-        {
-            var sort = af.Elements<SortState>().FirstOrDefault();
-            if (sort != null)
-            {
-                var condition = sort.Elements<SortCondition>().FirstOrDefault();
-                if (condition != null)
-                {
-                    Int32 column = ws.Range(condition.Reference.Value).FirstCell().Address.ColumnNumber - autoFilter.Range.FirstCell().Address.ColumnNumber + 1 ;
-                    autoFilter.SortColumn = column;
-                    autoFilter.Sorted = true;
-                    autoFilter.SortOrder = condition.Descending != null && condition.Descending.Value ? XLSortOrder.Descending : XLSortOrder.Ascending;
-                }
-            }
-        }
-
-        private static void LoadSheetProtection(SheetProtection sp, XLWorksheet ws)
-        {
-            if (sp == null) return;
-
-            if (sp.Sheet != null) ws.Protection.Protected = sp.Sheet.Value;
-            if (sp.Password != null) ws.Protection.PasswordHash = sp.Password.Value;
-            if (sp.FormatCells != null) ws.Protection.FormatCells = !sp.FormatCells.Value;
-            if (sp.FormatColumns != null) ws.Protection.FormatColumns = !sp.FormatColumns.Value;
-            if (sp.FormatRows != null) ws.Protection.FormatRows = !sp.FormatRows.Value;
-            if (sp.InsertColumns != null) ws.Protection.InsertColumns = !sp.InsertColumns.Value;
-            if (sp.InsertHyperlinks != null) ws.Protection.InsertHyperlinks = !sp.InsertHyperlinks.Value;
-            if (sp.InsertRows != null) ws.Protection.InsertRows = !sp.InsertRows.Value;
-            if (sp.DeleteColumns != null) ws.Protection.DeleteColumns = !sp.DeleteColumns.Value;
-            if (sp.DeleteRows != null) ws.Protection.DeleteRows = !sp.DeleteRows.Value;
-            if (sp.AutoFilter != null) ws.Protection.AutoFilter = !sp.AutoFilter.Value;
-            if (sp.PivotTables != null) ws.Protection.PivotTables = !sp.PivotTables.Value;
-            if (sp.Sort != null) ws.Protection.Sort = !sp.Sort.Value;
-            if (sp.SelectLockedCells != null) ws.Protection.SelectLockedCells = sp.SelectLockedCells.Value;
-            if (sp.SelectUnlockedCells != null) ws.Protection.SelectUnlockedCells = sp.SelectUnlockedCells.Value;
-        }
-
-        private static void LoadDataValidations(DataValidations dataValidations, XLWorksheet ws)
-        {
-            if (dataValidations == null) return;
-
-            foreach (DataValidation dvs in dataValidations.Elements<DataValidation>())
-            {
-                String txt = dvs.SequenceOfReferences.InnerText;
-                if (XLHelper.IsNullOrWhiteSpace(txt)) continue;
-                foreach (var dvt in txt.Split(' ').Select(rangeAddress => ws.Range(rangeAddress).DataValidation))
-                {
-                    if (dvs.AllowBlank != null) dvt.IgnoreBlanks = dvs.AllowBlank;
-                    if (dvs.ShowDropDown != null) dvt.InCellDropdown = !dvs.ShowDropDown.Value;
-                    if (dvs.ShowErrorMessage != null) dvt.ShowErrorMessage = dvs.ShowErrorMessage;
-                    if (dvs.ShowInputMessage != null) dvt.ShowInputMessage = dvs.ShowInputMessage;
-                    if (dvs.PromptTitle != null) dvt.InputTitle = dvs.PromptTitle;
-                    if (dvs.Prompt != null) dvt.InputMessage = dvs.Prompt;
-                    if (dvs.ErrorTitle != null) dvt.ErrorTitle = dvs.ErrorTitle;
-                    if (dvs.Error != null) dvt.ErrorMessage = dvs.Error;
-                    if (dvs.ErrorStyle != null) dvt.ErrorStyle = dvs.ErrorStyle.Value.ToClosedXml();
-                    if (dvs.Type != null) dvt.AllowedValues = dvs.Type.Value.ToClosedXml();
-                    if (dvs.Operator != null) dvt.Operator = dvs.Operator.Value.ToClosedXml();
-                    if (dvs.Formula1 != null) dvt.MinValue = dvs.Formula1.Text;
-                    if (dvs.Formula2 != null) dvt.MaxValue = dvs.Formula2.Text;
-                }
-            }
-        }
-
-        private void LoadConditionalFormatting(ConditionalFormatting conditionalFormatting, XLWorksheet ws, Dictionary<Int32, DifferentialFormat> differentialFormats)
-        {
-            if (conditionalFormatting == null) return;
-
-            foreach (var sor in conditionalFormatting.SequenceOfReferences.Items)
-            {
-                foreach (var fr in conditionalFormatting.Elements<ConditionalFormattingRule>())
-                {
-                    var conditionalFormat = new XLConditionalFormat(ws.Range(sor.Value));
-                    if (fr.FormatId != null)
-                    {
-                        LoadFont(differentialFormats[(Int32) fr.FormatId.Value].Font, conditionalFormat.Style.Font);
-                        LoadFill(differentialFormats[(Int32) fr.FormatId.Value].Fill, conditionalFormat.Style.Fill);
-                        LoadBorder(differentialFormats[(Int32) fr.FormatId.Value].Border, conditionalFormat.Style.Border);
-                        LoadNumberFormat(differentialFormats[(Int32) fr.FormatId.Value].NumberingFormat, conditionalFormat.Style.NumberFormat);
-                    }
-                    if (fr.Operator != null)
-                        conditionalFormat.Operator = fr.Operator.Value.ToClosedXml();
-                    if (fr.Type != null)
-                        conditionalFormat.ConditionalFormatType = fr.Type.Value.ToClosedXml();
-                    if (fr.Text != null)
-                        conditionalFormat.Values.Add(GetFormula(fr.Text.Value));
-                    if (fr.Percent != null)
-                        conditionalFormat.Percent = fr.Percent.Value;
-                    if (fr.Bottom != null)
-                        conditionalFormat.Bottom = fr.Bottom.Value;
-                    if (fr.Rank != null)
-                        conditionalFormat.Values.Add(GetFormula(fr.Rank.Value.ToString()));
-
-                    if (fr.Elements<ColorScale>().Any())
-                    {
-                        var colorScale = fr.Elements<ColorScale>().First();
-                        ExtractConditionalFormatValueObjects(conditionalFormat, colorScale);
-                    }
-                    else if (fr.Elements<DataBar>().Any())
-                    {
-                        var dataBar = fr.Elements<DataBar>().First();
-                        if (dataBar.ShowValue != null)
-                            conditionalFormat.ShowBarOnly = !dataBar.ShowValue.Value;
-                        ExtractConditionalFormatValueObjects(conditionalFormat, dataBar);
-                    }
-                    else if (fr.Elements<IconSet>().Any())
-                    {
-                        var iconSet = fr.Elements<IconSet>().First();
-                        if (iconSet.ShowValue != null)
-                            conditionalFormat.ShowIconOnly = !iconSet.ShowValue.Value;
-                        if (iconSet.Reverse != null)
-                            conditionalFormat.ReverseIconOrder = iconSet.Reverse.Value;
-                        
-                        if (iconSet.IconSetValue != null)
-                            conditionalFormat.IconSetStyle = iconSet.IconSetValue.Value.ToClosedXml();
-                        else
-                            conditionalFormat.IconSetStyle = XLIconSetStyle.ThreeTrafficLights1;
-
-                        ExtractConditionalFormatValueObjects(conditionalFormat, iconSet);
-                    }
-                    else
-                    {
-                        foreach (var formula in fr.Elements<Formula>())
-                        {
-                            if (formula.Text != null 
-                                && (conditionalFormat.ConditionalFormatType == XLConditionalFormatType.CellIs
-                                || conditionalFormat.ConditionalFormatType == XLConditionalFormatType.Expression))
-                            {
-                                conditionalFormat.Values.Add(GetFormula(formula.Text));
-                            }
-                        }
-                    }
-                    ws.ConditionalFormats.Add(conditionalFormat);
-                }
-            }
-            
-        }
-
-        private static XLFormula GetFormula(String value)
-        {
-            var formula = new XLFormula();
-            formula._value = value;
-            formula.IsFormula = !(value[0] == '"' && value.EndsWith("\""));
-            return formula;    
-        }
-
-        private void ExtractConditionalFormatValueObjects(XLConditionalFormat conditionalFormat, OpenXmlElement element)
-        {
-            foreach (var c in element.Elements<ConditionalFormatValueObject>())
-            {
-                if (c.Type != null)
-                    conditionalFormat.ContentTypes.Add(c.Type.Value.ToClosedXml());
-                if (c.Val != null)
-                    conditionalFormat.Values.Add(new XLFormula { Value = c.Val.Value });
-
-                if (c.GreaterThanOrEqual != null)
-                    conditionalFormat.IconSetOperators.Add(c.GreaterThanOrEqual.Value ? XLCFIconSetOperator.EqualOrGreaterThan : XLCFIconSetOperator.GreaterThan);
-                else
-                    conditionalFormat.IconSetOperators.Add(XLCFIconSetOperator.EqualOrGreaterThan);
-            }
-            foreach (var c in element.Elements<DocumentFormat.OpenXml.Spreadsheet.Color>())
-            {
-                conditionalFormat.Colors.Add(GetColor(c));
-            }
-        }
-
-        private static void LoadHyperlinks(Hyperlinks hyperlinks, WorksheetPart worksheetPart, XLWorksheet ws)
-        {
-            var hyperlinkDictionary = new Dictionary<String, Uri>();
-            if (worksheetPart.HyperlinkRelationships != null)
-                hyperlinkDictionary = worksheetPart.HyperlinkRelationships.ToDictionary(hr => hr.Id, hr => hr.Uri);
-
-            if (hyperlinks == null) return;
-
-            foreach (Hyperlink hl in hyperlinks.Elements<Hyperlink>())
-            {
-                if (hl.Reference.Value.Equals("#REF")) continue;
-                String tooltip = hl.Tooltip != null ? hl.Tooltip.Value : String.Empty;
-                var xlRange = ws.Range(hl.Reference.Value);
-                foreach (XLCell xlCell in xlRange.Cells())
-                {
-                    xlCell.SettingHyperlink = true;
-
-                    if (hl.Id != null)
-                        xlCell.Hyperlink = new XLHyperlink(hyperlinkDictionary[hl.Id], tooltip);
-                    else if (hl.Location != null)
-                        xlCell.Hyperlink = new XLHyperlink(hl.Location.Value, tooltip);
-                    else
-                        xlCell.Hyperlink = new XLHyperlink(hl.Reference.Value, tooltip);
-
-                    xlCell.SettingHyperlink = false;
-                }
-            }
-        }
-
-        private static void LoadColumnBreaks(ColumnBreaks columnBreaks, XLWorksheet ws)
-        {
-            if (columnBreaks == null) return;
-
-            foreach (Break columnBreak in columnBreaks.Elements<Break>().Where(columnBreak => columnBreak.Id != null))
-            {
-                ws.PageSetup.ColumnBreaks.Add(Int32.Parse(columnBreak.Id.InnerText));
-            }
-        }
-
-        private static void LoadRowBreaks(RowBreaks rowBreaks, XLWorksheet ws)
-        {
-            if (rowBreaks == null) return;
-
-            foreach (Break rowBreak in rowBreaks.Elements<Break>())
-                ws.PageSetup.RowBreaks.Add(Int32.Parse(rowBreak.Id.InnerText));
-        }
-
-        private void LoadSheetProperties(SheetProperties sheetProperty, XLWorksheet ws)
-        {
-            if (sheetProperty == null) return;
-
-            if (sheetProperty.TabColor != null)
-                ws.TabColor = GetColor(sheetProperty.TabColor);
-
-            if (sheetProperty.OutlineProperties == null) return;
-
-            if (sheetProperty.OutlineProperties.SummaryBelow != null)
-            {
-                ws.Outline.SummaryVLocation = sheetProperty.OutlineProperties.SummaryBelow
-                                                  ? XLOutlineSummaryVLocation.Bottom
-                                                  : XLOutlineSummaryVLocation.Top;
-            }
-
-            if (sheetProperty.OutlineProperties.SummaryRight != null)
-            {
-                ws.Outline.SummaryHLocation = sheetProperty.OutlineProperties.SummaryRight
-                                                  ? XLOutlineSummaryHLocation.Right
-                                                  : XLOutlineSummaryHLocation.Left;
-            }
-        }
-
-        private static void LoadHeaderFooter(HeaderFooter headerFooter, XLWorksheet ws)
-        {
-            if (headerFooter == null) return;
-
-            if (headerFooter.AlignWithMargins != null)
-                ws.PageSetup.AlignHFWithMargins = headerFooter.AlignWithMargins;
-            if (headerFooter.ScaleWithDoc != null)
-                ws.PageSetup.ScaleHFWithDocument = headerFooter.ScaleWithDoc;
-
-            if (headerFooter.DifferentFirst != null)
-                ws.PageSetup.DifferentFirstPageOnHF = headerFooter.DifferentFirst;
-            if (headerFooter.DifferentOddEven != null)
-                ws.PageSetup.DifferentOddEvenPagesOnHF = headerFooter.DifferentOddEven;
-
-            // Footers
-            var xlFooter = (XLHeaderFooter) ws.PageSetup.Footer;
-            var evenFooter = headerFooter.EvenFooter;
-            if (evenFooter != null)
-                xlFooter.SetInnerText(XLHFOccurrence.EvenPages, evenFooter.Text);
-            var oddFooter = headerFooter.OddFooter;
-            if (oddFooter != null)
-                xlFooter.SetInnerText(XLHFOccurrence.OddPages, oddFooter.Text);
-            var firstFooter = headerFooter.FirstFooter;
-            if (firstFooter != null)
-                xlFooter.SetInnerText(XLHFOccurrence.FirstPage, firstFooter.Text);
-            // Headers
-            var xlHeader = (XLHeaderFooter) ws.PageSetup.Header;
-            var evenHeader = headerFooter.EvenHeader;
-            if (evenHeader != null)
-                xlHeader.SetInnerText(XLHFOccurrence.EvenPages, evenHeader.Text);
-            var oddHeader = headerFooter.OddHeader;
-            if (oddHeader != null)
-                xlHeader.SetInnerText(XLHFOccurrence.OddPages, oddHeader.Text);
-            var firstHeader = headerFooter.FirstHeader;
-            if (firstHeader != null)
-                xlHeader.SetInnerText(XLHFOccurrence.FirstPage, firstHeader.Text);
-
-            ((XLHeaderFooter)ws.PageSetup.Header).SetAsInitial();
-            ((XLHeaderFooter)ws.PageSetup.Footer).SetAsInitial();
-        }
-
-        private static void LoadPageSetup(PageSetup pageSetup, XLWorksheet ws)
-        {
-            if (pageSetup == null) return;
-
-            if (pageSetup.PaperSize != null)
-                ws.PageSetup.PaperSize = (XLPaperSize) Int32.Parse(pageSetup.PaperSize.InnerText);
-            if (pageSetup.Scale != null)
-                ws.PageSetup.Scale = Int32.Parse(pageSetup.Scale.InnerText);
-            else
-            {
-                if (pageSetup.FitToWidth != null)
-                    ws.PageSetup.PagesWide = Int32.Parse(pageSetup.FitToWidth.InnerText);
-                if (pageSetup.FitToHeight != null)
-                    ws.PageSetup.PagesTall = Int32.Parse(pageSetup.FitToHeight.InnerText);
-            }
-            if (pageSetup.PageOrder != null)
-                ws.PageSetup.PageOrder = pageSetup.PageOrder.Value.ToClosedXml();
-            if (pageSetup.Orientation != null)
-                ws.PageSetup.PageOrientation = pageSetup.Orientation.Value.ToClosedXml();
-            if (pageSetup.BlackAndWhite != null)
-                ws.PageSetup.BlackAndWhite = pageSetup.BlackAndWhite;
-            if (pageSetup.Draft != null)
-                ws.PageSetup.DraftQuality = pageSetup.Draft;
-            if (pageSetup.CellComments != null)
-                ws.PageSetup.ShowComments = pageSetup.CellComments.Value.ToClosedXml();
-            if (pageSetup.Errors != null)
-                ws.PageSetup.PrintErrorValue = pageSetup.Errors.Value.ToClosedXml();
-            if (pageSetup.HorizontalDpi != null) ws.PageSetup.HorizontalDpi = (Int32) pageSetup.HorizontalDpi.Value;
-            if (pageSetup.VerticalDpi != null) ws.PageSetup.VerticalDpi = (Int32) pageSetup.VerticalDpi.Value;
-            if (pageSetup.FirstPageNumber != null)
-                ws.PageSetup.FirstPageNumber = UInt32.Parse(pageSetup.FirstPageNumber.InnerText);
-        }
-
-        private static void LoadPageMargins(PageMargins pageMargins, XLWorksheet ws)
-        {
-            if (pageMargins == null) return;
-
-            if (pageMargins.Bottom != null)
-                ws.PageSetup.Margins.Bottom = pageMargins.Bottom;
-            if (pageMargins.Footer != null)
-                ws.PageSetup.Margins.Footer = pageMargins.Footer;
-            if (pageMargins.Header != null)
-                ws.PageSetup.Margins.Header = pageMargins.Header;
-            if (pageMargins.Left != null)
-                ws.PageSetup.Margins.Left = pageMargins.Left;
-            if (pageMargins.Right != null)
-                ws.PageSetup.Margins.Right = pageMargins.Right;
-            if (pageMargins.Top != null)
-                ws.PageSetup.Margins.Top = pageMargins.Top;
-        }
-
-        private static void LoadPrintOptions(PrintOptions printOptions, XLWorksheet ws)
-        {
-            if (printOptions == null) return;
-
-            if (printOptions.GridLines != null)
-                ws.PageSetup.ShowGridlines = printOptions.GridLines;
-            if (printOptions.HorizontalCentered != null)
-                ws.PageSetup.CenterHorizontally = printOptions.HorizontalCentered;
-            if (printOptions.VerticalCentered != null)
-                ws.PageSetup.CenterVertically = printOptions.VerticalCentered;
-            if (printOptions.Headings != null)
-                ws.PageSetup.ShowRowAndColumnHeadings = printOptions.Headings;
-        }
-
-        private static void LoadSheetViews(SheetViews sheetViews, XLWorksheet ws)
-        {
-            if (sheetViews == null) return;
-
-            var sheetView = sheetViews.Elements<SheetView>().FirstOrDefault();
-
-            if (sheetView == null) return;
-
-            if (sheetView.ShowFormulas != null) ws.ShowFormulas = sheetView.ShowFormulas.Value;
-            if (sheetView.ShowGridLines != null) ws.ShowGridLines = sheetView.ShowGridLines.Value;
-            if (sheetView.ShowOutlineSymbols != null)
-                ws.ShowOutlineSymbols = sheetView.ShowOutlineSymbols.Value;
-            if (sheetView.ShowRowColHeaders != null) ws.ShowRowColHeaders = sheetView.ShowRowColHeaders.Value;
-            if (sheetView.ShowRuler != null) ws.ShowRuler = sheetView.ShowRuler.Value;
-            if (sheetView.ShowWhiteSpace != null) ws.ShowWhiteSpace = sheetView.ShowWhiteSpace.Value;
-            if (sheetView.ShowZeros != null) ws.ShowZeros = sheetView.ShowZeros.Value;
-            if (sheetView.TabSelected != null) ws.TabSelected = sheetView.TabSelected.Value;
-
-            var selection = sheetView.Elements<Selection>().FirstOrDefault();
-            if (selection != null)
-            {
-                if (selection.SequenceOfReferences != null)
-                    ws.Ranges(selection.SequenceOfReferences.InnerText.Replace(" ", ",")).Select();
-
-                if (selection.ActiveCell != null)
-                    ws.Cell(selection.ActiveCell).SetActive();
-            }
-
-            var pane = sheetView.Elements<Pane>().FirstOrDefault();
-
-            if (pane == null) return;
-
-            if (pane.State == null ||
-                (pane.State != PaneStateValues.FrozenSplit && pane.State != PaneStateValues.Frozen)) return;
-
-            if (pane.HorizontalSplit != null)
-                ws.SheetView.SplitColumn = (Int32) pane.HorizontalSplit.Value;
-            if (pane.VerticalSplit != null)
-                ws.SheetView.SplitRow = (Int32) pane.VerticalSplit.Value;
-
-        }
-
-        private void SetProperties(SpreadsheetDocument dSpreadsheet)
-        {
-            var p = dSpreadsheet.PackageProperties;
-            Properties.Author = p.Creator;
-            Properties.Category = p.Category;
-            Properties.Comments = p.Description;
-            if (p.Created != null)
-                Properties.Created = p.Created.Value;
-            Properties.Keywords = p.Keywords;
-            Properties.LastModifiedBy = p.LastModifiedBy;
-            Properties.Status = p.ContentStatus;
-            Properties.Subject = p.Subject;
-            Properties.Title = p.Title;
-        }
-
-        private XLColor GetColor(ColorType color)
-        {
-            XLColor retVal = null;
-            if (color != null)
-            {
-                if (color.Rgb != null)
-                {
-                    String htmlColor = "#" + color.Rgb.Value;
-                    Color thisColor;
-                    if (!_colorList.ContainsKey(htmlColor))
-                    {
-                        thisColor = ColorTranslator.FromHtml(htmlColor);
-                        _colorList.Add(htmlColor, thisColor);
-                    }
-                    else
-                        thisColor = _colorList[htmlColor];
-                    retVal = XLColor.FromColor(thisColor);
-                }
-                else if (color.Indexed != null && color.Indexed < 64)
-                    retVal = XLColor.FromIndex((Int32) color.Indexed.Value);
-                else if (color.Theme != null)
-                {
-                    retVal = color.Tint != null ? XLColor.FromTheme((XLThemeColor) color.Theme.Value, color.Tint.Value) : XLColor.FromTheme((XLThemeColor) color.Theme.Value);
-                }
-            }
-            return retVal ?? XLColor.NoColor;
-        }
-
-        private void ApplyStyle(IXLStylized xlStylized, Int32 styleIndex, Stylesheet s, Fills fills, Borders borders,
-                                Fonts fonts, NumberingFormats numberingFormats)
-        {
-            if (s == null) return; //No Stylesheet, no Styles
-
-            var cellFormat = (CellFormat) s.CellFormats.ElementAt(styleIndex);
-
-            if (cellFormat.ApplyProtection != null)
-            {
-                var protection = cellFormat.Protection;
-
-                if (protection == null)
-                    xlStylized.InnerStyle.Protection = new XLProtection(null, DefaultStyle.Protection);
-                else
-                {
-                    xlStylized.InnerStyle.Protection.Hidden = protection.Hidden != null && protection.Hidden.HasValue &&
-                                                              protection.Hidden.Value;
-                    xlStylized.InnerStyle.Protection.Locked = protection.Locked == null ||
-                                                              (protection.Locked.HasValue && protection.Locked.Value);
-                }
-            }
-
-            if (UInt32HasValue(cellFormat.FillId))
-            {
-                var fill = (Fill)fills.ElementAt((Int32)cellFormat.FillId.Value);
-                if (fill.PatternFill != null)
-                {
-                    if (fill.PatternFill.PatternType != null)
-                        xlStylized.InnerStyle.Fill.PatternType = fill.PatternFill.PatternType.Value.ToClosedXml();
-
-                    var fgColor = GetColor(fill.PatternFill.ForegroundColor);
-                    if (fgColor.HasValue) xlStylized.InnerStyle.Fill.PatternColor = fgColor;
-
-                    var bgColor = GetColor(fill.PatternFill.BackgroundColor);
-                    if (bgColor.HasValue)
-                        xlStylized.InnerStyle.Fill.PatternBackgroundColor = bgColor;
-                }
-            }
-
-
-            var alignment = cellFormat.Alignment;
-            if (alignment != null)
-            {
-                if (alignment.Horizontal != null)
-                    xlStylized.InnerStyle.Alignment.Horizontal = alignment.Horizontal.Value.ToClosedXml();
-                if (alignment.Indent != null && alignment.Indent != 0)
-                    xlStylized.InnerStyle.Alignment.Indent = Int32.Parse(alignment.Indent.ToString());
-                if (alignment.JustifyLastLine != null)
-                    xlStylized.InnerStyle.Alignment.JustifyLastLine = alignment.JustifyLastLine;
-                if (alignment.ReadingOrder != null)
-                {
-                    xlStylized.InnerStyle.Alignment.ReadingOrder =
-                        (XLAlignmentReadingOrderValues) Int32.Parse(alignment.ReadingOrder.ToString());
-                }
-                if (alignment.RelativeIndent != null)
-                    xlStylized.InnerStyle.Alignment.RelativeIndent = alignment.RelativeIndent;
-                if (alignment.ShrinkToFit != null)
-                    xlStylized.InnerStyle.Alignment.ShrinkToFit = alignment.ShrinkToFit;
-                if (alignment.TextRotation != null)
-                    xlStylized.InnerStyle.Alignment.TextRotation = (Int32) alignment.TextRotation.Value;
-                if (alignment.Vertical != null)
-                    xlStylized.InnerStyle.Alignment.Vertical = alignment.Vertical.Value.ToClosedXml();
-                if (alignment.WrapText != null)
-                    xlStylized.InnerStyle.Alignment.WrapText = alignment.WrapText;
-            }
-
-
-            if (UInt32HasValue(cellFormat.BorderId))
-            {
-                uint borderId = cellFormat.BorderId.Value;
-                var border = (Border)borders.ElementAt((Int32)borderId);
-                if (border != null)
-                {
-                    var bottomBorder = border.BottomBorder;
-                    if (bottomBorder != null)
-                    {
-                        if (bottomBorder.Style != null)
-                            xlStylized.InnerStyle.Border.BottomBorder = bottomBorder.Style.Value.ToClosedXml();
-
-                        var bottomBorderColor = GetColor(bottomBorder.Color);
-                        if (bottomBorderColor.HasValue)
-                            xlStylized.InnerStyle.Border.BottomBorderColor = bottomBorderColor;
-                    }
-                    var topBorder = border.TopBorder;
-                    if (topBorder != null)
-                    {
-                        if (topBorder.Style != null)
-                            xlStylized.InnerStyle.Border.TopBorder = topBorder.Style.Value.ToClosedXml();
-                        var topBorderColor = GetColor(topBorder.Color);
-                        if (topBorderColor.HasValue)
-                            xlStylized.InnerStyle.Border.TopBorderColor = topBorderColor;
-                    }
-                    var leftBorder = border.LeftBorder;
-                    if (leftBorder != null)
-                    {
-                        if (leftBorder.Style != null)
-                            xlStylized.InnerStyle.Border.LeftBorder = leftBorder.Style.Value.ToClosedXml();
-                        var leftBorderColor = GetColor(leftBorder.Color);
-                        if (leftBorderColor.HasValue)
-                            xlStylized.InnerStyle.Border.LeftBorderColor = leftBorderColor;
-                    }
-                    var rightBorder = border.RightBorder;
-                    if (rightBorder != null)
-                    {
-                        if (rightBorder.Style != null)
-                            xlStylized.InnerStyle.Border.RightBorder = rightBorder.Style.Value.ToClosedXml();
-                        var rightBorderColor = GetColor(rightBorder.Color);
-                        if (rightBorderColor.HasValue)
-                            xlStylized.InnerStyle.Border.RightBorderColor = rightBorderColor;
-                    }
-                    var diagonalBorder = border.DiagonalBorder;
-                    if (diagonalBorder != null)
-                    {
-                        if (diagonalBorder.Style != null)
-                            xlStylized.InnerStyle.Border.DiagonalBorder = diagonalBorder.Style.Value.ToClosedXml();
-                        var diagonalBorderColor = GetColor(diagonalBorder.Color);
-                        if (diagonalBorderColor.HasValue)
-                            xlStylized.InnerStyle.Border.DiagonalBorderColor = diagonalBorderColor;
-                        if (border.DiagonalDown != null)
-                            xlStylized.InnerStyle.Border.DiagonalDown = border.DiagonalDown;
-                        if (border.DiagonalUp != null)
-                            xlStylized.InnerStyle.Border.DiagonalUp = border.DiagonalUp;
-                    }
-                }
-            }
-
-            if (UInt32HasValue(cellFormat.FontId))
-            {
-                var fontId = cellFormat.FontId;
-                var font = (DocumentFormat.OpenXml.Spreadsheet.Font)fonts.ElementAt((Int32)fontId.Value);
-                if (font != null)
-                {
-                    xlStylized.InnerStyle.Font.Bold = GetBoolean(font.Bold);
-
-                    var fontColor = GetColor(font.Color);
-                    if (fontColor.HasValue)
-                        xlStylized.InnerStyle.Font.FontColor = fontColor;
-
-                    if (font.FontFamilyNumbering != null && (font.FontFamilyNumbering).Val != null)
-                    {
-                        xlStylized.InnerStyle.Font.FontFamilyNumbering =
-                            (XLFontFamilyNumberingValues)Int32.Parse((font.FontFamilyNumbering).Val.ToString());
-                    }
-                    if (font.FontName != null)
-                    {
-                        if ((font.FontName).Val != null)
-                            xlStylized.InnerStyle.Font.FontName = (font.FontName).Val;
-                    }
-                    if (font.FontSize != null)
-                    {
-                        if ((font.FontSize).Val != null)
-                            xlStylized.InnerStyle.Font.FontSize = (font.FontSize).Val;
-                    }
-
-                    xlStylized.InnerStyle.Font.Italic = GetBoolean(font.Italic);
-                    xlStylized.InnerStyle.Font.Shadow = GetBoolean(font.Shadow);
-                    xlStylized.InnerStyle.Font.Strikethrough = GetBoolean(font.Strike);
-
-                    if (font.Underline != null)
-                    {
-                        xlStylized.InnerStyle.Font.Underline = font.Underline.Val != null
-                                                                   ? (font.Underline).Val.Value.ToClosedXml()
-                                                                   : XLFontUnderlineValues.Single;
-                    }
-
-                    if (font.VerticalTextAlignment != null)
-                    {
-                        xlStylized.InnerStyle.Font.VerticalAlignment = font.VerticalTextAlignment.Val != null
-                                                                           ? (font.VerticalTextAlignment).Val.Value.
-                                                                                 ToClosedXml()
-                                                                           : XLFontVerticalTextAlignmentValues.Baseline;
-                    }
-                }
-            }
-
-            
-
-            if (!UInt32HasValue(cellFormat.NumberFormatId)) return;
-            
-            var numberFormatId = cellFormat.NumberFormatId;
-
-            string formatCode = String.Empty;
-            if (numberingFormats != null)
-            {
-                var numberingFormat =
-                    numberingFormats.FirstOrDefault(
-                        nf =>
-                        ((NumberingFormat) nf).NumberFormatId != null &&
-                        ((NumberingFormat) nf).NumberFormatId.Value == numberFormatId) as NumberingFormat;
-
-                if (numberingFormat != null && numberingFormat.FormatCode != null)
-                    formatCode = numberingFormat.FormatCode.Value;
-            }
-            if (formatCode.Length > 0)
-                xlStylized.InnerStyle.NumberFormat.Format = formatCode;
-            else
-                xlStylized.InnerStyle.NumberFormat.NumberFormatId = (Int32) numberFormatId.Value;
-        }
-
-        private static Boolean UInt32HasValue(UInt32Value value)
-        {
-            return value != null && value.HasValue;
-        }
-
-        private static Boolean GetBoolean(BooleanPropertyType property)
-        {
-            if (property != null)
-            {
-                if (property.Val != null)
-                    return property.Val;
-                return true;
-            }
-
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.NestedTypes.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.NestedTypes.cs
deleted file mode 100644
index 0f1c4ca..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.NestedTypes.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    public partial class XLWorkbook
-    {
-        #region Nested type: SaveContext
-        internal sealed class SaveContext
-        {
-            #region Private fields
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            private readonly RelIdGenerator _relIdGenerator;
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            private readonly Dictionary<Int32, StyleInfo> _sharedStyles;
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            private readonly Dictionary<IXLFont, FontInfo> _sharedFonts;
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            private readonly HashSet<string> _tableNames;
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            private uint _tableId;
-            #endregion
-            #region Constructor
-            public SaveContext()
-            {
-                _relIdGenerator = new RelIdGenerator();
-                _sharedStyles = new Dictionary<Int32, StyleInfo>();
-                _sharedFonts = new Dictionary<IXLFont, FontInfo>();
-                _tableNames = new HashSet<String>();
-                _tableId = 0;
-            }
-            #endregion
-            #region Public properties
-            public RelIdGenerator RelIdGenerator
-            {
-                [DebuggerStepThrough]
-                get { return _relIdGenerator; }
-            }
-            public Dictionary<Int32, StyleInfo> SharedStyles
-            {
-                [DebuggerStepThrough]
-                get { return _sharedStyles; }
-            }
-            public Dictionary<IXLFont, FontInfo> SharedFonts
-            {
-                [DebuggerStepThrough]
-                get { return _sharedFonts; }
-            }
-            public HashSet<string> TableNames
-            {
-                [DebuggerStepThrough]
-                get { return _tableNames; }
-            }
-            public uint TableId
-            {
-                [DebuggerStepThrough]
-                get { return _tableId; }
-                [DebuggerStepThrough]
-                set { _tableId = value; }
-            }
-            public Dictionary<IXLStyle, Int32> DifferentialFormats = new Dictionary<IXLStyle, int>();
-            #endregion
-        }
-        #endregion
-        #region Nested type: RelType
-        internal enum RelType
-        {
-            Workbook//, Worksheet
-        }
-        #endregion
-        #region Nested type: RelIdGenerator
-        internal sealed class RelIdGenerator
-        {
-            private readonly Dictionary<RelType, List<String>> _relIds = new Dictionary<RelType, List<String>>();
-            public String GetNext(RelType relType)
-            {
-                if (!_relIds.ContainsKey(relType))
-                {
-                    _relIds.Add(relType, new List<String>());
-                }
-
-                Int32 id = _relIds[relType].Count + 1;
-                while (true)
-                {
-                    String relId = String.Format("rId{0}", id);
-                    if (!_relIds[relType].Contains(relId))
-                    {
-                        _relIds[relType].Add(relId);
-                        return relId;
-                    }
-                    id++;
-                }
-            }
-            public void AddValues(List<String> values, RelType relType)
-            {
-                if (!_relIds.ContainsKey(relType))
-                {
-                    _relIds.Add(relType, new List<String>());
-                }
-                _relIds[relType].AddRange(values);
-            }
-            public void Reset(RelType relType)
-            {
-                if (_relIds.ContainsKey(relType))
-                    _relIds.Remove(relType);
-            }
-        }
-        #endregion
-        #region Nested type: FontInfo
-        internal struct FontInfo
-        {
-            public UInt32 FontId;
-            public XLFont Font;
-        };
-        #endregion
-        #region Nested type: FillInfo
-        internal struct FillInfo
-        {
-            public UInt32 FillId;
-            public XLFill Fill;
-        }
-        #endregion
-        #region Nested type: BorderInfo
-        internal struct BorderInfo
-        {
-            public UInt32 BorderId;
-            public XLBorder Border;
-        }
-        #endregion
-        #region Nested type: NumberFormatInfo
-        internal struct NumberFormatInfo
-        {
-            public Int32 NumberFormatId;
-            public IXLNumberFormat NumberFormat;
-        }
-        #endregion
-        #region Nested type: StyleInfo
-        internal struct StyleInfo
-        {
-            public UInt32 StyleId;
-            public UInt32 FontId;
-            public UInt32 FillId;
-            public UInt32 BorderId;
-            public Int32 NumberFormatId;
-            public IXLStyle Style;
-        }
-        #endregion
-
-        
-        
-       
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs
deleted file mode 100644
index 0bfa65c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs
+++ /dev/null
@@ -1,4635 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.CustomProperties;
-using DocumentFormat.OpenXml.Drawing;
-using DocumentFormat.OpenXml.ExtendedProperties;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.VariantTypes;
-using DocumentFormat.OpenXml.Vml.Office;
-using DocumentFormat.OpenXml.Vml.Spreadsheet;
-using Vml = DocumentFormat.OpenXml.Vml;
-using BackgroundColor = DocumentFormat.OpenXml.Spreadsheet.BackgroundColor;
-using BottomBorder = DocumentFormat.OpenXml.Spreadsheet.BottomBorder;
-using Break = DocumentFormat.OpenXml.Spreadsheet.Break;
-using Fill = DocumentFormat.OpenXml.Spreadsheet.Fill;
-using FontScheme = DocumentFormat.OpenXml.Drawing.FontScheme;
-using Fonts = DocumentFormat.OpenXml.Spreadsheet.Fonts;
-using ForegroundColor = DocumentFormat.OpenXml.Spreadsheet.ForegroundColor;
-using GradientFill = DocumentFormat.OpenXml.Drawing.GradientFill;
-using GradientStop = DocumentFormat.OpenXml.Drawing.GradientStop;
-using Hyperlink = DocumentFormat.OpenXml.Spreadsheet.Hyperlink;
-using LeftBorder = DocumentFormat.OpenXml.Spreadsheet.LeftBorder;
-using Outline = DocumentFormat.OpenXml.Drawing.Outline;
-using Path = System.IO.Path;
-using PatternFill = DocumentFormat.OpenXml.Spreadsheet.PatternFill;
-using Properties = DocumentFormat.OpenXml.ExtendedProperties.Properties;
-using RightBorder = DocumentFormat.OpenXml.Spreadsheet.RightBorder;
-using Table = DocumentFormat.OpenXml.Spreadsheet.Table;
-using Text = DocumentFormat.OpenXml.Spreadsheet.Text;
-using TopBorder = DocumentFormat.OpenXml.Spreadsheet.TopBorder;
-using Underline = DocumentFormat.OpenXml.Spreadsheet.Underline;
-using System.Xml;
-using System.Xml.Linq;
-using System.Text;
-using Anchor = DocumentFormat.OpenXml.Vml.Spreadsheet.Anchor;
-using Field = DocumentFormat.OpenXml.Spreadsheet.Field;
-using Run = DocumentFormat.OpenXml.Spreadsheet.Run;
-using RunProperties = DocumentFormat.OpenXml.Spreadsheet.RunProperties;
-using VerticalTextAlignment = DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment;
-
-
-namespace ClosedXML.Excel
-{
-    public partial class XLWorkbook
-    {
-        private const Double ColumnWidthOffset = 0.710625;
-
-        //private Dictionary<String, UInt32> sharedStrings;
-        //private Dictionary<IXLStyle, StyleInfo> context.SharedStyles;
-
-        private static readonly EnumValue<CellValues> CvSharedString = new EnumValue<CellValues>(CellValues.SharedString);
-        private static readonly EnumValue<CellValues> CvInlineString = new EnumValue<CellValues>(CellValues.InlineString);
-        private static readonly EnumValue<CellValues> CvNumber = new EnumValue<CellValues>(CellValues.Number);
-        private static readonly EnumValue<CellValues> CvDate = new EnumValue<CellValues>(CellValues.Date);
-        private static readonly EnumValue<CellValues> CvBoolean = new EnumValue<CellValues>(CellValues.Boolean);
-
-        private static EnumValue<CellValues> GetCellValue(XLCell xlCell)
-        {
-            switch (xlCell.DataType)
-            {
-                case XLCellValues.Text:
-                {
-                    return xlCell.ShareString ? CvSharedString : CvInlineString;
-                }
-                case XLCellValues.Number:
-                    return CvNumber;
-                case XLCellValues.DateTime:
-                    return CvDate;
-                case XLCellValues.Boolean:
-                    return CvBoolean;
-                case XLCellValues.TimeSpan:
-                    return CvNumber;
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        private void CreatePackage(String filePath, SpreadsheetDocumentType spreadsheetDocumentType)
-        {
-            PathHelper.CreateDirectory(Path.GetDirectoryName(filePath));
-            var package = File.Exists(filePath)
-                ? SpreadsheetDocument.Open(filePath, true)
-                : SpreadsheetDocument.Create(filePath, spreadsheetDocumentType);
-
-            using (package)
-            {
-                CreateParts(package);
-                //package.Close();
-            }
-        }
-
-        private void CreatePackage(Stream stream, bool newStream, SpreadsheetDocumentType spreadsheetDocumentType)
-        {
-            var package = newStream
-                ? SpreadsheetDocument.Create(stream, spreadsheetDocumentType)
-                : SpreadsheetDocument.Open(stream, true);
-
-            using (package)
-            {
-                CreateParts(package);
-                //package.Close();
-            }
-        }
-
-        // http://blogs.msdn.com/b/vsod/archive/2010/02/05/how-to-delete-a-worksheet-from-excel-using-open-xml-sdk-2-0.aspx
-        private void DeleteSheetAndDependencies(WorkbookPart wbPart, string sheetId)
-        {
-            //Get the SheetToDelete from workbook.xml
-            Sheet worksheet = wbPart.Workbook.Descendants<Sheet>().Where(s => s.Id == sheetId).FirstOrDefault();
-            if (worksheet == null)
-            { }
-
-            string sheetName = worksheet.Name;
-            // Get the pivot Table Parts
-            IEnumerable<PivotTableCacheDefinitionPart> pvtTableCacheParts = wbPart.PivotTableCacheDefinitionParts;
-            Dictionary<PivotTableCacheDefinitionPart, string> pvtTableCacheDefinationPart = new Dictionary<PivotTableCacheDefinitionPart, string>();
-            foreach (PivotTableCacheDefinitionPart Item in pvtTableCacheParts)
-            {
-                PivotCacheDefinition pvtCacheDef = Item.PivotCacheDefinition;
-                //Check if this CacheSource is linked to SheetToDelete
-                var pvtCahce = pvtCacheDef.Descendants<CacheSource>().Where(s => s.WorksheetSource.Sheet == sheetName);
-                if (pvtCahce.Count() > 0)
-                {
-                    pvtTableCacheDefinationPart.Add(Item, Item.ToString());
-                }
-            }
-            foreach (var Item in pvtTableCacheDefinationPart)
-            {
-                wbPart.DeletePart(Item.Key);
-            }
-
-            // Remove the sheet reference from the workbook.
-            WorksheetPart worksheetPart = (WorksheetPart)(wbPart.GetPartById(sheetId));
-            worksheet.Remove();
-
-            // Delete the worksheet part.
-            wbPart.DeletePart(worksheetPart);
-
-            //Get the DefinedNames
-            var definedNames = wbPart.Workbook.Descendants<DefinedNames>().FirstOrDefault();
-            if (definedNames != null)
-            {
-                List<DefinedName> defNamesToDelete = new List<DefinedName>();
-
-                foreach (DefinedName Item in definedNames)
-                {
-                    // This condition checks to delete only those names which are part of Sheet in question
-                    if (Item.Text.Contains(worksheet.Name + "!"))
-                        defNamesToDelete.Add(Item);
-                }
-
-                foreach (DefinedName Item in defNamesToDelete)
-                {
-                    Item.Remove();
-                }
-
-            }
-            // Get the CalculationChainPart 
-            //Note: An instance of this part type contains an ordered set of references to all cells in all worksheets in the 
-            //workbook whose value is calculated from any formula
-
-            CalculationChainPart calChainPart;
-            calChainPart = wbPart.CalculationChainPart;
-            if (calChainPart != null)
-            {
-                var calChainEntries = calChainPart.CalculationChain.Descendants<CalculationCell>().Where(c => c.SheetId == sheetId);
-                List<CalculationCell> calcsToDelete = new List<CalculationCell>();
-                foreach (CalculationCell Item in calChainEntries)
-                {
-                    calcsToDelete.Add(Item);
-                }
-
-                foreach (CalculationCell Item in calcsToDelete)
-                {
-                    Item.Remove();
-                }
-
-                if (calChainPart.CalculationChain.Count() == 0)
-                {
-                    wbPart.DeletePart(calChainPart);
-                }
-            }
-        }
-
-        // Adds child parts and generates content of the specified part.
-        private void CreateParts(SpreadsheetDocument document)
-        {
-            var context = new SaveContext();
-
-            var workbookPart = document.WorkbookPart ?? document.AddWorkbookPart();
-
-            var worksheets = WorksheetsInternal;
-            
-
-            var partsToRemove = workbookPart.Parts.Where(s => worksheets.Deleted.Contains(s.RelationshipId)).ToList();
-
-            var pivotCacheDefinitionsToRemove = partsToRemove.SelectMany(s => ((WorksheetPart)s.OpenXmlPart).PivotTableParts.Select(pt => pt.PivotTableCacheDefinitionPart)).Distinct().ToList();
-            pivotCacheDefinitionsToRemove.ForEach(c => workbookPart.DeletePart(c));
-
-            if (workbookPart.Workbook != null && workbookPart.Workbook.PivotCaches != null)
-            {
-                var pivotCachesToRemove = workbookPart.Workbook.PivotCaches.Where(pc => pivotCacheDefinitionsToRemove.Select(pcd => workbookPart.GetIdOfPart(pcd)).ToList().Contains(((PivotCache)pc).Id)).Distinct().ToList();
-                pivotCachesToRemove.ForEach(c => workbookPart.Workbook.PivotCaches.RemoveChild(c));
-            }
-
-            worksheets.Deleted.ToList().ForEach(ws => DeleteSheetAndDependencies(workbookPart, ws));
-
-            context.RelIdGenerator.AddValues(workbookPart.Parts.Select(p => p.RelationshipId).ToList(), RelType.Workbook);
-
-            var extendedFilePropertiesPart = document.ExtendedFilePropertiesPart ??
-                                             document.AddNewPart<ExtendedFilePropertiesPart>(
-                                                 context.RelIdGenerator.GetNext(RelType.Workbook));
-
-            GenerateExtendedFilePropertiesPartContent(extendedFilePropertiesPart);
-
-            GenerateWorkbookPartContent(workbookPart, context);
-
-            var sharedStringTablePart = workbookPart.SharedStringTablePart ??
-                                        workbookPart.AddNewPart<SharedStringTablePart>(
-                                            context.RelIdGenerator.GetNext(RelType.Workbook));
-
-            GenerateSharedStringTablePartContent(sharedStringTablePart, context);
-
-            var workbookStylesPart = workbookPart.WorkbookStylesPart ??
-                                     workbookPart.AddNewPart<WorkbookStylesPart>(
-                                         context.RelIdGenerator.GetNext(RelType.Workbook));
-
-            GenerateWorkbookStylesPartContent(workbookStylesPart, context);
-
-            foreach (var worksheet in WorksheetsInternal.Cast<XLWorksheet>().OrderBy(w => w.Position))
-            {
-                //context.RelIdGenerator.Reset(RelType.);
-                WorksheetPart worksheetPart;
-                var wsRelId = worksheet.RelId;
-                if (workbookPart.Parts.Any(p => p.RelationshipId == wsRelId))
-                {
-                    worksheetPart = (WorksheetPart)workbookPart.GetPartById(wsRelId);
-                    var wsPartsToRemove = worksheetPart.TableDefinitionParts.ToList();
-                    wsPartsToRemove.ForEach(tdp => worksheetPart.DeletePart(tdp));
-                }
-                else
-                    worksheetPart = workbookPart.AddNewPart<WorksheetPart>(wsRelId);
-
-
-                context.RelIdGenerator.AddValues(worksheetPart.HyperlinkRelationships.Select(hr => hr.Id).ToList(),
-                    RelType.Workbook);
-                context.RelIdGenerator.AddValues(worksheetPart.Parts.Select(p => p.RelationshipId).ToList(),
-                    RelType.Workbook);
-                if (worksheetPart.DrawingsPart != null)
-                    context.RelIdGenerator.AddValues(
-                        worksheetPart.DrawingsPart.Parts.Select(p => p.RelationshipId).ToList(), RelType.Workbook);
-
-                // delete comment related parts (todo: review)
-                DeleteComments(worksheetPart, worksheet, context);
-
-                if (worksheet.Internals.CellsCollection.GetCells(c => c.HasComment).Any())
-                {
-                    var worksheetCommentsPart =
-                        worksheetPart.AddNewPart<WorksheetCommentsPart>(context.RelIdGenerator.GetNext(RelType.Workbook));
-
-                    GenerateWorksheetCommentsPartContent(worksheetCommentsPart, worksheet);
-
-                    //VmlDrawingPart vmlDrawingPart = worksheetPart.AddNewPart<VmlDrawingPart>(worksheet.LegacyDrawingId);
-                    var vmlDrawingPart = worksheetPart.VmlDrawingParts.FirstOrDefault();
-                    if (vmlDrawingPart == null)
-                    {
-                        if (XLHelper.IsNullOrWhiteSpace(worksheet.LegacyDrawingId))
-                        {
-                            worksheet.LegacyDrawingId = context.RelIdGenerator.GetNext(RelType.Workbook);
-                            worksheet.LegacyDrawingIsNew = true;
-                        }
-
-                        vmlDrawingPart = worksheetPart.AddNewPart<VmlDrawingPart>(worksheet.LegacyDrawingId);
-                    }
-                    GenerateVmlDrawingPartContent(vmlDrawingPart, worksheet, context);
-                }
-
-                GenerateWorksheetPartContent(worksheetPart, worksheet, context);
-
-                if (worksheet.PivotTables.Any())
-                {
-                    GeneratePivotTables(workbookPart, worksheetPart, worksheet, context);
-                }
-            }
-
-            GenerateCalculationChainPartContent(workbookPart, context);
-
-            if (workbookPart.ThemePart == null)
-            {
-                var themePart = workbookPart.AddNewPart<ThemePart>(context.RelIdGenerator.GetNext(RelType.Workbook));
-                GenerateThemePartContent(themePart);
-            }
-
-            if (CustomProperties.Any())
-            {
-                document.GetPartsOfType<CustomFilePropertiesPart>().ToList().ForEach(p => document.DeletePart(p));
-                var customFilePropertiesPart =
-                    document.AddNewPart<CustomFilePropertiesPart>(context.RelIdGenerator.GetNext(RelType.Workbook));
-
-                GenerateCustomFilePropertiesPartContent(customFilePropertiesPart);
-            }
-            SetPackageProperties(document);
-        }
-
-        private void DeleteComments(WorksheetPart worksheetPart, XLWorksheet worksheet, SaveContext context)
-        {
-            // We have the comments so we can delete the comments part
-            worksheetPart.DeletePart(worksheetPart.WorksheetCommentsPart);
-            var vmlDrawingPart = worksheetPart.VmlDrawingParts.FirstOrDefault();
-
-            // Only delete the VmlDrawingParts for comments.
-            if (vmlDrawingPart != null)
-            {
-                var xdoc = XDocumentExtensions.Load(vmlDrawingPart.GetStream(FileMode.Open));
-                //xdoc.Root.Elements().Where(e => e.Name.LocalName == "shapelayout").Remove();
-                xdoc.Root.Elements().Where(
-                    e => e.Name.LocalName == "shapetype" && (string)e.Attribute("id") == @"_x0000_t202").Remove();
-                xdoc.Root.Elements().Where(
-                    e => e.Name.LocalName == "shape" && (string)e.Attribute("type") == @"#_x0000_t202").Remove();
-                var imageParts = vmlDrawingPart.ImageParts.ToList();
-                var legacyParts = vmlDrawingPart.LegacyDiagramTextParts.ToList();
-                var rId = worksheetPart.GetIdOfPart(vmlDrawingPart);
-                worksheet.LegacyDrawingId = rId;
-                worksheetPart.ChangeIdOfPart(vmlDrawingPart, "xxRRxx"); // Anything will do for the new relationship id
-                // we just want it alive enough to create the copy
-
-                var hasShapes = xdoc.Root.Elements().Any(e => e.Name.LocalName == "shape" || e.Name.LocalName == "group");
-
-                VmlDrawingPart vmlDrawingPartNew = null;
-                var hasNewPart = (imageParts.Count > 0 || legacyParts.Count > 0 || hasShapes);
-                if (hasNewPart)
-                {
-                    vmlDrawingPartNew = worksheetPart.AddNewPart<VmlDrawingPart>(rId);
-
-                    using (var writer = new XmlTextWriter(vmlDrawingPartNew.GetStream(FileMode.Create), Encoding.UTF8))
-                    {
-                        writer.WriteRaw(xdoc.ToString());
-                    }
-
-                    imageParts.ForEach(p => vmlDrawingPartNew.AddPart(p, vmlDrawingPart.GetIdOfPart(p)));
-                    legacyParts.ForEach(p => vmlDrawingPartNew.AddPart(p, vmlDrawingPart.GetIdOfPart(p)));
-                }
-
-                worksheetPart.DeletePart(vmlDrawingPart);
-
-                if (hasNewPart && rId != worksheetPart.GetIdOfPart(vmlDrawingPartNew))
-                    worksheetPart.ChangeIdOfPart(vmlDrawingPartNew, rId);
-            }
-        }
-
-        private static void GenerateTables(XLWorksheet worksheet, WorksheetPart worksheetPart, SaveContext context)
-        {
-            worksheetPart.Worksheet.RemoveAllChildren<TablePart>();
-
-            if (!worksheet.Tables.Any()) return;
-
-            foreach (var table in worksheet.Tables)
-            {
-                var tableRelId = context.RelIdGenerator.GetNext(RelType.Workbook);
-
-                var xlTable = (XLTable)table;
-                xlTable.RelId = tableRelId;
-
-                var tableDefinitionPart = worksheetPart.AddNewPart<TableDefinitionPart>(tableRelId);
-                GenerateTableDefinitionPartContent(tableDefinitionPart, xlTable, context);
-            }
-        }
-
-        private void GenerateExtendedFilePropertiesPartContent(ExtendedFilePropertiesPart extendedFilePropertiesPart)
-        {
-            if (extendedFilePropertiesPart.Properties == null)
-                extendedFilePropertiesPart.Properties = new Properties();
-
-            var properties = extendedFilePropertiesPart.Properties;
-            if (
-                !properties.NamespaceDeclarations.Contains(new KeyValuePair<string, string>("vt",
-                    "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes")))
-            {
-                properties.AddNamespaceDeclaration("vt",
-                    "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
-            }
-
-            if (properties.Application == null)
-                properties.AppendChild(new Application {Text = "Microsoft Excel"});
-
-            if (properties.DocumentSecurity == null)
-                properties.AppendChild(new DocumentSecurity {Text = "0"});
-
-            if (properties.ScaleCrop == null)
-                properties.AppendChild(new ScaleCrop {Text = "false"});
-
-            if (properties.HeadingPairs == null)
-                properties.HeadingPairs = new HeadingPairs();
-
-            if (properties.TitlesOfParts == null)
-                properties.TitlesOfParts = new TitlesOfParts();
-
-            properties.HeadingPairs.VTVector = new VTVector {BaseType = VectorBaseValues.Variant};
-
-            properties.TitlesOfParts.VTVector = new VTVector {BaseType = VectorBaseValues.Lpstr};
-
-            var vTVectorOne = properties.HeadingPairs.VTVector;
-
-            var vTVectorTwo = properties.TitlesOfParts.VTVector;
-
-            var modifiedWorksheets =
-                ((IEnumerable<XLWorksheet>)WorksheetsInternal).Select(w => new {w.Name, Order = w.Position}).ToList();
-            var modifiedNamedRanges = GetModifiedNamedRanges();
-            var modifiedWorksheetsCount = modifiedWorksheets.Count;
-            var modifiedNamedRangesCount = modifiedNamedRanges.Count;
-
-            InsertOnVtVector(vTVectorOne, "Worksheets", 0, modifiedWorksheetsCount.ToString());
-            InsertOnVtVector(vTVectorOne, "Named Ranges", 2, modifiedNamedRangesCount.ToString());
-
-            vTVectorTwo.Size = (UInt32)(modifiedNamedRangesCount + modifiedWorksheetsCount);
-
-            foreach (
-                var vTlpstr3 in modifiedWorksheets.OrderBy(w => w.Order).Select(w => new VTLPSTR {Text = w.Name}))
-                vTVectorTwo.AppendChild(vTlpstr3);
-
-            foreach (var vTlpstr7 in modifiedNamedRanges.Select(nr => new VTLPSTR {Text = nr}))
-                vTVectorTwo.AppendChild(vTlpstr7);
-
-            if (Properties.Manager != null)
-            {
-                if (!XLHelper.IsNullOrWhiteSpace(Properties.Manager))
-                {
-                    if (properties.Manager == null)
-                        properties.Manager = new Manager();
-
-                    properties.Manager.Text = Properties.Manager;
-                }
-                else
-                    properties.Manager = null;
-            }
-
-            if (Properties.Company == null) return;
-
-            if (!XLHelper.IsNullOrWhiteSpace(Properties.Company))
-            {
-                if (properties.Company == null)
-                    properties.Company = new Company();
-
-                properties.Company.Text = Properties.Company;
-            }
-            else
-                properties.Company = null;
-        }
-
-        private static void InsertOnVtVector(VTVector vTVector, String property, Int32 index, String text)
-        {
-            var m = from e1 in vTVector.Elements<Variant>()
-                where e1.Elements<VTLPSTR>().Any(e2 => e2.Text == property)
-                select e1;
-            if (!m.Any())
-            {
-                if (vTVector.Size == null)
-                    vTVector.Size = new UInt32Value(0U);
-
-                vTVector.Size += 2U;
-                var variant1 = new Variant();
-                var vTlpstr1 = new VTLPSTR {Text = property};
-                variant1.AppendChild(vTlpstr1);
-                vTVector.InsertAt(variant1, index);
-
-                var variant2 = new Variant();
-                var vTInt321 = new VTInt32();
-                variant2.AppendChild(vTInt321);
-                vTVector.InsertAt(variant2, index + 1);
-            }
-
-            var targetIndex = 0;
-            foreach (var e in vTVector.Elements<Variant>())
-            {
-                if (e.Elements<VTLPSTR>().Any(e2 => e2.Text == property))
-                {
-                    vTVector.ElementAt(targetIndex + 1).GetFirstChild<VTInt32>().Text = text;
-                    break;
-                }
-                targetIndex++;
-            }
-        }
-
-        private List<string> GetModifiedNamedRanges()
-        {
-            var namedRanges = new List<String>();
-            foreach (var w in WorksheetsInternal)
-            {
-                var wName = w.Name;
-                namedRanges.AddRange(w.NamedRanges.Select(n => wName + "!" + n.Name));
-                namedRanges.Add(w.Name + "!Print_Area");
-                namedRanges.Add(w.Name + "!Print_Titles");
-            }
-            namedRanges.AddRange(NamedRanges.Select(n => n.Name));
-            return namedRanges;
-        }
-
-        private void GenerateWorkbookPartContent(WorkbookPart workbookPart, SaveContext context)
-        {
-            if (workbookPart.Workbook == null)
-                workbookPart.Workbook = new Workbook();
-
-            var workbook = workbookPart.Workbook;
-            if (
-                !workbook.NamespaceDeclarations.Contains(new KeyValuePair<string, string>("r",
-                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships")))
-            {
-                workbook.AddNamespaceDeclaration("r",
-                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-            }
-
-            #region WorkbookProperties
-
-            if (workbook.WorkbookProperties == null)
-                workbook.WorkbookProperties = new WorkbookProperties();
-
-            if (workbook.WorkbookProperties.CodeName == null)
-                workbook.WorkbookProperties.CodeName = "ThisWorkbook";
-
-            if (Use1904DateSystem)
-                workbook.WorkbookProperties.Date1904 = true;
-
-            #endregion
-
-            if (LockStructure || LockWindows)
-            {
-                if (workbook.WorkbookProtection == null)
-                    workbook.WorkbookProtection = new WorkbookProtection();
-
-                workbook.WorkbookProtection.LockStructure = LockStructure;
-                workbook.WorkbookProtection.LockWindows = LockWindows;
-            }
-            else
-            {
-                workbook.WorkbookProtection = null;
-            }
-            
-
-            if (workbook.BookViews == null)
-                workbook.BookViews = new BookViews();
-
-            if (workbook.Sheets == null)
-                workbook.Sheets = new Sheets();
-
-            var worksheets = WorksheetsInternal;
-            workbook.Sheets.Elements<Sheet>().Where(s => worksheets.Deleted.Contains(s.Id)).ToList().ForEach(
-                s => s.Remove());
-
-            foreach (var sheet in workbook.Sheets.Elements<Sheet>())
-            {
-                var sheetId = (Int32)sheet.SheetId.Value;
-
-                if (WorksheetsInternal.All<XLWorksheet>(w => w.SheetId != sheetId)) continue;
-
-                var wks = WorksheetsInternal.Single<XLWorksheet>(w => w.SheetId == sheetId);
-                wks.RelId = sheet.Id;
-                sheet.Name = wks.Name;
-            }
-
-            foreach (var xlSheet in
-                WorksheetsInternal.Cast<XLWorksheet>().Where(s => s.SheetId == 0).OrderBy(w => w.Position))
-            {
-                var rId = context.RelIdGenerator.GetNext(RelType.Workbook);
-
-                while (WorksheetsInternal.Cast<XLWorksheet>().Any(w => w.SheetId == Int32.Parse(rId.Substring(3))))
-                    rId = context.RelIdGenerator.GetNext(RelType.Workbook);
-
-                xlSheet.SheetId = Int32.Parse(rId.Substring(3));
-                xlSheet.RelId = rId;
-                var newSheet = new Sheet
-                {
-                    Name = xlSheet.Name,
-                    Id = rId,
-                    SheetId = (UInt32)xlSheet.SheetId
-                };
-
-                workbook.Sheets.AppendChild(newSheet);
-            }
-
-            var sheetElements = from sheet in workbook.Sheets.Elements<Sheet>()
-                join worksheet in ((IEnumerable<XLWorksheet>)WorksheetsInternal) on sheet.Id.Value
-                    equals worksheet.RelId
-                orderby worksheet.Position
-                select sheet;
-
-            UInt32 firstSheetVisible = 0;
-            var activeTab =
-                (from us in UnsupportedSheets where us.IsActive select (UInt32)us.Position - 1).FirstOrDefault();
-            var foundVisible = false;
-
-            var totalSheets = sheetElements.Count() + UnsupportedSheets.Count;
-            for (var p = 1; p <= totalSheets; p++)
-            {
-                if (UnsupportedSheets.All(us => us.Position != p))
-                {
-                    var sheet = sheetElements.ElementAt(p - UnsupportedSheets.Count(us => us.Position <= p) - 1);
-                    workbook.Sheets.RemoveChild(sheet);
-                    workbook.Sheets.AppendChild(sheet);
-                    var xlSheet = Worksheet(sheet.Name);
-                    if (xlSheet.Visibility != XLWorksheetVisibility.Visible)
-                        sheet.State = xlSheet.Visibility.ToOpenXml();
-
-                    if (foundVisible) continue;
-
-                    if (sheet.State == null || sheet.State == SheetStateValues.Visible)
-                        foundVisible = true;
-                    else
-                        firstSheetVisible++;
-                }
-                else
-                {
-                    var sheetId = UnsupportedSheets.First(us => us.Position == p).SheetId;
-                    var sheet = workbook.Sheets.Elements<Sheet>().First(s => s.SheetId == sheetId);
-                    workbook.Sheets.RemoveChild(sheet);
-                    workbook.Sheets.AppendChild(sheet);
-                }
-            }
-
-            var workbookView = workbook.BookViews.Elements<WorkbookView>().FirstOrDefault();
-
-            if (activeTab == 0)
-            {
-                activeTab = firstSheetVisible;
-                foreach (var ws in worksheets)
-                {
-                    if (!ws.TabActive) continue;
-
-                    activeTab = (UInt32)(ws.Position - 1);
-                    break;
-                }
-            }
-
-            if (workbookView == null)
-            {
-                workbookView = new WorkbookView {ActiveTab = activeTab, FirstSheet = firstSheetVisible};
-                workbook.BookViews.AppendChild(workbookView);
-            }
-            else
-            {
-                workbookView.ActiveTab = activeTab;
-                workbookView.FirstSheet = firstSheetVisible;
-            }
-
-            var definedNames = new DefinedNames();
-            foreach (var worksheet in WorksheetsInternal)
-            {
-                var wsSheetId = (UInt32)worksheet.SheetId;
-                UInt32 sheetId = 0;
-                foreach (var s in workbook.Sheets.Elements<Sheet>().TakeWhile(s => s.SheetId != wsSheetId))
-                {
-                    sheetId++;
-                }
-
-                if (worksheet.PageSetup.PrintAreas.Any())
-                {
-                    var definedName = new DefinedName {Name = "_xlnm.Print_Area", LocalSheetId = sheetId};
-                    var worksheetName = worksheet.Name;
-                    var definedNameText = worksheet.PageSetup.PrintAreas.Aggregate(String.Empty,
-                        (current, printArea) =>
-                            current +
-                            ("'" + worksheetName + "'!" +
-                             printArea.RangeAddress.
-                                 FirstAddress.ToStringFixed(
-                                     XLReferenceStyle.A1) +
-                             ":" +
-                             printArea.RangeAddress.
-                                 LastAddress.ToStringFixed(
-                                     XLReferenceStyle.A1) +
-                             ","));
-                    definedName.Text = definedNameText.Substring(0, definedNameText.Length - 1);
-                    definedNames.AppendChild(definedName);
-                }
-
-                if (worksheet.AutoFilter.Enabled)
-                {
-                    var definedName = new DefinedName
-                    {
-                        Name = "_xlnm._FilterDatabase",
-                        LocalSheetId = sheetId,
-                        Text = "'" + worksheet.Name + "'!" +
-                               worksheet.AutoFilter.Range.RangeAddress.FirstAddress.ToStringFixed(
-                                   XLReferenceStyle.A1) +
-                               ":" +
-                               worksheet.AutoFilter.Range.RangeAddress.LastAddress.ToStringFixed(
-                                   XLReferenceStyle.A1),
-                        Hidden = BooleanValue.FromBoolean(true)
-                    };
-                    definedNames.AppendChild(definedName);
-                }
-
-                foreach (var nr in worksheet.NamedRanges.Where(n => n.Name != "_xlnm._FilterDatabase"))
-                {
-                    var definedName = new DefinedName
-                    {
-                        Name = nr.Name,
-                        LocalSheetId = sheetId,
-                        Text = nr.ToString()
-                    };
-                    if (!XLHelper.IsNullOrWhiteSpace(nr.Comment))
-                        definedName.Comment = nr.Comment;
-                    definedNames.AppendChild(definedName);
-                }
-
-
-                var definedNameTextRow = String.Empty;
-                var definedNameTextColumn = String.Empty;
-                if (worksheet.PageSetup.FirstRowToRepeatAtTop > 0)
-                {
-                    definedNameTextRow = "'" + worksheet.Name + "'!" + worksheet.PageSetup.FirstRowToRepeatAtTop
-                                         + ":" + worksheet.PageSetup.LastRowToRepeatAtTop;
-                }
-                if (worksheet.PageSetup.FirstColumnToRepeatAtLeft > 0)
-                {
-                    var minColumn = worksheet.PageSetup.FirstColumnToRepeatAtLeft;
-                    var maxColumn = worksheet.PageSetup.LastColumnToRepeatAtLeft;
-                    definedNameTextColumn = "'" + worksheet.Name + "'!" +
-                                            XLHelper.GetColumnLetterFromNumber(minColumn)
-                                            + ":" + XLHelper.GetColumnLetterFromNumber(maxColumn);
-                }
-
-                string titles;
-                if (definedNameTextColumn.Length > 0)
-                {
-                    titles = definedNameTextColumn;
-                    if (definedNameTextRow.Length > 0)
-                        titles += "," + definedNameTextRow;
-                }
-                else
-                    titles = definedNameTextRow;
-
-                if (titles.Length <= 0) continue;
-
-                var definedName2 = new DefinedName
-                {
-                    Name = "_xlnm.Print_Titles",
-                    LocalSheetId = sheetId,
-                    Text = titles
-                };
-
-                definedNames.AppendChild(definedName2);
-            }
-
-            foreach (var nr in NamedRanges)
-            {
-                var definedName = new DefinedName
-                {
-                    Name = nr.Name,
-                    Text = nr.ToString()
-                };
-                if (!XLHelper.IsNullOrWhiteSpace(nr.Comment))
-                    definedName.Comment = nr.Comment;
-                definedNames.AppendChild(definedName);
-            }
-
-            workbook.DefinedNames = definedNames;
-
-            if (workbook.CalculationProperties == null)
-                workbook.CalculationProperties = new CalculationProperties {CalculationId = 125725U};
-
-            if (CalculateMode == XLCalculateMode.Default)
-                workbook.CalculationProperties.CalculationMode = null;
-            else
-                workbook.CalculationProperties.CalculationMode = CalculateMode.ToOpenXml();
-
-            if (ReferenceStyle == XLReferenceStyle.Default)
-                workbook.CalculationProperties.ReferenceMode = null;
-            else
-                workbook.CalculationProperties.ReferenceMode = ReferenceStyle.ToOpenXml();
-        }
-
-        private void GenerateSharedStringTablePartContent(SharedStringTablePart sharedStringTablePart,
-            SaveContext context)
-        {
-            // Call all table headers to make sure their names are filled
-            var x = 0;
-            Worksheets.ForEach(w => w.Tables.ForEach(t => x = (t as XLTable).FieldNames.Count));
-
-            sharedStringTablePart.SharedStringTable = new SharedStringTable {Count = 0, UniqueCount = 0};
-
-            var stringId = 0;
-
-            var newStrings = new Dictionary<String, Int32>();
-            var newRichStrings = new Dictionary<IXLRichText, Int32>();
-            foreach (
-                var c in
-                    Worksheets.Cast<XLWorksheet>().SelectMany(
-                        w =>
-                            w.Internals.CellsCollection.GetCells(
-                                c => ((c.DataType == XLCellValues.Text && c.ShareString) || c.HasRichText)
-                                     && (c as XLCell).InnerText.Length > 0
-                                     && XLHelper.IsNullOrWhiteSpace(c.FormulaA1)
-                                )))
-            {
-                c.DataType = XLCellValues.Text;
-                if (c.HasRichText)
-                {
-                    if (newRichStrings.ContainsKey(c.RichText))
-                        c.SharedStringId = newRichStrings[c.RichText];
-                    else
-                    {
-                        var sharedStringItem = new SharedStringItem();
-                        foreach (var rt in c.RichText.Where(r => !String.IsNullOrEmpty(r.Text)))
-                        {
-                            sharedStringItem.Append(GetRun(rt));
-                        }
-
-                        if (c.RichText.HasPhonetics)
-                        {
-                            foreach (var p in c.RichText.Phonetics)
-                            {
-                                var phoneticRun = new PhoneticRun
-                                {
-                                    BaseTextStartIndex = (UInt32)p.Start,
-                                    EndingBaseIndex = (UInt32)p.End
-                                };
-
-                                var text = new Text {Text = p.Text};
-                                if (p.Text.PreserveSpaces())
-                                    text.Space = SpaceProcessingModeValues.Preserve;
-
-                                phoneticRun.Append(text);
-                                sharedStringItem.Append(phoneticRun);
-                            }
-                            var f = new XLFont(null, c.RichText.Phonetics);
-                            if (!context.SharedFonts.ContainsKey(f))
-                                context.SharedFonts.Add(f, new FontInfo {Font = f});
-
-                            var phoneticProperties = new PhoneticProperties
-                            {
-                                FontId =
-                                    context.SharedFonts[
-                                        new XLFont(null, c.RichText.Phonetics)].
-                                        FontId
-                            };
-                            if (c.RichText.Phonetics.Alignment != XLPhoneticAlignment.Left)
-                                phoneticProperties.Alignment = c.RichText.Phonetics.Alignment.ToOpenXml();
-                            if (c.RichText.Phonetics.Type != XLPhoneticType.FullWidthKatakana)
-                                phoneticProperties.Type = c.RichText.Phonetics.Type.ToOpenXml();
-
-                            sharedStringItem.Append(phoneticProperties);
-                        }
-
-                        sharedStringTablePart.SharedStringTable.Append(sharedStringItem);
-                        sharedStringTablePart.SharedStringTable.Count += 1;
-                        sharedStringTablePart.SharedStringTable.UniqueCount += 1;
-
-                        newRichStrings.Add(c.RichText, stringId);
-                        c.SharedStringId = stringId;
-
-                        stringId++;
-                    }
-                }
-                else
-                {
-                    if (newStrings.ContainsKey(c.Value.ToString()))
-                        c.SharedStringId = newStrings[c.Value.ToString()];
-                    else
-                    {
-                        var s = c.Value.ToString();
-                        var sharedStringItem = new SharedStringItem();
-                        var text = new Text {Text = s};
-                        if (!s.Trim().Equals(s))
-                            text.Space = SpaceProcessingModeValues.Preserve;
-                        sharedStringItem.Append(text);
-                        sharedStringTablePart.SharedStringTable.Append(sharedStringItem);
-                        sharedStringTablePart.SharedStringTable.Count += 1;
-                        sharedStringTablePart.SharedStringTable.UniqueCount += 1;
-
-                        newStrings.Add(c.Value.ToString(), stringId);
-                        c.SharedStringId = stringId;
-
-                        stringId++;
-                    }
-                }
-            }
-        }
-
-        private static Run GetRun(IXLRichString rt)
-        {
-            var run = new Run();
-
-            var runProperties = new RunProperties();
-
-            var bold = rt.Bold ? new Bold() : null;
-            var italic = rt.Italic ? new Italic() : null;
-            var underline = rt.Underline != XLFontUnderlineValues.None
-                ? new Underline {Val = rt.Underline.ToOpenXml()}
-                : null;
-            var strike = rt.Strikethrough ? new Strike() : null;
-            var verticalAlignment = new VerticalTextAlignment
-            {Val = rt.VerticalAlignment.ToOpenXml()};
-            var shadow = rt.Shadow ? new Shadow() : null;
-            var fontSize = new FontSize {Val = rt.FontSize};
-            var color = GetNewColor(rt.FontColor);
-            var fontName = new RunFont {Val = rt.FontName};
-            var fontFamilyNumbering = new FontFamily {Val = (Int32)rt.FontFamilyNumbering};
-
-            if (bold != null) runProperties.Append(bold);
-            if (italic != null) runProperties.Append(italic);
-
-            if (strike != null) runProperties.Append(strike);
-            if (shadow != null) runProperties.Append(shadow);
-            if (underline != null) runProperties.Append(underline);
-            runProperties.Append(verticalAlignment);
-
-            runProperties.Append(fontSize);
-            runProperties.Append(color);
-            runProperties.Append(fontName);
-            runProperties.Append(fontFamilyNumbering);
-
-            var text = new Text {Text = rt.Text};
-            if (rt.Text.PreserveSpaces())
-                text.Space = SpaceProcessingModeValues.Preserve;
-
-            run.Append(runProperties);
-            run.Append(text);
-            return run;
-        }
-
-        private void GenerateCalculationChainPartContent(WorkbookPart workbookPart, SaveContext context)
-        {
-            var thisRelId = context.RelIdGenerator.GetNext(RelType.Workbook);
-            if (workbookPart.CalculationChainPart == null)
-                workbookPart.AddNewPart<CalculationChainPart>(thisRelId);
-
-            if (workbookPart.CalculationChainPart.CalculationChain == null)
-                workbookPart.CalculationChainPart.CalculationChain = new CalculationChain();
-
-            var calculationChain = workbookPart.CalculationChainPart.CalculationChain;
-            calculationChain.RemoveAllChildren<CalculationCell>();
-
-            foreach (var worksheet in WorksheetsInternal)
-            {
-                var cellsWithoutFormulas = new HashSet<String>();
-                foreach (var c in worksheet.Internals.CellsCollection.GetCells())
-                {
-                    if (XLHelper.IsNullOrWhiteSpace(c.FormulaA1))
-                        cellsWithoutFormulas.Add(c.Address.ToStringRelative());
-                    else
-                    {
-                        if (c.FormulaA1.StartsWith("{"))
-                        {
-                            var cc = new CalculationCell
-                            {
-                                CellReference = c.Address.ToString(),
-                                SheetId = worksheet.SheetId
-                            };
-
-                            if (c.FormulaReference == null)
-                                c.FormulaReference = c.AsRange().RangeAddress;
-                            if (c.FormulaReference.FirstAddress.Equals(c.Address))
-                            {
-                                cc.Array = true;
-                                calculationChain.AppendChild(cc);
-                                calculationChain.AppendChild(new CalculationCell {CellReference = c.Address.ToString(), InChildChain = true});
-                            }
-                            else
-                            {
-                                calculationChain.AppendChild(cc);
-                            }
-                        }
-                        else
-                        {
-                            calculationChain.AppendChild(new CalculationCell
-                            {
-                                CellReference = c.Address.ToString(),
-                                SheetId = worksheet.SheetId
-                            });
-                        }
-                    }
-                }
-
-                //var cCellsToRemove = new List<CalculationCell>();
-                var m = from cc in calculationChain.Elements<CalculationCell>()
-                    where !(cc.SheetId != null || cc.InChildChain != null)
-                          && calculationChain.Elements<CalculationCell>()
-                              .Where(c1 => c1.SheetId != null)
-                              .Select(c1 => c1.CellReference.Value)
-                              .Contains(cc.CellReference.Value)
-                          || cellsWithoutFormulas.Contains(cc.CellReference.Value)
-                    select cc;
-                //m.ToList().ForEach(cc => cCellsToRemove.Add(cc));
-                m.ToList().ForEach(cc => calculationChain.RemoveChild(cc));
-            }
-
-            if (!calculationChain.Any())
-                workbookPart.DeletePart(workbookPart.CalculationChainPart);
-        }
-
-        private void GenerateThemePartContent(ThemePart themePart)
-        {
-            var theme1 = new Theme {Name = "Office Theme"};
-            theme1.AddNamespaceDeclaration("a", "http://schemas.openxmlformats.org/drawingml/2006/main");
-
-            var themeElements1 = new ThemeElements();
-
-            var colorScheme1 = new ColorScheme {Name = "Office"};
-
-            var dark1Color1 = new Dark1Color();
-            var systemColor1 = new SystemColor
-            {
-                Val = SystemColorValues.WindowText,
-                LastColor = Theme.Text1.Color.ToHex().Substring(2)
-            };
-
-            dark1Color1.AppendChild(systemColor1);
-
-            var light1Color1 = new Light1Color();
-            var systemColor2 = new SystemColor
-            {
-                Val = SystemColorValues.Window,
-                LastColor = Theme.Background1.Color.ToHex().Substring(2)
-            };
-
-            light1Color1.AppendChild(systemColor2);
-
-            var dark2Color1 = new Dark2Color();
-            var rgbColorModelHex1 = new RgbColorModelHex {Val = Theme.Text2.Color.ToHex().Substring(2)};
-
-            dark2Color1.AppendChild(rgbColorModelHex1);
-
-            var light2Color1 = new Light2Color();
-            var rgbColorModelHex2 = new RgbColorModelHex {Val = Theme.Background2.Color.ToHex().Substring(2)};
-
-            light2Color1.AppendChild(rgbColorModelHex2);
-
-            var accent1Color1 = new Accent1Color();
-            var rgbColorModelHex3 = new RgbColorModelHex {Val = Theme.Accent1.Color.ToHex().Substring(2)};
-
-            accent1Color1.AppendChild(rgbColorModelHex3);
-
-            var accent2Color1 = new Accent2Color();
-            var rgbColorModelHex4 = new RgbColorModelHex {Val = Theme.Accent2.Color.ToHex().Substring(2)};
-
-            accent2Color1.AppendChild(rgbColorModelHex4);
-
-            var accent3Color1 = new Accent3Color();
-            var rgbColorModelHex5 = new RgbColorModelHex {Val = Theme.Accent3.Color.ToHex().Substring(2)};
-
-            accent3Color1.AppendChild(rgbColorModelHex5);
-
-            var accent4Color1 = new Accent4Color();
-            var rgbColorModelHex6 = new RgbColorModelHex {Val = Theme.Accent4.Color.ToHex().Substring(2)};
-
-            accent4Color1.AppendChild(rgbColorModelHex6);
-
-            var accent5Color1 = new Accent5Color();
-            var rgbColorModelHex7 = new RgbColorModelHex {Val = Theme.Accent5.Color.ToHex().Substring(2)};
-
-            accent5Color1.AppendChild(rgbColorModelHex7);
-
-            var accent6Color1 = new Accent6Color();
-            var rgbColorModelHex8 = new RgbColorModelHex {Val = Theme.Accent6.Color.ToHex().Substring(2)};
-
-            accent6Color1.AppendChild(rgbColorModelHex8);
-
-            var hyperlink1 = new DocumentFormat.OpenXml.Drawing.Hyperlink();
-            var rgbColorModelHex9 = new RgbColorModelHex {Val = Theme.Hyperlink.Color.ToHex().Substring(2)};
-
-            hyperlink1.AppendChild(rgbColorModelHex9);
-
-            var followedHyperlinkColor1 = new FollowedHyperlinkColor();
-            var rgbColorModelHex10 = new RgbColorModelHex {Val = Theme.FollowedHyperlink.Color.ToHex().Substring(2)};
-
-            followedHyperlinkColor1.AppendChild(rgbColorModelHex10);
-
-            colorScheme1.AppendChild(dark1Color1);
-            colorScheme1.AppendChild(light1Color1);
-            colorScheme1.AppendChild(dark2Color1);
-            colorScheme1.AppendChild(light2Color1);
-            colorScheme1.AppendChild(accent1Color1);
-            colorScheme1.AppendChild(accent2Color1);
-            colorScheme1.AppendChild(accent3Color1);
-            colorScheme1.AppendChild(accent4Color1);
-            colorScheme1.AppendChild(accent5Color1);
-            colorScheme1.AppendChild(accent6Color1);
-            colorScheme1.AppendChild(hyperlink1);
-            colorScheme1.AppendChild(followedHyperlinkColor1);
-
-            var fontScheme2 = new FontScheme {Name = "Office"};
-
-            var majorFont1 = new MajorFont();
-            var latinFont1 = new LatinFont {Typeface = "Cambria"};
-            var eastAsianFont1 = new EastAsianFont {Typeface = ""};
-            var complexScriptFont1 = new ComplexScriptFont {Typeface = ""};
-            var supplementalFont1 = new SupplementalFont {Script = "Jpan", Typeface = "ＭＳ Ｐゴシック"};
-            var supplementalFont2 = new SupplementalFont {Script = "Hang", Typeface = "맑은 고딕"};
-            var supplementalFont3 = new SupplementalFont {Script = "Hans", Typeface = "宋体"};
-            var supplementalFont4 = new SupplementalFont {Script = "Hant", Typeface = "新細明體"};
-            var supplementalFont5 = new SupplementalFont {Script = "Arab", Typeface = "Times New Roman"};
-            var supplementalFont6 = new SupplementalFont {Script = "Hebr", Typeface = "Times New Roman"};
-            var supplementalFont7 = new SupplementalFont {Script = "Thai", Typeface = "Tahoma"};
-            var supplementalFont8 = new SupplementalFont {Script = "Ethi", Typeface = "Nyala"};
-            var supplementalFont9 = new SupplementalFont {Script = "Beng", Typeface = "Vrinda"};
-            var supplementalFont10 = new SupplementalFont {Script = "Gujr", Typeface = "Shruti"};
-            var supplementalFont11 = new SupplementalFont {Script = "Khmr", Typeface = "MoolBoran"};
-            var supplementalFont12 = new SupplementalFont {Script = "Knda", Typeface = "Tunga"};
-            var supplementalFont13 = new SupplementalFont {Script = "Guru", Typeface = "Raavi"};
-            var supplementalFont14 = new SupplementalFont {Script = "Cans", Typeface = "Euphemia"};
-            var supplementalFont15 = new SupplementalFont {Script = "Cher", Typeface = "Plantagenet Cherokee"};
-            var supplementalFont16 = new SupplementalFont {Script = "Yiii", Typeface = "Microsoft Yi Baiti"};
-            var supplementalFont17 = new SupplementalFont {Script = "Tibt", Typeface = "Microsoft Himalaya"};
-            var supplementalFont18 = new SupplementalFont {Script = "Thaa", Typeface = "MV Boli"};
-            var supplementalFont19 = new SupplementalFont {Script = "Deva", Typeface = "Mangal"};
-            var supplementalFont20 = new SupplementalFont {Script = "Telu", Typeface = "Gautami"};
-            var supplementalFont21 = new SupplementalFont {Script = "Taml", Typeface = "Latha"};
-            var supplementalFont22 = new SupplementalFont {Script = "Syrc", Typeface = "Estrangelo Edessa"};
-            var supplementalFont23 = new SupplementalFont {Script = "Orya", Typeface = "Kalinga"};
-            var supplementalFont24 = new SupplementalFont {Script = "Mlym", Typeface = "Kartika"};
-            var supplementalFont25 = new SupplementalFont {Script = "Laoo", Typeface = "DokChampa"};
-            var supplementalFont26 = new SupplementalFont {Script = "Sinh", Typeface = "Iskoola Pota"};
-            var supplementalFont27 = new SupplementalFont {Script = "Mong", Typeface = "Mongolian Baiti"};
-            var supplementalFont28 = new SupplementalFont {Script = "Viet", Typeface = "Times New Roman"};
-            var supplementalFont29 = new SupplementalFont {Script = "Uigh", Typeface = "Microsoft Uighur"};
-
-            majorFont1.AppendChild(latinFont1);
-            majorFont1.AppendChild(eastAsianFont1);
-            majorFont1.AppendChild(complexScriptFont1);
-            majorFont1.AppendChild(supplementalFont1);
-            majorFont1.AppendChild(supplementalFont2);
-            majorFont1.AppendChild(supplementalFont3);
-            majorFont1.AppendChild(supplementalFont4);
-            majorFont1.AppendChild(supplementalFont5);
-            majorFont1.AppendChild(supplementalFont6);
-            majorFont1.AppendChild(supplementalFont7);
-            majorFont1.AppendChild(supplementalFont8);
-            majorFont1.AppendChild(supplementalFont9);
-            majorFont1.AppendChild(supplementalFont10);
-            majorFont1.AppendChild(supplementalFont11);
-            majorFont1.AppendChild(supplementalFont12);
-            majorFont1.AppendChild(supplementalFont13);
-            majorFont1.AppendChild(supplementalFont14);
-            majorFont1.AppendChild(supplementalFont15);
-            majorFont1.AppendChild(supplementalFont16);
-            majorFont1.AppendChild(supplementalFont17);
-            majorFont1.AppendChild(supplementalFont18);
-            majorFont1.AppendChild(supplementalFont19);
-            majorFont1.AppendChild(supplementalFont20);
-            majorFont1.AppendChild(supplementalFont21);
-            majorFont1.AppendChild(supplementalFont22);
-            majorFont1.AppendChild(supplementalFont23);
-            majorFont1.AppendChild(supplementalFont24);
-            majorFont1.AppendChild(supplementalFont25);
-            majorFont1.AppendChild(supplementalFont26);
-            majorFont1.AppendChild(supplementalFont27);
-            majorFont1.AppendChild(supplementalFont28);
-            majorFont1.AppendChild(supplementalFont29);
-
-            var minorFont1 = new MinorFont();
-            var latinFont2 = new LatinFont {Typeface = "Calibri"};
-            var eastAsianFont2 = new EastAsianFont {Typeface = ""};
-            var complexScriptFont2 = new ComplexScriptFont {Typeface = ""};
-            var supplementalFont30 = new SupplementalFont {Script = "Jpan", Typeface = "ＭＳ Ｐゴシック"};
-            var supplementalFont31 = new SupplementalFont {Script = "Hang", Typeface = "맑은 고딕"};
-            var supplementalFont32 = new SupplementalFont {Script = "Hans", Typeface = "宋体"};
-            var supplementalFont33 = new SupplementalFont {Script = "Hant", Typeface = "新細明體"};
-            var supplementalFont34 = new SupplementalFont {Script = "Arab", Typeface = "Arial"};
-            var supplementalFont35 = new SupplementalFont {Script = "Hebr", Typeface = "Arial"};
-            var supplementalFont36 = new SupplementalFont {Script = "Thai", Typeface = "Tahoma"};
-            var supplementalFont37 = new SupplementalFont {Script = "Ethi", Typeface = "Nyala"};
-            var supplementalFont38 = new SupplementalFont {Script = "Beng", Typeface = "Vrinda"};
-            var supplementalFont39 = new SupplementalFont {Script = "Gujr", Typeface = "Shruti"};
-            var supplementalFont40 = new SupplementalFont {Script = "Khmr", Typeface = "DaunPenh"};
-            var supplementalFont41 = new SupplementalFont {Script = "Knda", Typeface = "Tunga"};
-            var supplementalFont42 = new SupplementalFont {Script = "Guru", Typeface = "Raavi"};
-            var supplementalFont43 = new SupplementalFont {Script = "Cans", Typeface = "Euphemia"};
-            var supplementalFont44 = new SupplementalFont {Script = "Cher", Typeface = "Plantagenet Cherokee"};
-            var supplementalFont45 = new SupplementalFont {Script = "Yiii", Typeface = "Microsoft Yi Baiti"};
-            var supplementalFont46 = new SupplementalFont {Script = "Tibt", Typeface = "Microsoft Himalaya"};
-            var supplementalFont47 = new SupplementalFont {Script = "Thaa", Typeface = "MV Boli"};
-            var supplementalFont48 = new SupplementalFont {Script = "Deva", Typeface = "Mangal"};
-            var supplementalFont49 = new SupplementalFont {Script = "Telu", Typeface = "Gautami"};
-            var supplementalFont50 = new SupplementalFont {Script = "Taml", Typeface = "Latha"};
-            var supplementalFont51 = new SupplementalFont {Script = "Syrc", Typeface = "Estrangelo Edessa"};
-            var supplementalFont52 = new SupplementalFont {Script = "Orya", Typeface = "Kalinga"};
-            var supplementalFont53 = new SupplementalFont {Script = "Mlym", Typeface = "Kartika"};
-            var supplementalFont54 = new SupplementalFont {Script = "Laoo", Typeface = "DokChampa"};
-            var supplementalFont55 = new SupplementalFont {Script = "Sinh", Typeface = "Iskoola Pota"};
-            var supplementalFont56 = new SupplementalFont {Script = "Mong", Typeface = "Mongolian Baiti"};
-            var supplementalFont57 = new SupplementalFont {Script = "Viet", Typeface = "Arial"};
-            var supplementalFont58 = new SupplementalFont {Script = "Uigh", Typeface = "Microsoft Uighur"};
-
-            minorFont1.AppendChild(latinFont2);
-            minorFont1.AppendChild(eastAsianFont2);
-            minorFont1.AppendChild(complexScriptFont2);
-            minorFont1.AppendChild(supplementalFont30);
-            minorFont1.AppendChild(supplementalFont31);
-            minorFont1.AppendChild(supplementalFont32);
-            minorFont1.AppendChild(supplementalFont33);
-            minorFont1.AppendChild(supplementalFont34);
-            minorFont1.AppendChild(supplementalFont35);
-            minorFont1.AppendChild(supplementalFont36);
-            minorFont1.AppendChild(supplementalFont37);
-            minorFont1.AppendChild(supplementalFont38);
-            minorFont1.AppendChild(supplementalFont39);
-            minorFont1.AppendChild(supplementalFont40);
-            minorFont1.AppendChild(supplementalFont41);
-            minorFont1.AppendChild(supplementalFont42);
-            minorFont1.AppendChild(supplementalFont43);
-            minorFont1.AppendChild(supplementalFont44);
-            minorFont1.AppendChild(supplementalFont45);
-            minorFont1.AppendChild(supplementalFont46);
-            minorFont1.AppendChild(supplementalFont47);
-            minorFont1.AppendChild(supplementalFont48);
-            minorFont1.AppendChild(supplementalFont49);
-            minorFont1.AppendChild(supplementalFont50);
-            minorFont1.AppendChild(supplementalFont51);
-            minorFont1.AppendChild(supplementalFont52);
-            minorFont1.AppendChild(supplementalFont53);
-            minorFont1.AppendChild(supplementalFont54);
-            minorFont1.AppendChild(supplementalFont55);
-            minorFont1.AppendChild(supplementalFont56);
-            minorFont1.AppendChild(supplementalFont57);
-            minorFont1.AppendChild(supplementalFont58);
-
-            fontScheme2.AppendChild(majorFont1);
-            fontScheme2.AppendChild(minorFont1);
-
-            var formatScheme1 = new FormatScheme {Name = "Office"};
-
-            var fillStyleList1 = new FillStyleList();
-
-            var solidFill1 = new SolidFill();
-            var schemeColor1 = new SchemeColor {Val = SchemeColorValues.PhColor};
-
-            solidFill1.AppendChild(schemeColor1);
-
-            var gradientFill1 = new GradientFill {RotateWithShape = true};
-
-            var gradientStopList1 = new GradientStopList();
-
-            var gradientStop1 = new GradientStop {Position = 0};
-
-            var schemeColor2 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var tint1 = new Tint {Val = 50000};
-            var saturationModulation1 = new SaturationModulation {Val = 300000};
-
-            schemeColor2.AppendChild(tint1);
-            schemeColor2.AppendChild(saturationModulation1);
-
-            gradientStop1.AppendChild(schemeColor2);
-
-            var gradientStop2 = new GradientStop {Position = 35000};
-
-            var schemeColor3 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var tint2 = new Tint {Val = 37000};
-            var saturationModulation2 = new SaturationModulation {Val = 300000};
-
-            schemeColor3.AppendChild(tint2);
-            schemeColor3.AppendChild(saturationModulation2);
-
-            gradientStop2.AppendChild(schemeColor3);
-
-            var gradientStop3 = new GradientStop {Position = 100000};
-
-            var schemeColor4 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var tint3 = new Tint {Val = 15000};
-            var saturationModulation3 = new SaturationModulation {Val = 350000};
-
-            schemeColor4.AppendChild(tint3);
-            schemeColor4.AppendChild(saturationModulation3);
-
-            gradientStop3.AppendChild(schemeColor4);
-
-            gradientStopList1.AppendChild(gradientStop1);
-            gradientStopList1.AppendChild(gradientStop2);
-            gradientStopList1.AppendChild(gradientStop3);
-            var linearGradientFill1 = new LinearGradientFill {Angle = 16200000, Scaled = true};
-
-            gradientFill1.AppendChild(gradientStopList1);
-            gradientFill1.AppendChild(linearGradientFill1);
-
-            var gradientFill2 = new GradientFill {RotateWithShape = true};
-
-            var gradientStopList2 = new GradientStopList();
-
-            var gradientStop4 = new GradientStop {Position = 0};
-
-            var schemeColor5 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var shade1 = new Shade {Val = 51000};
-            var saturationModulation4 = new SaturationModulation {Val = 130000};
-
-            schemeColor5.AppendChild(shade1);
-            schemeColor5.AppendChild(saturationModulation4);
-
-            gradientStop4.AppendChild(schemeColor5);
-
-            var gradientStop5 = new GradientStop {Position = 80000};
-
-            var schemeColor6 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var shade2 = new Shade {Val = 93000};
-            var saturationModulation5 = new SaturationModulation {Val = 130000};
-
-            schemeColor6.AppendChild(shade2);
-            schemeColor6.AppendChild(saturationModulation5);
-
-            gradientStop5.AppendChild(schemeColor6);
-
-            var gradientStop6 = new GradientStop {Position = 100000};
-
-            var schemeColor7 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var shade3 = new Shade {Val = 94000};
-            var saturationModulation6 = new SaturationModulation {Val = 135000};
-
-            schemeColor7.AppendChild(shade3);
-            schemeColor7.AppendChild(saturationModulation6);
-
-            gradientStop6.AppendChild(schemeColor7);
-
-            gradientStopList2.AppendChild(gradientStop4);
-            gradientStopList2.AppendChild(gradientStop5);
-            gradientStopList2.AppendChild(gradientStop6);
-            var linearGradientFill2 = new LinearGradientFill {Angle = 16200000, Scaled = false};
-
-            gradientFill2.AppendChild(gradientStopList2);
-            gradientFill2.AppendChild(linearGradientFill2);
-
-            fillStyleList1.AppendChild(solidFill1);
-            fillStyleList1.AppendChild(gradientFill1);
-            fillStyleList1.AppendChild(gradientFill2);
-
-            var lineStyleList1 = new LineStyleList();
-
-            var outline1 = new Outline
-            {
-                Width = 9525,
-                CapType = LineCapValues.Flat,
-                CompoundLineType = CompoundLineValues.Single,
-                Alignment = PenAlignmentValues.Center
-            };
-
-            var solidFill2 = new SolidFill();
-
-            var schemeColor8 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var shade4 = new Shade {Val = 95000};
-            var saturationModulation7 = new SaturationModulation {Val = 105000};
-
-            schemeColor8.AppendChild(shade4);
-            schemeColor8.AppendChild(saturationModulation7);
-
-            solidFill2.AppendChild(schemeColor8);
-            var presetDash1 = new PresetDash {Val = PresetLineDashValues.Solid};
-
-            outline1.AppendChild(solidFill2);
-            outline1.AppendChild(presetDash1);
-
-            var outline2 = new Outline
-            {
-                Width = 25400,
-                CapType = LineCapValues.Flat,
-                CompoundLineType = CompoundLineValues.Single,
-                Alignment = PenAlignmentValues.Center
-            };
-
-            var solidFill3 = new SolidFill();
-            var schemeColor9 = new SchemeColor {Val = SchemeColorValues.PhColor};
-
-            solidFill3.AppendChild(schemeColor9);
-            var presetDash2 = new PresetDash {Val = PresetLineDashValues.Solid};
-
-            outline2.AppendChild(solidFill3);
-            outline2.AppendChild(presetDash2);
-
-            var outline3 = new Outline
-            {
-                Width = 38100,
-                CapType = LineCapValues.Flat,
-                CompoundLineType = CompoundLineValues.Single,
-                Alignment = PenAlignmentValues.Center
-            };
-
-            var solidFill4 = new SolidFill();
-            var schemeColor10 = new SchemeColor {Val = SchemeColorValues.PhColor};
-
-            solidFill4.AppendChild(schemeColor10);
-            var presetDash3 = new PresetDash {Val = PresetLineDashValues.Solid};
-
-            outline3.AppendChild(solidFill4);
-            outline3.AppendChild(presetDash3);
-
-            lineStyleList1.AppendChild(outline1);
-            lineStyleList1.AppendChild(outline2);
-            lineStyleList1.AppendChild(outline3);
-
-            var effectStyleList1 = new EffectStyleList();
-
-            var effectStyle1 = new EffectStyle();
-
-            var effectList1 = new EffectList();
-
-            var outerShadow1 = new OuterShadow
-            {
-                BlurRadius = 40000L,
-                Distance = 20000L,
-                Direction = 5400000,
-                RotateWithShape = false
-            };
-
-            var rgbColorModelHex11 = new RgbColorModelHex {Val = "000000"};
-            var alpha1 = new Alpha {Val = 38000};
-
-            rgbColorModelHex11.AppendChild(alpha1);
-
-            outerShadow1.AppendChild(rgbColorModelHex11);
-
-            effectList1.AppendChild(outerShadow1);
-
-            effectStyle1.AppendChild(effectList1);
-
-            var effectStyle2 = new EffectStyle();
-
-            var effectList2 = new EffectList();
-
-            var outerShadow2 = new OuterShadow
-            {
-                BlurRadius = 40000L,
-                Distance = 23000L,
-                Direction = 5400000,
-                RotateWithShape = false
-            };
-
-            var rgbColorModelHex12 = new RgbColorModelHex {Val = "000000"};
-            var alpha2 = new Alpha {Val = 35000};
-
-            rgbColorModelHex12.AppendChild(alpha2);
-
-            outerShadow2.AppendChild(rgbColorModelHex12);
-
-            effectList2.AppendChild(outerShadow2);
-
-            effectStyle2.AppendChild(effectList2);
-
-            var effectStyle3 = new EffectStyle();
-
-            var effectList3 = new EffectList();
-
-            var outerShadow3 = new OuterShadow
-            {
-                BlurRadius = 40000L,
-                Distance = 23000L,
-                Direction = 5400000,
-                RotateWithShape = false
-            };
-
-            var rgbColorModelHex13 = new RgbColorModelHex {Val = "000000"};
-            var alpha3 = new Alpha {Val = 35000};
-
-            rgbColorModelHex13.AppendChild(alpha3);
-
-            outerShadow3.AppendChild(rgbColorModelHex13);
-
-            effectList3.AppendChild(outerShadow3);
-
-            var scene3DType1 = new Scene3DType();
-
-            var camera1 = new Camera {Preset = PresetCameraValues.OrthographicFront};
-            var rotation1 = new Rotation {Latitude = 0, Longitude = 0, Revolution = 0};
-
-            camera1.AppendChild(rotation1);
-
-            var lightRig1 = new LightRig {Rig = LightRigValues.ThreePoints, Direction = LightRigDirectionValues.Top};
-            var rotation2 = new Rotation {Latitude = 0, Longitude = 0, Revolution = 1200000};
-
-            lightRig1.AppendChild(rotation2);
-
-            scene3DType1.AppendChild(camera1);
-            scene3DType1.AppendChild(lightRig1);
-
-            var shape3DType1 = new Shape3DType();
-            var bevelTop1 = new BevelTop {Width = 63500L, Height = 25400L};
-
-            shape3DType1.AppendChild(bevelTop1);
-
-            effectStyle3.AppendChild(effectList3);
-            effectStyle3.AppendChild(scene3DType1);
-            effectStyle3.AppendChild(shape3DType1);
-
-            effectStyleList1.AppendChild(effectStyle1);
-            effectStyleList1.AppendChild(effectStyle2);
-            effectStyleList1.AppendChild(effectStyle3);
-
-            var backgroundFillStyleList1 = new BackgroundFillStyleList();
-
-            var solidFill5 = new SolidFill();
-            var schemeColor11 = new SchemeColor {Val = SchemeColorValues.PhColor};
-
-            solidFill5.AppendChild(schemeColor11);
-
-            var gradientFill3 = new GradientFill {RotateWithShape = true};
-
-            var gradientStopList3 = new GradientStopList();
-
-            var gradientStop7 = new GradientStop {Position = 0};
-
-            var schemeColor12 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var tint4 = new Tint {Val = 40000};
-            var saturationModulation8 = new SaturationModulation {Val = 350000};
-
-            schemeColor12.AppendChild(tint4);
-            schemeColor12.AppendChild(saturationModulation8);
-
-            gradientStop7.AppendChild(schemeColor12);
-
-            var gradientStop8 = new GradientStop {Position = 40000};
-
-            var schemeColor13 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var tint5 = new Tint {Val = 45000};
-            var shade5 = new Shade {Val = 99000};
-            var saturationModulation9 = new SaturationModulation {Val = 350000};
-
-            schemeColor13.AppendChild(tint5);
-            schemeColor13.AppendChild(shade5);
-            schemeColor13.AppendChild(saturationModulation9);
-
-            gradientStop8.AppendChild(schemeColor13);
-
-            var gradientStop9 = new GradientStop {Position = 100000};
-
-            var schemeColor14 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var shade6 = new Shade {Val = 20000};
-            var saturationModulation10 = new SaturationModulation {Val = 255000};
-
-            schemeColor14.AppendChild(shade6);
-            schemeColor14.AppendChild(saturationModulation10);
-
-            gradientStop9.AppendChild(schemeColor14);
-
-            gradientStopList3.AppendChild(gradientStop7);
-            gradientStopList3.AppendChild(gradientStop8);
-            gradientStopList3.AppendChild(gradientStop9);
-
-            var pathGradientFill1 = new PathGradientFill {Path = PathShadeValues.Circle};
-            var fillToRectangle1 = new FillToRectangle {Left = 50000, Top = -80000, Right = 50000, Bottom = 180000};
-
-            pathGradientFill1.AppendChild(fillToRectangle1);
-
-            gradientFill3.AppendChild(gradientStopList3);
-            gradientFill3.AppendChild(pathGradientFill1);
-
-            var gradientFill4 = new GradientFill {RotateWithShape = true};
-
-            var gradientStopList4 = new GradientStopList();
-
-            var gradientStop10 = new GradientStop {Position = 0};
-
-            var schemeColor15 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var tint6 = new Tint {Val = 80000};
-            var saturationModulation11 = new SaturationModulation {Val = 300000};
-
-            schemeColor15.AppendChild(tint6);
-            schemeColor15.AppendChild(saturationModulation11);
-
-            gradientStop10.AppendChild(schemeColor15);
-
-            var gradientStop11 = new GradientStop {Position = 100000};
-
-            var schemeColor16 = new SchemeColor {Val = SchemeColorValues.PhColor};
-            var shade7 = new Shade {Val = 30000};
-            var saturationModulation12 = new SaturationModulation {Val = 200000};
-
-            schemeColor16.AppendChild(shade7);
-            schemeColor16.AppendChild(saturationModulation12);
-
-            gradientStop11.AppendChild(schemeColor16);
-
-            gradientStopList4.AppendChild(gradientStop10);
-            gradientStopList4.AppendChild(gradientStop11);
-
-            var pathGradientFill2 = new PathGradientFill {Path = PathShadeValues.Circle};
-            var fillToRectangle2 = new FillToRectangle {Left = 50000, Top = 50000, Right = 50000, Bottom = 50000};
-
-            pathGradientFill2.AppendChild(fillToRectangle2);
-
-            gradientFill4.AppendChild(gradientStopList4);
-            gradientFill4.AppendChild(pathGradientFill2);
-
-            backgroundFillStyleList1.AppendChild(solidFill5);
-            backgroundFillStyleList1.AppendChild(gradientFill3);
-            backgroundFillStyleList1.AppendChild(gradientFill4);
-
-            formatScheme1.AppendChild(fillStyleList1);
-            formatScheme1.AppendChild(lineStyleList1);
-            formatScheme1.AppendChild(effectStyleList1);
-            formatScheme1.AppendChild(backgroundFillStyleList1);
-
-            themeElements1.AppendChild(colorScheme1);
-            themeElements1.AppendChild(fontScheme2);
-            themeElements1.AppendChild(formatScheme1);
-            var objectDefaults1 = new ObjectDefaults();
-            var extraColorSchemeList1 = new ExtraColorSchemeList();
-
-            theme1.AppendChild(themeElements1);
-            theme1.AppendChild(objectDefaults1);
-            theme1.AppendChild(extraColorSchemeList1);
-
-            themePart.Theme = theme1;
-        }
-
-        private void GenerateCustomFilePropertiesPartContent(CustomFilePropertiesPart customFilePropertiesPart1)
-        {
-            var properties2 = new DocumentFormat.OpenXml.CustomProperties.Properties();
-            properties2.AddNamespaceDeclaration("vt",
-                "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
-            var propertyId = 1;
-            foreach (var p in CustomProperties)
-            {
-                propertyId++;
-                var customDocumentProperty = new CustomDocumentProperty
-                {
-                    FormatId = "{D5CDD505-2E9C-101B-9397-08002B2CF9AE}",
-                    PropertyId = propertyId,
-                    Name = p.Name
-                };
-                if (p.Type == XLCustomPropertyType.Text)
-                {
-                    var vTlpwstr1 = new VTLPWSTR {Text = p.GetValue<string>()};
-                    customDocumentProperty.AppendChild(vTlpwstr1);
-                }
-                else if (p.Type == XLCustomPropertyType.Date)
-                {
-                    var vTFileTime1 = new VTFileTime
-                    {
-                        Text =
-                            p.GetValue<DateTime>().ToUniversalTime().ToString(
-                                "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'")
-                    };
-                    customDocumentProperty.AppendChild(vTFileTime1);
-                }
-                else if (p.Type == XLCustomPropertyType.Number)
-                {
-                    var vTDouble1 = new VTDouble
-                    {
-                        Text = p.GetValue<Double>().ToString(CultureInfo.InvariantCulture)
-                    };
-                    customDocumentProperty.AppendChild(vTDouble1);
-                }
-                else
-                {
-                    var vTBool1 = new VTBool {Text = p.GetValue<Boolean>().ToString().ToLower()};
-                    customDocumentProperty.AppendChild(vTBool1);
-                }
-                properties2.AppendChild(customDocumentProperty);
-            }
-
-            customFilePropertiesPart1.Properties = properties2;
-        }
-
-        private void SetPackageProperties(OpenXmlPackage document)
-        {
-            var created = Properties.Created == DateTime.MinValue ? DateTime.Now : Properties.Created;
-            var modified = Properties.Modified == DateTime.MinValue ? DateTime.Now : Properties.Modified;
-            document.PackageProperties.Created = created;
-            document.PackageProperties.Modified = modified;
-            document.PackageProperties.LastModifiedBy = Properties.LastModifiedBy;
-
-            document.PackageProperties.Creator = Properties.Author;
-            document.PackageProperties.Title = Properties.Title;
-            document.PackageProperties.Subject = Properties.Subject;
-            document.PackageProperties.Category = Properties.Category;
-            document.PackageProperties.Keywords = Properties.Keywords;
-            document.PackageProperties.Description = Properties.Comments;
-            document.PackageProperties.ContentStatus = Properties.Status;
-        }
-
-        private static string GetTableName(String originalTableName, SaveContext context)
-        {
-            var tableName = originalTableName.RemoveSpecialCharacters();
-            var name = tableName;
-            if (context.TableNames.Contains(name))
-            {
-                var i = 1;
-                name = tableName + i.ToInvariantString();
-                while (context.TableNames.Contains(name))
-                {
-                    i++;
-                    name = tableName + i.ToInvariantString();
-                }
-            }
-
-            context.TableNames.Add(name);
-            return name;
-        }
-
-        private static void GenerateTableDefinitionPartContent(TableDefinitionPart tableDefinitionPart, XLTable xlTable,
-            SaveContext context)
-        {
-            context.TableId++;
-            var reference = xlTable.RangeAddress.FirstAddress + ":" + xlTable.RangeAddress.LastAddress;
-            var tableName = GetTableName(xlTable.Name, context);
-            var table = new Table
-            {
-                Id = context.TableId,
-                Name = tableName,
-                DisplayName = tableName,
-                Reference = reference
-            };
-
-            if (!xlTable.ShowHeaderRow)
-                table.HeaderRowCount = 0;
-
-            if (xlTable.ShowTotalsRow)
-                table.TotalsRowCount = 1;
-            else
-                table.TotalsRowShown = false;
-
-            var tableColumns1 = new TableColumns {Count = (UInt32)xlTable.ColumnCount()};
-
-            UInt32 columnId = 0;
-            foreach (var xlField in xlTable.Fields)
-            {
-                columnId++;
-                var fieldName = xlField.Name;
-                var tableColumn1 = new TableColumn
-                {
-                    Id = columnId,
-                    Name = fieldName.Replace("_x000a_", "_x005f_x000a_").Replace(Environment.NewLine, "_x000a_")
-                };
-                if (xlTable.ShowTotalsRow)
-                {
-                    if (xlField.TotalsRowFunction != XLTotalsRowFunction.None)
-                    {
-                        tableColumn1.TotalsRowFunction = xlField.TotalsRowFunction.ToOpenXml();
-
-                        if (xlField.TotalsRowFunction == XLTotalsRowFunction.Custom)
-                            tableColumn1.TotalsRowFormula = new TotalsRowFormula(xlField.TotalsRowFormulaA1);
-                    }
-
-                    if (!XLHelper.IsNullOrWhiteSpace(xlField.TotalsRowLabel))
-                        tableColumn1.TotalsRowLabel = xlField.TotalsRowLabel;
-                }
-                tableColumns1.AppendChild(tableColumn1);
-            }
-
-            var tableStyleInfo1 = new TableStyleInfo
-            {
-                ShowFirstColumn = xlTable.EmphasizeFirstColumn,
-                ShowLastColumn = xlTable.EmphasizeLastColumn,
-                ShowRowStripes = xlTable.ShowRowStripes,
-                ShowColumnStripes = xlTable.ShowColumnStripes
-            };
-
-            if (xlTable.Theme != XLTableTheme.None)
-                tableStyleInfo1.Name = Enum.GetName(typeof(XLTableTheme), xlTable.Theme);
-
-            if (xlTable.ShowAutoFilter)
-            {
-                var autoFilter1 = new AutoFilter();
-                if (xlTable.ShowTotalsRow)
-                {
-                    xlTable.AutoFilter.Range = xlTable.Worksheet.Range(
-                        xlTable.RangeAddress.FirstAddress.RowNumber, xlTable.RangeAddress.FirstAddress.ColumnNumber,
-                        xlTable.RangeAddress.LastAddress.RowNumber - 1, xlTable.RangeAddress.LastAddress.ColumnNumber);
-                }
-                else
-                    xlTable.AutoFilter.Range = xlTable.Worksheet.Range(xlTable.RangeAddress);
-
-                PopulateAutoFilter(xlTable.AutoFilter, autoFilter1);
-
-                table.AppendChild(autoFilter1);
-            }
-
-            table.AppendChild(tableColumns1);
-            table.AppendChild(tableStyleInfo1);
-
-            tableDefinitionPart.Table = table;
-        }
-
-        private static void GeneratePivotTables(WorkbookPart workbookPart, WorksheetPart worksheetPart,
-            XLWorksheet xlWorksheet,
-            SaveContext context)
-        {
-            foreach (var pt in xlWorksheet.PivotTables)
-            {
-                var ptCdp = context.RelIdGenerator.GetNext(RelType.Workbook);
-
-                var pivotTableCacheDefinitionPart = workbookPart.AddNewPart<PivotTableCacheDefinitionPart>(ptCdp);
-                GeneratePivotTableCacheDefinitionPartContent(pivotTableCacheDefinitionPart, pt);
-
-                var pivotCaches = new PivotCaches();
-                var pivotCache = new PivotCache {CacheId = 0U, Id = ptCdp};
-
-                pivotCaches.AppendChild(pivotCache);
-
-                workbookPart.Workbook.AppendChild(pivotCaches);
-
-                var pivotTablePart =
-                    worksheetPart.AddNewPart<PivotTablePart>(context.RelIdGenerator.GetNext(RelType.Workbook));
-                GeneratePivotTablePartContent(pivotTablePart, pt);
-
-                pivotTablePart.AddPart(pivotTableCacheDefinitionPart, context.RelIdGenerator.GetNext(RelType.Workbook));
-            }
-        }
-
-        // Generates content of pivotTableCacheDefinitionPart
-        private static void GeneratePivotTableCacheDefinitionPartContent(
-            PivotTableCacheDefinitionPart pivotTableCacheDefinitionPart, IXLPivotTable pt)
-        {
-            var source = pt.SourceRange;
-
-            var pivotCacheDefinition = new PivotCacheDefinition
-            {
-                Id = "rId1",
-                SaveData = pt.SaveSourceData,
-                RefreshOnLoad = true //pt.RefreshDataOnOpen
-            };
-            if (pt.ItemsToRetainPerField == XLItemsToRetain.None)
-                pivotCacheDefinition.MissingItemsLimit = 0U;
-            else if (pt.ItemsToRetainPerField == XLItemsToRetain.Max)
-                pivotCacheDefinition.MissingItemsLimit = XLHelper.MaxRowNumber;
-
-            pivotCacheDefinition.AddNamespaceDeclaration("r",
-                "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-
-            var cacheSource = new CacheSource {Type = SourceValues.Worksheet};
-            cacheSource.AppendChild(new WorksheetSource {Name = source.ToString()});
-
-            var cacheFields = new CacheFields();
-
-            foreach (var c in source.Columns())
-            {
-                var columnNumber = c.ColumnNumber();
-                var columnName = c.FirstCell().Value.ToString();
-                var xlpf = pt.Fields.Add(columnName);
-
-                var field =
-                    pt.RowLabels.Union(pt.ColumnLabels).Union(pt.ReportFilters).FirstOrDefault(f => f.SourceName == columnName);
-                if (field != null)
-                {
-                    xlpf.CustomName = field.CustomName;
-                    xlpf.Subtotals.AddRange(field.Subtotals);
-                }
-
-                var sharedItems = new SharedItems();
-
-                var onlyNumbers =
-                    !source.Cells().Any(
-                        cell =>
-                            cell.Address.ColumnNumber == columnNumber &&
-                            cell.Address.RowNumber > source.FirstRow().RowNumber() && cell.DataType != XLCellValues.Number);
-                if (onlyNumbers)
-                {
-                    sharedItems = new SharedItems
-                    {ContainsSemiMixedTypes = false, ContainsString = false, ContainsNumber = true};
-                }
-                else
-                {
-                    foreach (var cellValue in source.Cells().Where(cell =>
-                        cell.Address.ColumnNumber == columnNumber &&
-                        cell.Address.RowNumber >
-                        source.FirstRow().RowNumber()).Select(
-                            cell => cell.Value.ToString())
-                        .Where(cellValue => !xlpf.SharedStrings.Contains(cellValue)))
-                    {
-                        xlpf.SharedStrings.Add(cellValue);
-                    }
-
-                    foreach (var li in xlpf.SharedStrings)
-                    {
-                        sharedItems.AppendChild(new StringItem {Val = li});
-                    }
-                }
-
-                var cacheField = new CacheField {Name = xlpf.SourceName};
-                cacheField.AppendChild(sharedItems);
-                cacheFields.AppendChild(cacheField);
-            }
-
-            pivotCacheDefinition.AppendChild(cacheSource);
-            pivotCacheDefinition.AppendChild(cacheFields);
-
-            pivotTableCacheDefinitionPart.PivotCacheDefinition = pivotCacheDefinition;
-
-            var pivotTableCacheRecordsPart = pivotTableCacheDefinitionPart.AddNewPart<PivotTableCacheRecordsPart>("rId1");
-
-            var pivotCacheRecords = new PivotCacheRecords();
-            pivotCacheRecords.AddNamespaceDeclaration("r",
-                "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-            pivotTableCacheRecordsPart.PivotCacheRecords = pivotCacheRecords;
-        }
-
-        // Generates content of pivotTablePart
-        private static void GeneratePivotTablePartContent(PivotTablePart pivotTablePart1, IXLPivotTable pt)
-        {
-            var pivotTableDefinition = new PivotTableDefinition
-            {
-                Name = pt.Name,
-                CacheId = 0U,
-                DataCaption = "Values",
-                MergeItem = GetBooleanValue(pt.MergeAndCenterWithLabels, true),
-                Indent = Convert.ToUInt32(pt.RowLabelIndent),
-                PageOverThenDown = (pt.FilterAreaOrder == XLFilterAreaOrder.OverThenDown),
-                PageWrap = Convert.ToUInt32(pt.FilterFieldsPageWrap),
-                ShowError = String.IsNullOrEmpty(pt.ErrorValueReplacement),
-                UseAutoFormatting = GetBooleanValue(pt.AutofitColumns, true),
-                PreserveFormatting = GetBooleanValue(pt.PreserveCellFormatting, true),
-                RowGrandTotals = GetBooleanValue(pt.ShowGrandTotalsRows, true),
-                ColumnGrandTotals = GetBooleanValue(pt.ShowGrandTotalsColumns, true),
-                SubtotalHiddenItems = GetBooleanValue(pt.FilteredItemsInSubtotals, true),
-                MultipleFieldFilters = GetBooleanValue(pt.AllowMultipleFilters, true),
-                CustomListSort = GetBooleanValue(pt.UseCustomListsForSorting, true),
-                ShowDrill = GetBooleanValue(pt.ShowExpandCollapseButtons, true),
-                ShowDataTips = GetBooleanValue(pt.ShowContextualTooltips, true),
-                ShowMemberPropertyTips = GetBooleanValue(pt.ShowPropertiesInTooltips, true),
-                ShowHeaders = GetBooleanValue(pt.DisplayCaptionsAndDropdowns, true),
-                GridDropZones = GetBooleanValue(pt.ClassicPivotTableLayout, true),
-                ShowEmptyRow = GetBooleanValue(pt.ShowEmptyItemsOnRows, true),
-                ShowEmptyColumn = GetBooleanValue(pt.ShowEmptyItemsOnColumns, true),
-                ShowItems = GetBooleanValue(pt.DisplayItemLabels, true),
-                FieldListSortAscending = GetBooleanValue(pt.SortFieldsAtoZ, true),
-                PrintDrill = GetBooleanValue(pt.PrintExpandCollapsedButtons, true),
-                ItemPrintTitles = GetBooleanValue(pt.RepeatRowLabels, true),
-                FieldPrintTitles = GetBooleanValue(pt.PrintTitles, true),
-                EnableDrill = GetBooleanValue(pt.EnableShowDetails, true)
-            };
-
-            if (pt.EmptyCellReplacement != null)
-            {
-                pivotTableDefinition.ShowMissing = true;
-                pivotTableDefinition.MissingCaption = pt.EmptyCellReplacement;
-            }
-            else
-            {
-                pivotTableDefinition.ShowMissing = false;
-            }
-
-            if (pt.ErrorValueReplacement != null)
-            {
-                pivotTableDefinition.ShowError = true;
-                pivotTableDefinition.ErrorCaption = pt.ErrorValueReplacement;
-            }
-            else
-            {
-                pivotTableDefinition.ShowError = false;
-            }
-
-            var location = new Location
-            {
-                Reference = pt.TargetCell.Address.ToString(),
-                FirstHeaderRow = 1U,
-                FirstDataRow = 1U,
-                FirstDataColumn = 1U
-            };
-
-
-            var rowFields = new RowFields();
-            var columnFields = new ColumnFields();
-            var rowItems = new RowItems();
-            var columnItems = new ColumnItems();
-            var pageFields = new PageFields {Count = (uint)pt.ReportFilters.Count()};
-
-            var pivotFields = new PivotFields {Count = Convert.ToUInt32(pt.SourceRange.ColumnCount())};
-            foreach (var xlpf in pt.Fields.OrderBy(f => pt.RowLabels.Any(p => p.SourceName == f.SourceName) ? pt.RowLabels.IndexOf(f) : Int32.MaxValue ))
-            {
-                if (pt.RowLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
-                {
-                    var f = new Field {Index = pt.Fields.IndexOf(xlpf)};
-                    rowFields.AppendChild(f);
-
-                    for (var i = 0; i < xlpf.SharedStrings.Count; i++)
-                    {
-                        var rowItem = new RowItem();
-                        rowItem.AppendChild(new MemberPropertyIndex {Val = i});
-                        rowItems.AppendChild(rowItem);
-                    }
-
-                    var rowItemTotal = new RowItem {ItemType = ItemValues.Grand};
-                    rowItemTotal.AppendChild(new MemberPropertyIndex());
-                    rowItems.AppendChild(rowItemTotal);
-                }
-                else if (pt.ColumnLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
-                {
-                    var f = new Field {Index = pt.Fields.IndexOf(xlpf)};
-                    columnFields.AppendChild(f);
-
-                    for (var i = 0; i < xlpf.SharedStrings.Count; i++)
-                    {
-                        var rowItem = new RowItem();
-                        rowItem.AppendChild(new MemberPropertyIndex {Val = i});
-                        columnItems.AppendChild(rowItem);
-                    }
-
-                    var rowItemTotal = new RowItem {ItemType = ItemValues.Grand};
-                    rowItemTotal.AppendChild(new MemberPropertyIndex());
-                    columnItems.AppendChild(rowItemTotal);
-                }
-            }
-
-            foreach (var xlpf in pt.Fields)
-            {
-                var pf = new PivotField {ShowAll = false, Name = xlpf.CustomName};
-
-                if (pt.RowLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
-                {
-                    pf.Axis = PivotTableAxisValues.AxisRow;
-                }
-                else if (pt.ColumnLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
-                {
-                    pf.Axis = PivotTableAxisValues.AxisColumn;
-                }
-                else if (pt.ReportFilters.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
-                {
-                    location.ColumnsPerPage = 1;
-                    location.RowPageCount = 1;
-                    pf.Axis = PivotTableAxisValues.AxisPage;
-                    pageFields.AppendChild(new PageField {Hierarchy = -1, Field = pt.Fields.IndexOf(xlpf)});
-                }
-                else if (pt.Values.FirstOrDefault(p => p.CustomName == xlpf.SourceName) != null)
-                {
-                    pf.DataField = true;
-                }
-
-                var fieldItems = new Items();
-
-                if (xlpf.SharedStrings.Count > 0)
-                {
-                    for (uint i = 0; i < xlpf.SharedStrings.Count; i++)
-                    {
-                        fieldItems.AppendChild(new Item {Index = i});
-                    }
-                }
-
-                if (xlpf.Subtotals.Count > 0)
-                {
-                    foreach (var subtotal in xlpf.Subtotals)
-                    {
-                        var itemSubtotal = new Item();
-                        switch (subtotal)
-                        {
-                            case XLSubtotalFunction.Average:
-                                pf.AverageSubTotal = true;
-                                itemSubtotal.ItemType = ItemValues.Average;
-                                break;
-                            case XLSubtotalFunction.Count:
-                                pf.CountASubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.CountA;
-                                break;
-                            case XLSubtotalFunction.CountNumbers:
-                                pf.CountSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.Count;
-                                break;
-                            case XLSubtotalFunction.Maximum:
-                                pf.MaxSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.Maximum;
-                                break;
-                            case XLSubtotalFunction.Minimum:
-                                pf.MinSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.Minimum;
-                                break;
-                            case XLSubtotalFunction.PopulationStandardDeviation:
-                                pf.ApplyStandardDeviationPInSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.StandardDeviationP;
-                                break;
-                            case XLSubtotalFunction.PopulationVariance:
-                                pf.ApplyVariancePInSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.VarianceP;
-                                break;
-                            case XLSubtotalFunction.Product:
-                                pf.ApplyProductInSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.Product;
-                                break;
-                            case XLSubtotalFunction.StandardDeviation:
-                                pf.ApplyStandardDeviationInSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.StandardDeviation;
-                                break;
-                            case XLSubtotalFunction.Sum:
-                                pf.SumSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.Sum;
-                                break;
-                            case XLSubtotalFunction.Variance:
-                                pf.ApplyVarianceInSubtotal = true;
-                                itemSubtotal.ItemType = ItemValues.Variance;
-                                break;
-                        }
-                        fieldItems.AppendChild(itemSubtotal);
-                    }
-                }
-                else
-                {
-                    fieldItems.AppendChild(new Item {ItemType = ItemValues.Default});
-                }
-
-                pf.AppendChild(fieldItems);
-                pivotFields.AppendChild(pf);
-            }
-
-            pivotTableDefinition.AppendChild(location);
-            pivotTableDefinition.AppendChild(pivotFields);
-
-            if (pt.RowLabels.Any())
-            {
-                pivotTableDefinition.AppendChild(rowFields);
-            }
-            else
-            {
-                rowItems.AppendChild(new RowItem());
-            }
-            pivotTableDefinition.AppendChild(rowItems);
-
-            if (!pt.ColumnLabels.Any())
-            {
-                columnItems.AppendChild(new RowItem());
-                pivotTableDefinition.AppendChild(columnItems);
-            }
-            else
-            {
-                pivotTableDefinition.AppendChild(columnFields);
-                pivotTableDefinition.AppendChild(columnItems);
-            }
-
-            if (pt.ReportFilters.Any())
-            {
-                pivotTableDefinition.AppendChild(pageFields);
-            }
-
-
-            var dataFields = new DataFields();
-            foreach (var value in pt.Values)
-            {
-                var sourceColumn =
-                    pt.SourceRange.Columns().FirstOrDefault(c => c.Cell(1).Value.ToString() == value.SourceName);
-                if (sourceColumn == null) continue;
-
-                var df = new DataField
-                {
-                    Name = value.SourceName,
-                    Field = (UInt32)sourceColumn.ColumnNumber() - 1,
-                    Subtotal = value.SummaryFormula.ToOpenXml(),
-                    ShowDataAs = value.Calculation.ToOpenXml(),
-                    NumberFormatId = (UInt32)value.NumberFormat.NumberFormatId
-                };
-
-                if (!String.IsNullOrEmpty(value.BaseField))
-                {
-                    var baseField =
-                        pt.SourceRange.Columns().FirstOrDefault(c => c.Cell(1).Value.ToString() == value.BaseField);
-                    if (baseField != null)
-                        df.BaseField = baseField.ColumnNumber() - 1;
-                }
-                else
-                {
-                    df.BaseField = 0;
-                }
-
-                if (value.CalculationItem == XLPivotCalculationItem.Previous)
-                    df.BaseItem = 1048828U;
-                else if (value.CalculationItem == XLPivotCalculationItem.Next)
-                    df.BaseItem = 1048829U;
-                else
-                    df.BaseItem = 0U;
-
-
-                dataFields.AppendChild(df);
-            }
-            pivotTableDefinition.AppendChild(dataFields);
-
-            pivotTableDefinition.AppendChild(new PivotTableStyle
-            {
-                Name = Enum.GetName(typeof (XLPivotTableTheme), pt.Theme),
-                ShowRowHeaders = pt.ShowRowHeaders,
-                ShowColumnHeaders = pt.ShowColumnHeaders,
-                ShowRowStripes = pt.ShowRowStripes,
-                ShowColumnStripes = pt.ShowColumnStripes
-            });
-
-            #region Excel 2010 Features
-
-            var pivotTableDefinitionExtensionList = new PivotTableDefinitionExtensionList();
-
-            var pivotTableDefinitionExtension = new PivotTableDefinitionExtension
-            {Uri = "{962EF5D1-5CA2-4c93-8EF4-DBF5C05439D2}"};
-            pivotTableDefinitionExtension.AddNamespaceDeclaration("x14",
-                "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
-
-            var pivotTableDefinition2 = new DocumentFormat.OpenXml.Office2010.Excel.PivotTableDefinition
-            {EnableEdit = pt.EnableCellEditing, HideValuesRow = !pt.ShowValuesRow};
-            pivotTableDefinition2.AddNamespaceDeclaration("xm", "http://schemas.microsoft.com/office/excel/2006/main");
-
-            pivotTableDefinitionExtension.AppendChild(pivotTableDefinition2);
-
-            pivotTableDefinitionExtensionList.AppendChild(pivotTableDefinitionExtension);
-            pivotTableDefinition.AppendChild(pivotTableDefinitionExtensionList);
-
-            #endregion
-
-            pivotTablePart1.PivotTableDefinition = pivotTableDefinition;
-        }
-
-
-        private static void GenerateWorksheetCommentsPartContent(WorksheetCommentsPart worksheetCommentsPart,
-            XLWorksheet xlWorksheet)
-        {
-            var comments = new Comments();
-            var commentList = new CommentList();
-            var authorsDict = new Dictionary<String, Int32>();
-            foreach (var c in xlWorksheet.Internals.CellsCollection.GetCells(c => c.HasComment))
-            {
-                var comment = new Comment {Reference = c.Address.ToStringRelative()};
-                var authorName = c.Comment.Author;
-
-                Int32 authorId;
-                if (!authorsDict.TryGetValue(authorName, out authorId))
-                {
-                    authorId = authorsDict.Count;
-                    authorsDict.Add(authorName, authorId);
-                }
-                comment.AuthorId = (UInt32)authorId;
-
-                var commentText = new CommentText();
-                foreach (var rt in c.Comment)
-                {
-                    commentText.Append(GetRun(rt));
-                }
-
-                comment.Append(commentText);
-                commentList.Append(comment);
-            }
-
-            var authors = new Authors();
-            foreach (var author in authorsDict.Select(a => new Author {Text = a.Key}))
-            {
-                authors.Append(author);
-            }
-            comments.Append(authors);
-            comments.Append(commentList);
-
-            worksheetCommentsPart.Comments = comments;
-        }
-
-        // Generates content of vmlDrawingPart1.
-        private static void GenerateVmlDrawingPartContent(VmlDrawingPart vmlDrawingPart, XLWorksheet xlWorksheet,
-            SaveContext context)
-        {
-            var ms = new MemoryStream();
-            CopyStream(vmlDrawingPart.GetStream(FileMode.OpenOrCreate), ms);
-            ms.Position = 0;
-            var writer = new XmlTextWriter(vmlDrawingPart.GetStream(FileMode.Create), Encoding.UTF8);
-
-            writer.WriteStartElement("xml");
-
-            const string shapeTypeId = "_x0000_t202"; // arbitrary, assigned by office
-
-            new Vml.Shapetype(
-                new Vml.Stroke {JoinStyle = Vml.StrokeJoinStyleValues.Miter},
-                new Vml.Path {AllowGradientShape = true, ConnectionPointType = ConnectValues.Rectangle}
-                )
-            {
-                Id = shapeTypeId,
-                CoordinateSize = "21600,21600",
-                OptionalNumber = 202,
-                EdgePath = "m,l,21600r21600,l21600,xe",
-            }
-                .WriteTo(writer);
-
-            var cellWithComments = xlWorksheet.Internals.CellsCollection.GetCells().Where(c => c.HasComment);
-
-            foreach (var c in cellWithComments)
-            {
-                GenerateShape(c, shapeTypeId).WriteTo(writer);
-            }
-
-            if (ms.Length > 0)
-            {
-                ms.Position = 0;
-                var xdoc = XDocumentExtensions.Load(ms);
-                xdoc.Root.Elements().ForEach(e => writer.WriteRaw(e.ToString()));
-            }
-
-
-            writer.WriteEndElement();
-            writer.Flush();
-            writer.Close();
-        }
-
-        // VML Shape for Comment
-        private static Vml.Shape GenerateShape(XLCell c, string shapeTypeId)
-        {
-            var rowNumber = c.Address.RowNumber;
-            var columnNumber = c.Address.ColumnNumber;
-
-            var shapeId = String.Format("_x0000_s{0}", c.Comment.ShapeId);
-            // Unique per cell (workbook?), e.g.: "_x0000_s1026"
-            var anchor = GetAnchor(c);
-            var textBox = GetTextBox(c.Comment.Style);
-            var fill = new Vml.Fill {Color2 = "#" + c.Comment.Style.ColorsAndLines.FillColor.Color.ToHex().Substring(2)};
-            if (c.Comment.Style.ColorsAndLines.FillTransparency < 1)
-                fill.Opacity =
-                    Math.Round(Convert.ToDouble(c.Comment.Style.ColorsAndLines.FillTransparency), 2).ToString(
-                        CultureInfo.InvariantCulture);
-            var stroke = GetStroke(c);
-            var shape = new Vml.Shape(
-                fill,
-                stroke,
-                new Vml.Shadow {On = true, Color = "black", Obscured = true},
-                new Vml.Path {ConnectionPointType = ConnectValues.None},
-                textBox,
-                new ClientData(
-                    new MoveWithCells(c.Comment.Style.Properties.Positioning == XLDrawingAnchor.Absolute
-                        ? "True"
-                        : "False"), // Counterintuitive
-                    new ResizeWithCells(c.Comment.Style.Properties.Positioning == XLDrawingAnchor.MoveAndSizeWithCells
-                        ? "False"
-                        : "True"), // Counterintuitive
-                    anchor,
-                    new HorizontalTextAlignment(c.Comment.Style.Alignment.Horizontal.ToString().ToCamel()),
-                    new Vml.Spreadsheet.VerticalTextAlignment(c.Comment.Style.Alignment.Vertical.ToString().ToCamel()),
-                    new AutoFill("False"),
-                    new CommentRowTarget {Text = (rowNumber - 1).ToString()},
-                    new CommentColumnTarget {Text = (columnNumber - 1).ToString()},
-                    new Locked(c.Comment.Style.Protection.Locked ? "True" : "False"),
-                    new LockText(c.Comment.Style.Protection.LockText ? "True" : "False"),
-                    new Visible(c.Comment.Visible ? "True" : "False")
-                    ) {ObjectType = ObjectValues.Note}
-                )
-            {
-                Id = shapeId,
-                Type = "#" + shapeTypeId,
-                Style = GetCommentStyle(c),
-                FillColor = "#" + c.Comment.Style.ColorsAndLines.FillColor.Color.ToHex().Substring(2),
-                StrokeColor = "#" + c.Comment.Style.ColorsAndLines.LineColor.Color.ToHex().Substring(2),
-                StrokeWeight = String.Format(CultureInfo.InvariantCulture, "{0}pt", c.Comment.Style.ColorsAndLines.LineWeight),
-                InsetMode = c.Comment.Style.Margins.Automatic ? InsetMarginValues.Auto : InsetMarginValues.Custom
-            };
-            if (!XLHelper.IsNullOrWhiteSpace(c.Comment.Style.Web.AlternateText))
-                shape.Alternate = c.Comment.Style.Web.AlternateText;
-
-
-            return shape;
-        }
-
-        private static Vml.Stroke GetStroke(XLCell c)
-        {
-            var lineDash = c.Comment.Style.ColorsAndLines.LineDash;
-            var stroke = new Vml.Stroke
-            {
-                LineStyle = c.Comment.Style.ColorsAndLines.LineStyle.ToOpenXml(),
-                DashStyle =
-                    lineDash == XLDashStyle.RoundDot || lineDash == XLDashStyle.SquareDot
-                        ? "shortDot"
-                        : lineDash.ToString().ToCamel()
-            };
-            if (lineDash == XLDashStyle.RoundDot)
-                stroke.EndCap = Vml.StrokeEndCapValues.Round;
-            if (c.Comment.Style.ColorsAndLines.LineTransparency < 1)
-                stroke.Opacity =
-                    Math.Round(Convert.ToDouble(c.Comment.Style.ColorsAndLines.LineTransparency), 2).ToString(
-                        CultureInfo.InvariantCulture);
-            return stroke;
-        }
-
-        private static Vml.TextBox GetTextBox(IXLDrawingStyle ds)
-        {
-            var sb = new StringBuilder();
-            var a = ds.Alignment;
-
-            if (a.Direction == XLDrawingTextDirection.Context)
-                sb.Append("mso-direction-alt:auto;");
-            else if (a.Direction == XLDrawingTextDirection.RightToLeft)
-                sb.Append("direction:RTL;");
-
-            if (a.Orientation != XLDrawingTextOrientation.LeftToRight)
-            {
-                sb.Append("layout-flow:vertical;");
-                if (a.Orientation == XLDrawingTextOrientation.BottomToTop)
-                    sb.Append("mso-layout-flow-alt:bottom-to-top;");
-                else if (a.Orientation == XLDrawingTextOrientation.Vertical)
-                    sb.Append("mso-layout-flow-alt:top-to-bottom;");
-            }
-            if (a.AutomaticSize)
-                sb.Append("mso-fit-shape-to-text:t;");
-            var retVal = new Vml.TextBox {Style = sb.ToString()};
-            var dm = ds.Margins;
-            if (!dm.Automatic)
-                retVal.Inset = String.Format("{0}in,{1}in,{2}in,{3}in",
-                    dm.Left.ToString(CultureInfo.InvariantCulture),
-                    dm.Top.ToString(CultureInfo.InvariantCulture),
-                    dm.Right.ToString(CultureInfo.InvariantCulture),
-                    dm.Bottom.ToString(CultureInfo.InvariantCulture));
-
-            return retVal;
-        }
-
-        private static Anchor GetAnchor(XLCell cell)
-        {
-            var c = cell.Comment;
-            var cWidth = c.Style.Size.Width;
-            var fcNumber = c.Position.Column - 1;
-            var fcOffset = Convert.ToInt32(c.Position.ColumnOffset * 7.5);
-            var widthFromColumns = cell.Worksheet.Column(c.Position.Column).Width - c.Position.ColumnOffset;
-            var lastCell = cell.CellRight(c.Position.Column - cell.Address.ColumnNumber);
-            while (widthFromColumns <= cWidth)
-            {
-                lastCell = lastCell.CellRight();
-                widthFromColumns += lastCell.WorksheetColumn().Width;
-            }
-
-            var lcNumber = lastCell.WorksheetColumn().ColumnNumber() - 1;
-            var lcOffset = Convert.ToInt32((lastCell.WorksheetColumn().Width - (widthFromColumns - cWidth)) * 7.5);
-
-            var cHeight = c.Style.Size.Height; //c.Style.Size.Height * 72.0;
-            var frNumber = c.Position.Row - 1;
-            var frOffset = Convert.ToInt32(c.Position.RowOffset);
-            var heightFromRows = cell.Worksheet.Row(c.Position.Row).Height - c.Position.RowOffset;
-            lastCell = cell.CellBelow(c.Position.Row - cell.Address.RowNumber);
-            while (heightFromRows <= cHeight)
-            {
-                lastCell = lastCell.CellBelow();
-                heightFromRows += lastCell.WorksheetRow().Height;
-            }
-
-            var lrNumber = lastCell.WorksheetRow().RowNumber() - 1;
-            var lrOffset = Convert.ToInt32(lastCell.WorksheetRow().Height - (heightFromRows - cHeight));
-            return new Anchor
-            {
-                Text = string.Format("{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}",
-                    fcNumber, fcOffset,
-                    frNumber, frOffset,
-                    lcNumber, lcOffset,
-                    lrNumber, lrOffset
-                    )
-            };
-        }
-
-        private static StringValue GetCommentStyle(XLCell cell)
-        {
-            var c = cell.Comment;
-            var sb = new StringBuilder("position:absolute; ");
-
-            sb.Append("visibility:");
-            sb.Append(c.Visible ? "visible" : "hidden");
-            sb.Append(";");
-
-            sb.Append("width:");
-            sb.Append(Math.Round(c.Style.Size.Width * 7.5, 2).ToString(CultureInfo.InvariantCulture));
-            sb.Append("pt;");
-            sb.Append("height:");
-            sb.Append(Math.Round(c.Style.Size.Height, 2).ToString(CultureInfo.InvariantCulture));
-            sb.Append("pt;");
-
-            sb.Append("z-index:");
-            sb.Append(c.ZOrder.ToString());
-
-
-            return sb.ToString();
-        }
-
-        #region GenerateWorkbookStylesPartContent
-
-        private void GenerateWorkbookStylesPartContent(WorkbookStylesPart workbookStylesPart, SaveContext context)
-        {
-            var defaultStyle = new XLStyle(null, DefaultStyle);
-            var defaultStyleId = GetStyleId(defaultStyle);
-            if (!context.SharedFonts.ContainsKey(defaultStyle.Font))
-                context.SharedFonts.Add(defaultStyle.Font, new FontInfo {FontId = 0, Font = defaultStyle.Font as XLFont});
-
-            var sharedFills = new Dictionary<IXLFill, FillInfo>
-            {{defaultStyle.Fill, new FillInfo {FillId = 2, Fill = defaultStyle.Fill as XLFill}}};
-
-            var sharedBorders = new Dictionary<IXLBorder, BorderInfo>
-            {{defaultStyle.Border, new BorderInfo {BorderId = 0, Border = defaultStyle.Border as XLBorder}}};
-
-            var sharedNumberFormats = new Dictionary<IXLNumberFormat, NumberFormatInfo>
-            {
-                {
-                    defaultStyle.NumberFormat,
-                    new NumberFormatInfo
-                    {NumberFormatId = 0, NumberFormat = defaultStyle.NumberFormat}
-                }
-            };
-
-            //Dictionary<String, AlignmentInfo> sharedAlignments = new Dictionary<String, AlignmentInfo>();
-            //sharedAlignments.Add(defaultStyle.Alignment.ToString(), new AlignmentInfo() { AlignmentId = 0, Alignment = defaultStyle.Alignment });
-
-            if (workbookStylesPart.Stylesheet == null)
-                workbookStylesPart.Stylesheet = new Stylesheet();
-
-            // Cell styles = Named styles
-            if (workbookStylesPart.Stylesheet.CellStyles == null)
-                workbookStylesPart.Stylesheet.CellStyles = new CellStyles();
-
-            UInt32 defaultFormatId;
-            if (workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Any(c => c.Name == "Normal"))
-            {
-                defaultFormatId =
-                    workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Single(c => c.Name == "Normal").FormatId.Value;
-            }
-            else if (workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Any())
-            {
-                defaultFormatId =
-                    workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Max(c => c.FormatId.Value) + 1;
-            }
-            else
-                defaultFormatId = 0;
-
-            context.SharedStyles.Add(defaultStyleId,
-                new StyleInfo
-                {
-                    StyleId = defaultFormatId,
-                    Style = defaultStyle,
-                    FontId = 0,
-                    FillId = 0,
-                    BorderId = 0,
-                    NumberFormatId = 0
-                    //AlignmentId = 0
-                });
-
-            UInt32 styleCount = 1;
-            UInt32 fontCount = 1;
-            UInt32 fillCount = 3;
-            UInt32 borderCount = 1;
-            var numberFormatCount = 1;
-            var xlStyles = new HashSet<Int32>();
-
-            foreach (var worksheet in WorksheetsInternal)
-            {
-                foreach (var s in worksheet.GetStyleIds().Where(s => !xlStyles.Contains(s)))
-                    xlStyles.Add(s);
-
-                foreach (
-                    var s in
-                        worksheet.Internals.ColumnsCollection.Select(kp => kp.Value.GetStyleId()).Where(
-                            s => !xlStyles.Contains(s)))
-                    xlStyles.Add(s);
-
-                foreach (
-                    var s in
-                        worksheet.Internals.RowsCollection.Select(kp => kp.Value.GetStyleId()).Where(
-                            s => !xlStyles.Contains(s))
-                    )
-                    xlStyles.Add(s);
-            }
-
-            foreach (var xlStyle in xlStyles.Select(GetStyleById))
-            {
-                if (!context.SharedFonts.ContainsKey(xlStyle.Font))
-                    context.SharedFonts.Add(xlStyle.Font,
-                        new FontInfo {FontId = fontCount++, Font = xlStyle.Font as XLFont});
-
-                if (!sharedFills.ContainsKey(xlStyle.Fill))
-                    sharedFills.Add(xlStyle.Fill, new FillInfo {FillId = fillCount++, Fill = xlStyle.Fill as XLFill});
-
-                if (!sharedBorders.ContainsKey(xlStyle.Border))
-                    sharedBorders.Add(xlStyle.Border,
-                        new BorderInfo {BorderId = borderCount++, Border = xlStyle.Border as XLBorder});
-
-                if (xlStyle.NumberFormat.NumberFormatId != -1
-                    || sharedNumberFormats.ContainsKey(xlStyle.NumberFormat))
-                    continue;
-
-                sharedNumberFormats.Add(xlStyle.NumberFormat,
-                    new NumberFormatInfo
-                    {
-                        NumberFormatId = numberFormatCount + 164,
-                        NumberFormat = xlStyle.NumberFormat
-                    });
-                numberFormatCount++;
-            }
-
-            var allSharedNumberFormats = ResolveNumberFormats(workbookStylesPart, sharedNumberFormats, defaultFormatId);
-            ResolveFonts(workbookStylesPart, context);
-            var allSharedFills = ResolveFills(workbookStylesPart, sharedFills);
-            var allSharedBorders = ResolveBorders(workbookStylesPart, sharedBorders);
-
-            foreach (var id in xlStyles)
-            {
-                var xlStyle = GetStyleById(id);
-                if (context.SharedStyles.ContainsKey(id)) continue;
-
-                var numberFormatId = xlStyle.NumberFormat.NumberFormatId >= 0
-                    ? xlStyle.NumberFormat.NumberFormatId
-                    : allSharedNumberFormats[xlStyle.NumberFormat].NumberFormatId;
-
-                context.SharedStyles.Add(id,
-                    new StyleInfo
-                    {
-                        StyleId = styleCount++,
-                        Style = xlStyle,
-                        FontId = context.SharedFonts[xlStyle.Font].FontId,
-                        FillId = allSharedFills[xlStyle.Fill].FillId,
-                        BorderId = allSharedBorders[xlStyle.Border].BorderId,
-                        NumberFormatId = numberFormatId
-                    });
-            }
-
-            ResolveCellStyleFormats(workbookStylesPart, context);
-            ResolveRest(workbookStylesPart, context);
-
-            if (workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().All(c => c.Name != "Normal"))
-            {
-                //var defaultFormatId = context.SharedStyles.Values.Where(s => s.Style.Equals(DefaultStyle)).Single().StyleId;
-
-                var cellStyle1 = new CellStyle {Name = "Normal", FormatId = defaultFormatId, BuiltinId = 0U};
-                workbookStylesPart.Stylesheet.CellStyles.AppendChild(cellStyle1);
-            }
-            workbookStylesPart.Stylesheet.CellStyles.Count = (UInt32)workbookStylesPart.Stylesheet.CellStyles.Count();
-
-            var newSharedStyles = new Dictionary<Int32, StyleInfo>();
-            foreach (var ss in context.SharedStyles)
-            {
-                var styleId = -1;
-                foreach (CellFormat f in workbookStylesPart.Stylesheet.CellFormats)
-                {
-                    styleId++;
-                    if (CellFormatsAreEqual(f, ss.Value))
-                        break;
-                }
-                if (styleId == -1)
-                    styleId = 0;
-                var si = ss.Value;
-                si.StyleId = (UInt32)styleId;
-                newSharedStyles.Add(ss.Key, si);
-            }
-            context.SharedStyles.Clear();
-            newSharedStyles.ForEach(kp => context.SharedStyles.Add(kp.Key, kp.Value));
-
-            AddDifferentialFormats(workbookStylesPart, context);
-        }
-
-        private void AddDifferentialFormats(WorkbookStylesPart workbookStylesPart, SaveContext context)
-        {
-            if (workbookStylesPart.Stylesheet.DifferentialFormats == null)
-                workbookStylesPart.Stylesheet.DifferentialFormats = new DifferentialFormats();
-
-
-            var differentialFormats = workbookStylesPart.Stylesheet.DifferentialFormats;
-
-            FillDifferentialFormatsCollection(differentialFormats, context.DifferentialFormats);
-
-
-            foreach (var ws in Worksheets)
-            {
-                foreach (var cf in ws.ConditionalFormats)
-                {
-                    if (!context.DifferentialFormats.ContainsKey(cf.Style))
-                        AddDifferentialFormat(workbookStylesPart.Stylesheet.DifferentialFormats, cf, context);
-                }
-            }
-
-            differentialFormats.Count = (UInt32)differentialFormats.Count();
-            if (differentialFormats.Count == 0)
-                workbookStylesPart.Stylesheet.DifferentialFormats = null;
-        }
-
-        private void FillDifferentialFormatsCollection(DifferentialFormats differentialFormats,
-            Dictionary<IXLStyle, int> dictionary)
-        {
-            dictionary.Clear();
-            var id = 0;
-            foreach (var df in differentialFormats.Elements<DifferentialFormat>())
-            {
-                var style = new XLStyle(new XLStylizedEmpty(DefaultStyle), DefaultStyle);
-                LoadFont(df.Font, style.Font);
-                LoadBorder(df.Border, style.Border);
-                LoadNumberFormat(df.NumberingFormat, style.NumberFormat);
-                LoadFill(df.Fill, style.Fill);
-                if (!dictionary.ContainsKey(style))
-                    dictionary.Add(style, ++id);
-            }
-        }
-
-        private static void AddDifferentialFormat(DifferentialFormats differentialFormats, IXLConditionalFormat cf,
-            SaveContext context)
-        {
-            var differentialFormat = new DifferentialFormat();
-            differentialFormat.Append(GetNewFont(new FontInfo {Font = cf.Style.Font as XLFont}, false));
-            if (!XLHelper.IsNullOrWhiteSpace(cf.Style.NumberFormat.Format))
-            {
-                var numberFormat = new NumberingFormat
-                {
-                    NumberFormatId = (UInt32)(differentialFormats.Count() + 164),
-                    FormatCode = cf.Style.NumberFormat.Format
-                };
-                differentialFormat.Append(numberFormat);
-            }
-            differentialFormat.Append(GetNewFill(new FillInfo {Fill = cf.Style.Fill as XLFill}, false));
-            differentialFormat.Append(GetNewBorder(new BorderInfo {Border = cf.Style.Border as XLBorder}, false));
-
-            differentialFormats.Append(differentialFormat);
-
-            context.DifferentialFormats.Add(cf.Style, differentialFormats.Count() - 1);
-        }
-
-        private static void ResolveRest(WorkbookStylesPart workbookStylesPart, SaveContext context)
-        {
-            if (workbookStylesPart.Stylesheet.CellFormats == null)
-                workbookStylesPart.Stylesheet.CellFormats = new CellFormats();
-
-            foreach (var styleInfo in context.SharedStyles.Values)
-            {
-                var info = styleInfo;
-                var foundOne =
-                    workbookStylesPart.Stylesheet.CellFormats.Cast<CellFormat>().Any(f => CellFormatsAreEqual(f, info));
-
-                if (foundOne) continue;
-
-                var cellFormat = GetCellFormat(styleInfo);
-                cellFormat.FormatId = 0;
-                var alignment = new Alignment
-                {
-                    Horizontal = styleInfo.Style.Alignment.Horizontal.ToOpenXml(),
-                    Vertical = styleInfo.Style.Alignment.Vertical.ToOpenXml(),
-                    Indent = (UInt32)styleInfo.Style.Alignment.Indent,
-                    ReadingOrder = (UInt32)styleInfo.Style.Alignment.ReadingOrder,
-                    WrapText = styleInfo.Style.Alignment.WrapText,
-                    TextRotation = (UInt32)styleInfo.Style.Alignment.TextRotation,
-                    ShrinkToFit = styleInfo.Style.Alignment.ShrinkToFit,
-                    RelativeIndent = styleInfo.Style.Alignment.RelativeIndent,
-                    JustifyLastLine = styleInfo.Style.Alignment.JustifyLastLine
-                };
-                cellFormat.AppendChild(alignment);
-
-                if (cellFormat.ApplyProtection.Value)
-                    cellFormat.AppendChild(GetProtection(styleInfo));
-
-                workbookStylesPart.Stylesheet.CellFormats.AppendChild(cellFormat);
-            }
-            workbookStylesPart.Stylesheet.CellFormats.Count = (UInt32)workbookStylesPart.Stylesheet.CellFormats.Count();
-        }
-
-        private static void ResolveCellStyleFormats(WorkbookStylesPart workbookStylesPart,
-            SaveContext context)
-        {
-            if (workbookStylesPart.Stylesheet.CellStyleFormats == null)
-                workbookStylesPart.Stylesheet.CellStyleFormats = new CellStyleFormats();
-
-            foreach (var styleInfo in context.SharedStyles.Values)
-            {
-                var info = styleInfo;
-                var foundOne =
-                    workbookStylesPart.Stylesheet.CellStyleFormats.Cast<CellFormat>().Any(
-                        f => CellFormatsAreEqual(f, info));
-
-                if (foundOne) continue;
-
-                var cellStyleFormat = GetCellFormat(styleInfo);
-
-                if (cellStyleFormat.ApplyProtection.Value)
-                    cellStyleFormat.AppendChild(GetProtection(styleInfo));
-
-                workbookStylesPart.Stylesheet.CellStyleFormats.AppendChild(cellStyleFormat);
-            }
-            workbookStylesPart.Stylesheet.CellStyleFormats.Count =
-                (UInt32)workbookStylesPart.Stylesheet.CellStyleFormats.Count();
-        }
-
-        private static bool ApplyFill(StyleInfo styleInfo)
-        {
-            return styleInfo.Style.Fill.PatternType.ToOpenXml() == PatternValues.None;
-        }
-
-        private static bool ApplyBorder(StyleInfo styleInfo)
-        {
-            var opBorder = styleInfo.Style.Border;
-            return (opBorder.BottomBorder.ToOpenXml() != BorderStyleValues.None
-                    || opBorder.DiagonalBorder.ToOpenXml() != BorderStyleValues.None
-                    || opBorder.RightBorder.ToOpenXml() != BorderStyleValues.None
-                    || opBorder.LeftBorder.ToOpenXml() != BorderStyleValues.None
-                    || opBorder.TopBorder.ToOpenXml() != BorderStyleValues.None);
-        }
-
-        private static bool ApplyProtection(StyleInfo styleInfo)
-        {
-            return styleInfo.Style.Protection != null;
-        }
-
-        private static CellFormat GetCellFormat(StyleInfo styleInfo)
-        {
-            var cellFormat = new CellFormat
-            {
-                NumberFormatId = (UInt32)styleInfo.NumberFormatId,
-                FontId = styleInfo.FontId,
-                FillId = styleInfo.FillId,
-                BorderId = styleInfo.BorderId,
-                ApplyNumberFormat = true,
-                ApplyAlignment = true,
-                ApplyFill = ApplyFill(styleInfo),
-                ApplyBorder = ApplyBorder(styleInfo),
-                ApplyProtection = ApplyProtection(styleInfo)
-            };
-            return cellFormat;
-        }
-
-        private static Protection GetProtection(StyleInfo styleInfo)
-        {
-            return new Protection
-            {
-                Locked = styleInfo.Style.Protection.Locked,
-                Hidden = styleInfo.Style.Protection.Hidden
-            };
-        }
-
-        private static bool CellFormatsAreEqual(CellFormat f, StyleInfo styleInfo)
-        {
-            return
-                f.BorderId != null && styleInfo.BorderId == f.BorderId
-                && f.FillId != null && styleInfo.FillId == f.FillId
-                && f.FontId != null && styleInfo.FontId == f.FontId
-                && f.NumberFormatId != null && styleInfo.NumberFormatId == f.NumberFormatId
-                && f.ApplyFill != null && f.ApplyFill == ApplyFill(styleInfo)
-                && f.ApplyBorder != null && f.ApplyBorder == ApplyBorder(styleInfo)
-                && AlignmentsAreEqual(f.Alignment, styleInfo.Style.Alignment)
-                && ProtectionsAreEqual(f.Protection, styleInfo.Style.Protection)
-                ;
-        }
-
-        private static bool ProtectionsAreEqual(Protection protection, IXLProtection xlProtection)
-        {
-            var p = new XLProtection();
-            if (protection != null)
-            {
-                if (protection.Locked != null)
-                    p.Locked = protection.Locked.Value;
-                if (protection.Hidden != null)
-                    p.Hidden = protection.Hidden.Value;
-            }
-            return p.Equals(xlProtection);
-        }
-
-        private static bool AlignmentsAreEqual(Alignment alignment, IXLAlignment xlAlignment)
-        {
-            var a = new XLAlignment();
-            if (alignment != null)
-            {
-                if (alignment.Indent != null)
-                    a.Indent = (Int32)alignment.Indent.Value;
-
-                if (alignment.Horizontal != null)
-                    a.Horizontal = alignment.Horizontal.Value.ToClosedXml();
-                if (alignment.Vertical != null)
-                    a.Vertical = alignment.Vertical.Value.ToClosedXml();
-
-                if (alignment.ReadingOrder != null)
-                    a.ReadingOrder = alignment.ReadingOrder.Value.ToClosedXml();
-                if (alignment.WrapText != null)
-                    a.WrapText = alignment.WrapText.Value;
-                if (alignment.TextRotation != null)
-                    a.TextRotation = (Int32)alignment.TextRotation.Value;
-                if (alignment.ShrinkToFit != null)
-                    a.ShrinkToFit = alignment.ShrinkToFit.Value;
-                if (alignment.RelativeIndent != null)
-                    a.RelativeIndent = alignment.RelativeIndent.Value;
-                if (alignment.JustifyLastLine != null)
-                    a.JustifyLastLine = alignment.JustifyLastLine.Value;
-            }
-            return a.Equals(xlAlignment);
-        }
-
-        private Dictionary<IXLBorder, BorderInfo> ResolveBorders(WorkbookStylesPart workbookStylesPart,
-            Dictionary<IXLBorder, BorderInfo> sharedBorders)
-        {
-            if (workbookStylesPart.Stylesheet.Borders == null)
-                workbookStylesPart.Stylesheet.Borders = new Borders();
-
-            var allSharedBorders = new Dictionary<IXLBorder, BorderInfo>();
-            foreach (var borderInfo in sharedBorders.Values)
-            {
-                var borderId = 0;
-                var foundOne = false;
-                foreach (Border f in workbookStylesPart.Stylesheet.Borders)
-                {
-                    if (BordersAreEqual(f, borderInfo.Border))
-                    {
-                        foundOne = true;
-                        break;
-                    }
-                    borderId++;
-                }
-                if (!foundOne)
-                {
-                    var border = GetNewBorder(borderInfo);
-                    workbookStylesPart.Stylesheet.Borders.AppendChild(border);
-                }
-                allSharedBorders.Add(borderInfo.Border,
-                    new BorderInfo {Border = borderInfo.Border, BorderId = (UInt32)borderId});
-            }
-            workbookStylesPart.Stylesheet.Borders.Count = (UInt32)workbookStylesPart.Stylesheet.Borders.Count();
-            return allSharedBorders;
-        }
-
-        private static Border GetNewBorder(BorderInfo borderInfo, Boolean ignoreMod = true)
-        {
-            var border = new Border();
-            if (borderInfo.Border.DiagonalUpModified || ignoreMod)
-                border.DiagonalUp = borderInfo.Border.DiagonalUp;
-
-            if (borderInfo.Border.DiagonalDownModified || ignoreMod)
-                border.DiagonalDown = borderInfo.Border.DiagonalDown;
-
-            if (borderInfo.Border.LeftBorderModified || borderInfo.Border.LeftBorderColorModified || ignoreMod)
-            {
-                var leftBorder = new LeftBorder {Style = borderInfo.Border.LeftBorder.ToOpenXml()};
-                if (borderInfo.Border.LeftBorderColorModified || ignoreMod)
-                {
-                    var leftBorderColor = GetNewColor(borderInfo.Border.LeftBorderColor);
-                    leftBorder.AppendChild(leftBorderColor);
-                }
-                border.AppendChild(leftBorder);
-            }
-
-            if (borderInfo.Border.RightBorderModified || borderInfo.Border.RightBorderColorModified || ignoreMod)
-            {
-                var rightBorder = new RightBorder {Style = borderInfo.Border.RightBorder.ToOpenXml()};
-                if (borderInfo.Border.RightBorderColorModified || ignoreMod)
-                {
-                    var rightBorderColor = GetNewColor(borderInfo.Border.RightBorderColor);
-                    rightBorder.AppendChild(rightBorderColor);
-                }
-                border.AppendChild(rightBorder);
-            }
-
-            if (borderInfo.Border.TopBorderModified || borderInfo.Border.TopBorderColorModified || ignoreMod)
-            {
-                var topBorder = new TopBorder {Style = borderInfo.Border.TopBorder.ToOpenXml()};
-                if (borderInfo.Border.TopBorderColorModified || ignoreMod)
-                {
-                    var topBorderColor = GetNewColor(borderInfo.Border.TopBorderColor);
-                    topBorder.AppendChild(topBorderColor);
-                }
-                border.AppendChild(topBorder);
-            }
-
-            if (borderInfo.Border.BottomBorderModified || borderInfo.Border.BottomBorderColorModified || ignoreMod)
-            {
-                var bottomBorder = new BottomBorder {Style = borderInfo.Border.BottomBorder.ToOpenXml()};
-                if (borderInfo.Border.BottomBorderColorModified || ignoreMod)
-                {
-                    var bottomBorderColor = GetNewColor(borderInfo.Border.BottomBorderColor);
-                    bottomBorder.AppendChild(bottomBorderColor);
-                }
-                border.AppendChild(bottomBorder);
-            }
-
-            if (borderInfo.Border.DiagonalBorderModified || borderInfo.Border.DiagonalBorderColorModified || ignoreMod)
-            {
-                var DiagonalBorder = new DiagonalBorder {Style = borderInfo.Border.DiagonalBorder.ToOpenXml()};
-                if (borderInfo.Border.DiagonalBorderColorModified || ignoreMod)
-                {
-                    var DiagonalBorderColor = GetNewColor(borderInfo.Border.DiagonalBorderColor);
-                    DiagonalBorder.AppendChild(DiagonalBorderColor);
-                }
-                border.AppendChild(DiagonalBorder);
-            }
-
-            return border;
-        }
-
-        private bool BordersAreEqual(Border b, IXLBorder xlBorder)
-        {
-            var nb = new XLBorder();
-            if (b.DiagonalUp != null)
-                nb.DiagonalUp = b.DiagonalUp.Value;
-
-            if (b.DiagonalDown != null)
-                nb.DiagonalDown = b.DiagonalDown.Value;
-
-            if (b.LeftBorder != null)
-            {
-                if (b.LeftBorder.Style != null)
-                    nb.LeftBorder = b.LeftBorder.Style.Value.ToClosedXml();
-                var bColor = GetColor(b.LeftBorder.Color);
-                if (bColor.HasValue)
-                    nb.LeftBorderColor = bColor;
-            }
-
-            if (b.RightBorder != null)
-            {
-                if (b.RightBorder.Style != null)
-                    nb.RightBorder = b.RightBorder.Style.Value.ToClosedXml();
-                var bColor = GetColor(b.RightBorder.Color);
-                if (bColor.HasValue)
-                    nb.RightBorderColor = bColor;
-            }
-
-            if (b.TopBorder != null)
-            {
-                if (b.TopBorder.Style != null)
-                    nb.TopBorder = b.TopBorder.Style.Value.ToClosedXml();
-                var bColor = GetColor(b.TopBorder.Color);
-                if (bColor.HasValue)
-                    nb.TopBorderColor = bColor;
-            }
-
-            if (b.BottomBorder != null)
-            {
-                if (b.BottomBorder.Style != null)
-                    nb.BottomBorder = b.BottomBorder.Style.Value.ToClosedXml();
-                var bColor = GetColor(b.BottomBorder.Color);
-                if (bColor.HasValue)
-                    nb.BottomBorderColor = bColor;
-            }
-
-            return nb.Equals(xlBorder);
-
-
-        }
-
-        private Dictionary<IXLFill, FillInfo> ResolveFills(WorkbookStylesPart workbookStylesPart,
-            Dictionary<IXLFill, FillInfo> sharedFills)
-        {
-            if (workbookStylesPart.Stylesheet.Fills == null)
-                workbookStylesPart.Stylesheet.Fills = new Fills();
-
-            ResolveFillWithPattern(workbookStylesPart.Stylesheet.Fills, PatternValues.None);
-            ResolveFillWithPattern(workbookStylesPart.Stylesheet.Fills, PatternValues.Gray125);
-
-            var allSharedFills = new Dictionary<IXLFill, FillInfo>();
-            foreach (var fillInfo in sharedFills.Values)
-            {
-                var fillId = 0;
-                var foundOne = false;
-                foreach (Fill f in workbookStylesPart.Stylesheet.Fills)
-                {
-                    if (FillsAreEqual(f, fillInfo.Fill))
-                    {
-                        foundOne = true;
-                        break;
-                    }
-                    fillId++;
-                }
-                if (!foundOne)
-                {
-                    var fill = GetNewFill(fillInfo);
-                    workbookStylesPart.Stylesheet.Fills.AppendChild(fill);
-                }
-                allSharedFills.Add(fillInfo.Fill, new FillInfo {Fill = fillInfo.Fill, FillId = (UInt32)fillId});
-            }
-
-            workbookStylesPart.Stylesheet.Fills.Count = (UInt32)workbookStylesPart.Stylesheet.Fills.Count();
-            return allSharedFills;
-        }
-
-        private static void ResolveFillWithPattern(Fills fills, PatternValues patternValues)
-        {
-            if (fills.Elements<Fill>().Any(f =>
-                f.PatternFill.PatternType == patternValues
-                && f.PatternFill.ForegroundColor == null
-                && f.PatternFill.BackgroundColor == null
-                )) return;
-
-            var fill1 = new Fill();
-            var patternFill1 = new PatternFill {PatternType = patternValues};
-            fill1.AppendChild(patternFill1);
-            fills.AppendChild(fill1);
-        }
-
-        private static Fill GetNewFill(FillInfo fillInfo, Boolean ignoreMod = true)
-        {
-            var fill = new Fill();
-
-            var patternFill = new PatternFill();
-            if (fillInfo.Fill.PatternTypeModified || ignoreMod)
-                patternFill.PatternType = fillInfo.Fill.PatternType.ToOpenXml();
-
-            if (fillInfo.Fill.PatternColorModified || ignoreMod)
-            {
-                var foregroundColor = new ForegroundColor();
-                if (fillInfo.Fill.PatternColor.ColorType == XLColorType.Color)
-                    foregroundColor.Rgb = fillInfo.Fill.PatternColor.Color.ToHex();
-                else if (fillInfo.Fill.PatternColor.ColorType == XLColorType.Indexed)
-                    foregroundColor.Indexed = (UInt32)fillInfo.Fill.PatternColor.Indexed;
-                else
-                {
-                    foregroundColor.Theme = (UInt32)fillInfo.Fill.PatternColor.ThemeColor;
-                    if (fillInfo.Fill.PatternColor.ThemeTint != 0)
-                        foregroundColor.Tint = fillInfo.Fill.PatternColor.ThemeTint;
-                }
-                patternFill.AppendChild(foregroundColor);
-            }
-
-            if (fillInfo.Fill.PatternBackgroundColorModified || ignoreMod)
-            {
-                var backgroundColor = new BackgroundColor();
-                if (fillInfo.Fill.PatternBackgroundColor.ColorType == XLColorType.Color)
-                    backgroundColor.Rgb = fillInfo.Fill.PatternBackgroundColor.Color.ToHex();
-                else if (fillInfo.Fill.PatternBackgroundColor.ColorType == XLColorType.Indexed)
-                    backgroundColor.Indexed = (UInt32)fillInfo.Fill.PatternBackgroundColor.Indexed;
-                else
-                {
-                    backgroundColor.Theme = (UInt32)fillInfo.Fill.PatternBackgroundColor.ThemeColor;
-                    if (fillInfo.Fill.PatternBackgroundColor.ThemeTint != 0)
-                        backgroundColor.Tint = fillInfo.Fill.PatternBackgroundColor.ThemeTint;
-                }
-                patternFill.AppendChild(backgroundColor);
-            }
-
-            fill.AppendChild(patternFill);
-
-            return fill;
-        }
-
-        private bool FillsAreEqual(Fill f, IXLFill xlFill)
-        {
-            var nF = new XLFill();
-            if (f.PatternFill != null)
-            {
-                if (f.PatternFill.PatternType != null)
-                    nF.PatternType = f.PatternFill.PatternType.Value.ToClosedXml();
-
-                var fColor = GetColor(f.PatternFill.ForegroundColor);
-                if (fColor.HasValue)
-                    nF.PatternColor = fColor;
-
-                var bColor = GetColor(f.PatternFill.BackgroundColor);
-                if (bColor.HasValue)
-                    nF.PatternBackgroundColor = bColor;
-            }
-            return nF.Equals(xlFill);
-        }
-
-        private void ResolveFonts(WorkbookStylesPart workbookStylesPart, SaveContext context)
-        {
-            if (workbookStylesPart.Stylesheet.Fonts == null)
-                workbookStylesPart.Stylesheet.Fonts = new Fonts();
-
-            var newFonts = new Dictionary<IXLFont, FontInfo>();
-            foreach (var fontInfo in context.SharedFonts.Values)
-            {
-                var fontId = 0;
-                var foundOne = false;
-                foreach (Font f in workbookStylesPart.Stylesheet.Fonts)
-                {
-                    if (FontsAreEqual(f, fontInfo.Font))
-                    {
-                        foundOne = true;
-                        break;
-                    }
-                    fontId++;
-                }
-                if (!foundOne)
-                {
-                    var font = GetNewFont(fontInfo);
-                    workbookStylesPart.Stylesheet.Fonts.AppendChild(font);
-                }
-                newFonts.Add(fontInfo.Font, new FontInfo {Font = fontInfo.Font, FontId = (UInt32)fontId});
-            }
-            context.SharedFonts.Clear();
-            foreach (var kp in newFonts)
-                context.SharedFonts.Add(kp.Key, kp.Value);
-
-            workbookStylesPart.Stylesheet.Fonts.Count = (UInt32)workbookStylesPart.Stylesheet.Fonts.Count();
-        }
-
-        private static Font GetNewFont(FontInfo fontInfo, Boolean ignoreMod = true)
-        {
-            var font = new Font();
-            var bold = (fontInfo.Font.BoldModified || ignoreMod) && fontInfo.Font.Bold ? new Bold() : null;
-            var italic = (fontInfo.Font.ItalicModified || ignoreMod) && fontInfo.Font.Italic ? new Italic() : null;
-            var underline = (fontInfo.Font.UnderlineModified || ignoreMod) &&
-                            fontInfo.Font.Underline != XLFontUnderlineValues.None
-                ? new Underline {Val = fontInfo.Font.Underline.ToOpenXml()}
-                : null;
-            var strike = (fontInfo.Font.StrikethroughModified || ignoreMod) && fontInfo.Font.Strikethrough
-                ? new Strike()
-                : null;
-            var verticalAlignment = fontInfo.Font.VerticalAlignmentModified || ignoreMod
-                ? new VerticalTextAlignment {Val = fontInfo.Font.VerticalAlignment.ToOpenXml()}
-                : null;
-            var shadow = (fontInfo.Font.ShadowModified || ignoreMod) && fontInfo.Font.Shadow ? new Shadow() : null;
-            var fontSize = fontInfo.Font.FontSizeModified || ignoreMod
-                ? new FontSize {Val = fontInfo.Font.FontSize}
-                : null;
-            var color = fontInfo.Font.FontColorModified || ignoreMod ? GetNewColor(fontInfo.Font.FontColor) : null;
-
-            var fontName = fontInfo.Font.FontNameModified || ignoreMod
-                ? new FontName {Val = fontInfo.Font.FontName}
-                : null;
-            var fontFamilyNumbering = fontInfo.Font.FontFamilyNumberingModified || ignoreMod
-                ? new FontFamilyNumbering {Val = (Int32)fontInfo.Font.FontFamilyNumbering}
-                : null;
-
-            if (bold != null)
-                font.AppendChild(bold);
-            if (italic != null)
-                font.AppendChild(italic);
-            if (underline != null)
-                font.AppendChild(underline);
-            if (strike != null)
-                font.AppendChild(strike);
-            if (verticalAlignment != null)
-                font.AppendChild(verticalAlignment);
-            if (shadow != null)
-                font.AppendChild(shadow);
-            if (fontSize != null)
-                font.AppendChild(fontSize);
-            if (color != null)
-                font.AppendChild(color);
-            if (fontName != null)
-                font.AppendChild(fontName);
-            if (fontFamilyNumbering != null)
-                font.AppendChild(fontFamilyNumbering);
-
-            return font;
-        }
-
-        private static Color GetNewColor(XLColor xlColor)
-        {
-            var color = new Color();
-            if (xlColor.ColorType == XLColorType.Color)
-                color.Rgb = xlColor.Color.ToHex();
-            else if (xlColor.ColorType == XLColorType.Indexed)
-                color.Indexed = (UInt32)xlColor.Indexed;
-            else
-            {
-                color.Theme = (UInt32)xlColor.ThemeColor;
-                if (xlColor.ThemeTint != 0)
-                    color.Tint = xlColor.ThemeTint;
-            }
-            return color;
-        }
-
-        private static TabColor GetTabColor(XLColor xlColor)
-        {
-            var color = new TabColor();
-            if (xlColor.ColorType == XLColorType.Color)
-                color.Rgb = xlColor.Color.ToHex();
-            else if (xlColor.ColorType == XLColorType.Indexed)
-                color.Indexed = (UInt32)xlColor.Indexed;
-            else
-            {
-                color.Theme = (UInt32)xlColor.ThemeColor;
-                if (xlColor.ThemeTint != 0)
-                    color.Tint = xlColor.ThemeTint;
-            }
-            return color;
-        }
-
-        private bool FontsAreEqual(Font f, IXLFont xlFont)
-        {
-            var nf = new XLFont {Bold = f.Bold != null, Italic = f.Italic != null};
-            if (f.Underline != null)
-            {
-                nf.Underline = f.Underline.Val != null
-                    ? f.Underline.Val.Value.ToClosedXml()
-                    : XLFontUnderlineValues.Single;
-            }
-            nf.Strikethrough = f.Strike != null;
-            if (f.VerticalTextAlignment != null)
-            {
-                nf.VerticalAlignment = f.VerticalTextAlignment.Val != null
-                    ? f.VerticalTextAlignment.Val.Value.ToClosedXml()
-                    : XLFontVerticalTextAlignmentValues.Baseline;
-            }
-            nf.Shadow = f.Shadow != null;
-            if (f.FontSize != null)
-                nf.FontSize = f.FontSize.Val;
-            var fColor = GetColor(f.Color);
-            if (fColor.HasValue)
-                nf.FontColor = fColor;
-            if (f.FontName != null)
-                nf.FontName = f.FontName.Val;
-            if (f.FontFamilyNumbering != null)
-                nf.FontFamilyNumbering = (XLFontFamilyNumberingValues)f.FontFamilyNumbering.Val.Value;
-
-            return nf.Equals(xlFont);
-        }
-
-        private static Dictionary<IXLNumberFormat, NumberFormatInfo> ResolveNumberFormats(
-            WorkbookStylesPart workbookStylesPart,
-            Dictionary<IXLNumberFormat, NumberFormatInfo> sharedNumberFormats,
-            UInt32 defaultFormatId)
-        {
-            if (workbookStylesPart.Stylesheet.NumberingFormats == null)
-            {
-                workbookStylesPart.Stylesheet.NumberingFormats = new NumberingFormats();
-                workbookStylesPart.Stylesheet.NumberingFormats.AppendChild(new NumberingFormat()
-                {
-                    NumberFormatId = 0,
-                    FormatCode = ""
-                });
-            }
-
-            var allSharedNumberFormats = new Dictionary<IXLNumberFormat, NumberFormatInfo>();
-            foreach (var numberFormatInfo in sharedNumberFormats.Values.Where(nf => nf.NumberFormatId != defaultFormatId))
-            {
-                var numberingFormatId = 164;
-                var foundOne = false;
-                foreach (NumberingFormat nf in workbookStylesPart.Stylesheet.NumberingFormats)
-                {
-                    if (NumberFormatsAreEqual(nf, numberFormatInfo.NumberFormat))
-                    {
-                        foundOne = true;
-                        numberingFormatId = (Int32)nf.NumberFormatId.Value;
-                        break;
-                    }
-                    numberingFormatId++;
-                }
-                if (!foundOne)
-                {
-                    var numberingFormat = new NumberingFormat
-                    {
-                        NumberFormatId = (UInt32)numberingFormatId,
-                        FormatCode = numberFormatInfo.NumberFormat.Format
-                    };
-                    workbookStylesPart.Stylesheet.NumberingFormats.AppendChild(numberingFormat);
-                }
-                allSharedNumberFormats.Add(numberFormatInfo.NumberFormat,
-                    new NumberFormatInfo
-                    {
-                        NumberFormat = numberFormatInfo.NumberFormat,
-                        NumberFormatId = numberingFormatId
-                    });
-            }
-            workbookStylesPart.Stylesheet.NumberingFormats.Count =
-                (UInt32)workbookStylesPart.Stylesheet.NumberingFormats.Count();
-            return allSharedNumberFormats;
-        }
-
-        private static bool NumberFormatsAreEqual(NumberingFormat nf, IXLNumberFormat xlNumberFormat)
-        {
-            var newXLNumberFormat = new XLNumberFormat();
-
-            if (nf.FormatCode != null && !XLHelper.IsNullOrWhiteSpace(nf.FormatCode.Value))
-                newXLNumberFormat.Format = nf.FormatCode.Value;
-            else if (nf.NumberFormatId != null)
-                newXLNumberFormat.NumberFormatId = (Int32)nf.NumberFormatId.Value;
-
-            return newXLNumberFormat.Equals(xlNumberFormat);
-        }
-
-        #endregion
-
-        #region GenerateWorksheetPartContent
-
-        private static void GenerateWorksheetPartContent(WorksheetPart worksheetPart, XLWorksheet xlWorksheet,
-            SaveContext context)
-        {
-            #region Worksheet
-
-            if (worksheetPart.Worksheet == null)
-                worksheetPart.Worksheet = new Worksheet();
-
-            GenerateTables(xlWorksheet, worksheetPart, context);
-
-            if (
-                !worksheetPart.Worksheet.NamespaceDeclarations.Contains(new KeyValuePair<String, String>("r",
-                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships")))
-            {
-                worksheetPart.Worksheet.AddNamespaceDeclaration("r",
-                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-            }
-
-            #endregion
-
-            var cm = new XLWSContentManager(worksheetPart.Worksheet);
-
-            #region SheetProperties
-
-            if (worksheetPart.Worksheet.SheetProperties == null)
-                worksheetPart.Worksheet.SheetProperties = new SheetProperties();
-
-            worksheetPart.Worksheet.SheetProperties.TabColor = xlWorksheet.TabColor.HasValue
-                ? GetTabColor(xlWorksheet.TabColor)
-                : null;
-
-            cm.SetElement(XLWSContentManager.XLWSContents.SheetProperties, worksheetPart.Worksheet.SheetProperties);
-
-            if (worksheetPart.Worksheet.SheetProperties.OutlineProperties == null)
-                worksheetPart.Worksheet.SheetProperties.OutlineProperties = new OutlineProperties();
-
-            worksheetPart.Worksheet.SheetProperties.OutlineProperties.SummaryBelow =
-                (xlWorksheet.Outline.SummaryVLocation ==
-                 XLOutlineSummaryVLocation.Bottom);
-            worksheetPart.Worksheet.SheetProperties.OutlineProperties.SummaryRight =
-                (xlWorksheet.Outline.SummaryHLocation ==
-                 XLOutlineSummaryHLocation.Right);
-
-            if (worksheetPart.Worksheet.SheetProperties.PageSetupProperties == null
-                && (xlWorksheet.PageSetup.PagesTall > 0 || xlWorksheet.PageSetup.PagesWide > 0))
-                worksheetPart.Worksheet.SheetProperties.PageSetupProperties = new PageSetupProperties {FitToPage = true};
-
-            #endregion
-
-            var maxColumn = 0;
-
-            var sheetDimensionReference = "A1";
-            if (xlWorksheet.Internals.CellsCollection.Count > 0)
-            {
-                maxColumn = xlWorksheet.Internals.CellsCollection.MaxColumnUsed;
-                var maxRow = xlWorksheet.Internals.CellsCollection.MaxRowUsed;
-                sheetDimensionReference = "A1:" + XLHelper.GetColumnLetterFromNumber(maxColumn) +
-                                          maxRow.ToInvariantString();
-            }
-
-            if (xlWorksheet.Internals.ColumnsCollection.Count > 0)
-            {
-                var maxColCollection = xlWorksheet.Internals.ColumnsCollection.Keys.Max();
-                if (maxColCollection > maxColumn)
-                    maxColumn = maxColCollection;
-            }
-
-            #region SheetViews
-
-            if (worksheetPart.Worksheet.SheetDimension == null)
-                worksheetPart.Worksheet.SheetDimension = new SheetDimension {Reference = sheetDimensionReference};
-
-            cm.SetElement(XLWSContentManager.XLWSContents.SheetDimension, worksheetPart.Worksheet.SheetDimension);
-
-            if (worksheetPart.Worksheet.SheetViews == null)
-                worksheetPart.Worksheet.SheetViews = new SheetViews();
-
-            cm.SetElement(XLWSContentManager.XLWSContents.SheetViews, worksheetPart.Worksheet.SheetViews);
-
-            var sheetView = (SheetView)worksheetPart.Worksheet.SheetViews.FirstOrDefault();
-            if (sheetView == null)
-            {
-                sheetView = new SheetView {WorkbookViewId = 0U};
-                worksheetPart.Worksheet.SheetViews.AppendChild(sheetView);
-            }
-
-            if (xlWorksheet.TabSelected)
-                sheetView.TabSelected = true;
-            else
-                sheetView.TabSelected = null;
-
-
-            if (xlWorksheet.ShowFormulas)
-                sheetView.ShowFormulas = true;
-            else
-                sheetView.ShowFormulas = null;
-
-            if (xlWorksheet.ShowGridLines)
-                sheetView.ShowGridLines = null;
-            else
-                sheetView.ShowGridLines = false;
-
-            if (xlWorksheet.ShowOutlineSymbols)
-                sheetView.ShowOutlineSymbols = null;
-            else
-                sheetView.ShowOutlineSymbols = false;
-
-            if (xlWorksheet.ShowRowColHeaders)
-                sheetView.ShowRowColHeaders = null;
-            else
-                sheetView.ShowRowColHeaders = false;
-
-            if (xlWorksheet.ShowRuler)
-                sheetView.ShowRuler = null;
-            else
-                sheetView.ShowRuler = false;
-
-            if (xlWorksheet.ShowWhiteSpace)
-                sheetView.ShowWhiteSpace = null;
-            else
-                sheetView.ShowWhiteSpace = false;
-
-            if (xlWorksheet.ShowZeros)
-                sheetView.ShowZeros = null;
-            else
-                sheetView.ShowZeros = false;
-
-            if (xlWorksheet.RightToLeft)
-                sheetView.RightToLeft = true;
-            else
-                sheetView.RightToLeft = null;
-
-            if (xlWorksheet.SheetView.View == XLSheetViewOptions.Normal)
-                sheetView.View = null;
-            else
-                sheetView.View = xlWorksheet.SheetView.View.ToOpenXml();
-
-            var pane = sheetView.Elements<Pane>().FirstOrDefault();
-            if (pane == null)
-            {
-                pane = new Pane();
-                sheetView.AppendChild(pane);
-            }
-
-
-            pane.State = PaneStateValues.FrozenSplit;
-            Double hSplit = xlWorksheet.SheetView.SplitColumn;
-            Double ySplit = xlWorksheet.SheetView.SplitRow;
-
-
-            pane.HorizontalSplit = hSplit;
-            pane.VerticalSplit = ySplit;
-
-            pane.TopLeftCell = XLHelper.GetColumnLetterFromNumber(xlWorksheet.SheetView.SplitColumn + 1)
-                               + (xlWorksheet.SheetView.SplitRow + 1);
-
-            if (hSplit == 0 && ySplit == 0)
-                sheetView.RemoveAllChildren<Pane>();
-
-            if (xlWorksheet.SelectedRanges.Any() || xlWorksheet.ActiveCell != null)
-            {
-                sheetView.RemoveAllChildren<Selection>();
-
-                var firstSelection = xlWorksheet.SelectedRanges.FirstOrDefault();
-                var selection = new Selection();
-                if (xlWorksheet.ActiveCell != null)
-                    selection.ActiveCell = xlWorksheet.ActiveCell.Address.ToStringRelative(false);
-                else if (firstSelection != null)
-                    selection.ActiveCell = firstSelection.RangeAddress.FirstAddress.ToStringRelative(false);
-
-
-                var seqRef = new List<String> {selection.ActiveCell.Value};
-                seqRef.AddRange(xlWorksheet.SelectedRanges
-                    .Select(range => range.RangeAddress.ToStringRelative(false)));
-
-
-                selection.SequenceOfReferences = new ListValue<StringValue> {InnerText = String.Join(" ", seqRef.Distinct().ToArray())};
-
-                sheetView.Append(selection);
-            }
-
-            #endregion
-
-            var maxOutlineColumn = 0;
-            if (xlWorksheet.ColumnCount() > 0)
-                maxOutlineColumn = xlWorksheet.GetMaxColumnOutline();
-
-            var maxOutlineRow = 0;
-            if (xlWorksheet.RowCount() > 0)
-                maxOutlineRow = xlWorksheet.GetMaxRowOutline();
-
-            #region SheetFormatProperties
-
-            if (worksheetPart.Worksheet.SheetFormatProperties == null)
-                worksheetPart.Worksheet.SheetFormatProperties = new SheetFormatProperties();
-
-            cm.SetElement(XLWSContentManager.XLWSContents.SheetFormatProperties,
-                worksheetPart.Worksheet.SheetFormatProperties);
-
-            worksheetPart.Worksheet.SheetFormatProperties.DefaultRowHeight = xlWorksheet.RowHeight.SaveRound();
-
-            if (xlWorksheet.RowHeightChanged)
-                worksheetPart.Worksheet.SheetFormatProperties.CustomHeight = true;
-            else
-                worksheetPart.Worksheet.SheetFormatProperties.CustomHeight = null;
-
-
-            var worksheetColumnWidth = GetColumnWidth(xlWorksheet.ColumnWidth).SaveRound();
-            if (xlWorksheet.ColumnWidthChanged)
-                worksheetPart.Worksheet.SheetFormatProperties.DefaultColumnWidth = worksheetColumnWidth;
-            else
-                worksheetPart.Worksheet.SheetFormatProperties.DefaultColumnWidth = null;
-
-
-            if (maxOutlineColumn > 0)
-                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelColumn = (byte)maxOutlineColumn;
-            else
-                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelColumn = null;
-
-            if (maxOutlineRow > 0)
-                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelRow = (byte)maxOutlineRow;
-            else
-                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelRow = null;
-
-            #endregion
-
-            #region Columns
-
-            if (xlWorksheet.Internals.CellsCollection.Count == 0 &&
-                xlWorksheet.Internals.ColumnsCollection.Count == 0
-                && xlWorksheet.Style.Equals(DefaultStyle))
-                worksheetPart.Worksheet.RemoveAllChildren<Columns>();
-            else
-            {
-                if (!worksheetPart.Worksheet.Elements<Columns>().Any())
-                {
-                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.Columns);
-                    worksheetPart.Worksheet.InsertAfter(new Columns(), previousElement);
-                }
-
-                var columns = worksheetPart.Worksheet.Elements<Columns>().First();
-                cm.SetElement(XLWSContentManager.XLWSContents.Columns, columns);
-
-                var sheetColumnsByMin = columns.Elements<Column>().ToDictionary(c => c.Min.Value, c => c);
-                //Dictionary<UInt32, Column> sheetColumnsByMax = columns.Elements<Column>().ToDictionary(c => c.Max.Value, c => c);
-
-                Int32 minInColumnsCollection;
-                Int32 maxInColumnsCollection;
-                if (xlWorksheet.Internals.ColumnsCollection.Count > 0)
-                {
-                    minInColumnsCollection = xlWorksheet.Internals.ColumnsCollection.Keys.Min();
-                    maxInColumnsCollection = xlWorksheet.Internals.ColumnsCollection.Keys.Max();
-                }
-                else
-                {
-                    minInColumnsCollection = 1;
-                    maxInColumnsCollection = 0;
-                }
-
-                var worksheetStyleId = context.SharedStyles[xlWorksheet.GetStyleId()].StyleId;
-                if (minInColumnsCollection > 1)
-                {
-                    UInt32Value min = 1;
-                    UInt32Value max = (UInt32)(minInColumnsCollection - 1);
-
-
-                    for (var co = min; co <= max; co++)
-                    {
-                        var column = new Column
-                        {
-                            Min = co,
-                            Max = co,
-                            Style = worksheetStyleId,
-                            Width = worksheetColumnWidth,
-                            CustomWidth = true
-                        };
-
-                        UpdateColumn(column, columns, sheetColumnsByMin); //, sheetColumnsByMax);
-                    }
-                }
-
-                for (var co = minInColumnsCollection; co <= maxInColumnsCollection; co++)
-                {
-                    UInt32 styleId;
-                    Double columnWidth;
-                    var isHidden = false;
-                    var collapsed = false;
-                    var outlineLevel = 0;
-                    if (xlWorksheet.Internals.ColumnsCollection.ContainsKey(co))
-                    {
-                        styleId = context.SharedStyles[xlWorksheet.Internals.ColumnsCollection[co].GetStyleId()].StyleId;
-                        columnWidth = GetColumnWidth(xlWorksheet.Internals.ColumnsCollection[co].Width).SaveRound();
-                        isHidden = xlWorksheet.Internals.ColumnsCollection[co].IsHidden;
-                        collapsed = xlWorksheet.Internals.ColumnsCollection[co].Collapsed;
-                        outlineLevel = xlWorksheet.Internals.ColumnsCollection[co].OutlineLevel;
-                    }
-                    else
-                    {
-                        styleId = context.SharedStyles[xlWorksheet.GetStyleId()].StyleId;
-                        columnWidth = worksheetColumnWidth;
-                    }
-
-                    var column = new Column
-                    {
-                        Min = (UInt32)co,
-                        Max = (UInt32)co,
-                        Style = styleId,
-                        Width = columnWidth,
-                        CustomWidth = true
-                    };
-
-                    if (isHidden)
-                        column.Hidden = true;
-                    if (collapsed)
-                        column.Collapsed = true;
-                    if (outlineLevel > 0)
-                        column.OutlineLevel = (byte)outlineLevel;
-
-                    UpdateColumn(column, columns, sheetColumnsByMin); //, sheetColumnsByMax);
-                }
-
-                var collection = maxInColumnsCollection;
-                foreach (
-                    var col in
-                        columns.Elements<Column>().Where(c => c.Min > (UInt32)(collection)).OrderBy(
-                            c => c.Min.Value))
-                {
-                    col.Style = worksheetStyleId;
-                    col.Width = worksheetColumnWidth;
-                    col.CustomWidth = true;
-
-                    if ((Int32)col.Max.Value > maxInColumnsCollection)
-                        maxInColumnsCollection = (Int32)col.Max.Value;
-                }
-
-                if (maxInColumnsCollection < XLHelper.MaxColumnNumber && !xlWorksheet.Style.Equals(DefaultStyle))
-                {
-                    var column = new Column
-                    {
-                        Min = (UInt32)(maxInColumnsCollection + 1),
-                        Max = (UInt32)(XLHelper.MaxColumnNumber),
-                        Style = worksheetStyleId,
-                        Width = worksheetColumnWidth,
-                        CustomWidth = true
-                    };
-                    columns.AppendChild(column);
-                }
-
-                CollapseColumns(columns, sheetColumnsByMin);
-
-                if (!columns.Any())
-                {
-                    worksheetPart.Worksheet.RemoveAllChildren<Columns>();
-                    cm.SetElement(XLWSContentManager.XLWSContents.Columns, null);
-                }
-            }
-
-            #endregion
-
-            #region SheetData
-
-            if (!worksheetPart.Worksheet.Elements<SheetData>().Any())
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.SheetData);
-                worksheetPart.Worksheet.InsertAfter(new SheetData(), previousElement);
-            }
-
-            var sheetData = worksheetPart.Worksheet.Elements<SheetData>().First();
-            cm.SetElement(XLWSContentManager.XLWSContents.SheetData, sheetData);
-
-            var lastRow = 0;
-            var sheetDataRows =
-                sheetData.Elements<Row>().ToDictionary(r => r.RowIndex == null ? ++lastRow : (Int32)r.RowIndex.Value,
-                    r => r);
-            foreach (
-                var r in
-                    xlWorksheet.Internals.RowsCollection.Deleted.Where(r => sheetDataRows.ContainsKey(r.Key)))
-            {
-                sheetData.RemoveChild(sheetDataRows[r.Key]);
-                sheetDataRows.Remove(r.Key);
-                xlWorksheet.Internals.CellsCollection.deleted.Remove(r.Key);
-            }
-
-            var distinctRows = xlWorksheet.Internals.CellsCollection.RowsCollection.Keys.Union(xlWorksheet.Internals.RowsCollection.Keys);
-            var noRows = (sheetData.Elements<Row>().FirstOrDefault() == null);
-            foreach (var distinctRow in distinctRows.OrderBy(r => r))
-            {
-                Row row;
-                if (sheetDataRows.ContainsKey(distinctRow))
-                    row = sheetDataRows[distinctRow];
-                else
-                {
-                    row = new Row {RowIndex = (UInt32)distinctRow};
-                    if (noRows)
-                    {
-                        sheetData.AppendChild(row);
-                        noRows = false;
-                    }
-                    else
-                    {
-                        if (sheetDataRows.Any(r => r.Key > row.RowIndex.Value))
-                        {
-                            var minRow = sheetDataRows.Where(r => r.Key > (Int32)row.RowIndex.Value).Min(r => r.Key);
-                            var rowBeforeInsert = sheetDataRows[minRow];
-                            sheetData.InsertBefore(row, rowBeforeInsert);
-                        }
-                        else
-                            sheetData.AppendChild(row);
-                    }
-                }
-
-                if (maxColumn > 0)
-                    row.Spans = new ListValue<StringValue> {InnerText = "1:" + maxColumn.ToInvariantString()};
-
-                row.Height = null;
-                row.CustomHeight = null;
-                row.Hidden = null;
-                row.StyleIndex = null;
-                row.CustomFormat = null;
-                row.Collapsed = null;
-                if (xlWorksheet.Internals.RowsCollection.ContainsKey(distinctRow))
-                {
-                    var thisRow = xlWorksheet.Internals.RowsCollection[distinctRow];
-                    if (thisRow.HeightChanged)
-                    {
-                        row.Height = thisRow.Height.SaveRound();
-                        row.CustomHeight = true;
-                        row.CustomFormat = true;
-                    }
-
-                    if (thisRow.GetStyleId() != xlWorksheet.GetStyleId())
-                    {
-                        row.StyleIndex = context.SharedStyles[thisRow.GetStyleId()].StyleId;
-                        row.CustomFormat = true;
-                    }
-
-                    if (thisRow.IsHidden)
-                        row.Hidden = true;
-                    if (thisRow.Collapsed)
-                        row.Collapsed = true;
-                    if (thisRow.OutlineLevel > 0)
-                        row.OutlineLevel = (byte)thisRow.OutlineLevel;
-                }
-
-                var lastCell = 0;
-                var cellsByReference = row.Elements<Cell>().ToDictionary(c => c.CellReference == null
-                    ? XLHelper.GetColumnLetterFromNumber(
-                        ++lastCell) + distinctRow
-                    : c.CellReference.Value, c => c);
-
-                foreach (var kpDel in xlWorksheet.Internals.CellsCollection.deleted.ToList())
-                {
-                    foreach (var delCo in kpDel.Value.ToList())
-                    {
-                        var key = XLHelper.GetColumnLetterFromNumber(delCo) + kpDel.Key.ToInvariantString();
-                        if (!cellsByReference.ContainsKey(key)) continue;
-                        row.RemoveChild(cellsByReference[key]);
-                        kpDel.Value.Remove(delCo);
-                    }
-                    if (kpDel.Value.Count == 0)
-                        xlWorksheet.Internals.CellsCollection.deleted.Remove(kpDel.Key);
-                }
-
-
-                if (!xlWorksheet.Internals.CellsCollection.RowsCollection.ContainsKey(distinctRow)) continue;
-
-                var isNewRow = !row.Elements<Cell>().Any();
-                lastCell = 0;
-                var mRows = row.Elements<Cell>().ToDictionary(c => XLHelper.GetColumnNumberFromAddress(c.CellReference == null
-                    ? (XLHelper.GetColumnLetterFromNumber(++lastCell) + distinctRow) : c.CellReference.Value), c => c);
-                foreach (var opCell in xlWorksheet.Internals.CellsCollection.RowsCollection[distinctRow].Values
-                    .OrderBy(c => c.Address.ColumnNumber)
-                    .Select(c => c))
-                {
-                    var styleId = context.SharedStyles[opCell.GetStyleId()].StyleId;
-
-                    var dataType = opCell.DataType;
-                    var cellReference = (opCell.Address).GetTrimmedAddress();
-
-                    var isEmpty = opCell.IsEmpty(true);
-
-                    Cell cell = null;
-                    if (cellsByReference.ContainsKey(cellReference))
-                    {
-                        cell = cellsByReference[cellReference];
-                        if (isEmpty)
-                        {
-                            cell.Remove();
-                        }
-                    }
-
-                    if (!isEmpty)
-                    {
-                        if (cell == null)
-                        {
-                            cell = new Cell();
-                            cell.CellReference = new StringValue(cellReference);
-
-                            if (isNewRow)
-                                row.AppendChild(cell);
-                            else
-                            {
-                                var newColumn = XLHelper.GetColumnNumberFromAddress(cellReference);
-
-                                Cell cellBeforeInsert = null;
-                                int[] lastCo = { Int32.MaxValue };
-                                foreach (var c in mRows.Where(kp => kp.Key > newColumn).Where(c => lastCo[0] > c.Key))
-                                {
-                                    cellBeforeInsert = c.Value;
-                                    lastCo[0] = c.Key;
-                                }
-                                if (cellBeforeInsert == null)
-                                    row.AppendChild(cell);
-                                else
-                                    row.InsertBefore(cell, cellBeforeInsert);
-                            }
-                        }
-
-                        cell.StyleIndex = styleId;
-                        var formula = opCell.FormulaA1;
-                        if (opCell.HasFormula)
-                        {
-                            if (formula.StartsWith("{"))
-                            {
-                                formula = formula.Substring(1, formula.Length - 2);
-                                var f = new CellFormula { FormulaType = CellFormulaValues.Array };
-
-                                if (opCell.FormulaReference == null)
-                                    opCell.FormulaReference = opCell.AsRange().RangeAddress;
-                                if (opCell.FormulaReference.FirstAddress.Equals(opCell.Address))
-                                {
-                                    f.Text = formula;
-                                    f.Reference = opCell.FormulaReference.ToStringRelative();
-                                }
-
-                                cell.CellFormula = f;
-                            }
-                            else
-                            {
-                                cell.CellFormula = new CellFormula();
-                                cell.CellFormula.Text = formula;
-                            }
-
-                            cell.CellValue = null;
-                        }
-                        else
-                        {
-                            cell.CellFormula = null;
-
-                            cell.DataType = opCell.DataType == XLCellValues.DateTime ? null : GetCellValue(opCell);
-
-                            if (dataType == XLCellValues.Text)
-                            {
-                                if (opCell.InnerText.Length == 0)
-                                    cell.CellValue = null;
-                                else
-                                {
-                                    if (opCell.ShareString)
-                                    {
-                                        var cellValue = new CellValue();
-                                        cellValue.Text = opCell.SharedStringId.ToString();
-                                        cell.CellValue = cellValue;
-                                    }
-                                    else
-                                    {
-                                        var text = opCell.GetString();
-                                        var t = new Text(text);
-                                        if (text.PreserveSpaces())
-                                            t.Space = SpaceProcessingModeValues.Preserve;
-
-                                        cell.InlineString = new InlineString { Text = t };
-                                    }
-                                }
-                            }
-                            else if (dataType == XLCellValues.TimeSpan)
-                            {
-                                var timeSpan = opCell.GetTimeSpan();
-                                var cellValue = new CellValue();
-                                cellValue.Text =
-                                    XLCell.BaseDate.Add(timeSpan).ToOADate().ToString(CultureInfo.InvariantCulture);
-                                cell.CellValue = cellValue;
-                            }
-                            else if (dataType == XLCellValues.DateTime || dataType == XLCellValues.Number)
-                            {
-                                if (!XLHelper.IsNullOrWhiteSpace(opCell.InnerText))
-                                {
-                                    var cellValue = new CellValue();
-                                    cellValue.Text = Double.Parse(opCell.InnerText).ToString(CultureInfo.InvariantCulture);
-                                    cell.CellValue = cellValue;
-                                }
-                            }
-                            else
-                            {
-                                var cellValue = new CellValue();
-                                cellValue.Text = opCell.InnerText;
-                                cell.CellValue = cellValue;
-                            }
-                        }
-                    }
-                }
-                xlWorksheet.Internals.CellsCollection.deleted.Remove(distinctRow);
-            }
-            foreach (
-                var r in
-                    xlWorksheet.Internals.CellsCollection.deleted.Keys.Where(
-                        sheetDataRows.ContainsKey))
-            {
-                sheetData.RemoveChild(sheetDataRows[r]);
-                sheetDataRows.Remove(r);
-            }
-
-            #endregion
-
-            #region SheetProtection
-
-            if (xlWorksheet.Protection.Protected)
-            {
-                if (!worksheetPart.Worksheet.Elements<SheetProtection>().Any())
-                {
-                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.SheetProtection);
-                    worksheetPart.Worksheet.InsertAfter(new SheetProtection(), previousElement);
-                }
-
-                var sheetProtection = worksheetPart.Worksheet.Elements<SheetProtection>().First();
-                cm.SetElement(XLWSContentManager.XLWSContents.SheetProtection, sheetProtection);
-
-                var protection = xlWorksheet.Protection;
-                sheetProtection.Sheet = protection.Protected;
-                if (!XLHelper.IsNullOrWhiteSpace(protection.PasswordHash))
-                    sheetProtection.Password = protection.PasswordHash;
-                sheetProtection.FormatCells = GetBooleanValue(!protection.FormatCells, true);
-                sheetProtection.FormatColumns = GetBooleanValue(!protection.FormatColumns, true);
-                sheetProtection.FormatRows = GetBooleanValue(!protection.FormatRows, true);
-                sheetProtection.InsertColumns = GetBooleanValue(!protection.InsertColumns, true);
-                sheetProtection.InsertHyperlinks = GetBooleanValue(!protection.InsertHyperlinks, true);
-                sheetProtection.InsertRows = GetBooleanValue(!protection.InsertRows, true);
-                sheetProtection.DeleteColumns = GetBooleanValue(!protection.DeleteColumns, true);
-                sheetProtection.DeleteRows = GetBooleanValue(!protection.DeleteRows, true);
-                sheetProtection.AutoFilter = GetBooleanValue(!protection.AutoFilter, true);
-                sheetProtection.PivotTables = GetBooleanValue(!protection.PivotTables, true);
-                sheetProtection.Sort = GetBooleanValue(!protection.Sort, true);
-                sheetProtection.SelectLockedCells = GetBooleanValue(!protection.SelectLockedCells, false);
-                sheetProtection.SelectUnlockedCells = GetBooleanValue(!protection.SelectUnlockedCells, false);
-            }
-            else
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<SheetProtection>();
-                cm.SetElement(XLWSContentManager.XLWSContents.SheetProtection, null);
-            }
-
-            #endregion
-
-            #region AutoFilter
-
-            worksheetPart.Worksheet.RemoveAllChildren<AutoFilter>();
-            if (xlWorksheet.AutoFilter.Enabled)
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.AutoFilter);
-                worksheetPart.Worksheet.InsertAfter(new AutoFilter(), previousElement);
-
-
-                var autoFilter = worksheetPart.Worksheet.Elements<AutoFilter>().First();
-                cm.SetElement(XLWSContentManager.XLWSContents.AutoFilter, autoFilter);
-
-                PopulateAutoFilter(xlWorksheet.AutoFilter, autoFilter);
-            }
-            else
-            {
-                cm.SetElement(XLWSContentManager.XLWSContents.AutoFilter, null);
-            }
-
-            #endregion
-
-            #region MergeCells
-
-            if ((xlWorksheet).Internals.MergedRanges.Any())
-            {
-                if (!worksheetPart.Worksheet.Elements<MergeCells>().Any())
-                {
-                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.MergeCells);
-                    worksheetPart.Worksheet.InsertAfter(new MergeCells(), previousElement);
-                }
-
-                var mergeCells = worksheetPart.Worksheet.Elements<MergeCells>().First();
-                cm.SetElement(XLWSContentManager.XLWSContents.MergeCells, mergeCells);
-                mergeCells.RemoveAllChildren<MergeCell>();
-
-                foreach (var mergeCell in (xlWorksheet).Internals.MergedRanges.Select(
-                    m => m.RangeAddress.FirstAddress.ToString() + ":" + m.RangeAddress.LastAddress.ToString()).Select(
-                        merged => new MergeCell {Reference = merged}))
-                    mergeCells.AppendChild(mergeCell);
-
-                mergeCells.Count = (UInt32)mergeCells.Count();
-            }
-            else
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<MergeCells>();
-                cm.SetElement(XLWSContentManager.XLWSContents.MergeCells, null);
-            }
-
-            #endregion
-
-            #region Conditional Formatting
-
-            if (!xlWorksheet.ConditionalFormats.Any())
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<ConditionalFormatting>();
-                cm.SetElement(XLWSContentManager.XLWSContents.ConditionalFormatting, null);
-            }
-            else
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<ConditionalFormatting>();
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.ConditionalFormatting);
-
-                var priority = 0;
-                foreach (var cfGroup in xlWorksheet.ConditionalFormats
-                    .GroupBy(
-                        c => c.Range.RangeAddress.ToStringRelative(false),
-                        c => c,
-                        (key, g) => new { RangeId = key, CfList = g.ToList() }
-                    )
-                    )
-                {
-                    
-                    priority++;
-                    var conditionalFormatting = new ConditionalFormatting
-                    {
-                        SequenceOfReferences =
-                            new ListValue<StringValue> { InnerText = cfGroup.RangeId }
-                    };
-                    foreach(var cf in cfGroup.CfList)
-                    {
-                        conditionalFormatting.Append(XLCFConverters.Convert(cf, priority, context));
-                    }
-                    worksheetPart.Worksheet.InsertAfter(conditionalFormatting, previousElement);
-                    previousElement = conditionalFormatting;
-                    cm.SetElement(XLWSContentManager.XLWSContents.ConditionalFormatting, conditionalFormatting);                    
-                }
-            }
-
-            #endregion
-
-            #region DataValidations
-
-            if (!xlWorksheet.DataValidations.Any(d => d.IsDirty()))
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<DataValidations>();
-                cm.SetElement(XLWSContentManager.XLWSContents.DataValidations, null);
-            }
-            else
-            {
-                if (!worksheetPart.Worksheet.Elements<DataValidations>().Any())
-                {
-                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.DataValidations);
-                    worksheetPart.Worksheet.InsertAfter(new DataValidations(), previousElement);
-                }
-
-                var dataValidations = worksheetPart.Worksheet.Elements<DataValidations>().First();
-                cm.SetElement(XLWSContentManager.XLWSContents.DataValidations, dataValidations);
-                dataValidations.RemoveAllChildren<DataValidation>();
-                foreach (var dv in xlWorksheet.DataValidations)
-                {
-                    var sequence = dv.Ranges.Aggregate(String.Empty, (current, r) => current + (r.RangeAddress + " "));
-
-                    if (sequence.Length > 0)
-                        sequence = sequence.Substring(0, sequence.Length - 1);
-
-                    var dataValidation = new DataValidation
-                    {
-                        AllowBlank = dv.IgnoreBlanks,
-                        Formula1 = new Formula1(dv.MinValue),
-                        Formula2 = new Formula2(dv.MaxValue),
-                        Type = dv.AllowedValues.ToOpenXml(),
-                        ShowErrorMessage = dv.ShowErrorMessage,
-                        Prompt = dv.InputMessage,
-                        PromptTitle = dv.InputTitle,
-                        ErrorTitle = dv.ErrorTitle,
-                        Error = dv.ErrorMessage,
-                        ShowDropDown = !dv.InCellDropdown,
-                        ShowInputMessage = dv.ShowInputMessage,
-                        ErrorStyle = dv.ErrorStyle.ToOpenXml(),
-                        Operator = dv.Operator.ToOpenXml(),
-                        SequenceOfReferences =
-                            new ListValue<StringValue> {InnerText = sequence}
-                    };
-
-                    dataValidations.AppendChild(dataValidation);
-                }
-                dataValidations.Count = (UInt32)xlWorksheet.DataValidations.Count();
-            }
-
-            #endregion
-
-            #region Hyperlinks
-
-            var relToRemove = worksheetPart.HyperlinkRelationships.ToList();
-            relToRemove.ForEach(worksheetPart.DeleteReferenceRelationship);
-            if (!xlWorksheet.Hyperlinks.Any())
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<Hyperlinks>();
-                cm.SetElement(XLWSContentManager.XLWSContents.Hyperlinks, null);
-            }
-            else
-            {
-                if (!worksheetPart.Worksheet.Elements<Hyperlinks>().Any())
-                {
-                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.Hyperlinks);
-                    worksheetPart.Worksheet.InsertAfter(new Hyperlinks(), previousElement);
-                }
-
-                var hyperlinks = worksheetPart.Worksheet.Elements<Hyperlinks>().First();
-                cm.SetElement(XLWSContentManager.XLWSContents.Hyperlinks, hyperlinks);
-                hyperlinks.RemoveAllChildren<Hyperlink>();
-                foreach (var hl in xlWorksheet.Hyperlinks)
-                {
-                    Hyperlink hyperlink;
-                    if (hl.IsExternal)
-                    {
-                        var rId = context.RelIdGenerator.GetNext(RelType.Workbook);
-                        hyperlink = new Hyperlink {Reference = hl.Cell.Address.ToString(), Id = rId};
-                        worksheetPart.AddHyperlinkRelationship(hl.ExternalAddress, true, rId);
-                    }
-                    else
-                    {
-                        hyperlink = new Hyperlink
-                        {
-                            Reference = hl.Cell.Address.ToString(),
-                            Location = hl.InternalAddress,
-                            Display = hl.Cell.GetFormattedString()
-                        };
-                    }
-                    if (!XLHelper.IsNullOrWhiteSpace(hl.Tooltip))
-                        hyperlink.Tooltip = hl.Tooltip;
-                    hyperlinks.AppendChild(hyperlink);
-                }
-            }
-
-            #endregion
-
-            #region PrintOptions
-
-            if (!worksheetPart.Worksheet.Elements<PrintOptions>().Any())
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.PrintOptions);
-                worksheetPart.Worksheet.InsertAfter(new PrintOptions(), previousElement);
-            }
-
-            var printOptions = worksheetPart.Worksheet.Elements<PrintOptions>().First();
-            cm.SetElement(XLWSContentManager.XLWSContents.PrintOptions, printOptions);
-
-            printOptions.HorizontalCentered = xlWorksheet.PageSetup.CenterHorizontally;
-            printOptions.VerticalCentered = xlWorksheet.PageSetup.CenterVertically;
-            printOptions.Headings = xlWorksheet.PageSetup.ShowRowAndColumnHeadings;
-            printOptions.GridLines = xlWorksheet.PageSetup.ShowGridlines;
-
-            #endregion
-
-            #region PageMargins
-
-            if (!worksheetPart.Worksheet.Elements<PageMargins>().Any())
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.PageMargins);
-                worksheetPart.Worksheet.InsertAfter(new PageMargins(), previousElement);
-            }
-
-            var pageMargins = worksheetPart.Worksheet.Elements<PageMargins>().First();
-            cm.SetElement(XLWSContentManager.XLWSContents.PageMargins, pageMargins);
-            pageMargins.Left = xlWorksheet.PageSetup.Margins.Left;
-            pageMargins.Right = xlWorksheet.PageSetup.Margins.Right;
-            pageMargins.Top = xlWorksheet.PageSetup.Margins.Top;
-            pageMargins.Bottom = xlWorksheet.PageSetup.Margins.Bottom;
-            pageMargins.Header = xlWorksheet.PageSetup.Margins.Header;
-            pageMargins.Footer = xlWorksheet.PageSetup.Margins.Footer;
-
-            #endregion
-
-            #region PageSetup
-
-            if (!worksheetPart.Worksheet.Elements<PageSetup>().Any())
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.PageSetup);
-                worksheetPart.Worksheet.InsertAfter(new PageSetup(), previousElement);
-            }
-
-            var pageSetup = worksheetPart.Worksheet.Elements<PageSetup>().First();
-            cm.SetElement(XLWSContentManager.XLWSContents.PageSetup, pageSetup);
-
-            pageSetup.Orientation = xlWorksheet.PageSetup.PageOrientation.ToOpenXml();
-            pageSetup.PaperSize = (UInt32)xlWorksheet.PageSetup.PaperSize;
-            pageSetup.BlackAndWhite = xlWorksheet.PageSetup.BlackAndWhite;
-            pageSetup.Draft = xlWorksheet.PageSetup.DraftQuality;
-            pageSetup.PageOrder = xlWorksheet.PageSetup.PageOrder.ToOpenXml();
-            pageSetup.CellComments = xlWorksheet.PageSetup.ShowComments.ToOpenXml();
-            pageSetup.Errors = xlWorksheet.PageSetup.PrintErrorValue.ToOpenXml();
-
-            if (xlWorksheet.PageSetup.FirstPageNumber > 0)
-            {
-                pageSetup.FirstPageNumber = (UInt32)xlWorksheet.PageSetup.FirstPageNumber;
-                pageSetup.UseFirstPageNumber = true;
-            }
-            else
-            {
-                pageSetup.FirstPageNumber = null;
-                pageSetup.UseFirstPageNumber = null;
-            }
-
-            if (xlWorksheet.PageSetup.HorizontalDpi > 0)
-                pageSetup.HorizontalDpi = (UInt32)xlWorksheet.PageSetup.HorizontalDpi;
-            else
-                pageSetup.HorizontalDpi = null;
-
-            if (xlWorksheet.PageSetup.VerticalDpi > 0)
-                pageSetup.VerticalDpi = (UInt32)xlWorksheet.PageSetup.VerticalDpi;
-            else
-                pageSetup.VerticalDpi = null;
-
-            if (xlWorksheet.PageSetup.Scale > 0)
-            {
-                pageSetup.Scale = (UInt32)xlWorksheet.PageSetup.Scale;
-                pageSetup.FitToWidth = null;
-                pageSetup.FitToHeight = null;
-            }
-            else
-            {
-                pageSetup.Scale = null;
-
-                if (xlWorksheet.PageSetup.PagesWide > 0)
-                    pageSetup.FitToWidth = (UInt32)xlWorksheet.PageSetup.PagesWide;
-                else
-                    pageSetup.FitToWidth = 0;
-
-                if (xlWorksheet.PageSetup.PagesTall > 0)
-                    pageSetup.FitToHeight = (UInt32)xlWorksheet.PageSetup.PagesTall;
-                else
-                    pageSetup.FitToHeight = 0;
-            }
-
-            #endregion
-
-            #region HeaderFooter
-
-            var headerFooter = worksheetPart.Worksheet.Elements<HeaderFooter>().FirstOrDefault();
-            if (headerFooter == null)
-                headerFooter = new HeaderFooter();
-            else
-                worksheetPart.Worksheet.RemoveAllChildren<HeaderFooter>();
-
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.HeaderFooter);
-                worksheetPart.Worksheet.InsertAfter(headerFooter, previousElement);
-                cm.SetElement(XLWSContentManager.XLWSContents.HeaderFooter, headerFooter);
-            }
-            if (((XLHeaderFooter)xlWorksheet.PageSetup.Header).Changed
-                || ((XLHeaderFooter)xlWorksheet.PageSetup.Footer).Changed)
-            {
-                //var headerFooter = worksheetPart.Worksheet.Elements<HeaderFooter>().First();
-
-                headerFooter.RemoveAllChildren();
-
-                headerFooter.ScaleWithDoc = xlWorksheet.PageSetup.ScaleHFWithDocument;
-                headerFooter.AlignWithMargins = xlWorksheet.PageSetup.AlignHFWithMargins;
-                headerFooter.DifferentFirst = xlWorksheet.PageSetup.DifferentFirstPageOnHF;
-                headerFooter.DifferentOddEven = xlWorksheet.PageSetup.DifferentOddEvenPagesOnHF;
-
-                var oddHeader = new OddHeader(xlWorksheet.PageSetup.Header.GetText(XLHFOccurrence.OddPages));
-                headerFooter.AppendChild(oddHeader);
-                var oddFooter = new OddFooter(xlWorksheet.PageSetup.Footer.GetText(XLHFOccurrence.OddPages));
-                headerFooter.AppendChild(oddFooter);
-
-                var evenHeader = new EvenHeader(xlWorksheet.PageSetup.Header.GetText(XLHFOccurrence.EvenPages));
-                headerFooter.AppendChild(evenHeader);
-                var evenFooter = new EvenFooter(xlWorksheet.PageSetup.Footer.GetText(XLHFOccurrence.EvenPages));
-                headerFooter.AppendChild(evenFooter);
-
-                var firstHeader = new FirstHeader(xlWorksheet.PageSetup.Header.GetText(XLHFOccurrence.FirstPage));
-                headerFooter.AppendChild(firstHeader);
-                var firstFooter = new FirstFooter(xlWorksheet.PageSetup.Footer.GetText(XLHFOccurrence.FirstPage));
-                headerFooter.AppendChild(firstFooter);
-            }
-
-            #endregion
-
-            #region RowBreaks
-
-            if (!worksheetPart.Worksheet.Elements<RowBreaks>().Any())
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.RowBreaks);
-                worksheetPart.Worksheet.InsertAfter(new RowBreaks(), previousElement);
-            }
-
-            var rowBreaks = worksheetPart.Worksheet.Elements<RowBreaks>().First();
-
-            var rowBreakCount = xlWorksheet.PageSetup.RowBreaks.Count;
-            if (rowBreakCount > 0)
-            {
-                rowBreaks.Count = (UInt32)rowBreakCount;
-                rowBreaks.ManualBreakCount = (UInt32)rowBreakCount;
-                var lastRowNum = (UInt32)xlWorksheet.RangeAddress.LastAddress.RowNumber;
-                foreach (var break1 in xlWorksheet.PageSetup.RowBreaks.Select(rb => new Break
-                {
-                    Id = (UInt32)rb,
-                    Max = lastRowNum,
-                    ManualPageBreak = true
-                }))
-                    rowBreaks.AppendChild(break1);
-                cm.SetElement(XLWSContentManager.XLWSContents.RowBreaks, rowBreaks);
-            }
-            else
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<RowBreaks>();
-                cm.SetElement(XLWSContentManager.XLWSContents.RowBreaks, null);
-            }
-
-            #endregion
-
-            #region ColumnBreaks
-
-            if (!worksheetPart.Worksheet.Elements<ColumnBreaks>().Any())
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.ColumnBreaks);
-                worksheetPart.Worksheet.InsertAfter(new ColumnBreaks(), previousElement);
-            }
-
-            var columnBreaks = worksheetPart.Worksheet.Elements<ColumnBreaks>().First();
-
-            var columnBreakCount = xlWorksheet.PageSetup.ColumnBreaks.Count;
-            if (columnBreakCount > 0)
-            {
-                columnBreaks.Count = (UInt32)columnBreakCount;
-                columnBreaks.ManualBreakCount = (UInt32)columnBreakCount;
-                var maxColumnNumber = (UInt32)xlWorksheet.RangeAddress.LastAddress.ColumnNumber;
-                foreach (var break1 in xlWorksheet.PageSetup.ColumnBreaks.Select(cb => new Break
-                {
-                    Id = (UInt32)cb,
-                    Max = maxColumnNumber,
-                    ManualPageBreak = true
-                }))
-                    columnBreaks.AppendChild(break1);
-                cm.SetElement(XLWSContentManager.XLWSContents.ColumnBreaks, columnBreaks);
-            }
-            else
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<ColumnBreaks>();
-                cm.SetElement(XLWSContentManager.XLWSContents.ColumnBreaks, null);
-            }
-
-            #endregion
-
-            #region Drawings
-
-            //worksheetPart.Worksheet.RemoveAllChildren<Drawing>();
-            //{
-            //    OpenXmlElement previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.Drawing);
-            //    worksheetPart.Worksheet.InsertAfter(new Drawing() { Id = String.Format("rId{0}", 1) }, previousElement);
-            //}
-
-            //Drawing drawing = worksheetPart.Worksheet.Elements<Drawing>().First();
-            //cm.SetElement(XLWSContentManager.XLWSContents.Drawing, drawing);
-
-            #endregion
-
-            #region Tables
-
-            worksheetPart.Worksheet.RemoveAllChildren<TableParts>();
-            {
-                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.TableParts);
-                worksheetPart.Worksheet.InsertAfter(new TableParts(), previousElement);
-            }
-
-            var tableParts = worksheetPart.Worksheet.Elements<TableParts>().First();
-            cm.SetElement(XLWSContentManager.XLWSContents.TableParts, tableParts);
-
-            tableParts.Count = (UInt32)xlWorksheet.Tables.Count();
-            foreach (
-                var tablePart in
-                    from XLTable xlTable in xlWorksheet.Tables select new TablePart {Id = xlTable.RelId})
-                tableParts.AppendChild(tablePart);
-
-            #endregion
-
-            #region LegacyDrawing
-
-            if (xlWorksheet.LegacyDrawingIsNew)
-            {
-                worksheetPart.Worksheet.RemoveAllChildren<LegacyDrawing>();
-                {
-                    if (!XLHelper.IsNullOrWhiteSpace(xlWorksheet.LegacyDrawingId))
-                    {
-                        var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.LegacyDrawing);
-                        worksheetPart.Worksheet.InsertAfter(new LegacyDrawing {Id = xlWorksheet.LegacyDrawingId},
-                            previousElement);
-                    }
-                }
-            }
-
-            #endregion
-
-            #region LegacyDrawingHeaderFooter
-
-            //LegacyDrawingHeaderFooter legacyHeaderFooter = worksheetPart.Worksheet.Elements<LegacyDrawingHeaderFooter>().FirstOrDefault();
-            //if (legacyHeaderFooter != null)
-            //{
-            //    worksheetPart.Worksheet.RemoveAllChildren<LegacyDrawingHeaderFooter>();
-            //    {
-            //            var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.LegacyDrawingHeaderFooter);
-            //            worksheetPart.Worksheet.InsertAfter(new LegacyDrawingHeaderFooter { Id = xlWorksheet.LegacyDrawingId },
-            //                                                previousElement);
-            //    }
-            //}
-
-            #endregion
-        }
-
-        private static void PopulateAutoFilter(XLAutoFilter xlAutoFilter, AutoFilter autoFilter)
-        {
-            var filterRange = xlAutoFilter.Range;
-            autoFilter.Reference = filterRange.RangeAddress.ToString();
-
-            foreach (var kp in xlAutoFilter.Filters)
-            {
-                var filterColumn = new FilterColumn {ColumnId = (UInt32)kp.Key - 1};
-                var xlFilterColumn = xlAutoFilter.Column(kp.Key);
-                var filterType = xlFilterColumn.FilterType;
-                if (filterType == XLFilterType.Custom)
-                {
-                    var customFilters = new CustomFilters();
-                    foreach (var filter in kp.Value)
-                    {
-                        var customFilter = new CustomFilter {Val = filter.Value.ToString()};
-
-                        if (filter.Operator != XLFilterOperator.Equal)
-                            customFilter.Operator = filter.Operator.ToOpenXml();
-
-                        if (filter.Connector == XLConnector.And)
-                            customFilters.And = true;
-
-                        customFilters.Append(customFilter);
-                    }
-                    filterColumn.Append(customFilters);
-                }
-                else if (filterType == XLFilterType.TopBottom)
-                {
-                    var top101 = new Top10 {Val = (double)xlFilterColumn.TopBottomValue};
-                    if (xlFilterColumn.TopBottomType == XLTopBottomType.Percent)
-                        top101.Percent = true;
-                    if (xlFilterColumn.TopBottomPart == XLTopBottomPart.Bottom)
-                        top101.Top = false;
-
-                    filterColumn.Append(top101);
-                }
-                else if (filterType == XLFilterType.Dynamic)
-                {
-                    var dynamicFilter = new DynamicFilter
-                    {Type = xlFilterColumn.DynamicType.ToOpenXml(), Val = xlFilterColumn.DynamicValue};
-                    filterColumn.Append(dynamicFilter);
-                }
-                else
-                {
-                    var filters = new Filters();
-                    foreach (var filter in kp.Value)
-                    {
-                        filters.Append(new Filter {Val = filter.Value.ToString()});
-                    }
-
-                    filterColumn.Append(filters);
-                }
-                autoFilter.Append(filterColumn);
-            }
-
-
-            if (xlAutoFilter.Sorted)
-            {
-                var sortState = new SortState
-                {
-                    Reference =
-                        filterRange.Range(filterRange.FirstCell().CellBelow(), filterRange.LastCell()).RangeAddress.
-                            ToString()
-                };
-                var sortCondition = new SortCondition
-                {
-                    Reference =
-                        filterRange.Range(1, xlAutoFilter.SortColumn, filterRange.RowCount(),
-                            xlAutoFilter.SortColumn).RangeAddress.ToString()
-                };
-                if (xlAutoFilter.SortOrder == XLSortOrder.Descending)
-                    sortCondition.Descending = true;
-
-                sortState.Append(sortCondition);
-                autoFilter.Append(sortState);
-            }
-        }
-
-        private static BooleanValue GetBooleanValue(bool value, bool defaultValue)
-        {
-            return value == defaultValue ? null : new BooleanValue(value);
-        }
-
-        private static void CollapseColumns(Columns columns, Dictionary<uint, Column> sheetColumns)
-        {
-            UInt32 lastMin = 1;
-            var count = sheetColumns.Count;
-            var arr = sheetColumns.OrderBy(kp => kp.Key).ToArray();
-            // sheetColumns[kp.Key + 1]
-            //Int32 i = 0;
-            //foreach (KeyValuePair<uint, Column> kp in arr
-            //    //.Where(kp => !(kp.Key < count && ColumnsAreEqual(kp.Value, )))
-            //    )
-            for (var i = 0; i < count; i++)
-            {
-                var kp = arr[i];
-                if (i + 1 != count && ColumnsAreEqual(kp.Value, arr[i + 1].Value)) continue;
-
-                var newColumn = (Column)kp.Value.CloneNode(true);
-                newColumn.Min = lastMin;
-                var newColumnMax = newColumn.Max.Value;
-                var columnsToRemove =
-                    columns.Elements<Column>().Where(co => co.Min >= lastMin && co.Max <= newColumnMax).
-                        Select(co => co).ToList();
-                columnsToRemove.ForEach(c => columns.RemoveChild(c));
-
-                columns.AppendChild(newColumn);
-                lastMin = kp.Key + 1;
-                //i++;
-            }
-        }
-
-        private static double GetColumnWidth(double columnWidth)
-        {
-            var retVal = columnWidth + ColumnWidthOffset;
-            return retVal > 0 ? retVal : 0;
-        }
-
-        private static void UpdateColumn(Column column, Columns columns, Dictionary<uint, Column> sheetColumnsByMin)
-        {
-            var co = column.Min.Value;
-            Column newColumn;
-            if (!sheetColumnsByMin.ContainsKey(co))
-            {
-                newColumn = (Column)column.CloneNode(true);
-                columns.AppendChild(newColumn);
-                sheetColumnsByMin.Add(co, newColumn);
-            }
-            else
-            {
-                var existingColumn = sheetColumnsByMin[column.Min.Value];
-                newColumn = (Column)existingColumn.CloneNode(true);
-                newColumn.Min = column.Min;
-                newColumn.Max = column.Max;
-                newColumn.Style = column.Style;
-                newColumn.Width = column.Width.SaveRound();
-                newColumn.CustomWidth = column.CustomWidth;
-
-                if (column.Hidden != null)
-                    newColumn.Hidden = true;
-                else
-                    newColumn.Hidden = null;
-
-                if (column.Collapsed != null)
-                    newColumn.Collapsed = true;
-                else
-                    newColumn.Collapsed = null;
-
-                if (column.OutlineLevel != null && column.OutlineLevel > 0)
-                    newColumn.OutlineLevel = (byte)column.OutlineLevel;
-                else
-                    newColumn.OutlineLevel = null;
-
-                sheetColumnsByMin.Remove(column.Min.Value);
-                if (existingColumn.Min + 1 > existingColumn.Max)
-                {
-                    //existingColumn.Min = existingColumn.Min + 1;
-                    //columns.InsertBefore(existingColumn, newColumn);
-                    //existingColumn.Remove();
-                    columns.RemoveChild(existingColumn);
-                    columns.AppendChild(newColumn);
-                    sheetColumnsByMin.Add(newColumn.Min.Value, newColumn);
-                }
-                else
-                {
-                    //columns.InsertBefore(existingColumn, newColumn);
-                    columns.AppendChild(newColumn);
-                    sheetColumnsByMin.Add(newColumn.Min.Value, newColumn);
-                    existingColumn.Min = existingColumn.Min + 1;
-                    sheetColumnsByMin.Add(existingColumn.Min.Value, existingColumn);
-                }
-            }
-        }
-
-        private static bool ColumnsAreEqual(Column left, Column right)
-        {
-            return
-                ((left.Style == null && right.Style == null)
-                 || (left.Style != null && right.Style != null && left.Style.Value == right.Style.Value))
-                && ((left.Width == null && right.Width == null)
-                    || (left.Width != null && right.Width != null && left.Width.Value == right.Width.Value))
-                && ((left.Hidden == null && right.Hidden == null)
-                    || (left.Hidden != null && right.Hidden != null && left.Hidden.Value == right.Hidden.Value))
-                && ((left.Collapsed == null && right.Collapsed == null)
-                    ||
-                    (left.Collapsed != null && right.Collapsed != null && left.Collapsed.Value == right.Collapsed.Value))
-                && ((left.OutlineLevel == null && right.OutlineLevel == null)
-                    ||
-                    (left.OutlineLevel != null && right.OutlineLevel != null &&
-                     left.OutlineLevel.Value == right.OutlineLevel.Value));
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs
deleted file mode 100644
index b8018fa..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs
+++ /dev/null
@@ -1,1459 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using ClosedXML.Excel.CalcEngine;
-using ClosedXML.Excel.Misc;
-
-
-namespace ClosedXML.Excel
-{
-    internal class XLWorksheet : XLRangeBase, IXLWorksheet
-    {
-        #region Constants
-
-        #endregion
-
-        #region Events
-
-		public XLReentrantEnumerableSet<XLCallbackAction> RangeShiftedRows;
-		public XLReentrantEnumerableSet<XLCallbackAction> RangeShiftedColumns;
-
-        #endregion
-
-        #region Fields
-
-        private readonly Dictionary<Int32, Int32> _columnOutlineCount = new Dictionary<Int32, Int32>();
-        private readonly Dictionary<Int32, Int32> _rowOutlineCount = new Dictionary<Int32, Int32>();
-        internal Int32 ZOrder = 1;
-        private String _name;
-        internal Int32 _position;
-
-        private Double _rowHeight;
-        private Boolean _tabActive;
-        internal Boolean EventTrackingEnabled;
-        #endregion
-
-        #region Constructor
-
-        public XLWorksheet(String sheetName, XLWorkbook workbook)
-            : base(
-                new XLRangeAddress(
-                    new XLAddress(null, XLHelper.MinRowNumber, XLHelper.MinColumnNumber, false, false),
-                    new XLAddress(null, XLHelper.MaxRowNumber, XLHelper.MaxColumnNumber, false, false)))
-        {
-            EventTrackingEnabled = workbook.EventTracking == XLEventTracking.Enabled;
-
-			RangeShiftedRows = new XLReentrantEnumerableSet<XLCallbackAction>();
-			RangeShiftedColumns = new XLReentrantEnumerableSet<XLCallbackAction>();
-
-            RangeAddress.Worksheet = this;
-            RangeAddress.FirstAddress.Worksheet = this;
-            RangeAddress.LastAddress.Worksheet = this;
-
-            NamedRanges = new XLNamedRanges(workbook);
-            SheetView = new XLSheetView();
-            Tables = new XLTables();
-            Hyperlinks = new XLHyperlinks();
-            DataValidations = new XLDataValidations();
-            PivotTables = new XLPivotTables();
-            Protection = new XLSheetProtection();
-            AutoFilter = new XLAutoFilter();
-            ConditionalFormats = new XLConditionalFormats();
-            Workbook = workbook;
-            SetStyle(workbook.Style);
-            Internals = new XLWorksheetInternals(new XLCellsCollection(), new XLColumnsCollection(),
-                                                 new XLRowsCollection(), new XLRanges());
-            PageSetup = new XLPageSetup((XLPageSetup)workbook.PageOptions, this);
-            Outline = new XLOutline(workbook.Outline);
-            _columnWidth = workbook.ColumnWidth;
-            _rowHeight = workbook.RowHeight;
-            RowHeightChanged = Math.Abs(workbook.RowHeight - XLWorkbook.DefaultRowHeight) > XLHelper.Epsilon;
-			Name = sheetName;
-			SubscribeToShiftedRows((range, rowsShifted) => this.WorksheetRangeShiftedRows(range, rowsShifted));
-			SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
-            Charts = new XLCharts();
-            ShowFormulas = workbook.ShowFormulas;
-            ShowGridLines = workbook.ShowGridLines;
-            ShowOutlineSymbols = workbook.ShowOutlineSymbols;
-            ShowRowColHeaders = workbook.ShowRowColHeaders;
-            ShowRuler = workbook.ShowRuler;
-            ShowWhiteSpace = workbook.ShowWhiteSpace;
-            ShowZeros = workbook.ShowZeros;
-            RightToLeft = workbook.RightToLeft;
-            TabColor = XLColor.NoColor;
-            SelectedRanges = new XLRanges();
-
-            Author = workbook.Author;
-        }
-
-        #endregion
-
-        //private IXLStyle _style;
-        private const String InvalidNameChars = @":\/?*[]";
-        public string LegacyDrawingId;
-        public Boolean LegacyDrawingIsNew;
-        private Double _columnWidth;
-        public XLWorksheetInternals Internals { get; private set; }
-
-        public override IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return GetStyle();
-                foreach (XLCell c in Internals.CellsCollection.GetCells())
-                    yield return c.Style;
-                UpdatingStyle = false;
-            }
-        }
-
-        public override Boolean UpdatingStyle { get; set; }
-
-        public override IXLStyle InnerStyle
-        {
-            get { return GetStyle(); }
-            set { SetStyle(value); }
-        }
-
-        internal Boolean RowHeightChanged { get; set; }
-        internal Boolean ColumnWidthChanged { get; set; }
-
-        public Int32 SheetId { get; set; }
-        public String RelId { get; set; }
-        public XLDataValidations DataValidations { get; private set; }
-        public IXLCharts Charts { get; private set; }
-        public XLSheetProtection Protection { get; private set; }
-        public XLAutoFilter AutoFilter { get; private set; }
-
-        #region IXLWorksheet Members
-
-        public XLWorkbook Workbook { get; private set; }
-
-        public override IXLStyle Style
-        {
-            get
-            {
-                return GetStyle();
-            }
-            set
-            {
-                SetStyle(value);
-                foreach (XLCell cell in Internals.CellsCollection.GetCells())
-                    cell.Style = value;
-            }
-        }
-
-        public Double ColumnWidth
-        {
-            get { return _columnWidth; }
-            set
-            {
-                ColumnWidthChanged = true;
-                _columnWidth = value;
-            }
-        }
-
-        public Double RowHeight
-        {
-            get { return _rowHeight; }
-            set
-            {
-                RowHeightChanged = true;
-                _rowHeight = value;
-            }
-        }
-
-        public String Name
-        {
-            get { return _name; }
-            set
-            {
-                if (value.IndexOfAny(InvalidNameChars.ToCharArray()) != -1)
-                    throw new ArgumentException("Worksheet names cannot contain any of the following characters: " +
-                                                InvalidNameChars);
-
-                if (XLHelper.IsNullOrWhiteSpace(value))
-                    throw new ArgumentException("Worksheet names cannot be empty");
-
-                if (value.Length > 31)
-                    throw new ArgumentException("Worksheet names cannot be more than 31 characters");
-
-                Workbook.WorksheetsInternal.Rename(_name, value);
-                _name = value;
-            }
-        }
-
-        public Int32 Position
-        {
-            get { return _position; }
-            set
-            {
-                if (value > Workbook.WorksheetsInternal.Count + Workbook.UnsupportedSheets.Count + 1)
-                    throw new IndexOutOfRangeException("Index must be equal or less than the number of worksheets + 1.");
-
-                if (value < _position)
-                {
-                    Workbook.WorksheetsInternal
-                        .Where<XLWorksheet>(w => w.Position >= value && w.Position < _position)
-                        .ForEach(w => w._position += 1);
-                }
-
-                if (value > _position)
-                {
-                    Workbook.WorksheetsInternal
-                        .Where<XLWorksheet>(w => w.Position <= value && w.Position > _position)
-                        .ForEach(w => (w)._position -= 1);
-                }
-
-                _position = value;
-            }
-        }
-
-        public IXLPageSetup PageSetup { get; private set; }
-        public IXLOutline Outline { get; private set; }
-
-        IXLRow IXLWorksheet.FirstRowUsed()
-        {
-            return FirstRowUsed();
-        }
-
-        IXLRow IXLWorksheet.FirstRowUsed(Boolean includeFormats)
-        {
-            return FirstRowUsed(includeFormats);
-        }
-
-        IXLRow IXLWorksheet.LastRowUsed()
-        {
-            return LastRowUsed();
-        }
-
-        IXLRow IXLWorksheet.LastRowUsed(Boolean includeFormats)
-        {
-            return LastRowUsed(includeFormats);
-        }
-
-        IXLColumn IXLWorksheet.LastColumn()
-        {
-            return LastColumn();
-        }
-
-        IXLColumn IXLWorksheet.FirstColumn()
-        {
-            return FirstColumn();
-        }
-
-        IXLRow IXLWorksheet.FirstRow()
-        {
-            return FirstRow();
-        }
-
-        IXLRow IXLWorksheet.LastRow()
-        {
-            return LastRow();
-        }
-
-        IXLColumn IXLWorksheet.FirstColumnUsed()
-        {
-            return FirstColumnUsed();
-        }
-
-        IXLColumn IXLWorksheet.FirstColumnUsed(Boolean includeFormats)
-        {
-            return FirstColumnUsed(includeFormats);
-        }
-
-        IXLColumn IXLWorksheet.LastColumnUsed()
-        {
-            return LastColumnUsed();
-        }
-
-        IXLColumn IXLWorksheet.LastColumnUsed(Boolean includeFormats)
-        {
-            return LastColumnUsed(includeFormats);
-        }
-
-
-        public IXLColumns Columns()
-        {
-            var retVal = new XLColumns(this);
-            var columnList = new List<Int32>();
-
-            if (Internals.CellsCollection.Count > 0)
-                columnList.AddRange(Internals.CellsCollection.ColumnsUsed.Keys);
-
-            if (Internals.ColumnsCollection.Count > 0)
-                columnList.AddRange(Internals.ColumnsCollection.Keys.Where(c => !columnList.Contains(c)));
-
-            foreach (int c in columnList)
-                retVal.Add(Column(c));
-
-            return retVal;
-        }
-
-        public IXLColumns Columns(String columns)
-        {
-            var retVal = new XLColumns(null);
-            var columnPairs = columns.Split(',');
-            foreach (string tPair in columnPairs.Select(pair => pair.Trim()))
-            {
-                String firstColumn;
-                String lastColumn;
-                if (tPair.Contains(':') || tPair.Contains('-'))
-                {
-                    var columnRange = XLHelper.SplitRange(tPair);
-                    firstColumn = columnRange[0];
-                    lastColumn = columnRange[1];
-                }
-                else
-                {
-                    firstColumn = tPair;
-                    lastColumn = tPair;
-                }
-
-                Int32 tmp;
-                if (Int32.TryParse(firstColumn, out tmp))
-                {
-                    foreach (IXLColumn col in Columns(Int32.Parse(firstColumn), Int32.Parse(lastColumn)))
-                        retVal.Add((XLColumn)col);
-                }
-                else
-                {
-                    foreach (IXLColumn col in Columns(firstColumn, lastColumn))
-                        retVal.Add((XLColumn)col);
-                }
-            }
-            return retVal;
-        }
-
-        public IXLColumns Columns(String firstColumn, String lastColumn)
-        {
-            return Columns(XLHelper.GetColumnNumberFromLetter(firstColumn),
-                           XLHelper.GetColumnNumberFromLetter(lastColumn));
-        }
-
-        public IXLColumns Columns(Int32 firstColumn, Int32 lastColumn)
-        {
-            var retVal = new XLColumns(null);
-
-            for (int co = firstColumn; co <= lastColumn; co++)
-                retVal.Add(Column(co));
-            return retVal;
-        }
-
-        public IXLRows Rows()
-        {
-            var retVal = new XLRows(this);
-            var rowList = new List<Int32>();
-
-            if (Internals.CellsCollection.Count > 0)
-                rowList.AddRange(Internals.CellsCollection.RowsUsed.Keys);
-
-            if (Internals.RowsCollection.Count > 0)
-                rowList.AddRange(Internals.RowsCollection.Keys.Where(r => !rowList.Contains(r)));
-
-            foreach (int r in rowList)
-                retVal.Add(Row(r));
-
-            return retVal;
-        }
-
-        public IXLRows Rows(String rows)
-        {
-            var retVal = new XLRows(null);
-            var rowPairs = rows.Split(',');
-            foreach (string tPair in rowPairs.Select(pair => pair.Trim()))
-            {
-                String firstRow;
-                String lastRow;
-                if (tPair.Contains(':') || tPair.Contains('-'))
-                {
-                    var rowRange = XLHelper.SplitRange(tPair);
-                    firstRow = rowRange[0];
-                    lastRow = rowRange[1];
-                }
-                else
-                {
-                    firstRow = tPair;
-                    lastRow = tPair;
-                }
-                foreach (IXLRow row in Rows(Int32.Parse(firstRow), Int32.Parse(lastRow)))
-                    retVal.Add((XLRow)row);
-            }
-            return retVal;
-        }
-
-        public IXLRows Rows(Int32 firstRow, Int32 lastRow)
-        {
-            var retVal = new XLRows(null);
-
-            for (int ro = firstRow; ro <= lastRow; ro++)
-                retVal.Add(Row(ro));
-            return retVal;
-        }
-
-        IXLRow IXLWorksheet.Row(Int32 row)
-        {
-            return Row(row);
-        }
-
-        IXLColumn IXLWorksheet.Column(Int32 column)
-        {
-            return Column(column);
-        }
-
-        IXLColumn IXLWorksheet.Column(String column)
-        {
-            return Column(column);
-        }
-
-        IXLCell IXLWorksheet.Cell(int row, int column)
-        {
-            return Cell(row, column);
-        }
-
-        IXLCell IXLWorksheet.Cell(string cellAddressInRange)
-        {
-            return Cell(cellAddressInRange);
-        }
-
-        IXLCell IXLWorksheet.Cell(int row, string column)
-        {
-            return Cell(row, column);
-        }
-
-        IXLCell IXLWorksheet.Cell(IXLAddress cellAddressInRange)
-        {
-            return Cell(cellAddressInRange);
-        }
-
-        IXLRange IXLWorksheet.Range(IXLRangeAddress rangeAddress)
-        {
-            return Range(rangeAddress);
-        }
-
-        IXLRange IXLWorksheet.Range(string rangeAddress)
-        {
-            return Range(rangeAddress);
-        }
-
-        IXLRange IXLWorksheet.Range(IXLCell firstCell, IXLCell lastCell)
-        {
-            return Range(firstCell, lastCell);
-        }
-
-        IXLRange IXLWorksheet.Range(string firstCellAddress, string lastCellAddress)
-        {
-            return Range(firstCellAddress, lastCellAddress);
-        }
-
-        IXLRange IXLWorksheet.Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
-        {
-            return Range(firstCellAddress, lastCellAddress);
-        }
-
-        IXLRange IXLWorksheet.Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn)
-        {
-            return Range(firstCellRow, firstCellColumn, lastCellRow, lastCellColumn);
-        }
-
-        public IXLWorksheet CollapseRows()
-        {
-            Enumerable.Range(1, 8).ForEach(i => CollapseRows(i));
-            return this;
-        }
-
-        public IXLWorksheet CollapseColumns()
-        {
-            Enumerable.Range(1, 8).ForEach(i => CollapseColumns(i));
-            return this;
-        }
-
-        public IXLWorksheet ExpandRows()
-        {
-            Enumerable.Range(1, 8).ForEach(i => ExpandRows(i));
-            return this;
-        }
-
-        public IXLWorksheet ExpandColumns()
-        {
-            Enumerable.Range(1, 8).ForEach(i => ExpandRows(i));
-            return this;
-        }
-
-        public IXLWorksheet CollapseRows(Int32 outlineLevel)
-        {
-            if (outlineLevel < 1 || outlineLevel > 8)
-                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
-
-            Internals.RowsCollection.Values.Where(r => r.OutlineLevel == outlineLevel).ForEach(r => r.Collapse());
-            return this;
-        }
-
-        public IXLWorksheet CollapseColumns(Int32 outlineLevel)
-        {
-            if (outlineLevel < 1 || outlineLevel > 8)
-                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
-
-            Internals.ColumnsCollection.Values.Where(c => c.OutlineLevel == outlineLevel).ForEach(c => c.Collapse());
-            return this;
-        }
-
-        public IXLWorksheet ExpandRows(Int32 outlineLevel)
-        {
-            if (outlineLevel < 1 || outlineLevel > 8)
-                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
-
-            Internals.RowsCollection.Values.Where(r => r.OutlineLevel == outlineLevel).ForEach(r => r.Expand());
-            return this;
-        }
-
-        public IXLWorksheet ExpandColumns(Int32 outlineLevel)
-        {
-            if (outlineLevel < 1 || outlineLevel > 8)
-                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
-
-            Internals.ColumnsCollection.Values.Where(c => c.OutlineLevel == outlineLevel).ForEach(c => c.Expand());
-            return this;
-        }
-
-        public void Delete()
-        {
-            Workbook.WorksheetsInternal.Delete(Name);
-        }
-
-        public IXLNamedRanges NamedRanges { get; private set; }
-
-        public IXLNamedRange NamedRange(String rangeName)
-        {
-            return NamedRanges.NamedRange(rangeName);
-        }
-
-        public IXLSheetView SheetView { get; private set; }
-        public IXLTables Tables { get; private set; }
-
-        public IXLTable Table(Int32 index)
-        {
-            return Tables.Table(index);
-        }
-
-        public IXLTable Table(String name)
-        {
-            return Tables.Table(name);
-        }
-
-        public IXLWorksheet CopyTo(String newSheetName)
-        {
-            return CopyTo(Workbook, newSheetName, Workbook.WorksheetsInternal.Count + 1);
-        }
-
-        public IXLWorksheet CopyTo(String newSheetName, Int32 position)
-        {
-            return CopyTo(Workbook, newSheetName, position);
-        }
-
-        public IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName)
-        {
-            return CopyTo(workbook, newSheetName, workbook.WorksheetsInternal.Count + 1);
-        }
-
-        public IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName, Int32 position)
-        {
-            var targetSheet = (XLWorksheet)workbook.WorksheetsInternal.Add(newSheetName, position);
-            Internals.ColumnsCollection.ForEach(kp => targetSheet.Internals.ColumnsCollection.Add(kp.Key, new XLColumn(kp.Value)));
-            Internals.RowsCollection.ForEach(kp => targetSheet.Internals.RowsCollection.Add(kp.Key, new XLRow(kp.Value)));
-            Internals.CellsCollection.GetCells().ForEach(c => targetSheet.Cell(c.Address).CopyFrom(c, false));
-            DataValidations.ForEach(dv => targetSheet.DataValidations.Add(new XLDataValidation(dv)));
-            targetSheet.Visibility = Visibility;
-            targetSheet.ColumnWidth = ColumnWidth;
-            targetSheet.ColumnWidthChanged = ColumnWidthChanged;
-            targetSheet.RowHeight = RowHeight;
-            targetSheet.RowHeightChanged = RowHeightChanged;
-            targetSheet.SetStyle(Style);
-            targetSheet.PageSetup = new XLPageSetup((XLPageSetup)PageSetup, targetSheet);
-            (targetSheet.PageSetup.Header as XLHeaderFooter).Changed = true;
-            (targetSheet.PageSetup.Footer as XLHeaderFooter).Changed = true;
-            targetSheet.Outline = new XLOutline(Outline);
-            targetSheet.SheetView = new XLSheetView(SheetView);
-            Internals.MergedRanges.ForEach(
-                kp => targetSheet.Internals.MergedRanges.Add(targetSheet.Range(kp.RangeAddress.ToString())));
-
-            foreach (IXLNamedRange r in NamedRanges)
-            {
-                var ranges = new XLRanges();
-                r.Ranges.ForEach(ranges.Add);
-                targetSheet.NamedRanges.Add(r.Name, ranges);
-            }
-
-            foreach (XLTable t in Tables.Cast<XLTable>())
-            {
-                String tableName = t.Name;
-                var table = targetSheet.Tables.Any(tt => tt.Name == tableName)
-                                ? new XLTable(targetSheet.Range(t.RangeAddress.ToString()), true)
-                                : new XLTable(targetSheet.Range(t.RangeAddress.ToString()), tableName, true);
-
-                table.RelId = t.RelId;
-                table.EmphasizeFirstColumn = t.EmphasizeFirstColumn;
-                table.EmphasizeLastColumn = t.EmphasizeLastColumn;
-                table.ShowRowStripes = t.ShowRowStripes;
-                table.ShowColumnStripes = t.ShowColumnStripes;
-                table.ShowAutoFilter = t.ShowAutoFilter;
-                table.Theme = t.Theme;
-                table._showTotalsRow = t.ShowTotalsRow;
-                table._uniqueNames.Clear();
-
-                t._uniqueNames.ForEach(n => table._uniqueNames.Add(n));
-                Int32 fieldCount = t.ColumnCount();
-                for (Int32 f = 0; f < fieldCount; f++)
-                {
-                    var tableField = table.Field(f) as XLTableField;
-                    var tField = t.Field(f) as XLTableField;
-                    tableField.Index = tField.Index;
-                    tableField.Name = tField.Name;
-                    tableField.totalsRowLabel = tField.totalsRowLabel;
-                    tableField.totalsRowFunction = tField.totalsRowFunction;
-                }
-            }
-
-            if (AutoFilter.Enabled)
-                targetSheet.Range(AutoFilter.Range.RangeAddress).SetAutoFilter();
-
-            return targetSheet;
-        }
-
-        private String ReplaceRelativeSheet(string newSheetName, String value)
-        {
-            if (XLHelper.IsNullOrWhiteSpace(value)) return value;
-
-            var newValue = new StringBuilder();
-            var addresses = value.Split(',');
-            foreach (var address in addresses)
-            {
-                var pair = address.Split('!');
-                if (pair.Length == 2)
-                {
-                    String sheetName = pair[0];
-                    if (sheetName.StartsWith("'"))
-                        sheetName = sheetName.Substring(1, sheetName.Length - 2);
-
-                    String name = sheetName.ToLower().Equals(Name.ToLower())
-                                      ? newSheetName
-                                      : sheetName;
-                    newValue.Append(String.Format("'{0}'!{1}", name, pair[1]));
-                }
-                else
-                {
-                    newValue.Append(address);
-                }
-            }
-            return newValue.ToString();
-        }
-
-        public new IXLHyperlinks Hyperlinks { get; private set; }
-
-        IXLDataValidations IXLWorksheet.DataValidations
-        {
-            get { return DataValidations; }
-        }
-
-        private XLWorksheetVisibility _visibility;
-        public XLWorksheetVisibility Visibility
-        {
-            get { return _visibility; }
-            set
-            {
-                if (value != XLWorksheetVisibility.Visible)
-                    TabSelected = false;
-
-                _visibility = value;
-            }
-        }
-
-        public IXLWorksheet Hide()
-        {
-            Visibility = XLWorksheetVisibility.Hidden;
-            return this;
-        }
-
-        public IXLWorksheet Unhide()
-        {
-            Visibility = XLWorksheetVisibility.Visible;
-            return this;
-        }
-
-        IXLSheetProtection IXLWorksheet.Protection
-        {
-            get { return Protection; }
-        }
-
-        public IXLSheetProtection Protect()
-        {
-            return Protection.Protect();
-        }
-
-        public IXLSheetProtection Protect(String password)
-        {
-            return Protection.Protect(password);
-        }
-
-        public IXLSheetProtection Unprotect()
-        {
-            return Protection.Unprotect();
-        }
-
-        public IXLSheetProtection Unprotect(String password)
-        {
-            return Protection.Unprotect(password);
-        }
-
-
-        public new IXLRange Sort()
-        {
-            return GetRangeForSort().Sort();
-        }
-
-        public new IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending,
-                                 Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            return GetRangeForSort().Sort(columnsToSortBy, sortOrder, matchCase, ignoreBlanks);
-        }
-
-        public new IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending,
-                                 Boolean matchCase = false, Boolean ignoreBlanks = true)
-        {
-            return GetRangeForSort().Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks);
-        }
-
-        public new IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false,
-                                            Boolean ignoreBlanks = true)
-        {
-            return GetRangeForSort().SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
-        }
-
-        public Boolean ShowFormulas { get; set; }
-        public Boolean ShowGridLines { get; set; }
-        public Boolean ShowOutlineSymbols { get; set; }
-        public Boolean ShowRowColHeaders { get; set; }
-        public Boolean ShowRuler { get; set; }
-        public Boolean ShowWhiteSpace { get; set; }
-        public Boolean ShowZeros { get; set; }
-
-        public IXLWorksheet SetShowFormulas()
-        {
-            ShowFormulas = true;
-            return this;
-        }
-
-        public IXLWorksheet SetShowFormulas(Boolean value)
-        {
-            ShowFormulas = value;
-            return this;
-        }
-
-        public IXLWorksheet SetShowGridLines()
-        {
-            ShowGridLines = true;
-            return this;
-        }
-
-        public IXLWorksheet SetShowGridLines(Boolean value)
-        {
-            ShowGridLines = value;
-            return this;
-        }
-
-        public IXLWorksheet SetShowOutlineSymbols()
-        {
-            ShowOutlineSymbols = true;
-            return this;
-        }
-
-        public IXLWorksheet SetShowOutlineSymbols(Boolean value)
-        {
-            ShowOutlineSymbols = value;
-            return this;
-        }
-
-        public IXLWorksheet SetShowRowColHeaders()
-        {
-            ShowRowColHeaders = true;
-            return this;
-        }
-
-        public IXLWorksheet SetShowRowColHeaders(Boolean value)
-        {
-            ShowRowColHeaders = value;
-            return this;
-        }
-
-        public IXLWorksheet SetShowRuler()
-        {
-            ShowRuler = true;
-            return this;
-        }
-
-        public IXLWorksheet SetShowRuler(Boolean value)
-        {
-            ShowRuler = value;
-            return this;
-        }
-
-        public IXLWorksheet SetShowWhiteSpace()
-        {
-            ShowWhiteSpace = true;
-            return this;
-        }
-
-        public IXLWorksheet SetShowWhiteSpace(Boolean value)
-        {
-            ShowWhiteSpace = value;
-            return this;
-        }
-
-        public IXLWorksheet SetShowZeros()
-        {
-            ShowZeros = true;
-            return this;
-        }
-
-        public IXLWorksheet SetShowZeros(Boolean value)
-        {
-            ShowZeros = value;
-            return this;
-        }
-
-        public XLColor TabColor { get; set; }
-
-        public IXLWorksheet SetTabColor(XLColor color)
-        {
-            TabColor = color;
-            return this;
-        }
-
-        public Boolean TabSelected { get; set; }
-
-        public Boolean TabActive
-        {
-            get { return _tabActive; }
-            set
-            {
-                if (value && !_tabActive)
-                {
-                    foreach (XLWorksheet ws in Worksheet.Workbook.WorksheetsInternal)
-                        ws._tabActive = false;
-                }
-                _tabActive = value;
-            }
-        }
-
-        public IXLWorksheet SetTabSelected()
-        {
-            TabSelected = true;
-            return this;
-        }
-
-        public IXLWorksheet SetTabSelected(Boolean value)
-        {
-            TabSelected = value;
-            return this;
-        }
-
-        public IXLWorksheet SetTabActive()
-        {
-            TabActive = true;
-            return this;
-        }
-
-        public IXLWorksheet SetTabActive(Boolean value)
-        {
-            TabActive = value;
-            return this;
-        }
-
-        IXLPivotTable IXLWorksheet.PivotTable(String name)
-        {
-            return PivotTable(name);
-        }
-
-        public IXLPivotTables PivotTables { get; private set; }
-
-        public Boolean RightToLeft { get; set; }
-
-        public IXLWorksheet SetRightToLeft()
-        {
-            RightToLeft = true;
-            return this;
-        }
-
-        public IXLWorksheet SetRightToLeft(Boolean value)
-        {
-            RightToLeft = value;
-            return this;
-        }
-
-        public new IXLRanges Ranges(String ranges)
-        {
-            var retVal = new XLRanges();
-            foreach (string rangeAddressStr in ranges.Split(',').Select(s => s.Trim()))
-            {
-                if (XLHelper.IsValidRangeAddress(rangeAddressStr))
-                    retVal.Add(Range(new XLRangeAddress(Worksheet, rangeAddressStr)));
-                else if (NamedRanges.Any(n => String.Compare(n.Name, rangeAddressStr, true) == 0))
-                    NamedRange(rangeAddressStr).Ranges.ForEach(retVal.Add);
-                else
-                {
-                    Workbook.NamedRanges.First(n =>
-                                               String.Compare(n.Name, rangeAddressStr, true) == 0
-                                               && n.Ranges.First().Worksheet == this)
-                        .Ranges.ForEach(retVal.Add);
-                }
-            }
-            return retVal;
-        }
-
-        IXLBaseAutoFilter IXLWorksheet.AutoFilter
-        {
-            get { return AutoFilter; }
-        }
-
-        public IXLRows RowsUsed(Boolean includeFormats = false, Func<IXLRow, Boolean> predicate = null)
-        {
-            var rows = new XLRows(Worksheet);
-            var rowsUsed = new HashSet<Int32>();
-            Internals.RowsCollection.Keys.ForEach(r => rowsUsed.Add(r));
-            Internals.CellsCollection.RowsUsed.Keys.ForEach(r => rowsUsed.Add(r));
-            foreach (var rowNum in rowsUsed)
-            {
-                var row = Row(rowNum);
-                if (!row.IsEmpty(includeFormats) && (predicate == null || predicate(row)))
-                    rows.Add(row);
-                else
-                    row.Dispose();
-            }
-            return rows;
-        }
-        public IXLRows RowsUsed(Func<IXLRow, Boolean> predicate = null)
-        {
-            return RowsUsed(false, predicate);
-        }
-
-        public IXLColumns ColumnsUsed(Boolean includeFormats = false, Func<IXLColumn, Boolean> predicate = null)
-        {
-            var columns = new XLColumns(Worksheet);
-            var columnsUsed = new HashSet<Int32>();
-            Internals.ColumnsCollection.Keys.ForEach(r => columnsUsed.Add(r));
-            Internals.CellsCollection.ColumnsUsed.Keys.ForEach(r => columnsUsed.Add(r));
-            foreach (var columnNum in columnsUsed)
-            {
-                var column = Column(columnNum);
-                if (!column.IsEmpty(includeFormats) && (predicate == null || predicate(column)))
-                    columns.Add(column);
-                else
-                    column.Dispose();
-            }
-            return columns;
-        }
-        public IXLColumns ColumnsUsed(Func<IXLColumn, Boolean> predicate = null)
-        {
-            return ColumnsUsed(false, predicate);
-        }
-
-        public new void Dispose()
-        {
-            if (AutoFilter != null)
-                AutoFilter.Dispose();
-
-            Internals.Dispose();
-
-            base.Dispose();
-        }
-
-        #endregion
-
-        #region Outlines
-
-        public void IncrementColumnOutline(Int32 level)
-        {
-            if (level <= 0) return;
-            if (!_columnOutlineCount.ContainsKey(level))
-                _columnOutlineCount.Add(level, 0);
-
-            _columnOutlineCount[level]++;
-        }
-
-        public void DecrementColumnOutline(Int32 level)
-        {
-            if (level <= 0) return;
-            if (!_columnOutlineCount.ContainsKey(level))
-                _columnOutlineCount.Add(level, 0);
-
-            if (_columnOutlineCount[level] > 0)
-                _columnOutlineCount[level]--;
-        }
-
-        public Int32 GetMaxColumnOutline()
-        {
-            var list = _columnOutlineCount.Where(kp => kp.Value > 0).ToList();
-            return list.Count == 0 ? 0 : list.Max(kp => kp.Key);
-        }
-
-        public void IncrementRowOutline(Int32 level)
-        {
-            if (level <= 0) return;
-            if (!_rowOutlineCount.ContainsKey(level))
-                _rowOutlineCount.Add(level, 0);
-
-            _rowOutlineCount[level]++;
-        }
-
-        public void DecrementRowOutline(Int32 level)
-        {
-            if (level <= 0) return;
-            if (!_rowOutlineCount.ContainsKey(level))
-                _rowOutlineCount.Add(level, 0);
-
-            if (_rowOutlineCount[level] > 0)
-                _rowOutlineCount[level]--;
-        }
-
-        public Int32 GetMaxRowOutline()
-        {
-            return _rowOutlineCount.Count == 0 ? 0 : _rowOutlineCount.Where(kp => kp.Value > 0).Max(kp => kp.Key);
-        }
-
-        #endregion
-
-        public HashSet<Int32> GetStyleIds()
-        {
-            return Internals.CellsCollection.GetStyleIds(GetStyleId());
-        }
-
-        public XLRow FirstRowUsed()
-        {
-            return FirstRowUsed(false);
-        }
-
-        public XLRow FirstRowUsed(Boolean includeFormats)
-        {
-            using (var asRange = AsRange())
-                using (var rngRow = asRange.FirstRowUsed(includeFormats))
-                    return rngRow != null ? Row(rngRow.RangeAddress.FirstAddress.RowNumber) : null;
-        }
-
-        public XLRow LastRowUsed()
-        {
-            return LastRowUsed(false);
-        }
-
-        public XLRow LastRowUsed(Boolean includeFormats)
-        {
-            using (var asRange = AsRange())
-                using (var rngRow = asRange.LastRowUsed(includeFormats))
-                    return rngRow != null ? Row(rngRow.RangeAddress.LastAddress.RowNumber) : null;
-        }
-
-        public XLColumn LastColumn()
-        {
-            return Column(XLHelper.MaxColumnNumber);
-        }
-
-        public XLColumn FirstColumn()
-        {
-            return Column(1);
-        }
-
-        public XLRow FirstRow()
-        {
-            return Row(1);
-        }
-
-        public XLRow LastRow()
-        {
-            return Row(XLHelper.MaxRowNumber);
-        }
-
-        public XLColumn FirstColumnUsed()
-        {
-            return FirstColumnUsed(false);
-        }
-
-        public XLColumn FirstColumnUsed(Boolean includeFormats)
-        {
-            using (var asRange = AsRange())
-                using (var rngColumn = asRange.FirstColumnUsed(includeFormats))
-                    return rngColumn != null ? Column(rngColumn.RangeAddress.FirstAddress.ColumnNumber) : null;
-        }
-
-        public XLColumn LastColumnUsed()
-        {
-            return LastColumnUsed(false);
-        }
-
-        public XLColumn LastColumnUsed(Boolean includeFormats)
-        {
-            using (var asRange = AsRange())
-                using (var rngColumn = asRange.LastColumnUsed(includeFormats))
-                    return rngColumn != null ? Column(rngColumn.RangeAddress.LastAddress.ColumnNumber) : null;
-        }
-
-        public XLRow Row(Int32 row)
-        {
-            return Row(row, true);
-        }
-
-        public XLColumn Column(Int32 column)
-        {
-            if (column <= 0 || column > XLHelper.MaxColumnNumber)
-                throw new IndexOutOfRangeException(String.Format("Column number must be between 1 and {0}",
-                                                                 XLHelper.MaxColumnNumber));
-
-            Int32 thisStyleId = GetStyleId();
-            if (!Internals.ColumnsCollection.ContainsKey(column))
-            {
-                // This is a new row so we're going to reference all 
-                // cells in this row to preserve their formatting
-                Internals.RowsCollection.Keys.ForEach(r => Cell(r, column));
-                Internals.ColumnsCollection.Add(column,
-                                                new XLColumn(column, new XLColumnParameters(this, thisStyleId, false)));
-            }
-
-            return new XLColumn(column, new XLColumnParameters(this, thisStyleId, true));
-        }
-
-        public IXLColumn Column(String column)
-        {
-            return Column(XLHelper.GetColumnNumberFromLetter(column));
-        }
-
-        public override XLRange AsRange()
-        {
-            return Range(1, 1, XLHelper.MaxRowNumber, XLHelper.MaxColumnNumber);
-        }
-
-        public void Clear()
-        {
-            Internals.CellsCollection.Clear();
-            Internals.ColumnsCollection.Clear();
-            Internals.MergedRanges.Clear();
-            Internals.RowsCollection.Clear();
-        }
-
-        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
-        {
-            var newMerge = new XLRanges();
-            foreach (IXLRange rngMerged in Internals.MergedRanges)
-            {
-                if (range.RangeAddress.FirstAddress.ColumnNumber <= rngMerged.RangeAddress.FirstAddress.ColumnNumber
-                    && rngMerged.RangeAddress.FirstAddress.RowNumber >= range.RangeAddress.FirstAddress.RowNumber
-                    && rngMerged.RangeAddress.LastAddress.RowNumber <= range.RangeAddress.LastAddress.RowNumber)
-                {
-                    var newRng = Range(
-                        rngMerged.RangeAddress.FirstAddress.RowNumber,
-                        rngMerged.RangeAddress.FirstAddress.ColumnNumber + columnsShifted,
-                        rngMerged.RangeAddress.LastAddress.RowNumber,
-                        rngMerged.RangeAddress.LastAddress.ColumnNumber + columnsShifted);
-                    newMerge.Add(newRng);
-                }
-                else if (
-                    !(range.RangeAddress.FirstAddress.ColumnNumber <= rngMerged.RangeAddress.FirstAddress.ColumnNumber
-                      && range.RangeAddress.FirstAddress.RowNumber <= rngMerged.RangeAddress.LastAddress.RowNumber))
-                    newMerge.Add(rngMerged);
-            }
-            Internals.MergedRanges = newMerge;
-
-            Workbook.Worksheets.ForEach(ws => MoveNamedRangesColumns(range, columnsShifted, ws.NamedRanges));
-            MoveNamedRangesColumns(range, columnsShifted, Workbook.NamedRanges);
-            ShiftConditionalFormattingColumns(range, columnsShifted);
-        }
-        private void ShiftConditionalFormattingColumns(XLRange range, int columnsShifted)
-        {
-            Int32 firstColumn = range.RangeAddress.FirstAddress.ColumnNumber;
-            if (firstColumn == 1) return;
-
-            Int32 lastColumn = range.RangeAddress.FirstAddress.ColumnNumber + columnsShifted - 1;
-            Int32 firstRow = range.RangeAddress.FirstAddress.RowNumber;
-            Int32 lastRow = range.RangeAddress.LastAddress.RowNumber;
-            var insertedRange = Range(firstRow, firstColumn, lastRow, lastColumn);
-            var fc = insertedRange.FirstColumn();
-            var model = fc.ColumnLeft();
-            Int32 modelFirstRow = model.RangeAddress.FirstAddress.RowNumber;
-            if (ConditionalFormats.Any(cf => cf.Range.Intersects(model)))
-            {
-                for (Int32 ro = firstRow; ro <= lastRow; ro++)
-                {
-                    var cellModel = model.Cell(ro - modelFirstRow + 1);
-                    foreach (var cf in ConditionalFormats.Where(cf => cf.Range.Intersects(cellModel.AsRange())).ToList())
-                    {
-                        Range(ro, firstColumn, ro, lastColumn).AddConditionalFormat(cf);
-                    }
-                }
-            }
-            insertedRange.Dispose();
-            model.Dispose();
-            fc.Dispose();
-        }
-
-        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
-        {
-            var newMerge = new XLRanges();
-            foreach (IXLRange rngMerged in Internals.MergedRanges)
-            {
-                if (range.RangeAddress.FirstAddress.RowNumber <= rngMerged.RangeAddress.FirstAddress.RowNumber
-                    && rngMerged.RangeAddress.FirstAddress.ColumnNumber >= range.RangeAddress.FirstAddress.ColumnNumber
-                    && rngMerged.RangeAddress.LastAddress.ColumnNumber <= range.RangeAddress.LastAddress.ColumnNumber)
-                {
-                    var newRng = Range(
-                        rngMerged.RangeAddress.FirstAddress.RowNumber + rowsShifted,
-                        rngMerged.RangeAddress.FirstAddress.ColumnNumber,
-                        rngMerged.RangeAddress.LastAddress.RowNumber + rowsShifted,
-                        rngMerged.RangeAddress.LastAddress.ColumnNumber);
-                    newMerge.Add(newRng);
-                }
-                else if (!(range.RangeAddress.FirstAddress.RowNumber <= rngMerged.RangeAddress.FirstAddress.RowNumber
-                           && range.RangeAddress.FirstAddress.ColumnNumber <= rngMerged.RangeAddress.LastAddress.ColumnNumber))
-                    newMerge.Add(rngMerged);
-            }
-            Internals.MergedRanges = newMerge;
-
-            Workbook.Worksheets.ForEach(ws => MoveNamedRangesRows(range, rowsShifted, ws.NamedRanges));
-            MoveNamedRangesRows(range, rowsShifted, Workbook.NamedRanges);
-            ShiftConditionalFormattingRows(range, rowsShifted);
-        }
-        private void ShiftConditionalFormattingRows(XLRange range, int rowsShifted)
-        {
-            Int32 firstRow = range.RangeAddress.FirstAddress.RowNumber;
-            if (firstRow == 1) return;
-
-            SuspendEvents();
-            var rangeUsed = range.Worksheet.RangeUsed(true);
-            IXLRangeAddress usedAddress;
-            if (rangeUsed == null)
-                usedAddress = range.RangeAddress;
-            else
-                usedAddress = rangeUsed.RangeAddress;
-            ResumeEvents();
-
-            if (firstRow < usedAddress.FirstAddress.RowNumber) firstRow = usedAddress.FirstAddress.RowNumber;
-
-            Int32 lastRow = range.RangeAddress.FirstAddress.RowNumber + rowsShifted - 1;
-            if (lastRow > usedAddress.LastAddress.RowNumber) lastRow = usedAddress.LastAddress.RowNumber;
-
-            Int32 firstColumn = range.RangeAddress.FirstAddress.ColumnNumber;
-            if (firstColumn < usedAddress.FirstAddress.ColumnNumber) firstColumn = usedAddress.FirstAddress.ColumnNumber;
-
-            Int32 lastColumn = range.RangeAddress.LastAddress.ColumnNumber;
-            if (lastColumn > usedAddress.LastAddress.ColumnNumber) lastColumn = usedAddress.LastAddress.ColumnNumber;
-
-            var insertedRange = Range(firstRow, firstColumn, lastRow, lastColumn);
-            var fr = insertedRange.FirstRow();
-            var model = fr.RowAbove();
-            Int32 modelFirstColumn = model.RangeAddress.FirstAddress.ColumnNumber;
-            if (ConditionalFormats.Any(cf=>cf.Range.Intersects(model)))
-            {
-                for (Int32 co = firstColumn; co <= lastColumn; co++)
-                {
-                    var cellModel = model.Cell(co - modelFirstColumn + 1);
-                    foreach (var cf in ConditionalFormats.Where(cf => cf.Range.Intersects(cellModel.AsRange())).ToList())
-                    {
-                        Range(firstRow, co, lastRow, co).AddConditionalFormat(cf);
-                    }
-                }
-            }
-            insertedRange.Dispose();
-            model.Dispose();
-            fr.Dispose();
-        }
-
-
-        internal void BreakConditionalFormatsIntoCells(List<IXLAddress> addresses)
-        {
-            var newConditionalFormats = new XLConditionalFormats();
-            SuspendEvents();
-            foreach (var conditionalFormat in ConditionalFormats)
-            {
-                foreach (XLCell cell in conditionalFormat.Range.Cells(c=>!addresses.Contains(c.Address)))
-                {
-                    var row = cell.Address.RowNumber;
-                    var column = cell.Address.ColumnLetter;
-                    var newConditionalFormat = new XLConditionalFormat(cell.AsRange(), true);
-                    newConditionalFormat.CopyFrom(conditionalFormat);
-                    newConditionalFormat.Values.Values.Where(f => f.IsFormula)
-                        .ForEach(f => f._value = XLHelper.ReplaceRelative(f.Value, row, column));
-                    newConditionalFormats.Add(newConditionalFormat);
-                }
-                conditionalFormat.Range.Dispose();
-            }
-            ResumeEvents();
-            ConditionalFormats = newConditionalFormats;
-        }
-
-
-
-        private void MoveNamedRangesRows(XLRange range, int rowsShifted, IXLNamedRanges namedRanges)
-        {
-            foreach (XLNamedRange nr in namedRanges)
-            {
-                var newRangeList =
-                    nr.RangeList.Select(r => XLCell.ShiftFormulaRows(r, this, range, rowsShifted)).Where(
-                        newReference => newReference.Length > 0).ToList();
-                nr.RangeList = newRangeList;
-            }
-        }
-
-        private void MoveNamedRangesColumns(XLRange range, int columnsShifted, IXLNamedRanges namedRanges)
-        {
-            foreach (XLNamedRange nr in namedRanges)
-            {
-                var newRangeList =
-                    nr.RangeList.Select(r => XLCell.ShiftFormulaColumns(r, this, range, columnsShifted)).Where(
-                        newReference => newReference.Length > 0).ToList();
-                nr.RangeList = newRangeList;
-            }
-        }
-
-        public void NotifyRangeShiftedRows(XLRange range, Int32 rowsShifted)
-        {
-            if (RangeShiftedRows != null)
-            {
-                foreach(var item in RangeShiftedRows)
-                {
-                    item.Action(range, rowsShifted);
-                }
-            }
-        }
-
-        public void NotifyRangeShiftedColumns(XLRange range, Int32 columnsShifted)
-        {
-            if (RangeShiftedColumns != null)
-            {
-                foreach(var item in RangeShiftedColumns)
-                {
-                    item.Action(range, columnsShifted);
-                }
-            }
-        }
-
-        public XLRow Row(Int32 row, Boolean pingCells)
-        {
-            if (row <= 0 || row > XLHelper.MaxRowNumber)
-                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}",
-                                                                 XLHelper.MaxRowNumber));
-
-            Int32 styleId;
-            XLRow rowToUse;
-            if (Internals.RowsCollection.TryGetValue(row, out rowToUse))
-                styleId = rowToUse.GetStyleId();
-            else
-            {
-                if (pingCells)
-                {
-                    // This is a new row so we're going to reference all 
-                    // cells in columns of this row to preserve their formatting
-
-                    var usedColumns = from c in Internals.ColumnsCollection
-                                      join dc in Internals.CellsCollection.ColumnsUsed.Keys
-                                          on c.Key equals dc
-                                      where !Internals.CellsCollection.Contains(row, dc)
-                                      select dc;
-
-                    usedColumns.ForEach(c => Cell(row, c));
-                }
-                styleId = GetStyleId();
-                Internals.RowsCollection.Add(row, new XLRow(row, new XLRowParameters(this, styleId, false)));
-            }
-
-            return new XLRow(row, new XLRowParameters(this, styleId));
-        }
-
-        private IXLRange GetRangeForSort()
-        {
-            var range = RangeUsed();
-            SortColumns.ForEach(e => range.SortColumns.Add(e.ElementNumber, e.SortOrder, e.IgnoreBlanks, e.MatchCase));
-            SortRows.ForEach(e => range.SortRows.Add(e.ElementNumber, e.SortOrder, e.IgnoreBlanks, e.MatchCase));
-            return range;
-        }
-
-        public XLPivotTable PivotTable(String name)
-        {
-            return (XLPivotTable)PivotTables.PivotTable(name);
-        }
-
-        public new XLCells Cells()
-        {
-            return CellsUsed(true);
-        }
-
-        public new XLCell Cell(String cellAddressInRange)
-        {
-            if (XLHelper.IsValidA1Address(cellAddressInRange))
-                return Cell(XLAddress.Create(this, cellAddressInRange));
-
-            if (NamedRanges.Any(n => String.Compare(n.Name, cellAddressInRange, true) == 0))
-                return (XLCell)NamedRange(cellAddressInRange).Ranges.First().FirstCell();
-
-            var namedRanges = Workbook.NamedRanges.FirstOrDefault(n =>
-                                                      String.Compare(n.Name, cellAddressInRange, true) == 0
-                                                      && n.Ranges.Count == 1);
-            if (namedRanges == null || !namedRanges.Ranges.Any()) return null;
-            
-            return (XLCell)namedRanges.Ranges.First().FirstCell();
-        }
-
-        public XLCell CellFast(String cellAddressInRange)
-        {
-            return Cell(XLAddress.Create(this, cellAddressInRange));
-        }
-
-        public override XLRange Range(String rangeAddressStr)
-        {
-            if (XLHelper.IsValidRangeAddress(rangeAddressStr))
-                return Range(new XLRangeAddress(Worksheet, rangeAddressStr));
-
-            if (rangeAddressStr.Contains("["))
-                return Table(rangeAddressStr.Substring(0, rangeAddressStr.IndexOf("["))) as XLRange;
-
-            if (NamedRanges.Any(n => String.Compare(n.Name, rangeAddressStr, true) == 0))
-                return (XLRange)NamedRange(rangeAddressStr).Ranges.First();
-
-            var namedRanges = Workbook.NamedRanges.FirstOrDefault(n =>
-                                                       String.Compare(n.Name, rangeAddressStr, true) == 0
-                                                       && n.Ranges.Count == 1
-                                                       );
-            if (namedRanges == null || !namedRanges.Ranges.Any()) return null;
-            return (XLRange)namedRanges.Ranges.First();
-        }
-
-        public IXLRanges MergedRanges { get { return Internals.MergedRanges; } }
-
-        public IXLConditionalFormats ConditionalFormats { get; private set; }
-
-        private Boolean _eventTracking;
-        public void SuspendEvents()
-        {
-            _eventTracking = EventTrackingEnabled;
-            EventTrackingEnabled = false;
-        }
-        public void ResumeEvents()
-        {
-            EventTrackingEnabled = _eventTracking;
-        }
-        
-        public IXLRanges SelectedRanges { get; internal set; }
-
-        public IXLCell ActiveCell { get; set; }
-
-        private XLCalcEngine _calcEngine;
-        private XLCalcEngine CalcEngine
-        {
-            get { return _calcEngine ?? (_calcEngine = new XLCalcEngine(this)); }
-        }
-
-        public Object Evaluate(String expression)
-        {
-            return CalcEngine.Evaluate(expression);
-        }
-
-        public String Author { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheetInternals.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheetInternals.cs
deleted file mode 100644
index e7b7b0c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheetInternals.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-namespace ClosedXML.Excel
-{
-    internal class XLWorksheetInternals: IDisposable
-    {
-        public XLWorksheetInternals(
-            XLCellsCollection cellsCollection, 
-            XLColumnsCollection columnsCollection,
-            XLRowsCollection rowsCollection,
-            XLRanges mergedRanges
-            )
-        {
-            CellsCollection = cellsCollection;
-            ColumnsCollection = columnsCollection;
-            RowsCollection = rowsCollection;
-            MergedRanges = mergedRanges;
-        }
-
-        public XLCellsCollection CellsCollection { get; private set; }
-        public XLColumnsCollection ColumnsCollection { get; private set; }
-        public XLRowsCollection RowsCollection { get; private set; }
-        public XLRanges MergedRanges { get; internal set; }
-
-        public void Dispose()
-        {
-            ColumnsCollection.Dispose();
-            RowsCollection.Dispose();
-            MergedRanges.Dispose();
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheets.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheets.cs
deleted file mode 100644
index 673328a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheets.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics;
-using System.Linq;
-
-namespace ClosedXML.Excel
-{
-    internal class XLWorksheets : IXLWorksheets, IEnumerable<XLWorksheet>
-    {
-        #region Constructor
-
-        private readonly XLWorkbook _workbook;
-        private readonly Dictionary<String, XLWorksheet> _worksheets = new Dictionary<String, XLWorksheet>();
-
-        #endregion
-
-        public HashSet<String> Deleted = new HashSet<String>();
-
-        #region Constructor
-
-        public XLWorksheets(XLWorkbook workbook)
-        {
-            _workbook = workbook;
-        }
-
-        #endregion
-
-        #region IEnumerable<XLWorksheet> Members
-
-        public IEnumerator<XLWorksheet> GetEnumerator()
-        {
-            return ((IEnumerable<XLWorksheet>)_worksheets.Values).GetEnumerator();
-        }
-
-        #endregion
-
-        #region IXLWorksheets Members
-
-        public int Count
-        {
-            [DebuggerStepThrough]
-            get { return _worksheets.Count; }
-        }
-
-        public bool TryGetWorksheet(string sheetName, out IXLWorksheet worksheet)
-        {
-            XLWorksheet w;
-            if (_worksheets.TryGetValue(sheetName, out w))
-            {
-                worksheet = w;
-                return true;
-            }
-            worksheet = null;
-            return false;
-        }
-
-        public IXLWorksheet Worksheet(String sheetName)
-        {
-            XLWorksheet w;
-            if (_worksheets.TryGetValue(sheetName, out w))
-                return w;
-
-            var wss = _worksheets.Where(ws => ws.Key.ToLower().Equals(sheetName.ToLower()));
-
-            if (wss.Any())
-                return wss.First().Value;
-
-            throw new Exception("There isn't a worksheet named '" + sheetName + "'.");
-        }
-
-        public IXLWorksheet Worksheet(Int32 position)
-        {
-            int wsCount = _worksheets.Values.Count(w => w.Position == position);
-            if (wsCount == 0)
-                throw new Exception("There isn't a worksheet associated with that position.");
-
-            if (wsCount > 1)
-            {
-                throw new Exception(
-                    "Can't retrieve a worksheet because there are multiple worksheets associated with that position.");
-            }
-
-            return _worksheets.Values.Single(w => w.Position == position);
-        }
-
-        public IXLWorksheet Add(String sheetName)
-        {
-            var sheet = new XLWorksheet(sheetName, _workbook);
-            _worksheets.Add(sheetName, sheet);
-            sheet._position = _worksheets.Count + _workbook.UnsupportedSheets.Count;
-            return sheet;
-        }
-
-        public IXLWorksheet Add(String sheetName, Int32 position)
-        {
-            _worksheets.Values.Where(w => w._position >= position).ForEach(w => w._position += 1);
-            _workbook.UnsupportedSheets.Where(w => w.Position >= position).ForEach(w => w.Position += 1);
-            var sheet = new XLWorksheet(sheetName, _workbook);
-            _worksheets.Add(sheetName, sheet);
-            sheet._position = position;
-            return sheet;
-        }
-
-        public void Delete(String sheetName)
-        {
-            Delete(_worksheets[sheetName].Position);
-        }
-
-        public void Delete(Int32 position)
-        {
-            int wsCount = _worksheets.Values.Count(w => w.Position == position);
-            if (wsCount == 0)
-                throw new Exception("There isn't a worksheet associated with that index.");
-
-            if (wsCount > 1)
-                throw new Exception(
-                    "Can't delete the worksheet because there are multiple worksheets associated with that index.");
-
-            var ws = _worksheets.Values.Single(w => w.Position == position);
-            if (!XLHelper.IsNullOrWhiteSpace(ws.RelId) && !Deleted.Contains(ws.RelId))
-                Deleted.Add(ws.RelId);
-
-            _worksheets.RemoveAll(w => w.Position == position);
-            _worksheets.Values.Where(w => w.Position > position).ForEach(w => w._position -= 1);
-            _workbook.UnsupportedSheets.Where(w => w.Position > position).ForEach(w => w.Position -= 1);
-        }
-
-        IEnumerator<IXLWorksheet> IEnumerable<IXLWorksheet>.GetEnumerator()
-        {
-            return _worksheets.Values.Cast<IXLWorksheet>().GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public IXLWorksheet Add(DataTable dataTable)
-        {
-            return Add(dataTable, dataTable.TableName);
-        }
-
-        public IXLWorksheet Add(DataTable dataTable, String sheetName)
-        {
-            var ws = Add(sheetName);
-            ws.Cell(1, 1).InsertTable(dataTable);
-            ws.Columns().AdjustToContents(1, 75);
-            return ws;
-        }
-
-        public void Add(DataSet dataSet)
-        {
-            foreach (DataTable t in dataSet.Tables)
-                Add(t);
-        }
-
-        #endregion
-
-        public void Rename(String oldSheetName, String newSheetName)
-        {
-            if (XLHelper.IsNullOrWhiteSpace(oldSheetName) || !_worksheets.ContainsKey(oldSheetName)) return;
-
-            var ws = _worksheets[oldSheetName];
-            _worksheets.Remove(oldSheetName);
-            _worksheets.Add(newSheetName, ws);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Extensions.cs b/ClosedXML/ClosedXML/ClosedXML/Extensions.cs
deleted file mode 100644
index 1a33550..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Extensions.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml.Linq;
-using System.IO;
-using System.Xml;
-using ClosedXML.Utils;
-using DocumentFormat.OpenXml;
-
-[assembly: CLSCompliantAttribute(true)]
-namespace ClosedXML.Excel
-{
-    public static class Extensions
-    {
-        // Adds the .ForEach method to all IEnumerables
-
-
-        private static readonly char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
-        public static String ToHex(this Color color)
-        {
-
-            byte[] bytes = new byte[4];
-
-            bytes[0] = color.A;
-
-            bytes[1] = color.R;
-
-            bytes[2] = color.G;
-
-            bytes[3] = color.B;
-
-            char[] chars = new char[bytes.Length * 2];
-
-            for (int i = 0; i < bytes.Length; i++)
-            {
-
-                int b = bytes[i];
-
-                chars[i * 2] = hexDigits[b >> 4];
-
-                chars[i * 2 + 1] = hexDigits[b & 0xF];
-
-            }
-
-            return new string(chars);
-
-        }
-
-        public static String RemoveSpecialCharacters(this String str)
-        {
-            StringBuilder sb = new StringBuilder();
-            foreach (char c in str)
-            {
-                if (Char.IsLetterOrDigit(c) || c == '.' || c == '_')
-                {
-                    sb.Append(c);
-                }
-            }
-            return sb.ToString();
-        }
-
-        public static Int32 CharCount(this String instance, Char c)
-        {
-            return instance.Length - instance.Replace(c.ToString(), "").Length;
-        }
-
-        public static Boolean HasDuplicates<T>(this IEnumerable<T> source)
-        {
-            HashSet<T> distinctItems = new HashSet<T>();
-            foreach (var item in source)
-            {
-                if (distinctItems.Contains(item))
-                    return true;
-                else
-                    distinctItems.Add(item);
-            }
-            return false;
-        }
-
-        public static T CastTo<T>(this Object o)
-        {
-            return (T)Convert.ChangeType(o, typeof(T));
-        }
-
-    }
-
-    public static class DictionaryExtensions
-    {
-        public static void RemoveAll<TKey, TValue>(this Dictionary<TKey, TValue> dic,
-            Func<TValue, bool> predicate)
-        {
-            var keys = dic.Keys.Where(k => predicate(dic[k])).ToList();
-            foreach (var key in keys)
-            {
-                dic.Remove(key);
-            }
-        }
-    }
-
-    public static class StringExtensions
-    {
-        private static readonly Regex RegexNewLine = new Regex(@"((?<!\r)\n|\r\n)", RegexOptions.Compiled);
-        public static String FixNewLines(this String value)
-        {
-            return value.Contains("\n") ? RegexNewLine.Replace(value, Environment.NewLine) : value;
-        }
-
-        public static Boolean PreserveSpaces(this String value)
-        {
-            return value.StartsWith(" ") || value.EndsWith(" ") || value.Contains(Environment.NewLine);
-        }
-
-        public static String ToCamel(this String value)
-        {
-            if (value.Length == 0)
-                return value;
-
-            if (value.Length == 1)
-                return value.ToLower();
-
-            return value.Substring(0, 1).ToLower() + value.Substring(1);
-        }
-
-        public static String ToProper(this String value)
-        {
-            if (value.Length == 0)
-                return value;
-
-            if (value.Length == 1)
-                return value.ToUpper();
-
-            return value.Substring(0, 1).ToUpper() + value.Substring(1);
-        }
-    }
-
-    public static class DateTimeExtensions
-    {
-        public static Double MaxOADate
-        {
-            get
-            {
-                return 2958465.99999999;
-            }
-        }
-
-        public static DateTime NextWorkday(this DateTime date, List<DateTime> bankHolidays)
-        {
-            var nextDate = date.AddDays(1);
-            while (nextDate.DayOfWeek == DayOfWeek.Saturday
-                || nextDate.DayOfWeek == DayOfWeek.Sunday
-                || bankHolidays.Contains(nextDate)
-                )
-                nextDate = nextDate.AddDays(1);
-
-            return nextDate;
-        }
-    }
-
-    public static class IntegerExtensions
-    {
-        private static readonly NumberFormatInfo nfi = CultureInfo.InvariantCulture.NumberFormat;
-        [ThreadStatic]
-        private static Dictionary<Int32, String> intToString;
-        public static String ToInvariantString(this Int32 value)
-        {
-            String sValue;
-            if (intToString == null)
-            {
-                intToString = new Dictionary<int, string>();
-                sValue = value.ToString(nfi);
-                intToString.Add(value, sValue);
-            }
-            else
-            {
-                if (!intToString.TryGetValue(value, out sValue))
-                {
-                    sValue = value.ToString(nfi);
-                    intToString.Add(value, sValue);
-                }
-            }
-            return sValue;
-        }
-
-    }
-
-    public static class DoubleExtensions
-    {
-        //All numbers are stored in XL files as invarient culture this is just a easy helper
-        public static String ToInvariantString(this Double value)
-        {
-            return value.ToString(CultureInfo.InvariantCulture);
-        }
-
-        public static Double SaveRound(this Double value)
-        {
-            return Math.Round(value, 6);
-        }
-    }
-
-    public static class FontBaseExtensions
-    {
-
-        private static Font GetCachedFont(IXLFontBase fontBase, Dictionary<IXLFontBase, Font> fontCache)
-        {
-            Font font;
-            if (!fontCache.TryGetValue(fontBase, out font))
-            {
-                font = new Font(fontBase.FontName, (float)fontBase.FontSize, GetFontStyle(fontBase));
-                fontCache.Add(fontBase, font);
-            }
-            return font;
-        }
-
-        public static Double GetWidth(this IXLFontBase fontBase, String text, Dictionary<IXLFontBase, Font> fontCache)
-        {
-            if (XLHelper.IsNullOrWhiteSpace(text))
-                return 0;
-
-            var font = GetCachedFont(fontBase, fontCache);
-
-            var textSize = GraphicsUtils.MeasureString(text, font);
-
-            double width = (((textSize.Width / (double)7) * 256) - (128 / 7)) / 256;
-            width = (double)decimal.Round((decimal)width + 0.2M, 2);
-
-            return width;
-        }
-
-        private static FontStyle GetFontStyle(IXLFontBase font)
-        {
-            FontStyle fontStyle = FontStyle.Regular;
-            if (font.Bold) fontStyle |= FontStyle.Bold;
-            if (font.Italic) fontStyle |= FontStyle.Italic;
-            if (font.Strikethrough) fontStyle |= FontStyle.Strikeout;
-            if (font.Underline != XLFontUnderlineValues.None ) fontStyle |= FontStyle.Underline;
-            return fontStyle;
-        }
-
-        public static Double GetHeight(this IXLFontBase fontBase, Dictionary<IXLFontBase, Font> fontCache)
-        {
-            var font = GetCachedFont(fontBase, fontCache);
-            var textSize = GraphicsUtils.MeasureString("X", font);
-            return (double)textSize.Height * 0.85;
-        }
-
-        public static void CopyFont(this IXLFontBase font, IXLFontBase sourceFont)
-        {
-            font.Bold = sourceFont.Bold;
-            font.Italic = sourceFont.Italic;
-            font.Underline = sourceFont.Underline;
-            font.Strikethrough = sourceFont.Strikethrough;
-            font.VerticalAlignment = sourceFont.VerticalAlignment;
-            font.Shadow = sourceFont.Shadow;
-            font.FontSize = sourceFont.FontSize;
-            font.FontColor = sourceFont.FontColor;
-            font.FontName = sourceFont.FontName;
-            font.FontFamilyNumbering = sourceFont.FontFamilyNumbering;
-        }
-    }
-
-    public static class XDocumentExtensions
-    {
-        public static XDocument Load(Stream stream)
-        {
-            using (XmlReader reader = XmlReader.Create(stream))
-            {
-                return XDocument.Load(reader);
-            }
-        }
-    }
-
-    public static class EnumerableExtensions
-    {
-        public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
-        {
-            foreach (T item in source)
-                action(item);
-        }
-
-        public static Type GetItemType<T>(this IEnumerable<T> source)
-        {
-            return typeof(T);
-        }
-    }
-
-    public static class DoubleValueExtensions
-    {
-        public static DoubleValue SaveRound(this DoubleValue value)
-        {
-            return value.HasValue ? new DoubleValue(Math.Round(value, 6)) : value;
-        }
-    }
-}
-
diff --git a/ClosedXML/ClosedXML/ClosedXML/PathHelper.cs b/ClosedXML/ClosedXML/ClosedXML/PathHelper.cs
deleted file mode 100644
index 83cbb4c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/PathHelper.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace ClosedXML
-{
-    /// <summary>
-    ///   Help methods for work with files
-    /// </summary>
-    internal static class PathHelper
-    {
-        private static readonly Regex ms_checkValidAbsolutePathRegEx = new Regex(
-                "^(([a-zA-Z]\\:)|\\\\)(\\\\|(\\\\[^\\n\\r\\t/:*?<>\\\"|]*)+)$",
-                RegexOptions.IgnoreCase
-                | RegexOptions.Singleline
-                | RegexOptions.CultureInvariant
-                | RegexOptions.Compiled
-                );
-        /// <summary>
-        ///   Can check only .\dfdfd\dfdf\dfdf or ..\..\gfhfgh\fghfh
-        /// </summary>
-        private static readonly Regex ms_checkValidRelativePathRegEx = new Regex(
-                "^(\\.\\.|\\.)(\\\\|(\\\\[^\\n\\r\\t/:*?<>\\\"|]*)+)$",
-                RegexOptions.IgnoreCase
-                | RegexOptions.Multiline
-                | RegexOptions.CultureInvariant
-                | RegexOptions.Compiled
-                );
-
-        private static readonly object ms_syncAbsolutePathObj = new object();
-
-        /// <summary>
-        ///   Gets data and time string stamp for file name
-        /// </summary>
-        /// <returns></returns>
-        public static string GetTimeStamp()
-        {
-            return GetTimeStamp(DateTime.Now);
-        }
-        /// <summary>
-        ///   Gets data and time string stamp for file name
-        /// </summary>
-        /// <returns></returns>
-        public static string GetTimeStamp(DateTime dateTime)
-        {
-            return dateTime.ToString("ddMMMyyyy_HHmmss", DateTimeFormatInfo.InvariantInfo);
-        }
-        /// <summary>
-        ///   Safety delete file(with try block)
-        /// </summary>
-        /// <param name = "fileName">file name</param>
-        public static void SafetyDeleteFile(string fileName)
-        {
-            try
-            {
-                if (!string.IsNullOrEmpty(fileName) && File.Exists(fileName))
-                {
-                    File.Delete(fileName);
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.Fail("Error during file deleting. Error message:" + ex.Message);
-            }
-        }
-        /// <summary>
-        ///   Replace all not implemented symbols to '_'
-        /// </summary>
-        /// <param name = "fileName">input filename</param>
-        /// <returns></returns>
-        public static string NormalizeFileName(string fileName)
-        {
-            char[] invalidCharacters = Path.GetInvalidFileNameChars();
-            #region Replace begin space
-            string result = fileName.TrimStart(' ');
-            if (result.Length < fileName.Length)
-            {
-                result = new string('_', fileName.Length - result.Length) + result;
-            }
-            #endregion
-            foreach (char curChar in invalidCharacters)
-            {
-                result = result.Replace(curChar, '_');
-            }
-            return result;
-        }
-
-        public static string NormalizePathName(string fileName)
-        {
-            char[] invalidCharacters = Path.GetInvalidPathChars();
-            string result = fileName.TrimStart(' ');
-            foreach (char curChar in invalidCharacters)
-            {
-                result = result.Replace(curChar, '_');
-            }
-            return result;
-        }
-        /// <summary>
-        ///   ValidatePath file or diretory path
-        /// </summary>
-        /// <param name = "path"></param>
-        /// <param name = "type">path type</param>
-        /// <returns></returns>
-        public static bool ValidatePath(string path, PathTypes type)
-        {
-            bool _result = false;
-            if ((type & PathTypes.Absolute) == PathTypes.Absolute)
-            {
-                _result |= ms_checkValidAbsolutePathRegEx.IsMatch(path);
-            }
-            if ((type & PathTypes.Relative) == PathTypes.Relative)
-            {
-                _result |= ms_checkValidRelativePathRegEx.IsMatch(path);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        ///   ValidatePath file or diretory path
-        /// </summary>
-        /// <param name = "fileName"></param>
-        /// <returns></returns>
-        public static bool ValidateFileName(string fileName)
-        {
-            return fileName.LastIndexOfAny(Path.GetInvalidFileNameChars()) < 0;
-        }
-
-        public static string EvaluateRelativePath(string mainDirPath, string absoluteFilePath)
-        {
-            string[] firstPathParts = mainDirPath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);
-            string[] secondPathParts = absoluteFilePath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);
-
-            int sameCounter = 0;
-            int partsCount = Math.Min(firstPathParts.Length, secondPathParts.Length);
-            for (int i = 0; i < partsCount; i++)
-            {
-                if (String.Compare(firstPathParts[i], secondPathParts[i], true) != 0)
-                {
-                    break;
-                }
-                sameCounter++;
-            }
-
-            if (sameCounter == 0)
-            {
-                return absoluteFilePath;
-            }
-
-            string newPath = string.Empty;
-            for (int i = sameCounter; i < firstPathParts.Length; i++)
-            {
-                if (i > sameCounter)
-                {
-                    newPath += Path.DirectorySeparatorChar;
-                }
-                newPath += "..";
-            }
-            if (newPath.Length == 0)
-            {
-                newPath = ".";
-            }
-            for (int i = sameCounter; i < secondPathParts.Length; i++)
-            {
-                newPath += Path.DirectorySeparatorChar;
-                newPath += secondPathParts[i];
-            }
-            return newPath;
-        }
-
-        public static string EvaluateAbsolutePath(string rootPath, string relativePath)
-        {
-            lock (ms_syncAbsolutePathObj)
-            {
-                string _temp = Environment.CurrentDirectory;
-                Environment.CurrentDirectory = rootPath;
-                string _result = Path.GetFullPath(relativePath);
-                Environment.CurrentDirectory = _temp;
-                return _result;
-            }
-        }
-
-        public static bool TryCreateFile(string filePath, out string message)
-        {
-            #region Check
-            if (string.IsNullOrEmpty(filePath))
-            {
-                throw new ArgumentNullException("filePath");
-            }
-            #endregion
-            try
-            {
-                if (File.Exists(filePath))
-                {
-                    message = null;
-                    return true;
-                }
-
-                using (FileStream _stream = new FileStream(filePath,
-                                                           FileMode.Create,
-                                                           FileAccess.ReadWrite,
-                                                           FileShare.Read,
-                                                           1024,
-                                                           FileOptions.DeleteOnClose))
-                {
-                }
-            }
-            catch (Exception exc)
-            {
-                message = exc.Message;
-                return false;
-            }
-
-            message = null;
-            return true;
-        }
-
-        public static string CreateDirectory(string path)
-        {
-            try
-            {
-                var info = new DirectoryInfo(path);
-                if (!info.Exists)
-                {
-                    info.Create();
-                }
-            }
-            catch
-            {
-            }
-            return path;
-        }
-
-        [Flags]
-        public enum PathTypes
-        {
-            None = 0,
-            Absolute = 1,
-            Relative = 2
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML/Properties/AssemblyInfo.cs
deleted file mode 100644
index e90dd2e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClosedXML")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ClosedXML")]
-[assembly: AssemblyCopyright("Copyright © Manuel De Leon 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8747331d-de58-4621-8c7f-a7d57ca3467a")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.75.0.0")]
-[assembly: AssemblyFileVersion("0.75.0.0")]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ClosedXML_Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a1fb8ba59167fe734d64128ca73d32c45cb8a117246d09c95c8769db88fe332b0a3396bedd0ea48ee42b0e5796fec0798ca5cb628a9a6de80d35d6c67b936ca1670347b3d4f2b769c8ce2ddcf959dbac6bcd88e6c08751ea1fffa0522de3507193e7035305a8aa008d6c88cca1341b3120fa9c347ab3f97e2d772e2709277da5")]
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/Utils/GraphicsUtils.cs b/ClosedXML/ClosedXML/ClosedXML/Utils/GraphicsUtils.cs
deleted file mode 100644
index b5e6762..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/Utils/GraphicsUtils.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Drawing;
-
-namespace ClosedXML.Utils
-{
-    internal static class GraphicsUtils
-    {
-        [ThreadStatic]
-        private static Graphics threadLocalGraphics;
-        private static Graphics g
-        {
-            get
-            {
-                if (threadLocalGraphics == null)
-                {
-                    var image = new Bitmap(1, 1);
-                    threadLocalGraphics = Graphics.FromImage(image);
-                }
-                return threadLocalGraphics;
-            }
-        }
-
-        public static SizeF MeasureString(string s, Font font)
-        {
-            SizeF result = g.MeasureString(s, font, Int32.MaxValue, StringFormat.GenericTypographic);
-            return result;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML/XLHelper.cs b/ClosedXML/ClosedXML/ClosedXML/XLHelper.cs
deleted file mode 100644
index d5f704d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/XLHelper.cs
+++ /dev/null
@@ -1,302 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    using System.Linq;
-    using System.Text.RegularExpressions;
-    using System.Drawing;
-
-    /// <summary>
-    /// 	Common methods
-    /// </summary>
-    public static class XLHelper
-    {
-        public const int MinRowNumber = 1;
-        public const int MinColumnNumber = 1;
-        public const int MaxRowNumber = 1048576;
-        public const int MaxColumnNumber = 16384;
-        public const String MaxColumnLetter = "XFD";
-        public const Double Epsilon = 1e-10;
-
-        private const Int32 TwoT26 = 26*26;
-        internal static readonly NumberFormatInfo NumberFormatForParse = CultureInfo.InvariantCulture.NumberFormat;
-        internal static readonly Graphics Graphic = Graphics.FromImage(new Bitmap(200, 200));
-        internal static readonly Double DpiX = Graphic.DpiX;
-
-        internal static readonly Regex A1SimpleRegex = new Regex(
-            @"\A"
-            + @"(?<Reference>" // Start Group to pick
-            + @"(?<Sheet>" // Start Sheet Name, optional
-            + @"("
-            + @"\'([^\[\]\*/\\\?:\']+|\'\')\'"
-            // Sheet name with special characters, surrounding apostrophes are required
-            + @"|"
-            + @"\'?\w+\'?" // Sheet name with letters and numbers, surrounding apostrophes are optional
-            + @")"
-            + @"!)?" // End Sheet Name, optional
-            + @"(?<Range>" // Start range
-            + @"\$?[a-zA-Z]{1,3}\$?\d{1,7}" // A1 Address 1
-            + @"(?<RangeEnd>:\$?[a-zA-Z]{1,3}\$?\d{1,7})?" // A1 Address 2, optional
-            + @"|"
-            + @"(?<ColumnNumbers>\$?\d{1,7}:\$?\d{1,7})" // 1:1
-            + @"|"
-            + @"(?<ColumnLetters>\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})" // A:A
-            + @")" // End Range
-            + @")" // End Group to pick
-            + @"\Z"
-            , RegexOptions.Compiled);
-
-        internal static readonly Regex NamedRangeReferenceRegex =
-            new Regex(@"^('?(?<Sheet>[^'!]+)'?!(?<Range>.+))|((?<Table>[^\[]+)\[(?<Column>[^\]]+)\])$",
-                      RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture
-                );
-
-        /// <summary>
-        /// Gets the column number of a given column letter.
-        /// </summary>
-        /// <param name="columnLetter"> The column letter to translate into a column number. </param>
-        public static int GetColumnNumberFromLetter(string columnLetter)
-        {
-            if (string.IsNullOrEmpty(columnLetter)) throw new ArgumentNullException("columnLetter");
-
-            int retVal;
-            columnLetter = columnLetter.ToUpper();
-
-            //Extra check because we allow users to pass row col positions in as strings
-            if (columnLetter[0] <= '9')
-            {
-                retVal = Int32.Parse(columnLetter, NumberFormatForParse);
-                return retVal;
-            }
-
-            int sum = 0;
-
-            for (int i = 0; i < columnLetter.Length; i++)
-            {
-                sum *= 26;
-                sum += (columnLetter[i] - 'A' + 1);
-            }
-
-            return sum;
-        }
-
-        private static readonly string[] letters = new[] { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
-
-        /// <summary>
-        /// 	Gets the column letter of a given column number.
-        /// </summary>
-        /// <param name="columnNumber"> The column number to translate into a column letter. </param>
-        public static string GetColumnLetterFromNumber(int columnNumber)
-        {
-            columnNumber--; // Adjust for start on column 1
-            if (columnNumber <= 25)
-            {
-                return letters[columnNumber];
-            }
-            var firstPart = (columnNumber) / 26;
-            var remainder = ((columnNumber) % 26) + 1;
-            return GetColumnLetterFromNumber(firstPart) + GetColumnLetterFromNumber(remainder);
-        }
-
-        public static bool IsValidColumn(string column)
-        {
-            var length = column.Length;
-            if (IsNullOrWhiteSpace(column) || length > 3)
-                return false;
-
-            var theColumn = column.ToUpper();
-
-
-            var isValid = theColumn[0] >= 'A' && theColumn[0] <= 'Z';
-            if (length == 1)
-                return isValid;
-
-            if (length == 2)
-                return isValid && theColumn[1] >= 'A' && theColumn[1] <= 'Z';
-
-            if (theColumn[0] >= 'A' && theColumn[0] < 'X')
-                return theColumn[1] >= 'A' && theColumn[1] <= 'Z'
-                       && theColumn[2] >= 'A' && theColumn[2] <= 'Z';
-
-            if (theColumn[0] != 'X') return false;
-
-            if (theColumn[1] < 'F')
-                return theColumn[2] >= 'A' && theColumn[2] <= 'Z';
-
-            if (theColumn[1] != 'F') return false;
-
-            return theColumn[2] >= 'A' && theColumn[2] <= 'D';
-        }
-
-        public static bool IsValidRow(string rowString)
-        {
-            Int32 row;
-            if (Int32.TryParse(rowString, out row))
-                return row > 0 && row <= MaxRowNumber;
-            return false;
-        }
-
-        public static bool IsValidA1Address(string address)
-        {
-            if (IsNullOrWhiteSpace(address))
-                return false;
-
-            address = address.Replace("$", "");
-            var rowPos = 0;
-            var addressLength = address.Length;
-            while (rowPos < addressLength && (address[rowPos] > '9' || address[rowPos] < '0'))
-                rowPos++;
-
-            return
-                rowPos < addressLength
-                && IsValidRow(address.Substring(rowPos))
-                && IsValidColumn(address.Substring(0, rowPos));
-        }
-
-        public static Boolean IsValidRangeAddress(String rangeAddress)
-        {
-            return A1SimpleRegex.IsMatch(rangeAddress);
-        }
-
-        public static Boolean IsValidRangeAddress(IXLRangeAddress rangeAddress)
-        {
-
-            return !rangeAddress.IsInvalid 
-                   && rangeAddress.FirstAddress.RowNumber >= 1 && rangeAddress.LastAddress.RowNumber <= MaxRowNumber
-                   && rangeAddress.FirstAddress.ColumnNumber >= 1 && rangeAddress.LastAddress.ColumnNumber <= MaxColumnNumber
-                   && rangeAddress.FirstAddress.RowNumber <= rangeAddress.LastAddress.RowNumber
-                   && rangeAddress.FirstAddress.ColumnNumber <= rangeAddress.LastAddress.ColumnNumber;
-        }
-
-        public static int GetColumnNumberFromAddress(string cellAddressString)
-        {
-            var rowPos = 0;
-            while (cellAddressString[rowPos] > '9')
-                rowPos++;
-
-            return GetColumnNumberFromLetter(cellAddressString.Substring(0, rowPos));
-        }
-
-        internal static string[] SplitRange(string range)
-        {
-            return range.Contains('-') ? range.Replace('-', ':').Split(':') : range.Split(':');
-        }
-
-        public static Int32 GetPtFromPx(Double px)
-        {
-            return Convert.ToInt32(px*72.0/DpiX);
-        }
-
-        public static Double GetPxFromPt(Int32 pt)
-        {
-            return Convert.ToDouble(pt)*DpiX/72.0;
-        }
-
-        internal static IXLTableRows InsertRowsWithoutEvents(Func<int, bool, IXLRangeRows> insertFunc,
-                                                             XLTableRange tableRange, Int32 numberOfRows,
-                                                             Boolean expandTable)
-        {
-            var ws = tableRange.Worksheet;
-            var tracking = ws.EventTrackingEnabled;
-            ws.EventTrackingEnabled = false;
-
-            var rows = new XLTableRows(ws.Style);
-            var inserted = insertFunc(numberOfRows, false);
-            inserted.ForEach(r => rows.Add(new XLTableRow(tableRange, r as XLRangeRow)));
-
-            if (expandTable)
-                tableRange.Table.ExpandTableRows(numberOfRows);
-
-            ws.EventTrackingEnabled = tracking;
-
-            return rows;
-        }
-
-
-
-        public static bool IsNullOrWhiteSpace(string value)
-        {
-#if NET4
-            return String.IsNullOrWhiteSpace(value);
-#else
-            if (value != null)
-            {
-                var length = value.Length;
-                for (int i = 0; i < length; i++)
-                {
-                    if (!char.IsWhiteSpace(value[i]))
-                    {
-                        return false;
-                    }
-                }
-            }
-            return true;
-#endif
-
-        }
-
-        private static readonly Regex A1RegexRelative = new Regex(
-      @"(?<=\W)(?<one>\$?[a-zA-Z]{1,3}\$?\d{1,7})(?=\W)" // A1
-    + @"|(?<=\W)(?<two>\$?\d{1,7}:\$?\d{1,7})(?=\W)" // 1:1
-    + @"|(?<=\W)(?<three>\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})(?=\W)", RegexOptions.Compiled); // A:A
-
-        private static string Evaluator(Match match, Int32 row, String column)
-        {
-            if (match.Groups["one"].Success)
-            {
-                var split = match.Groups["one"].Value.Split('$');
-                if (split.Length == 1) return column + row; // A1
-                if (split.Length == 3) return match.Groups["one"].Value; // $A$1
-                var a = XLAddress.Create(match.Groups["one"].Value);
-                if (split[0] == String.Empty) return "$" + a.ColumnLetter + row; // $A1
-                return column + "$" + a.RowNumber;
-            }
-
-            if (match.Groups["two"].Success)
-                return ReplaceGroup(match.Groups["two"].Value, row.ToString());
-
-            return ReplaceGroup(match.Groups["three"].Value, column);
-        }
-
-        private static String ReplaceGroup(String value, String item)
-        {
-            var split = value.Split(':');
-            String ret1 = split[0].StartsWith("$") ? split[0] : item;
-            String ret2 = split[1].StartsWith("$") ? split[1] : item;
-            return ret1 + ":" + ret2;
-        }
-
-        internal static String ReplaceRelative(String value, Int32 row, String column)
-        {
-            var oldValue = ">" + value + "<";
-            var newVal = A1RegexRelative.Replace(oldValue, m => Evaluator(m, row, column));
-            return newVal.Substring(1, newVal.Length - 2);
-        }
-
-        public static Boolean AreEqual(Double d1, Double d2)
-        {
-            return Math.Abs(d1 - d2) < Epsilon;
-        }
-
-        public static DateTime GetDate(Object v)
-        {
-            // handle dates
-            if (v is DateTime)
-            {
-                return (DateTime)v;
-            }
-
-            // handle doubles
-            if (v is double)
-            {
-                return DateTime.FromOADate((double)v);
-            }
-
-            // handle everything else
-            return (DateTime)Convert.ChangeType(v, typeof(DateTime));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML/packages.config b/ClosedXML/ClosedXML/ClosedXML/packages.config
deleted file mode 100644
index dfe0d07..0000000
--- a/ClosedXML/ClosedXML/ClosedXML/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/CustomAutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/CustomAutoFilter.cs
deleted file mode 100644
index 6dcdaa4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/CustomAutoFilter.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class CustomAutoFilter : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws;
-
-            #region Single Column Numbers
-            String singleColumnNumbers = "Single Column Numbers";
-            ws = wb.Worksheets.Add(singleColumnNumbers);
-
-            // Add a bunch of numbers to filter
-            ws.Cell("A1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).EqualTo(3).Or.GreaterThan(4);
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Single Column Strings
-            String singleColumnStrings = "Single Column Strings";
-            ws = wb.Worksheets.Add(singleColumnStrings);
-
-            // Add a bunch of strings to filter
-            ws.Cell("A1").SetValue("Strings")
-                         .CellBelow().SetValue("B")
-                         .CellBelow().SetValue("C")
-                         .CellBelow().SetValue("C")
-                         .CellBelow().SetValue("E")
-                         .CellBelow().SetValue("A")
-                         .CellBelow().SetValue("D");
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).Between("B", "D");
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Single Column Mixed
-            String singleColumnMixed = "Single Column Mixed";
-            ws = wb.Worksheets.Add(singleColumnMixed);
-
-            // Add a bunch of items to filter
-            ws.Cell("A1").SetValue("Mixed")
-                         .CellBelow().SetValue("B")
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue("C")
-                         .CellBelow().SetValue("E")
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).EqualTo(3).Or.EqualTo("C");
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Multi Column
-            String multiColumn = "Multi Column";
-            ws = wb.Worksheets.Add(multiColumn);
-
-            ws.Cell("A1").SetValue("First")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            ws.Cell("B1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            ws.Cell("C1").SetValue("Strings")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(2).EqualTo(3).Or.GreaterThan(4);
-            ws.RangeUsed().SetAutoFilter().Column(3).Between("B", "D");
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(3);
-            #endregion
-
-            using (var ms = new MemoryStream())
-            {
-                wb.SaveAs(ms);
-
-                var workbook = new XLWorkbook(ms);
-
-                #region Single Column Numbers
-                workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Single Column Strings
-                workbook.Worksheet(singleColumnStrings).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Single Column Mixed
-                workbook.Worksheet(singleColumnMixed).AutoFilter.Column(1).EqualOrGreaterThan("D");
-                workbook.Worksheet(singleColumnMixed).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Multi Column 
-                workbook.Worksheet(multiColumn).AutoFilter.Column(3).EqualTo("E");
-                workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
-                #endregion
-
-                workbook.SaveAs(filePath);
-                ms.Close();
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/DynamicAutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/DynamicAutoFilter.cs
deleted file mode 100644
index 3791185..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/DynamicAutoFilter.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class DynamicAutoFilter : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws;
-
-            #region Single Column Numbers
-            String singleColumnNumbers = "Single Column Numbers";
-            ws = wb.Worksheets.Add(singleColumnNumbers);
-
-            // Add a bunch of numbers to filter
-            ws.Cell("A1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).AboveAverage();
-
-            // Sort the filtered list
-            //ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Multi Column
-            String multiColumn = "Multi Column";
-            ws = wb.Worksheets.Add(multiColumn);
-
-            ws.Cell("A1").SetValue("First")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            ws.Cell("B1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            ws.Cell("C1").SetValue("Strings")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(2).BelowAverage();
-
-            // Sort the filtered list
-            //ws.AutoFilter.Sort(3);
-            #endregion
-
-            using (var ms = new MemoryStream())
-            {
-                wb.SaveAs(ms);
-
-                var workbook = new XLWorkbook(ms);
-
-                #region Single Column Numbers
-                //workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Multi Column 
-                //workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
-                #endregion
-
-                workbook.SaveAs(filePath);
-                ms.Close();
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/RegularAutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/RegularAutoFilter.cs
deleted file mode 100644
index 9a65eab..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/RegularAutoFilter.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using System;
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class RegularAutoFilter : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws;
-
-            #region Single Column Numbers
-            String singleColumnNumbers = "Single Column Numbers";
-            ws = wb.Worksheets.Add(singleColumnNumbers);
-
-            // Add a bunch of numbers to filter
-            ws.Cell("A1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).AddFilter(3)
-                                                    .AddFilter(1);
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Single Column Strings
-            String singleColumnStrings = "Single Column Strings";
-            ws = wb.Worksheets.Add(singleColumnStrings);
-
-            // Add a bunch of strings to filter
-            ws.Cell("A1").SetValue("Strings")
-                         .CellBelow().SetValue("B")
-                         .CellBelow().SetValue("C")
-                         .CellBelow().SetValue("C")
-                         .CellBelow().SetValue("E")
-                         .CellBelow().SetValue("A")
-                         .CellBelow().SetValue("D");
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).AddFilter("C")
-                                                    .AddFilter("A");
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Single Column Mixed
-            String singleColumnMixed = "Single Column Mixed";
-            ws = wb.Worksheets.Add(singleColumnMixed);
-
-            // Add a bunch of items to filter
-            ws.Cell("A1").SetValue("Mixed")
-                         .CellBelow().SetValue("B")
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue("C")
-                         .CellBelow().SetValue("E")
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).AddFilter("C")
-                                                    .AddFilter(1);
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Multi Column
-            String multiColumn = "Multi Column";
-            ws = wb.Worksheets.Add(multiColumn);
-
-            ws.Cell("A1").SetValue("First")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            ws.Cell("B1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            ws.Cell("C1").SetValue("Strings")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(2).AddFilter(3)
-                                                    .AddFilter(1);
-
-            // Sort the filtered list
-            ws.AutoFilter.Sort(3);
-            #endregion
-
-            #region Table
-            String tableSheetName = "Table";
-            ws = wb.Worksheets.Add(tableSheetName);
-
-            // Add a bunch of numbers to filter
-            ws.Cell("A1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            // Add filters
-            var table = ws.RangeUsed().CreateTable();
-            table.ShowTotalsRow = true;
-            table.Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
-            table.AutoFilter.Column(1).AddFilter(3).AddFilter(4);
-
-            table.AutoFilter.Sort(1);
-            #endregion
-
-            using (var ms = new MemoryStream())
-            {
-                wb.SaveAs(ms);
-
-                var workbook = new XLWorkbook(ms);
-
-                #region Single Column Numbers
-                workbook.Worksheet(singleColumnNumbers).AutoFilter.Column(1).AddFilter(5);
-                workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Single Column Strings
-                workbook.Worksheet(singleColumnStrings).AutoFilter.Column(1).AddFilter("E");
-                workbook.Worksheet(singleColumnStrings).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Single Column Mixed
-                workbook.Worksheet(singleColumnMixed).AutoFilter.Column(1).AddFilter("E");
-                workbook.Worksheet(singleColumnMixed).AutoFilter.Column(1).AddFilter(3);
-                workbook.Worksheet(singleColumnMixed).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Multi Column 
-                workbook.Worksheet(multiColumn).AutoFilter.Column(3).AddFilter("C");
-                workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
-                #endregion
-
-                #region Table
-                workbook.Worksheet(tableSheetName).Table(0).AutoFilter.Column(1).AddFilter(5);
-                workbook.Worksheet(tableSheetName).Table(0).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                workbook.SaveAs(filePath);
-                ms.Close();
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/TopBottomAutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/TopBottomAutoFilter.cs
deleted file mode 100644
index dbd8f88..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/AutoFilters/TopBottomAutoFilter.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class TopBottomAutoFilter : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws;
-
-            #region Single Column Numbers
-            String singleColumnNumbers = "Single Column Numbers";
-            ws = wb.Worksheets.Add(singleColumnNumbers);
-
-            // Add a bunch of numbers to filter
-            ws.Cell("A1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(1).Top(2);
-
-            // Sort the filtered list
-            //ws.AutoFilter.Sort(1);
-            #endregion
-
-            #region Multi Column
-            String multiColumn = "Multi Column";
-            ws = wb.Worksheets.Add(multiColumn);
-
-            ws.Cell("A1").SetValue("First")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            ws.Cell("B1").SetValue("Numbers")
-                         .CellBelow().SetValue(2)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(3)
-                         .CellBelow().SetValue(5)
-                         .CellBelow().SetValue(1)
-                         .CellBelow().SetValue(4);
-
-            ws.Cell("C1").SetValue("Strings")
-             .CellBelow().SetValue("B")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("C")
-             .CellBelow().SetValue("E")
-             .CellBelow().SetValue("A")
-             .CellBelow().SetValue("D");
-
-            // Add filters
-            ws.RangeUsed().SetAutoFilter().Column(2).Bottom(50, XLTopBottomType.Percent);
-
-            // Sort the filtered list
-            //ws.AutoFilter.Sort(3);
-            #endregion
-
-            using (var ms = new MemoryStream())
-            {
-                wb.SaveAs(ms);
-
-                var workbook = new XLWorkbook(ms);
-
-                #region Single Column Numbers
-                //workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
-                #endregion
-
-                #region Multi Column 
-                //workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
-                #endregion
-
-                workbook.SaveAs(filePath);
-                ms.Close();
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/BasicTable.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/BasicTable.cs
deleted file mode 100644
index c084772..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/BasicTable.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class BasicTable : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            // Creating a new workbook
-            var wb = new XLWorkbook();
-
-            //Adding a worksheet
-            var ws = wb.Worksheets.Add("Contacts");
-
-            //Adding text
-            //Title
-            ws.Cell("B2").Value = "Contacts";
-            //First Names
-            ws.Cell("B3").Value = "FName";
-            ws.Cell("B4").Value = "John";
-            ws.Cell("B5").Value = "Hank";
-            ws.Cell("B6").Value = "Dagny";
-            //Last Names
-            ws.Cell("C3").Value = "LName";
-            ws.Cell("C4").Value = "Galt";
-            ws.Cell("C5").Value = "Rearden";
-            ws.Cell("C6").Value = "Taggart";
-
-            //Adding more data types
-            //Is an outcast?
-            ws.Cell("D3").Value = "Outcast";
-            ws.Cell("D4").Value = true;
-            ws.Cell("D5").Value = false;
-            ws.Cell("D6").Value = false;
-            //Date of Birth
-            ws.Cell("E3").Value = "DOB";
-            ws.Cell("E4").Value = new DateTime(1919, 1, 21);
-            ws.Cell("E5").Value = new DateTime(1907, 3, 4);
-            ws.Cell("E6").Value = new DateTime(1921, 12, 15);
-            //Income
-            ws.Cell("F3").Value = "Income";
-            ws.Cell("F4").Value = 2000;
-            ws.Cell("F5").Value = 40000;
-            ws.Cell("F6").Value = 10000;
-
-            //Defining ranges
-            //From worksheet
-            var rngTable = ws.Range("B2:F6");
-            //From another range
-            var rngDates = rngTable.Range("D3:D5"); // The address is relative to rngTable (NOT the worksheet)
-            var rngNumbers = rngTable.Range("E3:E5"); // The address is relative to rngTable (NOT the worksheet)
-
-            //Formatting dates and numbers
-            //Using a OpenXML's predefined formats
-            rngDates.Style.NumberFormat.NumberFormatId = 15;
-            //Using a custom format
-            rngNumbers.Style.NumberFormat.Format = "$ #,##0";
-
-            //Formatting headers
-            var rngHeaders = rngTable.Range("A2:E2"); // The address is relative to rngTable (NOT the worksheet)
-            rngHeaders.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-            rngHeaders.Style.Font.Bold = true;
-            rngHeaders.Style.Fill.BackgroundColor = XLColor.Aqua;
-
-            //Adding grid lines
-            rngTable.Style.Border.BottomBorder = XLBorderStyleValues.Thin;
-
-            //Format title cell
-            rngTable.Cell(1, 1).Style.Font.Bold = true;
-            rngTable.Cell(1, 1).Style.Fill.BackgroundColor = XLColor.CornflowerBlue;
-            rngTable.Cell(1, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
-            //Merge title cells
-            rngTable.Row(1).Merge(); // We could've also used: rngTable.Range("A1:E1").Merge()
-            
-            //Add thick borders
-            rngTable.Style.Border.OutsideBorder = XLBorderStyleValues.Thick;
-
-            // You can also specify the border for each side with:
-            // rngTable.FirstColumn().Style.Border.LeftBorder = XLBorderStyleValues.Thick;
-            // rngTable.LastColumn().Style.Border.RightBorder = XLBorderStyleValues.Thick;
-            // rngTable.FirstRow().Style.Border.TopBorder = XLBorderStyleValues.Thick;
-            // rngTable.LastRow().Style.Border.BottomBorder = XLBorderStyleValues.Thick;
-
-            // Adjust column widths to their content
-            ws.Columns(2, 6).AdjustToContents();
-
-            //Saving the workbook
-            wb.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML.snk b/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML.snk
deleted file mode 100644
index a17cff7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML.snk
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML_Examples.csproj b/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML_Examples.csproj
deleted file mode 100644
index 6ae7ae6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML_Examples.csproj
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{03A518D0-1CB7-488E-861C-C4E782B27A46}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClosedXML_Examples</RootNamespace>
-    <AssemblyName>ClosedXML_Examples</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>ClosedXML_Examples.Program</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AutoFilters\DynamicAutoFilter.cs" />
-    <Compile Include="AutoFilters\TopBottomAutoFilter.cs" />
-    <Compile Include="AutoFilters\CustomAutoFilter.cs" />
-    <Compile Include="AutoFilters\RegularAutoFilter.cs" />
-    <Compile Include="BasicTable.cs" />
-    <Compile Include="Columns\ColumnCollections.cs" />
-    <Compile Include="Columns\ColumnSettings.cs" />
-    <Compile Include="Columns\ColumnCells.cs" />
-    <Compile Include="Columns\DeletingColumns.cs" />
-    <Compile Include="Comments\AddingComments.cs" />
-    <Compile Include="Comments\EditingComments.cs" />
-    <Compile Include="ConditionalFormatting\ConditionalFormatting.cs" />
-    <Compile Include="Delete\DeleteFewWorksheets.cs" />
-    <Compile Include="IXLExample.cs" />
-    <Compile Include="Misc\CopyingRowsAndColumns.cs" />
-    <Compile Include="ModifyFiles.cs" />
-    <Compile Include="Creating\CreateFiles.cs" />
-    <Compile Include="Loading\ChangingBasicTable.cs" />
-    <Compile Include="Misc\AdjustToContents.cs" />
-    <Compile Include="Misc\Collections.cs" />
-    <Compile Include="Misc\BlankCells.cs" />
-    <Compile Include="Misc\AutoFilter.cs" />
-    <Compile Include="Misc\AddingDataTableAsWorksheet.cs" />
-    <Compile Include="Misc\AddingDataSet.cs" />
-    <Compile Include="Misc\TabColors.cs" />
-    <Compile Include="Misc\SheetProtection.cs" />
-    <Compile Include="Misc\ShiftingFormulas.cs" />
-    <Compile Include="Misc\HideSheets.cs" />
-    <Compile Include="Misc\DataValidation.cs" />
-    <Compile Include="Misc\Hyperlinks.cs" />
-    <Compile Include="Misc\InsertingData.cs" />
-    <Compile Include="Misc\InsertingTables.cs" />
-    <Compile Include="Misc\CopyingWorksheets.cs" />
-    <Compile Include="Misc\FreezePanes.cs" />
-    <Compile Include="PageSetup\TwoPages.cs" />
-    <Compile Include="Misc\ShowCase.cs" />
-    <Compile Include="ExampleHelper.cs" />
-    <Compile Include="PivotTables\PivotTables.cs" />
-    <Compile Include="Ranges\SelectingRanges.cs" />
-    <Compile Include="Ranges\CurrentRowColumn.cs" />
-    <Compile Include="Ranges\WalkingRanges.cs" />
-    <Compile Include="Ranges\SortExample.cs" />
-    <Compile Include="Ranges\Sorting.cs" />
-    <Compile Include="Ranges\UsingTables.cs" />
-    <Compile Include="Ranges\CopyingRanges.cs" />
-    <Compile Include="Ranges\NamedRanges.cs" />
-    <Compile Include="Misc\Formulas.cs" />
-    <Compile Include="Misc\Outline.cs" />
-    <Compile Include="Misc\HideUnhide.cs" />
-    <Compile Include="Misc\WorkbookProperties.cs" />
-    <Compile Include="Misc\MergeMoves.cs" />
-    <Compile Include="Ranges\TransposeRanges.cs" />
-    <Compile Include="Ranges\TransposeRangesPlus.cs" />
-    <Compile Include="Misc\LambdaExpressions.cs" />
-    <Compile Include="Loading\LoadFiles.cs" />
-    <Compile Include="Misc\CellValues.cs" />
-    <Compile Include="PageSetup\SheetTab.cs" />
-    <Compile Include="PageSetup\Sheets.cs" />
-    <Compile Include="PageSetup\HeaderFooters.cs" />
-    <Compile Include="PageSetup\Margins.cs" />
-    <Compile Include="PageSetup\Page.cs" />
-    <Compile Include="Ranges\ClearingRanges.cs" />
-    <Compile Include="Ranges\InsertingDeletingColumns.cs" />
-    <Compile Include="Ranges\InsertingDeletingRows.cs" />
-    <Compile Include="Ranges\DeletingRanges.cs" />
-    <Compile Include="Ranges\DefiningRanges.cs" />
-    <Compile Include="Ranges\ShiftingRanges.cs" />
-    <Compile Include="Ranges\MultipleRanges.cs" />
-    <Compile Include="Delete\DeleteRows.cs" />
-    <Compile Include="Rows\RowCells.cs" />
-    <Compile Include="Rows\RowCollection.cs" />
-    <Compile Include="Columns\InsertColumns.cs" />
-    <Compile Include="HelloWorld.cs" />
-    <Compile Include="Misc\MultipleSheets.cs" />
-    <Compile Include="Misc\DataTypes.cs" />
-    <Compile Include="Misc\MergeCells.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Rows\InsertRows.cs" />
-    <Compile Include="Rows\RowSettings.cs" />
-    <Compile Include="StyleExamples.cs" />
-    <Compile Include="Styles\PurpleWorksheet.cs" />
-    <Compile Include="Styles\UsingPhonetics.cs" />
-    <Compile Include="Styles\UsingRichText.cs" />
-    <Compile Include="Styles\UsingColors.cs" />
-    <Compile Include="Styles\DefaultStyles.cs" />
-    <Compile Include="Styles\StyleRowsColumns.cs" />
-    <Compile Include="Styles\StyleWorksheet.cs" />
-    <Compile Include="Styles\StyleAlignment.cs" />
-    <Compile Include="Styles\StyleBorder.cs" />
-    <Compile Include="Styles\StyleFill.cs" />
-    <Compile Include="Styles\StyleFont.cs" />
-    <Compile Include="Styles\StyleNumberFormat.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="ClosedXML.snk" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
-      <Project>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</Project>
-      <Name>ClosedXML</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCells.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCells.cs
deleted file mode 100644
index f4ccf50..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCells.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class ColumnCells : IXLExample
-    {
-
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Column Cells");
-
-            var columnFromWorksheet = ws.Column(1);
-            columnFromWorksheet.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
-            columnFromWorksheet.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
-            columnFromWorksheet.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
-            columnFromWorksheet.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
-
-            var columnFromRange = ws.Range("B1:B9").FirstColumn();
-
-            columnFromRange.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
-            columnFromRange.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
-            columnFromRange.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
-            columnFromRange.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
-
-            workbook.SaveAs(filePath);
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCollections.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCollections.cs
deleted file mode 100644
index a97b777..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCollections.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Columns
-{
-    public class ColumnCollection : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Columns of a Range");
-
-            // All columns in a range
-            ws.Range("A1:B2").Columns().Style.Fill.BackgroundColor = XLColor.DimGray;
-
-            var bigRange = ws.Range("A4:V6");
-
-            // Contiguous columns by number
-            bigRange.Columns(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
-
-            // Contiguous columns by letter
-            bigRange.Columns("D", "E").Style.Fill.BackgroundColor = XLColor.Blue;
-
-            // Contiguous columns by letter
-            bigRange.Columns("G:H").Style.Fill.BackgroundColor = XLColor.DeepPink;
-
-            // Spread columns by number
-            bigRange.Columns("10:11,13:14").Style.Fill.BackgroundColor = XLColor.Orange;
-
-            // Spread columns by letter
-            bigRange.Columns("P:Q,S:T").Style.Fill.BackgroundColor = XLColor.Turquoise;
-
-            // Use a single number/letter
-            bigRange.Columns("V").Style.Fill.BackgroundColor = XLColor.Cyan;
-
-            // Adjust the width
-            ws.Columns("A:V").Width = 3; 
-
-            var ws2 = workbook.Worksheets.Add("Columns of a worksheet");
-            
-            // Contiguous columns by number
-            ws2.Columns(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
-
-            // Contiguous columns by letter
-            ws2.Columns("D", "E").Style.Fill.BackgroundColor = XLColor.Blue;
-
-            // Contiguous columns by letter
-            ws2.Columns("G:H").Style.Fill.BackgroundColor = XLColor.DeepPink;
-
-            // Spread columns by number
-            ws2.Columns("10:11,13:14").Style.Fill.BackgroundColor = XLColor.Orange;
-
-            // Spread columns by letter
-            ws2.Columns("P:Q,S:T").Style.Fill.BackgroundColor = XLColor.Turquoise;
-
-            // Use a single number/letter
-            ws2.Columns("V").Style.Fill.BackgroundColor = XLColor.Cyan;
-
-            // Adjust the width
-            ws2.Columns("A:V").Width = 3;
-            
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnSettings.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnSettings.cs
deleted file mode 100644
index e051640..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnSettings.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Columns
-{
-    public class ColumnSettings : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Constructors
-
-        // Public
-        public ColumnSettings()
-        {
-
-        }
-
-
-        // Private
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Column Settings");
-
-            var col1 = ws.Column("B");
-            col1.Style.Fill.BackgroundColor = XLColor.Red;
-            col1.Width = 20;
-
-            var col2 = ws.Column(4);
-            col2.Style.Fill.BackgroundColor = XLColor.DarkOrange;
-            col2.Width = 5;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/DeletingColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/DeletingColumns.cs
deleted file mode 100644
index 405a9bf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/DeletingColumns.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class DeletingColumns : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Deleting Columns");
-
-            var rngTitles = ws.Range("B2:D2");
-            ws.Row(1).InsertRowsBelow(2);
-
-            var rng1 = ws.Range("B2:D2");
-            var rng2 = ws.Range("F2:G2");
-            var rng3 = ws.Range("A1:A3");
-            var col1 = ws.Column(1);
-
-            rng1.Style.Fill.BackgroundColor = XLColor.Orange;
-            rng2.Style.Fill.BackgroundColor = XLColor.Blue;
-            rng3.Style.Fill.BackgroundColor = XLColor.Red;
-            col1.Style.Fill.BackgroundColor = XLColor.Black;
-
-            ws.Columns("A,C,E:H").Delete();
-            ws.Cell("A2").Value = "OK";
-            ws.Cell("B2").Value = "OK";
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/InsertColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/InsertColumns.cs
deleted file mode 100644
index e5f5579..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/InsertColumns.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Columns
-{
-    public class InsertColumns : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Inserting Columns");
-
-            // Color the entire spreadsheet using columns
-            ws.Columns().Style.Fill.BackgroundColor = XLColor.LightCyan;
-
-            // Put a value in a few cells
-            foreach (var r in Enumerable.Range(1, 5))
-                foreach (var c in Enumerable.Range(1, 5))
-                    ws.Cell(r, c).Value = "X";
-
-
-            var blueColumn = ws.Column(2);
-            var redColumn = ws.Column(5);
-
-            blueColumn.Style.Fill.BackgroundColor = XLColor.Blue;
-            blueColumn.InsertColumnsAfter(2);
-
-
-            redColumn.Style.Fill.BackgroundColor = XLColor.Red;
-            redColumn.InsertColumnsBefore(2);
-
-            ws.Rows(3, 4).Style.Fill.BackgroundColor = XLColor.Orange;
-            ws.Range("B1:D1").InsertColumnsAfter(2);
-            ws.Range("B2:D2").InsertColumnsBefore(2);
-            ws.Range("B3:D3").InsertColumnsAfter(2);
-            ws.Range("B4:D4").InsertColumnsBefore(2);
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Comments/AddingComments.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Comments/AddingComments.cs
deleted file mode 100644
index fe5b0d3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Comments/AddingComments.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using ClosedXML.Excel;
-using System.IO;
-
-namespace ClosedXML_Examples 
-{
-    public class AddingComments : IXLExample 
-    {
-
-        public void Create(string filePath)
-        {
-            var wb = new XLWorkbook {Author = "Manuel"};
-            AddMiscComments(wb);
-            AddVisibilityComments(wb);
-            AddPosition(wb);
-            AddSignatures(wb);
-            AddStyleAlignment(wb);
-            AddColorsAndLines(wb);
-            AddMagins(wb);
-            AddProperties(wb);
-            AddProtection(wb);
-            AddSize(wb);
-            AddWeb(wb);
-
-            wb.SaveAs(filePath);
-        }
-
-        private void AddWeb(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Web");
-            ws.Cell("A1").Comment.Style.Web.AlternateText = "The alternate text in case you need it.";
-        }
-
-        private void AddSize(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Size");
-
-            // Automatic size is a copy of the property comment.Style.Alignment.AutomaticSize
-            // I created the duplicate because it makes more sense for it to be in Size
-            // but Excel has it under the Alignment tab.
-            ws.Cell("A2").Comment.AddText("Things are very tight around here.");
-            ws.Cell("A2").Comment.Style.Size.SetAutomaticSize();
-
-            ws.Cell("A4").Comment.AddText("Different size");
-            ws.Cell("A4").Comment.Style
-                .Size.SetHeight(30) // The height is set in the same units as row.Height
-                .Size.SetWidth(30); // The width is set in the same units as row.Width
-
-            // Set all comments to visible
-            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
-        }
-
-        private void AddProtection(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Protection");
-
-            ws.Cell("A1").Comment.Style
-                .Protection.SetLocked(false)
-                .Protection.SetLockText(false);
-        }
-
-        private void AddProperties(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Properties");
-
-            ws.Cell("A1").Comment.Style.Properties.Positioning = XLDrawingAnchor.Absolute;
-            ws.Cell("A2").Comment.Style.Properties.Positioning = XLDrawingAnchor.MoveAndSizeWithCells;
-            ws.Cell("A3").Comment.Style.Properties.Positioning = XLDrawingAnchor.MoveWithCells;
-        }
-
-        private void AddMagins(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Margins");
-
-            ws.Cell("A2").Comment
-                .SetVisible()
-                .AddText("Lorem ipsum dolor sit amet, adipiscing elit. ").AddNewLine()
-                .AddText("Nunc elementum, sapien a ultrices, commodo nisl. ").AddNewLine()
-                .AddText("Consequat erat lectus a nisi. Aliquam facilisis.");
-
-            ws.Cell("A2").Comment.Style
-                .Margins.SetAll(0.25)
-                .Size.SetAutomaticSize();
-        }
-
-        private void AddColorsAndLines(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Colors and Lines");
-
-            ws.Cell("A2").Comment
-                .AddText("Now ")
-                .AddText("THIS").SetBold().SetFontColor(XLColor.Red)
-                .AddText(" is colorful!");
-            ws.Cell("A2").Comment.Style
-                .ColorsAndLines.SetFillColor(XLColor.RichCarmine)
-                .ColorsAndLines.SetFillTransparency(0.25) // 25% opaque
-                .ColorsAndLines.SetLineColor(XLColor.Blue)
-                .ColorsAndLines.SetLineTransparency(0.75) // 75% opaque
-                .ColorsAndLines.SetLineDash(XLDashStyle.LongDash)
-                .ColorsAndLines.SetLineStyle(XLLineStyle.ThickBetweenThin)
-                .ColorsAndLines.SetLineWeight(7.5);
-
-            // Set all comments to visible
-            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
-        }
-
-        private void AddStyleAlignment(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Alignment");
-
-            // Automagically adjust the size of the comment to fit the contents
-            ws.Cell("A1").Comment.Style.Alignment.SetAutomaticSize();
-            ws.Cell("A1").Comment.AddText("Things are pretty tight around here");
-
-            // Default values
-            ws.Cell("A3").Comment
-                .AddText("Default Alignments:").AddNewLine()
-                .AddText("Vertical = Top").AddNewLine()
-                .AddText("Horizontal = Left").AddNewLine()
-                .AddText("Orientation = Left to Right");
-
-            // Let's change the alignments
-            ws.Cell("A8").Comment
-                .AddText("Vertical = Bottom").AddNewLine()
-                .AddText("Horizontal = Right");
-            ws.Cell("A8").Comment.Style
-                .Alignment.SetVertical(XLDrawingVerticalAlignment.Bottom)
-                .Alignment.SetHorizontal(XLDrawingHorizontalAlignment.Right);
-
-            // And now the orientation...
-            ws.Cell("D3").Comment.AddText("Orientation = Bottom to Top");
-            ws.Cell("D3").Comment.Style
-                .Alignment.SetOrientation(XLDrawingTextOrientation.BottomToTop)
-                .Alignment.SetAutomaticSize();
-
-            ws.Cell("E3").Comment.AddText("Orientation = Top to Bottom");
-            ws.Cell("E3").Comment.Style
-                .Alignment.SetOrientation(XLDrawingTextOrientation.TopToBottom)
-                .Alignment.SetAutomaticSize();
-
-            ws.Cell("F3").Comment.AddText("Orientation = Vertical");
-            ws.Cell("F3").Comment.Style
-                .Alignment.SetOrientation(XLDrawingTextOrientation.Vertical)
-                .Alignment.SetAutomaticSize();
-
-
-            // Set all comments to visible
-            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
-        }
-
-        private static void AddMiscComments(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Comments");
-
-            ws.Cell("A1").SetValue("Hidden").Comment.AddText("Hidden");
-            ws.Cell("A2").SetValue("Visible").Comment.AddText("Visible");
-            ws.Cell("A3").SetValue("On Top").Comment.AddText("On Top");
-            ws.Cell("A4").SetValue("Underneath").Comment.AddText("Underneath");
-            ws.Cell("A4").Comment.Style.Alignment.SetVertical(XLDrawingVerticalAlignment.Bottom);
-            ws.Cell("A3").Comment.SetZOrder(ws.Cell("A4").Comment.ZOrder + 1);
-
-            ws.Cell("D9").Comment.AddText("Vertical");
-            ws.Cell("D9").Comment.Style.Alignment.Orientation = XLDrawingTextOrientation.Vertical;
-            ws.Cell("D9").Comment.Style.Size.SetAutomaticSize();
-
-            ws.Cell("E9").Comment.AddText("Top to Bottom");
-            ws.Cell("E9").Comment.Style.Alignment.Orientation = XLDrawingTextOrientation.TopToBottom;
-            ws.Cell("E9").Comment.Style.Size.SetAutomaticSize();
-
-            ws.Cell("F9").Comment.AddText("Bottom to Top");
-            ws.Cell("F9").Comment.Style.Alignment.Orientation = XLDrawingTextOrientation.BottomToTop;
-            ws.Cell("F9").Comment.Style.Size.SetAutomaticSize();
-
-            ws.Cell("E1").Comment.Position.SetColumn(5);
-            ws.Cell("E1").Comment.AddText("Start on Col E, on top border");
-            ws.Cell("E1").Comment.Style.Size.SetWidth(10);
-            var cE3 = ws.Cell("E3").Comment;
-            cE3.AddText("Size and position");
-            cE3.Position.SetColumn(5).SetRow(4).SetColumnOffset(7).SetRowOffset(10);
-            cE3.Style.Size.SetHeight(25).Size.SetWidth(10);
-            var cE7 = ws.Cell("E7").Comment;
-            cE7.Position.SetColumn(6).SetRow(7).SetColumnOffset(0).SetRowOffset(0);
-            cE7.Style.Size.SetHeight(ws.Row(7).Height).Size.SetWidth(ws.Column(6).Width);
-
-            ws.Cell("G1").Comment.AddText("Automatic Size");
-            ws.Cell("G1").Comment.Style.Alignment.SetAutomaticSize();
-            var cG3 = ws.Cell("G3").Comment;
-            cG3.SetAuthor("MDeLeon");
-            cG3.AddSignature();
-            cG3.AddText("This is a test of the emergency broadcast system.");
-            cG3.AddNewLine();
-            cG3.AddText("Do ");
-            cG3.AddText("NOT").SetFontColor(XLColor.RadicalRed).SetUnderline().SetBold();
-            cG3.AddText(" forget it.");
-            cG3.Style
-                .Size.SetWidth(25)
-                .Size.SetHeight(100)
-                .Alignment.SetDirection(XLDrawingTextDirection.LeftToRight)
-                .Alignment.SetHorizontal(XLDrawingHorizontalAlignment.Distributed)
-                .Alignment.SetVertical(XLDrawingVerticalAlignment.Center)
-                .Alignment.SetOrientation(XLDrawingTextOrientation.LeftToRight)
-                .ColorsAndLines.SetFillColor(XLColor.Cyan)
-                .ColorsAndLines.SetFillTransparency(0.25)
-                .ColorsAndLines.SetLineColor(XLColor.DarkBlue)
-                .ColorsAndLines.SetLineTransparency(0.75)
-                .ColorsAndLines.SetLineDash(XLDashStyle.DashDot)
-                .ColorsAndLines.SetLineStyle(XLLineStyle.ThinThick)
-                .ColorsAndLines.SetLineWeight(5)
-                .Margins.SetAll(0.25)
-                .Properties.SetPositioning(XLDrawingAnchor.MoveAndSizeWithCells)
-                .Protection.SetLocked(false)
-                .Protection.SetLockText(false)
-                .Web.SetAlternateText("This won't be released to the web");
-
-            ws.Cell("A9").Comment.SetAuthor("MDeLeon").AddSignature().AddText("Something");
-            ws.Cell("A9").Comment.SetBold().SetFontColor(XLColor.DarkBlue);
-
-            ws.CellsUsed(true, c => !c.Address.ToStringRelative().Equals("A1") && c.HasComment).ForEach(c => c.Comment.SetVisible());
-        }
-
-        private static void AddVisibilityComments(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Visibility");
-
-            // By default comments are hidden
-            ws.Cell("A1").SetValue("I have a hidden comment").Comment.AddText("Hidden");
-            
-            // Set the comment as visible
-            ws.Cell("A2").Comment.SetVisible().AddText("Visible");
-
-            // The ZOrder on previous comments were 1 and 2 respectively
-            // here we're explicit about the ZOrder
-            ws.Cell("A3").Comment.SetZOrder(5).SetVisible().AddText("On Top");
-
-            // We want this comment to appear underneath the one for A3
-            // so we set the ZOrder to something lower
-            ws.Cell("A4").Comment.SetZOrder(4).SetVisible().AddText("Underneath");
-            ws.Cell("A4").Comment.Style.Alignment.SetVertical(XLDrawingVerticalAlignment.Bottom);
-            
-            // Alternatively you could set all comments to visible with the following line:
-            // ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
-
-            ws.Columns().AdjustToContents();
-        }
-
-        private void AddPosition(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Position");
-            
-            ws.Columns().Width = 10;
-
-            ws.Cell("A1").Comment.AddText("This is an unusual place for a comment...");
-            ws.Cell("A1").Comment.Position
-                .SetColumn(3) // Starting from the third column
-                .SetColumnOffset(5) // The comment will start in the middle of the third column
-                .SetRow(5) // Starting from the fifth row
-                .SetRowOffset(7.5); // The comment will start in the middle of the fifth row
-
-            // Set all comments to visible
-            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
-        }
-
-        private void AddSignatures(XLWorkbook wb)
-        {
-            var ws = wb.Worksheets.Add("Signatures");
-
-            // By default the signature will be with the logged user
-            // ws.Cell("A2").Comment.AddSignature().AddText("Hello World!");
-
-            // You can override this by specifying the comment's author:
-            ws.Cell("A2").Comment
-                .SetAuthor("MDeLeon")
-                .AddSignature()
-                .AddText("Hello World!");
-            
-
-            // Set all comments to visible
-            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Comments/EditingComments.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Comments/EditingComments.cs
deleted file mode 100644
index 163bbea..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Comments/EditingComments.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using ClosedXML.Excel;
-using System.IO;
-
-namespace ClosedXML_Examples 
-{
-    class EditingComments : IXLExample 
-    {
-
-        public void Create(string filePath) {
-
-            // Exercise(@"path/to/test/resources/comments");
-          
-        }
-
-        public void Exercise(string basePath) 
-        {
-
-            // INCOMPLETE
-
-            var book = new XLWorkbook(Path.Combine(basePath, "EditingComments.xlsx"));
-            var sheet = book.Worksheet(1);
-
-            // no change
-            // A1
-
-            // edit existing comment
-            sheet.Cell("B3").Comment.AddNewLine();
-            sheet.Cell("B3").Comment.AddSignature();
-            sheet.Cell("B3").Comment.AddText("more comment");
-
-            // delete
-            //sheet.Cell("C1").DeleteComment();
-
-            // clear contents
-            sheet.Cell("D3").Clear(XLClearOptions.Contents);
-
-            // new basic
-            sheet.Cell("E1").Comment.AddText("non authored comment");
-
-            // new with author
-            sheet.Cell("F3").Comment.AddSignature();
-            sheet.Cell("F3").Comment.AddText("comment from author");
-
-            // TODO: merge with cells
-            // TODO: resize with cells
-            // TODO: visible
-
-            book.SaveAs(Path.Combine(basePath, "EditingComments_modified.xlsx"));
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/ConditionalFormatting/ConditionalFormatting.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/ConditionalFormatting/ConditionalFormatting.cs
deleted file mode 100644
index f87825b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/ConditionalFormatting/ConditionalFormatting.cs
+++ /dev/null
@@ -1,596 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class CFColorScaleLowMidHigh : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().ColorScale()
-                .LowestValue(XLColor.Red)
-                .Midpoint(XLCFContentType.Percent, "50", XLColor.Yellow) 
-                .HighestValue(XLColor.Green);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFColorScaleLowHigh : IXLExample
-    {
-
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().ColorScale()
-                .Minimum(XLCFContentType.Number, "2", XLColor.Red)
-                .Maximum(XLCFContentType.Percentile, "90", XLColor.Green);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFStartsWith : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("Hellos")
-                .CellBelow().SetValue("Hell")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenStartsWith("Hell")
-                .Fill.SetBackgroundColor(XLColor.Red)
-                .Border.SetOutsideBorder(XLBorderStyleValues.Thick)
-                .Border.SetOutsideBorderColor(XLColor.Blue)
-                .Font.SetBold();
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFEndsWith : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("Hellos")
-                .CellBelow().SetValue("Hell")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenEndsWith("ll")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFIsBlank : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("")
-                .CellBelow().SetValue("")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenIsBlank()
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFNotBlank : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("")
-                .CellBelow().SetValue("")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenNotBlank()
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFIsError : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetFormulaA1("1/0")
-                .CellBelow().SetFormulaA1("1/0")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenIsError()
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFNotError : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetFormulaA1("1/0")
-                .CellBelow().SetFormulaA1("1/0")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenNotError()
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFContains : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("Hellos")
-                .CellBelow().SetValue("Hell")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenContains("Hell")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFNotContains : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("Hellos")
-                .CellBelow().SetValue("Hell")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenNotContains("Hell")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-
-    public class CFEqualsString : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("Hellos")
-                .CellBelow().SetValue("Hell")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenEquals("Hell")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFEqualsNumber : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenEquals(2)
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFNotEqualsString : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue("Hello")
-                .CellBelow().SetValue("Hellos")
-                .CellBelow().SetValue("Hell")
-                .CellBelow().SetValue("Holl");
-
-            ws.RangeUsed().AddConditionalFormat().WhenNotEquals("Hell")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFNotEqualsNumber : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenNotEquals(2)
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFGreaterThan : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenGreaterThan("2")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFEqualOrGreaterThan : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenEqualOrGreaterThan("2")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFLessThan : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenLessThan("2")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFEqualOrLessThan : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenEqualOrLessThan("2")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFBetween : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenBetween("2", "3")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFNotBetween : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenNotBetween("2", "3")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFUnique : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenIsUnique()
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFDuplicate : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenIsDuplicate()
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFIsTrue : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenIsTrue("TRUE")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFTop : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenIsTop(2)
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFBottom : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().WhenIsBottom(10, XLTopBottomType.Percent)
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFDataBar : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().DataBar(XLColor.Red, true)
-                .LowestValue()
-                .Maximum(XLCFContentType.Percent, "100");
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFIconSet : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().IconSet(XLIconSetStyle.ThreeTrafficLights2, true, true)
-                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "0", XLCFContentType.Number)
-                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "2", XLCFContentType.Number)
-                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "3", XLCFContentType.Number);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFTwoConditions : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-                .CellBelow().SetValue(1)
-                .CellBelow().SetValue(2)
-                .CellBelow().SetValue(3);
-
-            ws.RangeUsed().AddConditionalFormat().IconSet(XLIconSetStyle.ThreeTrafficLights2, true, true)
-                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "0", XLCFContentType.Number)
-                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "2", XLCFContentType.Number)
-                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "3", XLCFContentType.Number);
-
-            ws.RangeUsed().AddConditionalFormat().WhenContains("1")
-                .Fill.SetBackgroundColor(XLColor.Red);
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFInsertRows : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.Cell(2,1).SetValue(1)
-                .CellRight().SetValue(1)
-                .CellRight().SetValue(2)
-                .CellRight().SetValue(3);
-
-            var range = ws.RangeUsed();
-            range.AddConditionalFormat().WhenEquals("1").Font.SetBold();
-            range.InsertRowsAbove(1);
-            
-
-            workbook.SaveAs(filePath);
-        }
-    }
-
-    public class CFTest : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.AddWorksheet("Sheet1");
-
-            ws.FirstCell().SetValue(1)
-              .CellBelow().SetValue(1)
-              .CellBelow().SetValue(2)
-              .CellBelow().SetValue(3)
-              .CellBelow().SetValue(4);
-
-            ws.RangeUsed().AddConditionalFormat().DataBar(XLColor.Red)
-                .LowestValue()
-                .HighestValue();
-                
-            workbook.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Creating/CreateFiles.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Creating/CreateFiles.cs
deleted file mode 100644
index 24cd221..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Creating/CreateFiles.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using ClosedXML_Examples.Columns;
-using ClosedXML_Examples.Misc;
-using ClosedXML_Examples.PageSetup;
-using ClosedXML_Examples.Ranges;
-using ClosedXML_Examples.Rows;
-using ClosedXML_Examples.Styles;
-using System.IO;
-
-namespace ClosedXML_Examples
-{
-    public class CreateFiles
-    {
-        public static void CreateAllFiles()
-        {
-            var path = @"C:\ClosedXML_Tests\Created";
-          
-            new HelloWorld().Create(path + @"\HelloWorld.xlsx");
-            new BasicTable().Create(path + @"\BasicTable.xlsx");
-
-            new StyleExamples().Create();
-            new ChangingBasicTable().Create(path + @"\BasicTable_Modified.xlsx");
-            new ShiftingRanges().Create(path + @"\ShiftingRanges.xlsx");
-            new ColumnSettings().Create(path + @"\ColumnSettings.xlsx");
-            new RowSettings().Create(path + @"\RowSettings.xlsx");
-            new MergeCells().Create(path + @"\MergedCells.xlsx");
-            new InsertRows().Create(path + @"\InsertRows.xlsx");
-            new InsertColumns().Create(path + @"\InsertColumns.xlsx");
-            new ColumnCollection().Create(path + @"\ColumnCollection.xlsx");
-            new DataTypes().Create(path + @"\DataTypes.xlsx");
-            new MultipleSheets().Create(path + @"\MultipleSheets.xlsx");
-            new RowCollection().Create(path + @"\RowCollection.xlsx");
-            new DefiningRanges().Create(path + @"\DefiningRanges.xlsx");
-            new ClearingRanges().Create(path + @"\ClearingRanges.xlsx");
-            new DeletingRanges().Create(path + @"\DeletingRanges.xlsx");
-            new Margins().Create(path + @"\Margins.xlsx");
-            new Page().Create(path + @"\Page.xlsx");
-            new HeaderFooters().Create(path + @"\HeaderFooters.xlsx");
-            new Sheets().Create(path + @"\Sheets.xlsx");
-            new SheetTab().Create(path + @"\SheetTab.xlsx");
-            new MultipleRanges().Create(path + @"\MultipleRanges.xlsx");
-            new StyleWorksheet().Create(path + @"\StyleWorksheet.xlsx");
-            new StyleRowsColumns().Create(path + @"\StyleRowsColumns.xlsx");
-            new InsertingDeletingRows().Create(path + @"\InsertingDeletingRows.xlsx");
-            new InsertingDeletingColumns().Create(path + @"\InsertingDeletingColumns.xlsx");
-            new DeletingColumns().Create(path + @"\DeletingColumns.xlsx");
-            new CellValues().Create(path + @"\CellValues.xlsx");
-            new LambdaExpressions().Create(path + @"\LambdaExpressions.xlsx");
-            new DefaultStyles().Create(path + @"\DefaultStyles.xlsx");
-            new TransposeRanges().Create(path + @"\TransposeRanges.xlsx");
-            new TransposeRangesPlus().Create(path + @"\TransposeRangesPlus.xlsx");
-            new MergeMoves().Create(path + @"\MergedMoves.xlsx");
-            new WorkbookProperties().Create(path + @"\WorkbookProperties.xlsx");
-            new AdjustToContents().Create(path + @"\AdjustToContents.xlsx");
-            new HideUnhide().Create(path + @"\HideUnhide.xlsx");
-            new Outline().Create(path + @"\Outline.xlsx");
-            new Formulas().Create(path + @"\Formulas.xlsx");
-            new Collections().Create(path + @"\Collections.xlsx");
-            new NamedRanges().Create(path + @"\NamedRanges.xlsx");
-            new CopyingRanges().Create(path + @"\CopyingRanges.xlsx");
-            new BlankCells().Create(path + @"\BlankCells.xlsx");
-            new TwoPages().Create(path + @"\TwoPages.xlsx");
-            new UsingColors().Create(path + @"\UsingColors.xlsx");
-
-            new ColumnCells().Create(path + @"\ColumnCells.xlsx");
-            new RowCells().Create(path + @"\RowCells.xlsx");
-            new FreezePanes().Create(path + @"\FreezePanes.xlsx");
-            new UsingTables().Create(path + @"\UsingTables.xlsx");
-            new ShowCase().Create(path + @"\ShowCase.xlsx");
-            new CopyingWorksheets().Create(path + @"\CopyingWorksheets.xlsx");
-            new InsertingTables().Create(path + @"\InsertingTables.xlsx");
-            new InsertingData().Create(path + @"\InsertingData.xlsx");
-            new Hyperlinks().Create(path + @"\Hyperlinks.xlsx");
-            new DataValidation().Create(path + @"\DataValidation.xlsx");
-            new HideSheets().Create(path + @"\HideSheets.xlsx");
-            new SheetProtection().Create(path + @"\SheetProtection.xlsx");
-            new AutoFilter().Create(path + @"\AutoFilter.xlsx");
-            new Sorting().Create(path + @"\Sorting.xlsx");
-            new SortExample().Create(path + @"\SortExample.xlsx");
-            new AddingDataSet().Create(path + @"\AddingDataSet.xlsx");
-            new AddingDataTableAsWorksheet().Create(path + @"\AddingDataTableAsWorksheet.xlsx");
-            new TabColors().Create(path + @"\TabColors.xlsx");
-            new ShiftingFormulas().Create(path + @"\ShiftingFormulas.xlsx");
-            new CopyingRowsAndColumns().Create(path + @"\CopyingRowsAndColumns.xlsx");
-            new UsingRichText().Create(path + @"\UsingRichText.xlsx");
-            new UsingPhonetics().Create(path + @"\UsingPhonetics.xlsx");
-            new WalkingRanges().Create(path + @"\CellMoves.xlsx");
-            new AddingComments().Create(path + @"\AddingComments.xlsx");
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Delete/DeleteFewWorksheets.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Delete/DeleteFewWorksheets.cs
deleted file mode 100644
index 8d879fc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Delete/DeleteFewWorksheets.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Delete
-{
-    public class DeleteFewWorksheets:IXLExample
-    {
-        public void Create(string filePath)
-        {
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                //Note: Prepare
-                {
-                    var workbook = new XLWorkbook();
-                    workbook.Worksheets.Add("1");
-                    workbook.Worksheets.Add("2");
-                    workbook.Worksheets.Add("3");
-                    workbook.Worksheets.Add("4");
-                    workbook.SaveAs(tempFile);
-                }
-
-                //Note: Delate few worksheet
-                {
-                    var workbook = new XLWorkbook(tempFile);
-                    workbook.Worksheets.Delete("1");
-                    workbook.Worksheets.Delete("2");
-                    workbook.SaveAs(filePath);
-                }
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-            
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Delete/DeleteRows.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Delete/DeleteRows.cs
deleted file mode 100644
index 25b7152..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Delete/DeleteRows.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Delete
-{
-    public class DeleteRows : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            #region Create case
-            {
-                var workbook = new XLWorkbook();
-                var ws = workbook.Worksheets.Add("Delete red rows");
-
-                // Put a value in a few cells
-                foreach (var r in Enumerable.Range(1, 5))
-                    foreach (var c in Enumerable.Range(1, 5))
-                        ws.Cell(r, c).Value = string.Format("R{0}C{1}", r, c);
-
-
-                var blueRow = ws.Rows(1, 2);
-                var redRow = ws.Row(5);
-
-                blueRow.Style.Fill.BackgroundColor = XLColor.Blue;
-
-                redRow.Style.Fill.BackgroundColor = XLColor.Red;
-                workbook.SaveAs(filePath);
-            }
-            #endregion
-
-            #region Remove rows
-            {
-                var workbook = new XLWorkbook(filePath);
-                var ws = workbook.Worksheets.Worksheet("Delete red rows");
-
-                ws.Rows(1, 2).Delete();
-                workbook.Save();
-            }
-            #endregion
-
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/ExampleHelper.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/ExampleHelper.cs
deleted file mode 100644
index 188a5b1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/ExampleHelper.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.IO;
-
-namespace ClosedXML_Examples
-{
-    public static class ExampleHelper
-    {
-        public static string GetTempFilePath()
-        {
-            return Path.GetTempFileName();
-        }
-
-        public static string GetTempFilePath(string filePath)
-        {
-            var extension = Path.GetExtension(filePath);
-            var tempFilePath = GetTempFilePath();
-            return Path.ChangeExtension(tempFilePath, extension);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/HelloWorld.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/HelloWorld.cs
deleted file mode 100644
index 5249a60..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/HelloWorld.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class HelloWorld
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var worksheet = workbook.Worksheets.Add("Sample Sheet");
-            worksheet.Cell("A1").Value = "Hello World!";
-            workbook.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/IXLExample.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/IXLExample.cs
deleted file mode 100644
index ad4384f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/IXLExample.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace ClosedXML_Examples
-{
-    public interface IXLExample
-    {
-        void Create(string filePath);
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/ChangingBasicTable.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/ChangingBasicTable.cs
deleted file mode 100644
index 10d122e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/ChangingBasicTable.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class ChangingBasicTable : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new BasicTable().Create(tempFile);
-                var workbook = new XLWorkbook(tempFile);
-                var ws = workbook.Worksheet(1);
-
-                // Change the background color of the headers
-                var rngHeaders = ws.Range("B3:F3");
-                rngHeaders.Style.Fill.BackgroundColor = XLColor.LightSalmon;
-
-                // Change the date formats
-                var rngDates = ws.Range("E4:E6");
-                rngDates.Style.DateFormat.Format = "MM/dd/yyyy";
-
-                // Change the income values to text
-                var rngNumbers = ws.Range("F4:F6");
-                foreach (var cell in rngNumbers.Cells())
-                {
-                    string formattedString = cell.GetFormattedString();
-                    cell.DataType = XLCellValues.Text;
-                    cell.Value = formattedString + " Dollars";
-                }
-
-                ws.Columns().AdjustToContents();
-
-                workbook.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/LoadFiles.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/LoadFiles.cs
deleted file mode 100644
index cc1b1d6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/LoadFiles.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class LoadFiles
-    {
-        public static void LoadAllFiles()
-        {
-            var forLoadingFolder = @"C:\ClosedXML_Tests\Created";
-            var forSavingFolder = @"C:\ClosedXML_Tests\Modified";
-
-            foreach (var file in Directory.GetFiles(forLoadingFolder))
-            {
-                var fileInfo = new FileInfo(file);
-                var fileName = fileInfo.Name;
-                LoadAndSaveFile(forLoadingFolder + @"\" + fileName, forSavingFolder + @"\" + fileName);
-            }
-
-            //LoadAndSaveFile(forLoadingFolder + @"\StyleRowsColumns.xlsx", forSavingFolder + @"\StyleRowsColumns.xlsx");
-        }
-
-        private static void LoadAndSaveFile(String input, String output)
-        {
-            var wb = new XLWorkbook(input);
-            wb.SaveAs(output);
-            wb.SaveAs(output);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AddingDataSet.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AddingDataSet.cs
deleted file mode 100644
index ad822aa..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AddingDataSet.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Data;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Misc
-{
-    public class AddingDataSet : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-
-            var dataSet = GetDataSet();
-
-            // Add all DataTables in the DataSet as a worksheets
-            wb.Worksheets.Add(dataSet);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-        private DataSet GetDataSet()
-        {
-            var ds = new DataSet();
-            ds.Tables.Add(GetTable("Patients"));
-            ds.Tables.Add(GetTable("Employees"));
-            ds.Tables.Add(GetTable("Information"));
-            return ds;
-        }
-
-        private DataTable GetTable(String tableName)
-        {
-            DataTable table = new DataTable();
-            table.TableName = tableName;
-            table.Columns.Add("Dosage", typeof(int));
-            table.Columns.Add("Drug", typeof(string));
-            table.Columns.Add("Patient", typeof(string));
-            table.Columns.Add("Date", typeof(DateTime));
-
-            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
-            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
-            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
-            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
-            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
-            return table;
-        }
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AddingDataTableAsWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AddingDataTableAsWorksheet.cs
deleted file mode 100644
index cc142a0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AddingDataTableAsWorksheet.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Data;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Misc
-{
-    public class AddingDataTableAsWorksheet : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-
-            var dataTable = GetTable("Information");
-
-            // Add a DataTable as a worksheet
-            wb.Worksheets.Add(dataTable);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-        private DataTable GetTable(String tableName)
-        {
-            DataTable table = new DataTable();
-            table.TableName = tableName;
-            table.Columns.Add("Dosage", typeof(int));
-            table.Columns.Add("Drug", typeof(string));
-            table.Columns.Add("Patient", typeof(string));
-            table.Columns.Add("Date", typeof(DateTime));
-
-            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
-            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
-            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
-            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
-            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
-            return table;
-        }
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AdjustToContents.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AdjustToContents.cs
deleted file mode 100644
index c35304d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AdjustToContents.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class AdjustToContents : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Adjust To Contents");
-
-            // Set some values with different font sizes
-            ws.Cell(1, 1).Value = "Tall Row";
-            ws.Cell(1, 1).Style.Font.FontSize = 30;
-            ws.Cell(2, 1).Value = "Very Wide Column";
-            ws.Cell(2, 1).Style.Font.FontSize = 20;
-            
-            // Adjust column width
-            ws.Column(1).AdjustToContents();
-
-            // Adjust row heights
-            ws.Rows(1, 2).AdjustToContents();
-
-            // You can also adjust all rows/columns in one shot
-            // ws.Rows().AdjustToContents();
-            // ws.Columns().AdjustToContents();
-
-
-            // We'll now select which cells should be used for calculating the
-            // column widths (same method applies for row heights)
-            
-            // Set the values
-            ws.Cell(4, 2).Value = "Width ignored because calling column.AdjustToContents(5, 7)";
-            ws.Cell(5, 2).Value = "Short text";
-            ws.Cell(6, 2).Value = "Width ignored because it's part of a merge";
-            ws.Range(6, 2, 6, 4).Merge();
-            ws.Cell(7, 2).Value = "Width should adjust to this cell";
-            ws.Cell(8, 2).Value = "Width ignored because calling column.AdjustToContents(5, 7)";
-
-            // Adjust column widths only taking into account rows 5-7
-            // (merged cells will be ignored)
-            ws.Column(2).AdjustToContents(5, 7);
-
-            // You can also specify the starting row to start calculating the widths:
-            // e.g. ws.Column(3).AdjustToContents(9);
-
-            var ws2 = wb.Worksheets.Add("Adjust Widths");
-            ws2.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
-            for (Int32 co = 0; co < 90; co += 5)
-            {
-                ws2.Cell(1, (co / 5) + 2).SetValue("Text to adjust - " + co).Style.Alignment.TextRotation = co;
-            }
-
-            ws2.Columns().AdjustToContents();
-
-            var ws4 = wb.Worksheets.Add("Adjust Widths 2");
-            ws4.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
-            for (Int32 co = 0; co < 90; co += 5)
-            {
-                var c = ws4.Cell(1, (co / 5) + 2);
-                
-                c.RichText.AddText("Text to adjust - " + co).SetBold();
-                c.RichText.AddText(Environment.NewLine);
-                c.RichText.AddText("World!").SetBold().SetFontColor(XLColor.Blue).SetFontSize(25);
-                c.RichText.AddText(Environment.NewLine);
-                c.RichText.AddText("Hello Cruel and unsusual world").SetBold().SetFontSize(20);
-                c.RichText.AddText(Environment.NewLine);
-                c.RichText.AddText("Hello").SetBold();
-                c.Style.Alignment.SetTextRotation(co);
-            }
-            ws4.Columns().AdjustToContents();
-
-            var ws3 = wb.Worksheets.Add("Adjust Heights");
-            ws3.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
-            for (Int32 ro = 0; ro < 90; ro += 5)
-            {
-                ws3.Cell((ro / 5) + 2, 1).SetValue("Text to adjust - " + ro).Style.Alignment.TextRotation = ro;
-            }
-
-            ws3.Rows().AdjustToContents();
-
-            var ws5 = wb.Worksheets.Add("Adjust Heights 2");
-            ws5.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
-            for (Int32 ro = 0; ro < 90; ro += 5)
-            {
-                var c = ws5.Cell((ro / 5) + 2, 1);
-                c.RichText.AddText("Text to adjust - " + ro).SetBold();
-                c.RichText.AddText(Environment.NewLine);
-                c.RichText.AddText("World!").SetBold().SetFontColor(XLColor.Blue).SetFontSize(10);
-                c.RichText.AddText(Environment.NewLine);
-                c.RichText.AddText("Hello Cruel and unsusual world").SetBold().SetFontSize(15);
-                c.RichText.AddText(Environment.NewLine);
-                c.RichText.AddText("Hello").SetBold();
-                c.Style.Alignment.SetTextRotation(ro);
-            }
-
-            ws5.Rows().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AutoFilter.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AutoFilter.cs
deleted file mode 100644
index acf82dd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/AutoFilter.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class AutoFilter : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("AutoFilter");
-            ws.Cell("A1").Value = "Names";
-            ws.Cell("A2").Value = "John";
-            ws.Cell("A3").Value = "Hank";
-            ws.Cell("A4").Value = "Dagny";
-
-            ws.RangeUsed().SetAutoFilter();
-            
-            // Your can turn off the autofilter in three ways:
-            // 1) worksheet.AutoFilterRange.SetAutoFilter(false)
-            // 2) worksheet.AutoFilterRange = null
-            // 3) Pick any range in the worksheet and call range.SetAutoFilter(false);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/BlankCells.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/BlankCells.cs
deleted file mode 100644
index 232950e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/BlankCells.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class BlankCells : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).Value = "X";
-            ws.Cell(1, 1).Clear();
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CellValues.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CellValues.cs
deleted file mode 100644
index 6919bcf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CellValues.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class CellValues : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Cell Values");
-
-            // Set the titles
-            ws.Cell(2, 2).Value = "Initial Value";
-            ws.Cell(2, 3).Value = "Casting";
-            ws.Cell(2, 4).Value = "Using Get...()";
-            ws.Cell(2, 5).Value = "Using GetValue<T>()";
-            ws.Cell(2, 6).Value = "GetString()";
-            ws.Cell(2, 7).Value = "GetFormattedString()";
-
-            //////////////////////////////////////////////////////////////////
-            // DateTime
-
-            // Fill a cell with a date
-            var cellDateTime = ws.Cell(3, 2);
-            cellDateTime.Value = new DateTime(2010, 9, 2);
-            cellDateTime.Style.DateFormat.Format = "yyyy-MMM-dd";
-
-            // Extract the date in different ways
-            DateTime dateTime1 = (DateTime)cellDateTime.Value;
-            DateTime dateTime2 = cellDateTime.GetDateTime();
-            DateTime dateTime3 = cellDateTime.GetValue<DateTime>();
-            String dateTimeString = cellDateTime.GetString();
-            String dateTimeFormattedString = cellDateTime.GetFormattedString();
-
-            // Set the values back to cells
-            // The apostrophe is to force ClosedXML to treat the date as a string
-            ws.Cell(3, 3).Value = dateTime1;
-            ws.Cell(3, 4).Value = dateTime2;
-            ws.Cell(3, 5).Value = dateTime3;
-            ws.Cell(3, 6).Value = "'" + dateTimeString;
-            ws.Cell(3, 7).Value = "'" + dateTimeFormattedString;
-
-            //////////////////////////////////////////////////////////////////
-            // Boolean
-
-            // Fill a cell with a boolean
-            var cellBoolean = ws.Cell(4, 2);
-            cellBoolean.Value = true;
-
-            // Extract the boolean in different ways
-            Boolean boolean1 = (Boolean)cellBoolean.Value;
-            Boolean boolean2 = cellBoolean.GetBoolean();
-            Boolean boolean3 = cellBoolean.GetValue<Boolean>();
-            String booleanString = cellBoolean.GetString();
-            String booleanFormattedString = cellBoolean.GetFormattedString();
-
-            // Set the values back to cells
-            // The apostrophe is to force ClosedXML to treat the boolean as a string
-            ws.Cell(4, 3).Value = boolean1;
-            ws.Cell(4, 4).Value = boolean2;
-            ws.Cell(4, 5).Value = boolean3;
-            ws.Cell(4, 6).Value = "'" + booleanString;
-            ws.Cell(4, 7).Value = "'" + booleanFormattedString;
-
-            //////////////////////////////////////////////////////////////////
-            // Double
-
-            // Fill a cell with a double
-            var cellDouble = ws.Cell(5, 2);
-            cellDouble.Value = 1234.567;
-            cellDouble.Style.NumberFormat.Format = "#,##0.00";
-
-            // Extract the double in different ways
-            Double double1 = (Double)cellDouble.Value;
-            Double double2 = cellDouble.GetDouble();
-            Double double3 = cellDouble.GetValue<Double>();
-            String doubleString = cellDouble.GetString();
-            String doubleFormattedString = cellDouble.GetFormattedString();
-
-            // Set the values back to cells
-            // The apostrophe is to force ClosedXML to treat the double as a string
-            ws.Cell(5, 3).Value = double1;
-            ws.Cell(5, 4).Value = double2;
-            ws.Cell(5, 5).Value = double3;
-            ws.Cell(5, 6).Value = "'" + doubleString;
-            ws.Cell(5, 7).Value = "'" + doubleFormattedString;
-
-            //////////////////////////////////////////////////////////////////
-            // String
-
-            // Fill a cell with a string
-            var cellString = ws.Cell(6, 2);
-            cellString.Value = "Test Case";
-
-            // Extract the string in different ways
-            String string1 = (String)cellString.Value;
-            String string2 = cellString.GetString();
-            String string3 = cellString.GetValue<String>();
-            String stringString = cellString.GetString();
-            String stringFormattedString = cellString.GetFormattedString();
-
-            // Set the values back to cells
-            ws.Cell(6, 3).Value = string1;
-            ws.Cell(6, 4).Value = string2;
-            ws.Cell(6, 5).Value = string3;
-            ws.Cell(6, 6).Value = stringString;
-            ws.Cell(6, 7).Value = stringFormattedString;
-
-            //////////////////////////////////////////////////////////////////
-            // TimeSpan
-
-            // Fill a cell with a timeSpan
-            var cellTimeSpan = ws.Cell(7, 2);
-            cellTimeSpan.Value = new TimeSpan(1, 2, 31, 45);
-
-            // Extract the timeSpan in different ways
-            TimeSpan timeSpan1 = (TimeSpan)cellTimeSpan.Value;
-            TimeSpan timeSpan2 = cellTimeSpan.GetTimeSpan();
-            TimeSpan timeSpan3 = cellTimeSpan.GetValue<TimeSpan>();
-            String timeSpanString = cellTimeSpan.GetString();
-            String timeSpanFormattedString = cellTimeSpan.GetFormattedString();
-
-            // Set the values back to cells
-            ws.Cell(7, 3).Value = timeSpan1;
-            ws.Cell(7, 4).Value = timeSpan2;
-            ws.Cell(7, 5).Value = timeSpan3;
-            ws.Cell(7, 6).Value = timeSpanString;
-            ws.Cell(7, 7).Value = timeSpanFormattedString;
-
-            //////////////////////////////////////////////////////////////////
-            // Do some formatting
-            ws.Columns("B:G").Width = 20;
-            var rngTitle = ws.Range("B2:G2");
-            rngTitle.Style.Font.Bold = true;
-            rngTitle.Style.Fill.BackgroundColor = XLColor.Cyan;
-
-            ws.Columns().AdjustToContents();
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Collections.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Collections.cs
deleted file mode 100644
index c97a995..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Collections.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Misc
-{
-    public class Collections : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Collections");
-
-            // From a list of strings
-            var listOfStrings = new List<String>();
-            listOfStrings.Add("House");
-            listOfStrings.Add("Car");
-            ws.Cell(1, 1).Value = "Strings";
-            ws.Cell(1, 1).AsRange().AddToNamed("Titles");
-            ws.Cell(2, 1).Value = listOfStrings;
-
-            // From a list of arrays
-            var listOfArr = new List<Int32[]>();
-            listOfArr.Add(new Int32[] { 1, 2, 3 });
-            listOfArr.Add(new Int32[] { 1 });
-            listOfArr.Add(new Int32[] { 1, 2, 3, 4, 5, 6 });
-            ws.Cell(1, 3).Value = "Arrays";
-            ws.Range(1, 3, 1, 8).Merge().AddToNamed("Titles");
-            ws.Cell(2, 3).Value = listOfArr;
-
-            // From a DataTable
-            var dataTable = GetTable();
-            ws.Cell(6, 1).Value = "DataTable";
-            ws.Range(6, 1, 6, 4).Merge().AddToNamed("Titles");
-            ws.Cell(7, 1).Value = dataTable.AsEnumerable();
-
-            // From a query
-            var list = new List<Person>();
-            list.Add(new Person() { Name = "John", Age = 30, House = "On Elm St."   });
-            list.Add(new Person() { Name = "Mary", Age = 15, House = "On Main St."  });
-            list.Add(new Person() { Name = "Luis", Age = 21, House = "On 23rd St."  });
-            list.Add(new Person() { Name = "Henry", Age = 45, House = "On 5th Ave." });
-
-            var people = from p in list
-                         where p.Age >= 21
-                         select new { p.Name, p.House, p.Age };
-
-            ws.Cell(6, 6).Value = "Query";
-            ws.Range(6, 6, 6, 8).Merge().AddToNamed("Titles");
-            ws.Cell(7, 6).Value = people.AsEnumerable();    // Very Important to call the AsEnumerable method
-                                                            // otherwise it won't be copied.
-
-
-            // Prepare the style for the titles
-            var titlesStyle = wb.Style;
-            titlesStyle.Font.Bold = true;
-            titlesStyle.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-            titlesStyle.Fill.BackgroundColor = XLColor.Cyan;
-            
-            // Format all titles in one shot
-            wb.NamedRanges.NamedRange("Titles").Ranges.Style = titlesStyle;
-
-            ws.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-
-        class Person
-        {
-            public String House { get; set; }
-            public String Name { get; set; }
-            public Int32 Age { get; set; }
-        }
-
-        // Private
-        private DataTable GetTable()
-        {
-
-            DataTable table = new DataTable();
-            table.Columns.Add("Dosage", typeof(int));
-            table.Columns.Add("Drug", typeof(string));
-            table.Columns.Add("Patient", typeof(string));
-            table.Columns.Add("Date", typeof(DateTime));
-
-            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
-            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
-            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
-            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
-            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
-            return table;
-        }
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CopyingRowsAndColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CopyingRowsAndColumns.cs
deleted file mode 100644
index a597e35..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CopyingRowsAndColumns.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class CopyingRowsAndColumns : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-
-            var originalSheet = workbook.Worksheets.Add("original");
-
-            originalSheet.Cell("A2").SetValue("test value");
-            originalSheet.Range("A2:E2").Merge();
-
-            originalSheet.Cell("F1").SetValue("test value").Style.Alignment.SetTopToBottom();
-            originalSheet.Range("F1:F6").Merge();
-
-            var fromRow = workbook.Worksheets.Add("From a Row");
-            fromRow.Cell(1, 1).SetValue("Row to Row:");
-            originalSheet.Row(2).CopyTo(fromRow.Row(2));
-            fromRow.Cell(3, 1).SetValue("Row to Range:");
-            originalSheet.Row(2).CopyTo(fromRow.Row(4).AsRange());
-            fromRow.Cell(5, 1).SetValue("Row to Cell:");
-            originalSheet.Row(2).CopyTo(fromRow.Row(6).FirstCell());
-
-            var fromRange = workbook.Worksheets.Add("From a Range");
-            fromRange.Cell(1, 1).SetValue("Range to Row:");
-            originalSheet.Row(2).AsRange().CopyTo(fromRange.Row(2));
-            fromRange.Cell(3, 1).SetValue("Range to Range:");
-            originalSheet.Row(2).AsRange().CopyTo(fromRange.Row(4).AsRange());
-            fromRange.Cell(5, 1).SetValue("Range to Cell:");
-            originalSheet.Row(2).AsRange().CopyTo(fromRange.Row(6).FirstCell());
-
-            CopyRowAsRange(originalSheet, 2, fromRange, 8);
-
-            var fromColumn = workbook.Worksheets.Add("From a Column to Column");
-            fromColumn.Cell(1, 1).SetValue("Column to Column:").Style.Alignment.SetTopToBottom();
-            originalSheet.Column("F").CopyTo(fromColumn.Column(2));
-            fromColumn.Cell(1, 3).SetValue("Column to Range:").Style.Alignment.SetTopToBottom();
-            originalSheet.Column("F").CopyTo(fromColumn.Column(4).AsRange());
-            fromColumn.Cell(1, 5).SetValue("Column to Cell:").Style.Alignment.SetTopToBottom();
-            originalSheet.Column("F").CopyTo(fromColumn.Column(6).FirstCell());
-
-            var fromRangeToColumn = workbook.Worksheets.Add("From a Range to Column");
-            fromRangeToColumn.Cell(1, 1).SetValue("Range to Column:").Style.Alignment.SetTopToBottom();
-            originalSheet.Column("F").AsRange().CopyTo(fromRangeToColumn.Column(2));
-            fromRangeToColumn.Cell(1, 3).SetValue("Range to Range:").Style.Alignment.SetTopToBottom();
-            originalSheet.Column("F").AsRange().CopyTo(fromRangeToColumn.Column(4).AsRange());
-            fromRangeToColumn.Cell(1, 5).SetValue("Range to Cell:").Style.Alignment.SetTopToBottom();
-            originalSheet.Column("F").AsRange().CopyTo(fromRangeToColumn.Column(6).FirstCell());
-          
-
-            workbook.SaveAs(filePath);
-        }
-
-        private static void CopyRowAsRange(IXLWorksheet originalSheet, int originalRowNumber, IXLWorksheet destSheet, int destRowNumber)
-        {
-            {
-                var destinationRow = destSheet.Row(destRowNumber);
-                destinationRow.Clear();
-
-                var originalRow = originalSheet.Row(originalRowNumber);
-                int columnNumber = originalRow.LastCellUsed(true).Address.ColumnNumber;
-
-                var originalRange = originalSheet.Range(originalRowNumber, 1, originalRowNumber, columnNumber);
-                var destRange = destSheet.Range(destRowNumber, 1, destRowNumber, columnNumber);
-                originalRange.CopyTo(destRange);
-            }
-        }
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CopyingWorksheets.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CopyingWorksheets.cs
deleted file mode 100644
index 2c86867..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CopyingWorksheets.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-using ClosedXML_Examples.Ranges;
-
-namespace ClosedXML_Examples.Misc
-{
-    public class CopyingWorksheets : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            string tempFile1 = ExampleHelper.GetTempFilePath(filePath);
-            string tempFile2 = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new UsingTables().Create(tempFile1);
-                var wb = new XLWorkbook(tempFile1);
-
-                var wsSource = wb.Worksheet(1);
-                // Copy the worksheet to a new sheet in this workbook
-                wsSource.CopyTo("Copy");
-                
-                // We're going to open another workbook to show that you can
-                // copy a sheet from one workbook to another:
-                new BasicTable().Create(tempFile2);
-                var wbSource = new XLWorkbook(tempFile2);
-                wbSource.Worksheet(1).CopyTo(wb, "Copy From Other");
-
-                // Save the workbook with the 2 copies
-                wb.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile1))
-                {
-                    File.Delete(tempFile1);
-                }
-                if (File.Exists(tempFile2))
-                {
-                    File.Delete(tempFile2);
-                }
-            }
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/DataTypes.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/DataTypes.cs
deleted file mode 100644
index e4feeb1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/DataTypes.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class DataTypes : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Data Types");
-
-            var co = 2;
-            var ro = 1;
-
-            ws.Cell(++ro, co).Value = "Plain Text:";
-            ws.Cell(ro, co + 1).Value = "Hello World.";
-
-            ws.Cell(++ro, co).Value = "Plain Date:";
-            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2);
-
-            ws.Cell(++ro, co).Value = "Plain DateTime:";
-            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2, 13, 45, 22);
-
-            ws.Cell(++ro, co).Value = "Plain Boolean:";
-            ws.Cell(ro, co + 1).Value = true;
-
-            ws.Cell(++ro, co).Value = "Plain Number:";
-            ws.Cell(ro, co + 1).Value = 123.45;
-
-            ws.Cell(++ro, co).Value = "TimeSpan:";
-            ws.Cell(ro, co + 1).Value = new TimeSpan(33, 45, 22);
-
-            ro++;
-
-            ws.Cell(++ro, co).Value = "Explicit Text:";
-            ws.Cell(ro, co + 1).Value = "'Hello World.";
-
-            ws.Cell(++ro, co).Value = "Date as Text:";
-            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2).ToString();
-
-            ws.Cell(++ro, co).Value = "DateTime as Text:";
-            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2, 13, 45, 22).ToString();
-
-            ws.Cell(++ro, co).Value = "Boolean as Text:";
-            ws.Cell(ro, co + 1).Value = "'" + true.ToString();
-
-            ws.Cell(++ro, co).Value = "Number as Text:";
-            ws.Cell(ro, co + 1).Value = "'123.45";
-
-            ws.Cell(++ro, co).Value = "Number with @ format:";
-            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "@";
-            ws.Cell(ro, co + 1).Value = 123.45;
-
-            ws.Cell(++ro, co).Value = "Format number with @:";
-            ws.Cell(ro, co + 1).Value = 123.45;
-            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "@";
-
-            ws.Cell(++ro, co).Value = "TimeSpan as Text:";
-            ws.Cell(ro, co + 1).Value = "'" + new TimeSpan(33, 45, 22).ToString();
-
-            ro++;
-
-            ws.Cell(++ro, co).Value = "Changing Data Types:";
-
-            ro++;
-
-            ws.Cell(++ro, co).Value = "Date to Text:";
-            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2);
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-
-            ws.Cell(++ro, co).Value = "DateTime to Text:";
-            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2, 13, 45, 22);
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-
-            ws.Cell(++ro, co).Value = "Boolean to Text:";
-            ws.Cell(ro, co + 1).Value = true;
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-
-            ws.Cell(++ro, co).Value = "Number to Text:";
-            ws.Cell(ro, co + 1).Value = 123.45;
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-
-            ws.Cell(++ro, co).Value = "TimeSpan to Text:";
-            ws.Cell(ro, co + 1).Value = new TimeSpan(33, 45, 22);
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-
-            ws.Cell(++ro, co).Value = "Text to Date:";
-            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2).ToString();
-            ws.Cell(ro, co + 1).DataType = XLCellValues.DateTime;
-
-            ws.Cell(++ro, co).Value = "Text to DateTime:";
-            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2, 13, 45, 22).ToString();
-            ws.Cell(ro, co + 1).DataType = XLCellValues.DateTime;
-
-            ws.Cell(++ro, co).Value = "Text to Boolean:";
-            ws.Cell(ro, co + 1).Value = "'" + true.ToString();
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Boolean;
-
-            ws.Cell(++ro, co).Value = "Text to Number:";
-            ws.Cell(ro, co + 1).Value = "'123.45";
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Number;
-
-            ws.Cell(++ro, co).Value = "@ format to Number:";
-            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "@";
-            ws.Cell(ro, co + 1).Value = 123.45;
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Number;
-
-            ws.Cell(++ro, co).Value = "Text to TimeSpan:";
-            ws.Cell(ro, co + 1).Value = "'" + new TimeSpan(33, 45, 22).ToString();
-            ws.Cell(ro, co + 1).DataType = XLCellValues.TimeSpan;
-
-            ro++;
-
-            ws.Cell(++ro, co).Value = "Formatted Date to Text:";
-            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2);
-            ws.Cell(ro, co + 1).Style.DateFormat.Format = "yyyy-MM-dd";
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-
-            ws.Cell(++ro, co).Value = "Formatted Number to Text:";
-            ws.Cell(ro, co + 1).Value = 12345.6789;
-            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "#,##0.00";
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-
-            ro++;
-
-            ws.Cell(++ro, co).Value = "Blank Text:";
-            ws.Cell(ro, co + 1).Value = 12345.6789;
-            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "#,##0.00";
-            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
-            ws.Cell(ro, co + 1).Value = "";
-
-            ro++;
-
-            // Using inline strings (few users will ever need to use this feature)
-            //
-            // By default all strings are stored as shared so one block of text
-            // can be reference by multiple cells.
-            // You can override this by setting the .ShareString property to false
-            ws.Cell(++ro, co).Value = "Inline String:";
-            var cell = ws.Cell(ro, co + 1);
-            cell.Value = "Not Shared";
-            cell.ShareString = false;
-
-            // To view all shared strings (all texts in the workbook actually), use the following:
-            // workbook.GetSharedStrings()
-
-            ws.Cell(++ro, co)
-                .SetDataType(XLCellValues.Text)
-                .SetDataType(XLCellValues.Boolean)
-                .SetDataType(XLCellValues.DateTime)
-                .SetDataType(XLCellValues.Number)
-                .SetDataType(XLCellValues.TimeSpan)
-                .SetDataType(XLCellValues.Text)
-                .SetDataType(XLCellValues.TimeSpan)
-                .SetDataType(XLCellValues.Number)
-                .SetDataType(XLCellValues.DateTime)
-                .SetDataType(XLCellValues.Boolean)
-                .SetDataType(XLCellValues.Text);
-                    
-            ws.Columns(2, 3).AdjustToContents();
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/DataValidation.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/DataValidation.cs
deleted file mode 100644
index fdbe3cc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/DataValidation.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class DataValidation : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Data Validation");
-
-            // Decimal between 1 and 5
-            ws.Cell(1, 1).SetDataValidation().Decimal.Between(1, 5);
-
-            // Whole number equals 2
-            var dv1 = ws.Range("A2:A3").SetDataValidation();
-            dv1.WholeNumber.EqualTo(2);
-            // Change the error message
-            dv1.ErrorStyle = XLErrorStyle.Warning;
-            dv1.ErrorTitle = "Number out of range";
-            dv1.ErrorMessage = "This cell only allows the number 2.";
-
-            // Date after the millenium
-            var dv2 = ws.Cell("A4").SetDataValidation();
-            dv2.Date.EqualOrGreaterThan(new DateTime(2000, 1, 1));
-            // Change the input message
-            dv2.InputTitle = "Can't party like it's 1999.";
-            dv2.InputMessage = "Please enter a date in this century.";
-
-            // From a list
-            ws.Cell("C1").Value = "Yes";
-            ws.Cell("C2").Value = "No";
-            ws.Cell("A5").SetDataValidation().List(ws.Range("C1:C2"));
-
-            ws.Range("C1:C2").AddToNamed("YesNo");
-            ws.Cell("A6").SetDataValidation().List("=YesNo");
-
-            // Intersecting dataValidations
-            ws.Range("B1:B4").SetDataValidation().WholeNumber.EqualTo(1);
-            ws.Range("B3:B4").SetDataValidation().WholeNumber.EqualTo(2);
-
-
-            // Validate with multiple ranges
-            var ws2 = wb.Worksheets.Add("Validate Ranges");
-            var rng1 = ws2.Ranges("A1:B2,B4:D7,F4:G5");
-            rng1.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
-            var rng1Validation = rng1.SetDataValidation();
-            rng1Validation.Decimal.EqualTo(1);
-            rng1Validation.IgnoreBlanks = false;
-
-            var rng2 = ws2.Range("A11:E14");
-            rng2.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
-            var rng2Validation = rng2.SetDataValidation();
-            rng2Validation.Decimal.EqualTo(2);
-            rng2Validation.IgnoreBlanks = false;
-
-            var rng3 = ws2.Range("B2:B12");
-            //rng3.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
-            var rng3Validation = rng3.SetDataValidation();
-            rng3Validation.Decimal.EqualTo(3);
-            rng3Validation.IgnoreBlanks = true;
-            
-            var rng4 = ws2.Range("D5:D6");
-            //rng4.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
-            var rng4Validation = rng4.SetDataValidation();
-            rng4Validation.Decimal.EqualTo(4);
-            rng4Validation.IgnoreBlanks = true;
-
-            var rng5 = ws2.Range("C13:C14");
-            //rng5.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
-            var rng5Validation = rng5.SetDataValidation();
-            rng5Validation.Decimal.EqualTo(5);
-            rng5Validation.IgnoreBlanks = true;
-
-            var rng6 = ws2.Range("D11:D12");
-            //rng6.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
-            var rng6Validation = rng6.SetDataValidation();
-            rng6Validation.Decimal.EqualTo(5);
-            rng6Validation.IgnoreBlanks = true;
-
-            var rng7 = ws2.Range("G4:G5");
-            //rng7.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
-            var rng7Validation = rng7.SetDataValidation();
-            rng7Validation.Decimal.EqualTo(5);
-            rng7Validation.IgnoreBlanks = true;
-
-            ws.CopyTo(ws.Name + " - Copy");
-            ws2.CopyTo(ws2.Name + " - Copy");
-
-            wb.AddWorksheet("Copy From Range 1").FirstCell().Value = ws.RangeUsed(true);
-            wb.AddWorksheet("Copy From Range 2").FirstCell().Value = ws2.RangeUsed(true);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Formulas.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Formulas.cs
deleted file mode 100644
index 8707e4c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Formulas.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class Formulas : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Formulas");
-
-            ws.Cell(1, 1).Value = "Num1";
-            ws.Cell(1, 2).Value = "Num2";
-            ws.Cell(1, 3).Value = "Total";
-            ws.Cell(1, 4).Value = "cell.FormulaA1";
-            ws.Cell(1, 5).Value = "cell.FormulaR1C1";
-            ws.Cell(1, 6).Value = "cell.Value";
-            ws.Cell(1, 7).Value = "Are Equal?";
-
-            ws.Cell(2, 1).Value = 1;
-            ws.Cell(2, 2).Value = 2;
-            var cellWithFormulaA1 = ws.Cell(2, 3);
-            // Use A1 notation
-            cellWithFormulaA1.FormulaA1 = "=A2+$B$2"; // The equal sign (=) in a formula is optional
-            ws.Cell(2, 4).Value = cellWithFormulaA1.FormulaA1;
-            ws.Cell(2, 5).Value = cellWithFormulaA1.FormulaR1C1;
-            ws.Cell(2, 6).Value = cellWithFormulaA1.Value;
-
-            ws.Cell(3, 1).Value = 1;
-            ws.Cell(3, 2).Value = 2;
-            var cellWithFormulaR1C1 = ws.Cell(3, 3);
-            // Use R1C1 notation
-            cellWithFormulaR1C1.FormulaR1C1 = "RC[-2]+R3C2"; // The equal sign (=) in a formula is optional
-            ws.Cell(3, 4).Value = cellWithFormulaR1C1.FormulaA1;
-            ws.Cell(3, 5).Value = cellWithFormulaR1C1.FormulaR1C1;
-            ws.Cell(3, 6).Value = cellWithFormulaR1C1.Value;
-
-            ws.Cell(4, 1).Value = "A";
-            ws.Cell(4, 2).Value = "B";
-            var cellWithStringFormula = ws.Cell(4, 3);
-
-            // Use R1C1 notation
-            cellWithStringFormula.FormulaR1C1 = "=\"Test\" & RC[-2] & \"R3C2\"";
-            ws.Cell(4, 4).Value = cellWithStringFormula.FormulaA1;
-            ws.Cell(4, 5).Value = cellWithStringFormula.FormulaR1C1;
-            ws.Cell(4, 6).Value = cellWithStringFormula.Value;
-
-            // Setting the formula of a range
-            var rngData = ws.Range(2, 1, 4, 7);
-            rngData.LastColumn().FormulaR1C1 = "=IF(RC[-3]=RC[-1],\"Yes\", \"No\")";
-
-            // Using an array formula:
-            // Just put the formula between curly braces
-            ws.Cell("A6").Value = "Array Formula: ";
-            ws.Cell("B6").FormulaA1 = "{A2+A3}";
-
-            ws.Range(1, 1, 1, 7).Style.Fill.BackgroundColor = XLColor.Cyan;
-            ws.Range(1, 1, 1, 7).Style.Font.Bold = true;
-            ws.Columns().AdjustToContents();
-
-            // You can also change the reference notation:
-            wb.ReferenceStyle = XLReferenceStyle.R1C1;
-
-            // And the workbook calculation mode:
-            wb.CalculateMode = XLCalculateMode.Auto;
-
-            ws.Range("A10").AddToNamed("A10_R1C1_A10_R1C1");
-            ws.Cell("A10").Value = 0;
-            ws.Cell("A11").FormulaA1 = "A2 + A10_R1C1_A10_R1C1";
-            ws.Cell("A12").FormulaR1C1 = "R2C1 + A10_R1C1_A10_R1C1";
-            ws.Cell("A13").FormulaR1C1 = "=SUM(R[-5]:R[-4])";
-            ws.Cell("A14").FormulaA1 = "=SUM(8:9)";
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/FreezePanes.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/FreezePanes.cs
deleted file mode 100644
index 913738f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/FreezePanes.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class FreezePanes : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var wsFreeze = wb.Worksheets.Add("Freeze View");
-            
-            // Freeze rows and columns in one shot
-            wsFreeze.SheetView.Freeze(3, 3);
-
-            // You can also be more specific on what you want to freeze
-            // For example:
-            // wsFreeze.SheetView.FreezeRows(3);
-            // wsFreeze.SheetView.FreezeColumns(3);
-
-
-            //////////////////////////////
-            //var wsSplit = wb.Worksheets.Add("Split View");
-            //wsSplit.SheetView.SplitRow = 3;
-            //wsSplit.SheetView.SplitColumn = 3;
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/HideSheets.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/HideSheets.cs
deleted file mode 100644
index 8d0b6fd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/HideSheets.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class HideSheets : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            
-            wb.Worksheets.Add("First Hidden").Hide();
-            wb.Worksheets.Add("Visible");
-            wb.Worksheets.Add("Unhidden").Hide().Unhide();
-            wb.Worksheets.Add("VeryHidden").Visibility = XLWorksheetVisibility.VeryHidden;
-            wb.Worksheets.Add("Last Hidden").Hide();
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/HideUnhide.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/HideUnhide.cs
deleted file mode 100644
index 82fe795..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/HideUnhide.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class HideUnhide : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Hide Rows Columns");
-
-            ws.Columns(1, 3).Hide();
-            ws.Rows(1, 3).Hide();
-
-            ws.Column(2).Unhide();
-            ws.Row(2).Unhide();
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Hyperlinks.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Hyperlinks.cs
deleted file mode 100644
index e40d32a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Hyperlinks.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class Hyperlinks : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Hyperlinks");
-            wb.Worksheets.Add("Second Sheet");
-
-            Int32 ro = 0;
-
-            // You can create a link with pretty much anything you can put on a
-            // browser: http, ftp, mailto, gopher, news, nntp, etc.
-            
-            ws.Cell(++ro, 1).Value = "Link to a web page, no tooltip - Yahoo!";
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"http://www.yahoo.com");
-
-            ws.Cell(++ro, 1).Value = "Link to a web page, with a tooltip - Yahoo!";
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"http://www.yahoo.com", "Click to go to Yahoo!");
-
-            ws.Cell(++ro, 1).Value = "Link to a file - same folder";
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink("Test.xlsx");
-
-            ws.Cell(++ro, 1).Value = "Link to a file - Absolute";
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"D:\Test.xlsx");
-
-            ws.Cell(++ro, 1).Value = "Link to a file - relative address";
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"../Test.xlsx");
-
-            ws.Cell(++ro, 1).Value = "Link to an address in this worksheet";
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink("B1");
-
-            ws.Cell(++ro, 1).Value = "Link to an address in another worksheet";
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink("'Second Sheet'!A1");
-
-            // You can also set the properties of a hyperlink directly:
-
-            ws.Cell(++ro, 1).Value = "Link to a range in this worksheet";
-            ws.Cell(ro, 1).Hyperlink.InternalAddress = "B1:C2";
-            ws.Cell(ro, 1).Hyperlink.Tooltip = "SquareBox";
-
-            ws.Cell(++ro, 1).Value = "Link to an email message";
-            ws.Cell(ro, 1).Hyperlink.ExternalAddress = new Uri(@"mailto:SantaClaus@NorthPole.com?subject=Presents");
-
-            // Deleting a hyperlink
-            ws.Cell(++ro, 1).Value = "This is no longer a link";
-            ws.Cell(ro, 1).Hyperlink.InternalAddress = "A1";
-            ws.Cell(ro, 1).Hyperlink.Delete();
-
-            // Setting a hyperlink preserves previous formatting:
-            ws.Cell(++ro, 1).Value = "Odd looking link";
-            ws.Cell(ro, 1).Style.Font.FontColor = XLColor.Red;
-            ws.Cell(ro, 1).Style.Font.Underline = XLFontUnderlineValues.Double;
-            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(ws.Range("B1:C2"));
-
-            // List all hyperlinks in a worksheet:
-            var hyperlinksInWorksheet = ws.Hyperlinks;
-
-            // List all hyperlinks in a range:
-            var hyperlinksInRange = ws.Range("A1:A3").Hyperlinks;
-
-            // Clearing a cell with a hyperlink
-            ws.Cell(++ro, 1).Value = "ERROR!";
-            ws.Cell(ro, 1).Hyperlink.InternalAddress = "A1";
-            ws.Cell(ro, 1).Clear();
-
-            // Deleting a cell with a hyperlink
-            ws.Cell(++ro, 1).Value = "ERROR!";
-            ws.Cell(ro, 1).Hyperlink.InternalAddress = "A1";
-            ws.Cell(ro, 1).Clear();
-
-            ws.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/InsertingData.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/InsertingData.cs
deleted file mode 100644
index 3877daa..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/InsertingData.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Misc
-{
-    public class InsertingData : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Inserting Data");
-
-            // From a list of strings
-            var listOfStrings = new List<String>();
-            listOfStrings.Add("House");
-            listOfStrings.Add("001");
-            ws.Cell(1, 1).Value = "From Strings";
-            ws.Cell(1, 1).AsRange().AddToNamed("Titles");
-            ws.Cell(2, 1).InsertData(listOfStrings);
-
-            // From a list of arrays
-            var listOfArr = new List<Int32[]>();
-            listOfArr.Add(new Int32[] { 1, 2, 3 });
-            listOfArr.Add(new Int32[] { 1 });
-            listOfArr.Add(new Int32[] { 1, 2, 3, 4, 5, 6 });
-            ws.Cell(1, 3).Value = "From Arrays";
-            ws.Range(1, 3, 1, 8).Merge().AddToNamed("Titles");
-            ws.Cell(2, 3).InsertData(listOfArr);
-
-            // From a DataTable
-            var dataTable = GetTable();
-            ws.Cell(6, 1).Value = "From DataTable";
-            ws.Range(6, 1, 6, 4).Merge().AddToNamed("Titles");
-            ws.Cell(7, 1).InsertData(dataTable.AsEnumerable());
-
-            // From a query
-            var list = new List<Person>();
-            list.Add(new Person() { Name = "John", Age = 30, House = "On Elm St."   });
-            list.Add(new Person() { Name = "Mary", Age = 15, House = "On Main St."  });
-            list.Add(new Person() { Name = "Luis", Age = 21, House = "On 23rd St."  });
-            list.Add(new Person() { Name = "Henry", Age = 45, House = "On 5th Ave." });
-
-            var people = from p in list
-                         where p.Age >= 21
-                         select new { p.Name, p.House, p.Age };
-
-            ws.Cell(6, 6).Value = "From Query";
-            ws.Range(6, 6, 6, 8).Merge().AddToNamed("Titles");
-            ws.Cell(7, 6).InsertData(people.AsEnumerable()); 
-
-            // Prepare the style for the titles
-            var titlesStyle = wb.Style;
-            titlesStyle.Font.Bold = true;
-            titlesStyle.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-            titlesStyle.Fill.BackgroundColor = XLColor.Cyan;
-            
-            // Format all titles in one shot
-            wb.NamedRanges.NamedRange("Titles").Ranges.Style = titlesStyle;
-
-            ws.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-
-        class Person
-        {
-            public String House { get; set; }
-            public String Name { get; set; }
-            public Int32 Age { get; set; }
-        }
-
-        // Private
-        private DataTable GetTable()
-        {
-
-            DataTable table = new DataTable();
-            table.Columns.Add("Dosage", typeof(int));
-            table.Columns.Add("Drug", typeof(string));
-            table.Columns.Add("Patient", typeof(string));
-            table.Columns.Add("Date", typeof(DateTime));
-
-            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
-            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
-            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
-            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
-            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
-            return table;
-        }
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/InsertingTables.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/InsertingTables.cs
deleted file mode 100644
index 0e865d1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/InsertingTables.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Data;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class InsertingTables : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Inserting Tables");
-
-            // From a list of strings
-            var listOfStrings = new List<String>();
-            listOfStrings.Add("House");
-            listOfStrings.Add("Car");
-            ws.Cell(1, 1).Value = "From Strings";
-            ws.Cell(1, 1).AsRange().AddToNamed("Titles");
-            ws.Cell(2, 1).InsertTable(listOfStrings);
-
-            // From a list of arrays
-            var listOfArr = new List<Int32[]>();
-            listOfArr.Add(new Int32[] { 1, 2, 3 });
-            listOfArr.Add(new Int32[] { 1 });
-            listOfArr.Add(new Int32[] { 1, 2, 3, 4, 5, 6 });
-            ws.Cell(1, 3).Value = "From Arrays";
-            ws.Range(1, 3, 1, 8).Merge().AddToNamed("Titles");
-            ws.Cell(2, 3).InsertTable(listOfArr);
-
-            // From a DataTable
-            var dataTable = GetTable();
-            ws.Cell(7, 1).Value = "From DataTable";
-            ws.Range(7, 1, 7, 4).Merge().AddToNamed("Titles");
-            ws.Cell(8, 1).InsertTable(dataTable.AsEnumerable());
-
-            // From a query
-            var list = new List<Person>();
-            list.Add(new Person() { Name = "John", Age = 30, House = "On Elm St."   });
-            list.Add(new Person() { Name = "Mary", Age = 15, House = "On Main St."  });
-            list.Add(new Person() { Name = "Luis", Age = 21, House = "On 23rd St."  });
-            list.Add(new Person() { Name = "Henry", Age = 45, House = "On 5th Ave." });
-
-            var people = from p in list
-                         where p.Age >= 21
-                         select p;
-
-
-            ws.Cell(7, 6).Value = "From Query";
-            ws.Range(7, 6, 7, 8).Merge().AddToNamed("Titles");
-            ws.Cell(8, 6).InsertTable(people.AsEnumerable()); 
-
-            // Prepare the style for the titles
-            var titlesStyle = wb.Style;
-            titlesStyle.Font.Bold = true;
-            titlesStyle.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-            titlesStyle.Fill.BackgroundColor = XLColor.Cyan;
-            
-            // Format all titles in one shot
-            wb.NamedRanges.NamedRange("Titles").Ranges.Style = titlesStyle;
-
-            ws.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-        
-        class Person
-        {
-            [Display(Name = "House Street")]
-            public String House { get; set; }
-            public String Name { get; set; }
-            public Int32 Age { get; set; }
-        }
-
-        // Private
-        private DataTable GetTable()
-        {
-
-            DataTable table = new DataTable();
-            table.Columns.Add("Dosage", typeof(int));
-            table.Columns.Add("Drug", typeof(string));
-            table.Columns.Add("Patient", typeof(string));
-            table.Columns.Add("Date", typeof(DateTime));
-
-            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
-            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
-            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
-            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
-            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
-            return table;
-        }
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/LambdaExpressions.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/LambdaExpressions.cs
deleted file mode 100644
index 325cf58..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/LambdaExpressions.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.IO;
-using System.Linq;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class LambdaExpressions : IXLExample
-    {
-        public void Create(string filePath)
-        {
-
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new BasicTable().Create(tempFile);
-                var workbook = new XLWorkbook(tempFile);
-                var ws = workbook.Worksheet(1);
-
-                // Define a range with the data
-                var firstDataCell = ws.Cell("B4");
-                var lastDataCell = ws.LastCellUsed();
-                var rngData = ws.Range(firstDataCell.Address, lastDataCell.Address);
-
-                // Delete all rows where Outcast = false (the 3rd column)
-                rngData.Rows() // From all rows
-                        .Where(r => !r.Cell(3).GetBoolean()) // where the 3rd cell of each row is false
-                        .ForEach(r => r.Delete()); // delete the row and shift the cells up (the default for rows in a range)
-
-                //// Put a light gray background to all text cells
-                //rngData.Cells() // From all cells
-                //        .Where(c => c.DataType == XLCellValues.Text) // where the data type is Text
-                //        .ForEach(c => c.Style.Fill.BackgroundColor = XLColor.LightGray); // Fill with a light gray
-
-                var cells = rngData.Cells();
-                var filtered = cells.Where(c => c.DataType == XLCellValues.Text);
-                var list = filtered.ToList();
-                foreach (var c in list)
-                {
-                    c.Style.Fill.BackgroundColor = XLColor.LightGray;
-                }
-
-                // Put a thick border to the bottom of the table (we may have deleted the bottom cells with the border)
-                rngData.LastRow().Style.Border.BottomBorder = XLBorderStyleValues.Thick;
-
-                workbook.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MergeCells.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MergeCells.cs
deleted file mode 100644
index ed9456f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MergeCells.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class MergeCells : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Constructors
-
-        // Public
-
-
-        // Private
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Merge Cells");
-
-            // Merge a row
-            ws.Cell("B2").Value = "Merged Row(1) of Range (B2:D3)";
-            ws.Range("B2:D3").Row(1).Merge();
-
-            // Merge a column
-            ws.Cell("F2").Value = "Merged Column(1) of Range (F2:G8)";
-            ws.Cell("F2").Style.Alignment.WrapText = true;
-            ws.Range("F2:G8").Column(1).Merge();
-
-            // Merge a range
-            ws.Cell("B4").Value = "Merged Range (B4:D6)";
-            ws.Cell("B4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-            ws.Cell("B4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
-            ws.Range("B4:D6").Merge();
-
-            // Unmerging a range...
-            ws.Cell("B8").Value = "Unmerged";
-            ws.Range("B8:D8").Merge();
-            ws.Range("B8:D8").Unmerge();
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MergeMoves.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MergeMoves.cs
deleted file mode 100644
index d2d5f46..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MergeMoves.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class MergeMoves : IXLExample
-    {
-
-        public void Create(string filePath)
-        {
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new MergeCells().Create(tempFile);
-                var workbook = new XLWorkbook(tempFile);
-
-                var ws = workbook.Worksheet(1);
-
-                ws.Range("B1:F1").InsertRowsBelow(1);
-                ws.Range("A3:A9").InsertColumnsAfter(1);
-                ws.Row(1).Delete();
-                ws.Column(1).Delete();
-
-                ws.Range("E8:E9").InsertColumnsAfter(1);
-                ws.Range("F2:F8").Merge();
-                ws.Range("E3:E4").InsertColumnsAfter(1);
-                ws.Range("F2:F8").Merge();
-                ws.Range("E1:E2").InsertColumnsAfter(1);
-                ws.Range("G2:G8").Merge();
-                ws.Range("E1:E2").Delete(XLShiftDeletedCells.ShiftCellsLeft);
-
-                ws.Range("D3:E3").InsertRowsBelow(1);
-                ws.Range("A1:B1").InsertRowsBelow(1);
-                ws.Range("B3:D3").Merge();
-                ws.Range("A1:B1").Delete(XLShiftDeletedCells.ShiftCellsUp);
-
-                ws.Range("B8:D8").Merge();
-                ws.Range("D8:D9").Clear();
-
-                workbook.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MultipleSheets.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MultipleSheets.cs
deleted file mode 100644
index 630c139..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/MultipleSheets.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class MultipleSheets : IXLExample
-    {
-        
-        public void Create(string filePath)
-        {
-            var wb = new XLWorkbook();
-            foreach (var wsNum in Enumerable.Range(1, 5))
-            {
-                wb.Worksheets.Add("Original Pos. is " + wsNum.ToString());
-            }
-
-            // Move first worksheet to the last position
-            wb.Worksheet(1).Position = wb.Worksheets.Count() + 1;
-
-            // Delete worksheet on position 4 (in this case it's where original position = 5)
-            wb.Worksheet(4).Delete();
-
-            // Swap sheets in positions 1 and 2
-            wb.Worksheet(2).Position = 1;
-
-            wb.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Outline.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Outline.cs
deleted file mode 100644
index 0d7dd21..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Outline.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class Outline : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Outline");
-
-            ws.Outline.SummaryHLocation = XLOutlineSummaryHLocation.Right;
-            ws.Columns(2, 6).Group(); // Create an outline (level 1) for columns 2-6
-            ws.Columns(2, 4).Group(); // Create an outline (level 2) for columns 2-4
-            ws.Column(2).Ungroup(true); // Remove column 2 from all outlines
-
-            ws.Outline.SummaryVLocation = XLOutlineSummaryVLocation.Bottom;
-            ws.Rows(1, 5).Group(); // Create an outline (level 1) for rows 1-5
-            ws.Rows(1, 4).Group(); // Create an outline (level 2) for rows 1-4
-            ws.Rows(1, 4).Collapse(); // Collapse rows 1-4
-            ws.Rows(1, 2).Group(); // Create an outline (level 3) for rows 1-2
-            ws.Rows(1, 2).Ungroup(); // Ungroup rows 1-2 from their last outline
-
-            // You can also Collapse/Expand specific outline levels
-            // 
-            // ws.CollapseRows(Int32 outlineLevel)
-            // ws.CollapseColumns(Int32 outlineLevel)
-            //
-            // ws.ExpandRows(Int32 outlineLevel)
-            // ws.ExpandColumns(Int32 outlineLevel)
-
-            // And you can also Collapse/Expand ALL outline levels in one shot
-            // 
-            // ws.CollapseRows()
-            // ws.CollapseColumns()
-            //
-            // ws.ExpandRows()
-            // ws.ExpandColumns()
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/SheetProtection.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/SheetProtection.cs
deleted file mode 100644
index 9ff9e3e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/SheetProtection.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class SheetProtection : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Protected No-Password");
-
-            ws.Protect()            // On this sheet we will only allow:
-                .SetFormatCells()   // Cell Formatting
-                .SetInsertColumns() // Inserting Columns
-                .SetDeleteColumns() // Deleting Columns
-                .SetDeleteRows();   // Deleting Rows
-
-            ws.Cell("A1").SetValue("Locked, No Hidden (Default):").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
-            ws.Cell("B1").Style
-                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
-
-            ws.Cell("A2").SetValue("Locked, Hidden:").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
-            ws.Cell("B2").Style
-                .Protection.SetHidden()
-                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
-
-            ws.Cell("A3").SetValue("Not Locked, Hidden:").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
-            ws.Cell("B3").Style
-                .Protection.SetLocked(false)
-                .Protection.SetHidden()
-                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
-
-            ws.Cell("A4").SetValue("Not Locked, Not Hidden:").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
-            ws.Cell("B4").Style
-                .Protection.SetLocked(false)
-                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
-
-            ws.Columns().AdjustToContents();
-
-            // Protect a sheet with a password
-            var protectedSheet = wb.Worksheets.Add("Protected Password = 123");
-            var protection = protectedSheet.Protect("123");
-            protection.InsertRows = true;
-            protection.InsertColumns = true;
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/ShiftingFormulas.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/ShiftingFormulas.cs
deleted file mode 100644
index f54aeb3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/ShiftingFormulas.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class ShiftingFormulas : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Shifting Formulas");
-            ws.Cell("B2").Value = 5;
-            ws.Cell("B3").Value = 6;
-            ws.Cell("C2").Value = 1;
-            ws.Cell("C3").Value = 2;
-            ws.Cell("A4").Value = "Sum:";
-            ws.Range("B4:C4").FormulaR1C1 = "Sum(R[-2]C:R[-1]C)";
-            ws.Range("B4:C4").AddToNamed("WorkbookB4C4");
-            ws.Range("B4:C4").AddToNamed("WorksheetB4C4", XLScope.Worksheet);
-            ws.Cell("E2").Value = "Avg:";
-
-            ws.Cell("F2").FormulaA1 = "Average(B2:C3)";
-            ws.Ranges("A4,E2").Style
-                .Font.SetBold()
-                .Fill.SetBackgroundColor(XLColor.CyanProcess);
-
-            var ws2 = wb.Worksheets.Add("WS2");
-            ws2.Cell(1, 1).FormulaA1 = "='Shifting Formulas'!B2";
-            ws2.Cell(1, 2).Value = ws2.Cell(1, 1).Value;
-            ws2.Cell(2, 1).FormulaA1 = "Average('Shifting Formulas'!$B$2:$C$3)";
-            ws2.Cell(3, 1).FormulaA1 = "Average('Shifting Formulas'!$B$2:$C3)";
-            ws2.Cell(4, 1).FormulaA1 = "Average('Shifting Formulas'!$B$2:C3)";
-            ws2.Cell(5, 1).FormulaA1 = "Average('Shifting Formulas'!$B2:C3)";
-            ws2.Cell(6, 1).FormulaA1 = "Average('Shifting Formulas'!B2:C3)";
-            ws2.Cell(7, 1).FormulaA1 = "Average('Shifting Formulas'!B2:C$3)";
-            ws2.Cell(8, 1).FormulaA1 = "Average('Shifting Formulas'!B2:$C$3)";
-            ws2.Cell(9, 1).FormulaA1 = "Average('Shifting Formulas'!B$2:$C$3)";
-
-            var dataGrid = ws.Range("B2:D3");
-            ws.Row(1).InsertRowsAbove(1);
-            var newRow = dataGrid.LastRow().InsertRowsAbove(1).First();
-            newRow.Value = 1;
-            dataGrid.LastColumn().FormulaR1C1 = String.Format("SUM(RC[-{0}]:RC[-1])", dataGrid.ColumnCount() - 1);
-            ws.Cell(1, 1).InsertCellsBelow(1);
-            ws.Column(1).InsertColumnsBefore(1);
-            ws.Row(4).Delete();
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/ShowCase.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/ShowCase.cs
deleted file mode 100644
index c8edc32..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/ShowCase.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class ShowCase : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            // Creating a new workbook
-            var wb = new XLWorkbook();
-
-            //Adding a worksheet
-            var ws = wb.Worksheets.Add("Contacts");
-
-            //Adding text
-            //Title
-            ws.Cell("B2").Value = "Contacts";
-            //First Names
-            ws.Cell("B3").Value = "FName";
-            ws.Cell("B4").Value = "John";
-            ws.Cell("B5").Value = "Hank";
-            ws.Cell("B6").SetValue("Dagny"); // Another way to set the value
-            //Last Names
-            ws.Cell("C3").Value = "LName";
-            ws.Cell("C4").Value = "Galt";
-            ws.Cell("C5").Value = "Rearden";
-            ws.Cell("C6").SetValue("Taggart"); // Another way to set the value
-
-            //Adding more data types
-            //Is an outcast?
-            ws.Cell("D3").Value = "Outcast";
-            ws.Cell("D4").Value = true;
-            ws.Cell("D5").Value = false;
-            ws.Cell("D6").SetValue(false); // Another way to set the value
-            //Date of Birth
-            ws.Cell("E3").Value = "DOB";
-            ws.Cell("E4").Value = new DateTime(1919, 1, 21);
-            ws.Cell("E5").Value = new DateTime(1907, 3, 4);
-            ws.Cell("E6").SetValue(new DateTime(1921, 12, 15)); // Another way to set the value
-            //Income
-            ws.Cell("F3").Value = "Income";
-            ws.Cell("F4").Value = 2000;
-            ws.Cell("F5").Value = 40000;
-            ws.Cell("F6").SetValue(10000); // Another way to set the value
-
-            //Defining ranges
-            //From worksheet
-            var rngTable = ws.Range("B2:F6");
-            //From another range
-            var rngDates = rngTable.Range("D3:D5"); // The address is relative to rngTable (NOT the worksheet)
-            var rngNumbers = rngTable.Range("E3:E5"); // The address is relative to rngTable (NOT the worksheet)
-
-            //Formatting dates and numbers
-            //Using a OpenXML's predefined formats
-            rngDates.Style.NumberFormat.NumberFormatId = 15;
-            //Using a custom format
-            rngNumbers.Style.NumberFormat.Format = "$ #,##0";
-
-            //Format title cell in one shot
-            rngTable.Cell(1, 1).Style
-                .Font.SetBold()
-                .Fill.SetBackgroundColor(XLColor.CornflowerBlue)
-                .Alignment.SetHorizontal(XLAlignmentHorizontalValues.Center);
-
-            //Merge title cells
-            rngTable.FirstRow().Merge(); // We could've also used: rngTable.Range("A1:E1").Merge() or rngTable.Row(1).Merge()
-
-            //Formatting headers
-            var rngHeaders = rngTable.Range("A2:E2"); // The address is relative to rngTable (NOT the worksheet)
-            rngHeaders.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-            rngHeaders.Style.Font.Bold = true;
-            rngHeaders.Style.Font.FontColor = XLColor.DarkBlue;
-            rngHeaders.Style.Fill.BackgroundColor = XLColor.Aqua;
-
-            // Create an Excel table with the data portion
-            var rngData = ws.Range("B3:F6");
-            var excelTable = rngData.CreateTable();
-
-            // Add the totals row
-            excelTable.ShowTotalsRow = true;
-            // Put the average on the field "Income"
-            // Notice how we're calling the cell by the column name
-            excelTable.Field("Income").TotalsRowFunction = XLTotalsRowFunction.Average;
-            // Put a label on the totals cell of the field "DOB"
-            excelTable.Field("DOB").TotalsRowLabel = "Average:";
-            
-            //Add thick borders to the contents of our spreadsheet
-            ws.RangeUsed().Style.Border.OutsideBorder = XLBorderStyleValues.Thick;
-
-            // You can also specify the border for each side with:
-            // contents.FirstColumn().Style.Border.LeftBorder = XLBorderStyleValues.Thick;
-            // contents.LastColumn().Style.Border.RightBorder = XLBorderStyleValues.Thick;
-            // contents.FirstRow().Style.Border.TopBorder = XLBorderStyleValues.Thick;
-            // contents.LastRow().Style.Border.BottomBorder = XLBorderStyleValues.Thick;
-
-            // Adjust column widths to their content
-            ws.Columns(2, 6).AdjustToContents();
-
-            //Saving the workbook
-            wb.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/TabColors.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/TabColors.cs
deleted file mode 100644
index 19f1664..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/TabColors.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class TabColors : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-
-            var wsRed = wb.Worksheets.Add("Red").SetTabColor(XLColor.Red);
-
-            var wsAccent3 = wb.Worksheets.Add("Accent3").SetTabColor(XLColor.FromTheme(XLThemeColor.Accent3));
-
-            var wsIndexed = wb.Worksheets.Add("Indexed");
-            wsIndexed.TabColor = XLColor.FromIndex(24);
-
-            var wsArgb = wb.Worksheets.Add("Argb");
-            wsArgb.TabColor = XLColor.FromArgb(23, 23, 23);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/WorkbookProperties.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/WorkbookProperties.cs
deleted file mode 100644
index 3a32bcf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/WorkbookProperties.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class WorkbookProperties : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Workbook Properties");
-
-            wb.Properties.Author = "theAuthor";
-            wb.Properties.Title = "theTitle";
-            wb.Properties.Subject = "theSubject";
-            wb.Properties.Category = "theCategory";
-            wb.Properties.Keywords = "theKeywords";
-            wb.Properties.Comments = "theComments";
-            wb.Properties.Status = "theStatus";
-            wb.Properties.LastModifiedBy = "theLastModifiedBy";
-            wb.Properties.Company = "theCompany";
-            wb.Properties.Manager = "theManager";
-
-            // Creating/Using custom properties
-            wb.CustomProperties.Add("theText", "XXX");
-            wb.CustomProperties.Add("theDate", new DateTime(2011, 1, 1, 17, 0, 0, DateTimeKind.Utc)); // Use UTC to make sure test can be run in any time zone
-            wb.CustomProperties.Add("theNumber", 123.456);
-            wb.CustomProperties.Add("theBoolean", true);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/ModifyFiles.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/ModifyFiles.cs
deleted file mode 100644
index 9e2cc47..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/ModifyFiles.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using ClosedXML_Examples.Delete;
-
-namespace ClosedXML_Examples
-{
-    public class ModifyFiles
-    {
-        public static void Run()
-        {
-            new DeleteRows().Create(@"C:\ClosedXML_Tests\Modified\DeleteRows.xlsx");
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/HeaderFooters.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/HeaderFooters.cs
deleted file mode 100644
index ed8646e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/HeaderFooters.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.PageSetup
-{
-    public class HeaderFooters : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Headers and Footers");
-            
-            // Simple left header to be placed on all pages
-            ws.PageSetup.Header.Left.AddText("Created with ClosedXML");
-
-            // Using various font decorations for the right header on the first page only
-            // Here we show different methods for setting font decorations.
-            
-            // Set single font decorations immediately
-            ws.PageSetup.Header.Right.AddText("The ", XLHFOccurrence.FirstPage).SetBold();
-            ws.PageSetup.Header.Right.AddText("First ", XLHFOccurrence.FirstPage).SetFontColor(XLColor.Red);
-
-            // Use the IXLRichText returned by the AddText(...) method to later on modify the font
-            var richText = ws.PageSetup.Header.Right.AddText("Colorful ", XLHFOccurrence.FirstPage);
-            richText.FontColor = XLColor.Blue;
-            richText.Underline = XLFontUnderlineValues.Double;
-
-            // Set multiple font decorations chained
-            ws.PageSetup.Header.Right.AddText("Page", XLHFOccurrence.FirstPage)
-                .SetBold()
-                .SetItalic()
-                .SetFontName("Broadway");
-
-
-            // Using predefined header/footer text:
-
-            // Let's put the full path to the file on the right footer of every odd page:
-            ws.PageSetup.Footer.Right.AddText(XLHFPredefinedText.FullPath, XLHFOccurrence.OddPages);
-
-            // Let's put the current page number and total pages on the center of every footer:
-            ws.PageSetup.Footer.Center.AddText(XLHFPredefinedText.PageNumber, XLHFOccurrence.AllPages);
-            ws.PageSetup.Footer.Center.AddText(" / ", XLHFOccurrence.AllPages);
-            ws.PageSetup.Footer.Center.AddText(XLHFPredefinedText.NumberOfPages, XLHFOccurrence.AllPages);
-
-            // Don't align headers and footers with the margins
-            ws.PageSetup.AlignHFWithMargins = false;
-
-            // Don't scale headers and footers with the document
-            ws.PageSetup.ScaleHFWithDocument = false;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Margins.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Margins.cs
deleted file mode 100644
index e343126..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Margins.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.PageSetup
-{
-    public class Margins : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Margins");
-            ws.PageSetup.Margins.Top = 1;
-            ws.PageSetup.Margins.Bottom = 1.25;
-            ws.PageSetup.Margins.Left = 0.5;
-            ws.PageSetup.Margins.Right = 0.75;
-            ws.PageSetup.Margins.Footer = 0.15;
-            ws.PageSetup.Margins.Header = 0.30;
-
-            ws.PageSetup.CenterHorizontally = true;
-            ws.PageSetup.CenterVertically = true;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Page.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Page.cs
deleted file mode 100644
index e4d745e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Page.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.PageSetup
-{
-    public class Page : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws1 = workbook.Worksheets.Add("Page Setup - Page1");
-            ws1.PageSetup.PageOrientation = XLPageOrientation.Landscape;
-            ws1.PageSetup.AdjustTo(80);
-            ws1.PageSetup.PaperSize = XLPaperSize.LegalPaper;
-            ws1.PageSetup.VerticalDpi = 600;
-            ws1.PageSetup.HorizontalDpi = 600;
-
-            var ws2 = workbook.Worksheets.Add("Page Setup - Page2");
-            ws2.PageSetup.PageOrientation = XLPageOrientation.Portrait;
-            ws2.PageSetup.FitToPages(2, 2);     // Alternatively you can use 
-                                                // ws2.PageSetup.PagesTall = #
-                                                // and/or ws2.PageSetup.PagesWide = #
-
-            ws2.PageSetup.PaperSize = XLPaperSize.LetterPaper;
-            ws2.PageSetup.VerticalDpi = 600;
-            ws2.PageSetup.HorizontalDpi = 600;
-            ws2.PageSetup.FirstPageNumber = 5;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/SheetTab.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/SheetTab.cs
deleted file mode 100644
index 1048dec..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/SheetTab.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.PageSetup
-{
-    public class SheetTab : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Sheet Tab");
-            
-            // Adding print areas
-            ws.PageSetup.PrintAreas.Add("A1:B2");
-            ws.PageSetup.PrintAreas.Add("D3:D5");
-
-            // Adding rows to repeat at top
-            ws.PageSetup.SetRowsToRepeatAtTop(1,2);
-
-            // Adding columns to repeat at left
-            ws.PageSetup.SetColumnsToRepeatAtLeft(1, 2);
-
-            // Show gridlines
-            ws.PageSetup.ShowGridlines = true;
-
-            // Print in black and white
-            ws.PageSetup.BlackAndWhite = true;
-
-            // Print in draft quality
-            ws.PageSetup.DraftQuality = true;
-
-            // Show row and column headings
-            ws.PageSetup.ShowRowAndColumnHeadings = true;
-
-            // Set the page print order to over, then down
-            ws.PageSetup.PageOrder = XLPageOrderValues.OverThenDown;
-
-            // Place comments at the end of the sheet
-            ws.PageSetup.ShowComments = XLShowCommentsValues.AtEnd;
-
-            // Print errors as #N/A
-            ws.PageSetup.PrintErrorValue = XLPrintErrorValues.NA;
-            
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Sheets.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Sheets.cs
deleted file mode 100644
index a7b2584..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/Sheets.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.PageSetup
-{
-    public class Sheets : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws1 = workbook.Worksheets.Add("Separate PrintAreas");
-            ws1.PageSetup.PrintAreas.Add("A1:B2");
-            ws1.PageSetup.PrintAreas.Add("D3:D5");
-
-            var ws2 = workbook.Worksheets.Add("Page Breaks");
-            ws2.PageSetup.PrintAreas.Add("A1:D5");
-            ws2.PageSetup.AddHorizontalPageBreak(2);
-            ws2.PageSetup.AddVerticalPageBreak(2);
-            
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/TwoPages.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/TwoPages.cs
deleted file mode 100644
index 33cf47d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/TwoPages.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.PageSetup
-{
-    public class TwoPages : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Sheet1");
-            foreach (var ro in Enumerable.Range(1, 100))
-            {
-                foreach (var co in Enumerable.Range(1, 10))
-                {
-                    ws.Cell(ro, co).Value = ws.Cell(ro, co).Address.ToString();
-                }
-            }
-            ws.PageSetup.PagesWide = 1;
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PivotTables/PivotTables.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PivotTables/PivotTables.cs
deleted file mode 100644
index b36a956..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/PivotTables/PivotTables.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class PivotTables
-    {
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Pivot Table");
-            
-            ws.Cell("A1").Value = "Category";
-            ws.Cell("A2").Value = "A";
-            ws.Cell("A3").Value = "B";
-            ws.Cell("A4").Value = "B";
-            ws.Cell("B1").Value = "Number";
-            ws.Cell("B2").Value = 100;
-            ws.Cell("B3").Value = 150;
-            ws.Cell("B4").Value = 75;
-
-            //var pivotTable = ws.Range("A1:B4").CreatePivotTable(ws.Cell("D1"));
-            //pivotTable.RowLabels.Add("Category");
-            //pivotTable.Values.Add("Number")
-            //    .ShowAsPctFrom("Category").And("A")
-            //    .NumberFormat.Format = "0%";
-
-            wb.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Program.cs
deleted file mode 100644
index 16edb3c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-namespace ClosedXML_Examples
-{
-    public class Program
-    {
-        static void Main(string[] args)
-        {
-            CreateFiles.CreateAllFiles();
-            LoadFiles.LoadAllFiles();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3b0f1c9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClosedXML_Examples")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("ClosedXML_Examples")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("603cd89c-23f2-415e-8afc-2e9ab7a4c372")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.56.0.0")]
-[assembly: AssemblyFileVersion("0.56.0.0")]
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ClearingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ClearingRanges.cs
deleted file mode 100644
index 4f9c9c1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ClearingRanges.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Ranges
-{
-    public class ClearingRanges : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Clearing Ranges");
-            foreach (var ro in Enumerable.Range(1, 10))
-            {
-                foreach (var co in Enumerable.Range(1, 10))
-                {
-                    var cell = ws.Cell(ro, co);
-                    cell.Value = cell.Address.ToString();
-                    cell.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-                    cell.Style.Fill.BackgroundColor = XLColor.Turquoise;
-                    cell.Style.Font.Bold = true;
-                }
-            }
-
-            // Clearing a range
-            ws.Range("B1:C2").Clear();
-
-            // Clearing a row in a range
-            ws.Range("B4:C5").Row(1).Clear();
-
-            // Clearing a column in a range
-            ws.Range("E1:F4").Column(2).Clear();
-
-            // Clear an entire row
-            ws.Row(7).Clear();
-
-            // Clear an entire column
-            ws.Column("H").Clear();
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/CopyingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/CopyingRanges.cs
deleted file mode 100644
index 1550592..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/CopyingRanges.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class CopyingRanges : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            var tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new BasicTable().Create(tempFile);
-                var workbook = new XLWorkbook(tempFile);
-                var ws = workbook.Worksheet(1);
-
-                // Define a range with the data
-                var firstTableCell = ws.FirstCellUsed();
-                var lastTableCell = ws.LastCellUsed();
-                var rngData = ws.Range(firstTableCell.Address, lastTableCell.Address);
-
-                // Copy the table to another worksheet
-                var wsCopy = workbook.Worksheets.Add("Contacts Copy");
-                wsCopy.Cell(1, 1).Value = rngData;
-
-                workbook.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/CurrentRowColumn.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/CurrentRowColumn.cs
deleted file mode 100644
index 8c1934c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/CurrentRowColumn.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Ranges
-{
-    public class CurrentRowColumn : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Current Row Column");
-
-            var cell = ws.Cell(5, 2);
-            cell.Style.Fill.SetBackgroundColor(XLColor.Red);
-            ws.Cell(1, 1)
-                .SetValue("Red's Row:")
-                .CellRight().SetValue(cell.WorksheetRow().RowNumber())
-                .CellBelow().SetValue(cell.WorksheetColumn().ColumnLetter())
-                .CellLeft().SetValue("Red's Column:");
-
-            var row = ws.Range("A6:C6").FirstRow();
-            row.Style.Fill.SetBackgroundColor(XLColor.Blue);
-
-            var column = ws.Range("B7:B9").FirstColumn();
-            column.Style.Fill.SetBackgroundColor(XLColor.Green);
-
-            ws.Cell(1, 4)
-                .SetValue("Blue's Row:")
-                .CellRight().SetValue(row.WorksheetRow().RowNumber())
-                .CellBelow().SetValue(column.WorksheetColumn().ColumnLetter())
-                .CellLeft().SetValue("Green's Column:");
-
-            ws.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
-            ws.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/DefiningRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/DefiningRanges.cs
deleted file mode 100644
index ba51969..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/DefiningRanges.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Ranges
-{
-    public class DefiningRanges : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Defining a Range");
-
-            // With a string
-            var range1 = ws.Range("A1:B1");
-            range1.Cell(1, 1).Value = "ws.Range(\"A1:B1\").Merge()";
-            range1.Merge();
-
-            // With two XLAddresses
-            var range2 = ws.Range(ws.Cell(2, 1).Address, ws.Cell(2, 2).Address);
-            range2.Cell(1, 1).Value = "ws.Range(ws.Cell(2, 1).Address, ws.Cell(2, 2).Address).Merge()";
-            range2.Merge();
-
-            // With two strings
-            var range4 = ws.Range("A3", "B3");
-            range4.Cell(1, 1).Value = "ws.Range(\"A3\", \"B3\").Merge()";
-            range4.Merge();
-
-            // With 4 points
-            var range5 = ws.Range(4, 1, 4, 2);
-            range5.Cell(1, 1).Value = "ws.Range(4, 1, 4, 2).Merge()";
-            range5.Merge();
-
-            ws.Column("A").AdjustToContents();
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/DeletingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/DeletingRanges.cs
deleted file mode 100644
index fa10274..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/DeletingRanges.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Ranges
-{
-    public class DeletingRanges : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Deleting Ranges");
-
-            // Deleting Columns
-            // Setup test values
-            ws.Columns("1-3, 5, 7").Style.Fill.BackgroundColor = XLColor.Gray;
-            ws.Columns("4, 6").Style.Fill.BackgroundColor = XLColor.GreenPigment;
-            ws.Row(1).Cells("1-3, 5, 7").Value = "FAIL";
-
-            ws.Column(7).Delete();
-            ws.Column(1).Delete();
-            ws.Columns(1,2).Delete();
-            ws.Column(2).Delete();
-
-            // Deleting Rows
-            ws.Rows("1,5,7").Style.Fill.BackgroundColor = XLColor.GreenPigment;
-            ws.Rows("2-4,6, 8").Style.Fill.BackgroundColor = XLColor.Gray;
-            ws.Column(1).Cells("2-4,6, 8").Value = "FAIL";
-
-            ws.Row(8).Delete();
-            ws.Row(2).Delete();
-            ws.Rows(2, 3).Delete();
-            ws.Rows(3, 4).Delete();
-
-            // Deleting Ranges (Shifting Left)
-            var rng1 = ws.Range(2, 2, 8, 8);
-            rng1.Columns("1-3, 5, 7").Style.Fill.BackgroundColor = XLColor.Gray;
-            rng1.Columns("4, 6").Style.Fill.BackgroundColor = XLColor.Orange;
-            rng1.Row(1).Cells("1-3, 5, 7").Value = "FAIL";
-
-            rng1.Column(7).Delete();
-            rng1.Column(1).Delete();
-            rng1.Range(1, 1, rng1.RowCount(), 2).Delete(XLShiftDeletedCells.ShiftCellsLeft);
-            rng1.Column(2).Delete();
-
-            // Deleting Ranges (Shifting Up)
-            rng1.Rows("4, 6").Style.Fill.BackgroundColor = XLColor.Orange;
-            rng1.Rows("1-3, 5, 7").Style.Fill.BackgroundColor = XLColor.Gray;
-            rng1.Column(1).Cells("1-3, 5, 7").Value = "FAIL";
-
-            rng1.Row(7).Delete();
-            rng1.Row(1).Delete();
-            rng1.Range(1, 1, 2, rng1.ColumnCount()).Delete(XLShiftDeletedCells.ShiftCellsUp);
-            rng1.Row(2).Delete();
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs
deleted file mode 100644
index 1e23002..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class InsertingDeletingColumns : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Inserting and Deleting Columns");
-
-            // Range starts with 2 columns
-            var rng = ws.Range("B2:C3"); // Range starts on B2
-
-            // Insert a column before the range
-            ws.Column(1).InsertColumnsAfter(1); // Range starts on C2
-
-            // Insert a column in between the range
-            ws.Column(3).InsertColumnsAfter(1); // Range now has 3 columns
-
-            // Insert a column (from a range) before the range
-            ws.Range("A2:A3").InsertColumnsAfter(1); // Range starts on D2
-
-            // Insert a column (from a range) in between the range
-            ws.Range("D2:D3").InsertColumnsAfter(1); // Range now has 4 columns
-
-            // Inserting columns from a range not covering all columns
-            // does not affect our defined range
-            ws.Range("A1:A2").InsertColumnsAfter(1);
-            ws.Range("E3:E4").InsertColumnsAfter(1);
-
-            // Delete a column before the range
-            ws.Column(1).Delete(); // Range starts on C2
-
-            // Delete a column (from a range) before the range
-            ws.Range("A2:A3").Delete(XLShiftDeletedCells.ShiftCellsLeft); // Range starts on B2
-
-            // Delete a column in between the range
-            ws.Column(3).Delete(); // Range now has 3 columns
-
-            // Delete a column (from a range) in between the range
-            ws.Range("C2:C3").Delete(XLShiftDeletedCells.ShiftCellsLeft); // Range now has 2 columns
-
-            // Deleting columns from a range not covering all columns
-            // does not affect our defined range
-            ws.Range("A1:A2").Delete(XLShiftDeletedCells.ShiftCellsLeft);
-            ws.Range("D3:D4").Delete(XLShiftDeletedCells.ShiftCellsLeft);
-
-            rng.Style.Fill.BackgroundColor = XLColor.Orange;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs
deleted file mode 100644
index 4c5a4db..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class InsertingDeletingRows : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Inserting and Deleting Rows");
-
-            // Range starts with 2 rows
-            var rng = ws.Range("B2:C3");
-
-            // Insert a row above the range
-            ws.Row(1).InsertRowsBelow(1); // Range starts on B3
-
-            // Insert a row in between the range
-            ws.Row(3).InsertRowsBelow(1); // Range now has 3 rows
-
-            // Insert a row (from a range) above the range
-            ws.Range("B1:C1").InsertRowsBelow(1); // Range starts on B4
-
-            // Insert a row (from a range) in between the range
-            ws.Range("B4:C4").InsertRowsBelow(1); // Range now has 4 rows
-
-            // Inserting rows from a range not covering all columns
-            // does not affect our defined range
-            ws.Range("A1:B1").InsertRowsBelow(1);
-            ws.Range("C4:D4").InsertRowsBelow(1);
-
-            // Delete a row above the range
-            ws.Row(1).Delete(); // Range starts on B3
-
-            // Delete a row (from a range) above the range
-            ws.Range("B1:C1").Delete(XLShiftDeletedCells.ShiftCellsUp); // Range starts on B2
-
-            // Delete a row in between the range
-            ws.Row(3).Delete(); // Range now has 3 rows
-
-            // Delete a row (from a range) in between the range
-            ws.Range("B3:C3").Delete(XLShiftDeletedCells.ShiftCellsUp); // Range now has 2 rows
-
-            // Deleting rows from a range not covering all columns
-            // does not affect our defined range
-            ws.Range("A1:B1").Delete(XLShiftDeletedCells.ShiftCellsUp);
-            ws.Range("C4:D4").Delete(XLShiftDeletedCells.ShiftCellsUp);
-
-            rng.Style.Fill.BackgroundColor = XLColor.Orange;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/MultipleRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/MultipleRanges.cs
deleted file mode 100644
index d49becf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/MultipleRanges.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class MultipleRanges : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Multiple Ranges");
-            
-            // using multiple string range definitions
-            ws.Ranges("A1:B2,C3:D4,E5:F6").Style.Fill.BackgroundColor = XLColor.Red;
-
-            // using a single string separated by commas
-            ws.Ranges("A5:B6,E1:F2").Style.Fill.BackgroundColor = XLColor.Orange;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/NamedRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/NamedRanges.cs
deleted file mode 100644
index 8b035df..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/NamedRanges.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class NamedRanges : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var wsPresentation = wb.Worksheets.Add("Presentation");
-            var wsData = wb.Worksheets.Add("Data");
-
-            // Fill up some data
-            wsData.Cell(1, 1).Value = "Name";
-            wsData.Cell(1, 2).Value = "Age";
-            wsData.Cell(2, 1).Value = "Tom";
-            wsData.Cell(2, 2).Value = 30;
-            wsData.Cell(3, 1).Value = "Dick";
-            wsData.Cell(3, 2).Value = 25;
-            wsData.Cell(4, 1).Value = "Harry";
-            wsData.Cell(4, 2).Value = 29;
-
-            // Create a named range with the data:
-            wsData.Range("A2:B4").AddToNamed("PeopleData"); // Default named range scope is Workbook
-
-            // Let's use the named range in a formula:
-            wsPresentation.Cell(1, 1).Value = "People Count:";
-            wsPresentation.Cell(1, 2).FormulaA1 = "COUNT(PeopleData)";
-
-            // Create a named range with worksheet scope:
-            wsPresentation.Range("B1").AddToNamed("PeopleCount", XLScope.Worksheet);
-
-            // Let's use the named range:
-            wsPresentation.Cell(2, 1).Value = "Total:";
-            wsPresentation.Cell(2, 2).FormulaA1 = "PeopleCount";
-
-            // Copy the data in a named range:
-            wsPresentation.Cell(4, 1).Value = "People Data:";
-            wsPresentation.Cell(5, 1).Value = wb.Range("PeopleData");
-            
-
-            /////////////////////////////////////////////////////////////////////////
-            // For the Excel geeks out there who actually know about
-            // named ranges with relative addresses, you can
-            // create such a thing with the following methods:
-
-            // The following creates a relative named range pointing to the same row
-            // and one column to the right. For example if the current cell is B4
-            // relativeRange1 will point to C4.
-            wsPresentation.NamedRanges.Add("relativeRange1", "Presentation!B1");
-
-            // The following creates a ralative named range pointing to the same row
-            // and one column to the left. For example if the current cell is D2
-            // relativeRange2 will point to C2.
-            wb.NamedRanges.Add("relativeRange2", "Presentation!XFD1");
-
-            // Explanation: The address of a relative range always starts at A1
-            // and moves from then on. To get the desired relative range just
-            // add or subtract the required rows and/or columns from A1.
-            // Column -1 = XFD, Column -2 = XFC, etc.
-            // Row -1 = 1048576, Row -2 = 1048575, etc.
-            /////////////////////////////////////////////////////////////////////////
-
-            wsData.Columns().AdjustToContents();
-            wsPresentation.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/SelectingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/SelectingRanges.cs
deleted file mode 100644
index 963a3cd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/SelectingRanges.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Ranges
-{
-    public class SelectingRanges : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var wsActiveCell = wb.AddWorksheet("Set Active Cell");
-            wsActiveCell.Cell("B2").SetActive();
-
-            var wsSelectRowsColumns = wb.AddWorksheet("Select Rows and Columns");
-            wsSelectRowsColumns.Rows("2, 4-5").Select();
-            wsSelectRowsColumns.Columns("2, 4-5").Select();
-
-            var wsSelectMisc = wb.AddWorksheet("Select Misc");
-            wsSelectMisc.Cell("B2").Select();
-            wsSelectMisc.Range("D2:E2").Select();
-            wsSelectMisc.Ranges("C3, D4:E5").Select();
-
-            wb.SaveAs(filePath);
-        }
-
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ShiftingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ShiftingRanges.cs
deleted file mode 100644
index b01bdb9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ShiftingRanges.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class ShiftingRanges : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new BasicTable().Create(tempFile);
-                var workbook = new XLWorkbook(tempFile);
-                var ws = workbook.Worksheet(1);
-
-                // Get a range object
-                var rngHeaders = ws.Range("B3:F3");
-
-                // Insert some rows/columns before the range
-                ws.Row(1).InsertRowsAbove(2);
-                ws.Column(1).InsertColumnsBefore(2);
-
-                // Change the background color of the headers
-                rngHeaders.Style.Fill.BackgroundColor = XLColor.LightSalmon;
-
-                ws.Columns().AdjustToContents();
-
-                workbook.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/SortExample.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/SortExample.cs
deleted file mode 100644
index 926a114..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/SortExample.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class SortExample : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-
-            #region Sort a table
-            var wsTable = wb.Worksheets.Add("Table");
-            AddTestTable(wsTable);
-            var header = wsTable.Row(1).InsertRowsAbove(1).First();
-            for(Int32 co = 1; co <= wsTable.LastColumnUsed().ColumnNumber(); co++)
-            {
-                header.Cell(co).Value = "Column" + co.ToString();
-            }
-            var rangeTable = wsTable.RangeUsed();
-            var table = rangeTable.CopyTo(wsTable.Column(wsTable.LastColumnUsed().ColumnNumber() + 3)).CreateTable();
-
-            table.Sort("Column2, Column3 Desc, Column1 ASC");
-            
-            wsTable.Row(1).InsertRowsAbove(2);
-            wsTable.Cell(1, 1)
-                .SetValue(".Sort(\"Column2, Column3 Desc, Column1 ASC\") = Sort table Top to Bottom, Col 2 Asc, Col 3 Desc, Col 1 Asc, Ignore Blanks, Ignore Case")
-                .Style.Font.SetBold();
-            #endregion
-
-            #region Sort a simple range left to right
-            var wsLeftToRight = wb.Worksheets.Add("Sort Left to Right");
-            AddTestTable(wsLeftToRight);
-            wsLeftToRight.RangeUsed().Transpose(XLTransposeOptions.MoveCells);
-            var rangeLeftToRight = wsLeftToRight.RangeUsed();
-            var copyLeftToRight = rangeLeftToRight.CopyTo(wsLeftToRight.Row(wsLeftToRight.LastRowUsed().RowNumber() + 3));
-
-            copyLeftToRight.SortLeftToRight();
-
-            wsLeftToRight.Row(1).InsertRowsAbove(2);
-            wsLeftToRight.Cell(1, 1)
-                .SetValue(".SortLeftToRight() = Sort Range Left to Right, Ascendingly, Ignore Blanks, Ignore Case")
-                .Style.Font.SetBold();
-            #endregion
-
-            #region Sort a range
-            var wsComplex2 = wb.Worksheets.Add("Complex 2");
-            AddTestTable(wsComplex2);
-            var rangeComplex2 = wsComplex2.RangeUsed();
-            var copyComplex2 = rangeComplex2.CopyTo(wsComplex2.Column(wsComplex2.LastColumnUsed().ColumnNumber() + 3));
-
-            copyComplex2.SortColumns.Add(1, XLSortOrder.Ascending, false, true);
-            copyComplex2.SortColumns.Add(3, XLSortOrder.Descending);
-            copyComplex2.Sort();
-
-            wsComplex2.Row(1).InsertRowsAbove(4);
-            wsComplex2.Cell(1, 1)
-                .SetValue(".SortColumns.Add(1, XLSortOrder.Ascending, false, true) = Sort Col 1 Asc, Match Blanks, Match Case").Style.Font.SetBold();
-            wsComplex2.Cell(2, 1)
-                .SetValue(".SortColumns.Add(3, XLSortOrder.Descending) = Sort Col 3 Desc, Ignore Blanks, Ignore Case").Style.Font.SetBold();
-            wsComplex2.Cell(3, 1)
-                .SetValue(".Sort() = Sort range using the parameters defined in SortColumns").Style.Font.SetBold();
-            #endregion
-
-            #region Sort a range 
-            var wsComplex1 = wb.Worksheets.Add("Complex 1");
-            AddTestTable(wsComplex1);
-            var rangeComplex1 = wsComplex1.RangeUsed();
-            var copyComplex1 = rangeComplex1.CopyTo(wsComplex1.Column(wsComplex1.LastColumnUsed().ColumnNumber() + 3));
-
-            copyComplex1.Sort("2, 1 DESC", XLSortOrder.Ascending, true);
-
-            wsComplex1.Row(1).InsertRowsAbove(2);
-            wsComplex1.Cell(1, 1)
-                .SetValue(".Sort(\"2, 1 DESC\", XLSortOrder.Ascending, true) = Sort Range Top to Bottom, Col 2 Asc, Col 1 Desc, Ignore Blanks, Match Case").Style.Font.SetBold();
-            #endregion
-
-            #region Sort a simple column
-            var wsSimpleColumn = wb.Worksheets.Add("Simple Column");
-            AddTestColumn(wsSimpleColumn);
-            var rangeSimpleColumn = wsSimpleColumn.RangeUsed();
-            var copySimpleColumn = rangeSimpleColumn.CopyTo(wsSimpleColumn.Column(wsSimpleColumn.LastColumnUsed().ColumnNumber() + 3));
-
-            copySimpleColumn.FirstColumn().Sort(XLSortOrder.Descending, true);
-
-            wsSimpleColumn.Row(1).InsertRowsAbove(2);
-            wsSimpleColumn.Cell(1, 1)
-                .SetValue(".Sort(XLSortOrder.Descending, true) = Sort Range Top to Bottom, Descendingly, Ignore Blanks, Match Case").Style.Font.SetBold();
-            #endregion
-
-            #region Sort a simple range
-            var wsSimple = wb.Worksheets.Add("Simple");
-            AddTestTable(wsSimple);
-            var rangeSimple = wsSimple.RangeUsed();
-            var copySimple = rangeSimple.CopyTo(wsSimple.Column(wsSimple.LastColumnUsed().ColumnNumber() + 3));
-            
-            copySimple.Sort();
-
-            wsSimple.Row(1).InsertRowsAbove(2);
-            wsSimple.Cell(1, 1).SetValue(".Sort() = Sort Range Top to Bottom, Ascendingly, Ignore Blanks, Ignore Case").Style.Font.SetBold();
-            #endregion
-
-            wb.SaveAs(filePath);
-        }
-
-        private void AddTestColumnMixed(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(new TimeSpan(9, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumnNumbers(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(1.30).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(1230).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(4.30).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(4.15).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumnTimeSpans(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(new TimeSpan(0, 12, 35, 21)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(new TimeSpan(45, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(new TimeSpan(0, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(new TimeSpan(1, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(new TimeSpan(1, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumnDates(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(new DateTime(2011, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(new DateTime(2011, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(new DateTime(2011, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(new DateTime(2011, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumn(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue("c").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestTable(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-
-            ws.Cell("B1").SetValue("").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("B2").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("B3").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("B4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("B5").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("B6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("B7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("B8").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-
-            ws.Cell("C1").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("C2").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("C3").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("C4").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("C5").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("C6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("C7").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("C8").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/Sorting.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/Sorting.cs
deleted file mode 100644
index 4d24204..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/Sorting.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Misc
-{
-    public class Sorting : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-
-            #region Sort Table
-            var wsTable = wb.Worksheets.Add("Table");
-            AddTestTable(wsTable);
-            var header = wsTable.Row(1).InsertRowsAbove(1);
-            Int32 lastCo = wsTable.LastColumnUsed().ColumnNumber();
-            for (Int32 co = 1; co <= lastCo; co++)
-                wsTable.Cell(1, co).Value = "Column" + co.ToString();
-
-            var table = wsTable.RangeUsed().AsTable();
-            table.Sort("Column2 Desc, 1, 3 Asc");
-            #endregion
-
-            #region Sort Rows
-            var wsRows = wb.Worksheets.Add("Rows");
-            AddTestTable(wsRows);
-            wsRows.Row(1).Sort();
-            wsRows.RangeUsed().Row(2).Sort();
-            wsRows.Rows(3, wsRows.LastRowUsed().RowNumber()).Delete();
-            #endregion
-
-            #region Sort Columns
-            var wsColumns = wb.Worksheets.Add("Columns");
-            AddTestTable(wsColumns);
-            wsColumns.LastColumnUsed().Delete();
-            wsColumns.Column(1).Sort();
-            wsColumns.RangeUsed().Column(2).Sort();
-            #endregion
-
-            #region Sort Mixed
-            var wsMixed = wb.Worksheets.Add("Mixed");
-            AddTestColumnMixed(wsMixed);
-            wsMixed.Sort();
-            #endregion
-
-            #region Sort Numbers
-            var wsNumbers = wb.Worksheets.Add("Numbers");
-            AddTestColumnNumbers(wsNumbers);
-            wsNumbers.Sort();
-            #endregion
-
-            #region Sort TimeSpans
-            var wsTimeSpans = wb.Worksheets.Add("TimeSpans");
-            AddTestColumnTimeSpans(wsTimeSpans);
-            wsTimeSpans.Sort();
-            #endregion
-
-            #region Sort Dates
-            var wsDates = wb.Worksheets.Add("Dates");
-            AddTestColumnDates(wsDates);
-            wsDates.Sort();
-            #endregion
-
-            #region Do Not Ignore Blanks
-            var wsIncludeBlanks = wb.Worksheets.Add("Include Blanks");
-            AddTestTable(wsIncludeBlanks);
-            var rangeIncludeBlanks = wsIncludeBlanks;
-            rangeIncludeBlanks.SortColumns.Add(1, XLSortOrder.Ascending, false, true);
-            rangeIncludeBlanks.SortColumns.Add(2, XLSortOrder.Descending, false, true);
-            rangeIncludeBlanks.Sort();
-
-            var wsIncludeBlanksColumn = wb.Worksheets.Add("Include Blanks Column");
-            AddTestColumn(wsIncludeBlanksColumn);
-            var rangeIncludeBlanksColumn = wsIncludeBlanksColumn;
-            rangeIncludeBlanksColumn.SortColumns.Add(1, XLSortOrder.Ascending, false, true);
-            rangeIncludeBlanksColumn.Sort();
-
-            var wsIncludeBlanksColumnDesc = wb.Worksheets.Add("Include Blanks Column Desc");
-            AddTestColumn(wsIncludeBlanksColumnDesc);
-            var rangeIncludeBlanksColumnDesc = wsIncludeBlanksColumnDesc;
-            rangeIncludeBlanksColumnDesc.SortColumns.Add(1, XLSortOrder.Descending, false, true);
-            rangeIncludeBlanksColumnDesc.Sort();
-            #endregion
-
-            #region Case Sensitive
-            var wsCaseSensitive = wb.Worksheets.Add("Case Sensitive");
-            AddTestTable(wsCaseSensitive);
-            var rangeCaseSensitive = wsCaseSensitive;
-            rangeCaseSensitive.SortColumns.Add(1, XLSortOrder.Ascending, true, true);
-            rangeCaseSensitive.SortColumns.Add(2, XLSortOrder.Descending, true, true);
-            rangeCaseSensitive.Sort();
-
-            var wsCaseSensitiveColumn = wb.Worksheets.Add("Case Sensitive Column");
-            AddTestColumn(wsCaseSensitiveColumn);
-            var rangeCaseSensitiveColumn = wsCaseSensitiveColumn;
-            rangeCaseSensitiveColumn.SortColumns.Add(1, XLSortOrder.Ascending, true, true);
-            rangeCaseSensitiveColumn.Sort();
-
-            var wsCaseSensitiveColumnDesc = wb.Worksheets.Add("Case Sensitive Column Desc");
-            AddTestColumn(wsCaseSensitiveColumnDesc);
-            var rangeCaseSensitiveColumnDesc = wsCaseSensitiveColumnDesc;
-            rangeCaseSensitiveColumnDesc.SortColumns.Add(1, XLSortOrder.Descending, true, true);
-            rangeCaseSensitiveColumnDesc.Sort();
-            #endregion
-
-            #region Simple Sorts
-            var wsSimple = wb.Worksheets.Add("Simple");
-            AddTestTable(wsSimple);
-            wsSimple.Sort();
-
-            var wsSimpleDesc = wb.Worksheets.Add("Simple Desc");
-            AddTestTable(wsSimpleDesc);
-            wsSimpleDesc.Sort("", XLSortOrder.Descending);
-
-            var wsSimpleColumns = wb.Worksheets.Add("Simple Columns");
-            AddTestTable(wsSimpleColumns);
-            wsSimpleColumns.Sort("2, A DESC, 3");
-
-            var wsSimpleColumn = wb.Worksheets.Add("Simple Column");
-            AddTestColumn(wsSimpleColumn);
-            wsSimpleColumn.Sort();
-
-            var wsSimpleColumnDesc = wb.Worksheets.Add("Simple Column Desc");
-            AddTestColumn(wsSimpleColumnDesc);
-            wsSimpleColumnDesc.Sort(1, XLSortOrder.Descending);
-            #endregion
-
-            wb.SaveAs(filePath);
-        }
-
-        private void AddTestColumnMixed(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(new TimeSpan(9, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumnNumbers(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(1.30).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(1230).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(4.30).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(4.15).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumnTimeSpans(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(new TimeSpan(0, 12, 35, 21)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(new TimeSpan(45, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(new TimeSpan(0, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(new TimeSpan(1, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(new TimeSpan(1, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumnDates(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue(new DateTime(2011, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue(new DateTime(2011, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue(new DateTime(2011, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue(new DateTime(2011, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestColumn(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue("c").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        private void AddTestTable(IXLWorksheet ws)
-        {
-            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("A4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("A6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("A7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("A8").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-
-            ws.Cell("B1").SetValue("").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("B2").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("B3").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("B4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("B5").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("B6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("B7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("B8").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-
-            ws.Cell("C1").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
-            ws.Cell("C2").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
-            ws.Cell("C3").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
-            ws.Cell("C4").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
-            ws.Cell("C5").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
-            ws.Cell("C6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
-            ws.Cell("C7").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
-            ws.Cell("C8").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
-        }
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/TransposeRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/TransposeRanges.cs
deleted file mode 100644
index 3d1af2d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/TransposeRanges.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class TransposeRanges:IXLExample
-    {
-        public void Create(string filePath)
-        {
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new BasicTable().Create(tempFile);
-                var workbook = new XLWorkbook(tempFile);
-
-                var ws = workbook.Worksheet(1);
-
-                var rngTable = ws.Range("B2:F6");
-
-                rngTable.Transpose(XLTransposeOptions.MoveCells);
-
-                ws.Columns().AdjustToContents();
-
-                workbook.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-            
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/TransposeRangesPlus.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/TransposeRangesPlus.cs
deleted file mode 100644
index 9ced0c0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/TransposeRangesPlus.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.IO;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples
-{
-    public class TransposeRangesPlus : IXLExample
-    {
-        public void Create(string filePath)
-        {
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new BasicTable().Create(tempFile);
-                var workbook = new XLWorkbook(tempFile);
-
-                var ws = workbook.Worksheet(1);
-
-                var rngTable = ws.Range("B2:F6");
-
-                rngTable.Row(rngTable.RowCount() - 1).Delete(XLShiftDeletedCells.ShiftCellsUp);
-
-                // Place some markers
-                var cellNextRow = ws.Cell(rngTable.RangeAddress.LastAddress.RowNumber + 1, rngTable.RangeAddress.LastAddress.ColumnNumber);
-                cellNextRow.Value = "ColumnRight Row";
-                var cellNextColumn = ws.Cell(rngTable.RangeAddress.LastAddress.RowNumber, rngTable.RangeAddress.LastAddress.ColumnNumber + 1);
-                cellNextColumn.Value = "ColumnRight Column";
-
-                rngTable.Transpose(XLTransposeOptions.MoveCells);
-                rngTable.Transpose(XLTransposeOptions.MoveCells);
-                rngTable.Transpose(XLTransposeOptions.ReplaceCells);
-                rngTable.Transpose(XLTransposeOptions.ReplaceCells);
-
-                ws.Columns().AdjustToContents();
-
-                workbook.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/UsingTables.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/UsingTables.cs
deleted file mode 100644
index 045dca9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/UsingTables.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.IO;
-using ClosedXML.Excel;
-using System.Linq;
-
-
-namespace ClosedXML_Examples.Ranges
-{
-    public class UsingTables : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            string tempFile = ExampleHelper.GetTempFilePath(filePath);
-            try
-            {
-                new BasicTable().Create(tempFile);
-                var wb = new XLWorkbook(tempFile);
-                var ws = wb.Worksheet(1);
-                ws.Name = "Contacts Table";
-                var firstCell = ws.FirstCellUsed();
-                var lastCell = ws.LastCellUsed();
-                var range = ws.Range(firstCell.Address, lastCell.Address);
-                range.FirstRow().Delete(); // Deleting the "Contacts" header (we don't need it for our purposes)
-
-                // We want to use a theme for table, not the hard coded format of the BasicTable
-                range.Clear(XLClearOptions.Formats);
-                // Put back the date and number formats
-                range.Column(4).Style.NumberFormat.NumberFormatId = 15;
-                range.Column(5).Style.NumberFormat.Format = "$ #,##0";
-
-                var table = range.CreateTable(); // You can also use range.AsTable() if you want to
-                // manipulate the range as a table but don't want 
-                // to create the table in the worksheet.
-
-                // Let's activate the Totals row and add the sum of Income
-                table.ShowTotalsRow = true;
-                table.Field("Income").TotalsRowFunction = XLTotalsRowFunction.Sum;
-                // Just for fun let's add the text "Sum Of Income" to the totals row
-                table.Field(0).TotalsRowLabel = "Sum Of Income";
-
-                // Copy all the headers
-                Int32 columnWithHeaders = lastCell.Address.ColumnNumber + 2;
-                Int32 currentRow = table.RangeAddress.FirstAddress.RowNumber;
-                ws.Cell(currentRow, columnWithHeaders).Value = "Table Headers";
-                foreach (var cell in table.HeadersRow().Cells())
-                {
-                    currentRow++;
-                    ws.Cell(currentRow, columnWithHeaders).Value = cell.Value;
-                }
-
-                // Format the headers as a table with a different style and no autofilters
-                var htFirstCell = ws.Cell(table.RangeAddress.FirstAddress.RowNumber, columnWithHeaders);
-                var htLastCell = ws.Cell(currentRow, columnWithHeaders);
-                var headersTable = ws.Range(htFirstCell, htLastCell).CreateTable("Headers");
-                headersTable.Theme = XLTableTheme.TableStyleLight10;
-                headersTable.ShowAutoFilter = false;
-
-                // Add a custom formula to the headersTable
-                headersTable.ShowTotalsRow = true;
-                headersTable.Field(0).TotalsRowFormulaA1 = "CONCATENATE(\"Count: \", CountA(Headers[Table Headers]))";
-
-                // Copy the names
-                Int32 columnWithNames = columnWithHeaders + 2;
-                currentRow = table.RangeAddress.FirstAddress.RowNumber; // reset the currentRow
-                ws.Cell(currentRow, columnWithNames).Value = "Names";
-                foreach (var row in table.DataRange.Rows())
-                {
-                    currentRow++;
-                    var fName = row.Field("FName").GetString(); // Notice how we're calling the cell by field name
-                    var lName = row.Field("LName").GetString(); // Notice how we're calling the cell by field name
-                    var name = String.Format("{0} {1}", fName, lName);
-                    ws.Cell(currentRow, columnWithNames).Value = name;
-                }
-
-                // Format the names as a table with a different style and no autofilters
-                var ntFirstCell = ws.Cell(table.RangeAddress.FirstAddress.RowNumber, columnWithNames);
-                var ntLastCell = ws.Cell(currentRow, columnWithNames);
-                var namesTable = ws.Range(ntFirstCell, ntLastCell).CreateTable();
-                namesTable.Theme = XLTableTheme.TableStyleLight12;
-                namesTable.ShowAutoFilter = false;
-
-                ws.Columns().AdjustToContents();
-                ws.Columns("A,G,I").Width = 3;
-
-                wb.SaveAs(filePath);
-            }
-            finally
-            {
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-            }
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/WalkingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/WalkingRanges.cs
deleted file mode 100644
index e891fbc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/WalkingRanges.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Ranges
-{
-    public class WalkingRanges : IXLExample
-    {
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Walking Cells");
-
-            var cell = ws.Cell(5, 5).SetValue("(5,5)");
-
-            cell.CellAbove().SetValue("(4,5)").Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
-            cell.CellAbove(2).SetValue("(3,5)").Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
-            cell.CellBelow().SetValue("(6,5)").Style.Fill.SetBackgroundColor(XLColor.Salmon);
-            cell.CellBelow(2).SetValue("(7,5)").Style.Fill.SetBackgroundColor(XLColor.Salmon);
-
-            cell.CellLeft().SetValue("(5,4)").Style.Fill.SetBackgroundColor(XLColor.LightBlue);
-            cell.CellLeft(2).SetValue("(5,3)").Style.Fill.SetBackgroundColor(XLColor.LightBlue);
-            cell.CellRight().SetValue("(5,6)").Style.Fill.SetBackgroundColor(XLColor.BlueBell);
-            cell.CellRight(2).SetValue("(5,7)").Style.Fill.SetBackgroundColor(XLColor.BlueBell);
-
-            var wsWalkRows = wb.Worksheets.Add("Walking rows");
-
-            var row = wsWalkRows.Row(3);
-            row.RowAbove().Style.Fill.SetBackgroundColor(XLColor.Salmon);
-            row.RowAbove(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
-            row.RowBelow().Style.Fill.SetBackgroundColor(XLColor.Blue);
-            row.RowBelow(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
-
-            var rangeRow = wsWalkRows.Range("B8:D12").Row(3);
-            rangeRow.RowAbove().Style.Fill.SetBackgroundColor(XLColor.Salmon);
-            rangeRow.RowAbove(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
-            rangeRow.RowBelow().Style.Fill.SetBackgroundColor(XLColor.Blue);
-            rangeRow.RowBelow(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
-
-            var wsWalkColumns = wb.Worksheets.Add("Walking columns");
-
-            var column = wsWalkColumns.Column(3);
-            column.ColumnLeft().Style.Fill.SetBackgroundColor(XLColor.Salmon);
-            column.ColumnLeft(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
-            column.ColumnRight().Style.Fill.SetBackgroundColor(XLColor.Blue);
-            column.ColumnRight(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
-
-            var rangeColumn = wsWalkColumns.Range("H2:L4").Column(3);
-            rangeColumn.ColumnLeft().Style.Fill.SetBackgroundColor(XLColor.Salmon);
-            rangeColumn.ColumnLeft(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
-            rangeColumn.ColumnRight().Style.Fill.SetBackgroundColor(XLColor.Blue);
-            rangeColumn.ColumnRight(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/InsertRows.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/InsertRows.cs
deleted file mode 100644
index 8b46171..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/InsertRows.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Rows
-{
-    public class InsertRows : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Inserting Rows");
-
-            // Color the entire spreadsheet using rows
-            ws.Rows().Style.Fill.BackgroundColor = XLColor.LightCyan;
-
-            // Put a value in a few cells
-            foreach (var r in Enumerable.Range(1, 5))
-                foreach (var c in Enumerable.Range(1, 5))
-                    ws.Cell(r, c).Value = "X";
-
-            var blueRow = ws.Row(2);
-            var redRow = ws.Row(5);
-
-            blueRow.Style.Fill.BackgroundColor = XLColor.Blue;
-            blueRow.InsertRowsBelow(2);
-
-
-            redRow.Style.Fill.BackgroundColor = XLColor.Red;
-            redRow.InsertRowsAbove(2);
-
-            ws.Columns(3, 4).Style.Fill.BackgroundColor = XLColor.Orange;
-            ws.Range("A2:A4").InsertRowsBelow(2);
-            ws.Range("B2:B4").InsertRowsAbove(2);
-            ws.Range("C2:C4").InsertRowsBelow(2);
-            ws.Range("D2:D4").InsertRowsAbove(2);
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCells.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCells.cs
deleted file mode 100644
index 369ae43..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCells.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples
-{
-    public class RowCells : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Row Cells");
-
-            var rowFromWorksheet = ws.Row(1);
-            rowFromWorksheet.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
-            rowFromWorksheet.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
-            rowFromWorksheet.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
-            rowFromWorksheet.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
-
-            var rowFromRange = ws.Range("A2:I2").FirstRow();
-
-            rowFromRange.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
-            rowFromRange.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
-            rowFromRange.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
-            rowFromRange.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
-
-            ws.Columns().Width = 7;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCollection.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCollection.cs
deleted file mode 100644
index b4b8817..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCollection.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Rows
-{
-    public class RowCollection : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Rows of a Range");
-
-            // All rows in a range
-            ws.Range("A1:B2").Rows().Style.Fill.BackgroundColor = XLColor.DimGray;
-
-            var bigRange = ws.Range("B4:C17");
-
-            // Contiguous rows by number
-            bigRange.Rows(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
-
-            // Contiguous rows by number
-            bigRange.Rows("4:5").Style.Fill.BackgroundColor = XLColor.Blue;
-
-            // Spread rows by number
-            bigRange.Rows("7:8,10:11").Style.Fill.BackgroundColor = XLColor.Orange;
-
-            // Using a single number
-            bigRange.Rows("13").Style.Fill.BackgroundColor = XLColor.Cyan;
-
-            // Adjust the height
-            ws.Rows().Height = 15;
-
-            var ws2 = workbook.Worksheets.Add("Rows of a Worksheet");
-
-            // Contiguous rows by number
-            ws2.Rows(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
-
-            // Contiguous rows by number
-            ws2.Rows("4:5").Style.Fill.BackgroundColor = XLColor.Blue;
-
-            // Spread rows by number
-            ws2.Rows("7:8,10:11").Style.Fill.BackgroundColor = XLColor.Orange;
-
-            // Using a single number
-            ws2.Rows("13").Style.Fill.BackgroundColor = XLColor.Cyan;
-
-            // Adjust the height
-            ws2.Rows("1:13").Height = 15;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowSettings.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowSettings.cs
deleted file mode 100644
index 54798a2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowSettings.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Rows
-{
-    public class RowSettings : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Constructors
-
-        // Public
-        public RowSettings()
-        {
-
-        }
-
-
-        // Private
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Row Settings");
-
-            var row1 = ws.Row(2);
-            row1.Style.Fill.BackgroundColor = XLColor.Red;
-            row1.Height = 30;
-
-            var row2 = ws.Row(4);
-            row2.Style.Fill.BackgroundColor = XLColor.DarkOrange;
-            row2.Height = 3;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/StyleExamples.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/StyleExamples.cs
deleted file mode 100644
index 74717e5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/StyleExamples.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using ClosedXML_Examples.Styles;
-
-namespace ClosedXML_Examples
-{
-    public class StyleExamples
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Constructors
-
-        // Public
-        public StyleExamples()
-        {
-
-        }
-
-
-        // Private
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create()
-        {
-            var path = @"C:\ClosedXML_Tests\Created";
-            new StyleFont().Create(path + @"\styleFont.xlsx");
-            new StyleFill().Create(path + @"\styleFill.xlsx");
-            new StyleBorder().Create(path + @"\styleBorder.xlsx");
-            new StyleAlignment().Create(path + @"\styleAlignment.xlsx");
-            new StyleNumberFormat().Create(path + @"\styleNumberFormat.xlsx");
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/DefaultStyles.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/DefaultStyles.cs
deleted file mode 100644
index 8c49955..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/DefaultStyles.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-    public class DefaultStyles : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            // Create our workbook
-            var workbook = new XLWorkbook();
-
-            // This worksheet will have the default style, row height, column width, and page setup
-            var ws1 = workbook.Worksheets.Add("Default Style");
-
-            // Change the default row height for all new worksheets in this workbook
-            workbook.RowHeight = 30;
-
-            var ws2 = workbook.Worksheets.Add("Tall Rows");
-
-            // Create a worksheet and change the default row height
-            var ws3 = workbook.Worksheets.Add("Short Rows");
-            ws3.RowHeight = 7.5;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/PurpleWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/PurpleWorksheet.cs
deleted file mode 100644
index fa4e674..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/PurpleWorksheet.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-    public class PurpleWorksheet : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Purple Worksheet");
-
-            ws.Style.Fill.BackgroundColor = XLColor.Purple;
-            
-            workbook.SaveAs(filePath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleAlignment.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleAlignment.cs
deleted file mode 100644
index 8ff3bcf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleAlignment.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-    public class StyleAlignment : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Constructors
-
-        // Public
-        public StyleAlignment()
-        {
-
-        }
-
-
-        // Private
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Style Alignment");
-
-            var co = 2;
-            var ro = 1;
-
-            ws.Cell(++ro, co).Value = "Horizontal = Right";
-            ws.Cell(ro, co).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
-
-            ws.Cell(++ro, co).Value = "Indent = 2";
-            ws.Cell(ro, co).Style.Alignment.Indent = 2;
-
-            ws.Cell(++ro, co).Value = "JustifyLastLine = true";
-            ws.Cell(ro, co).Style.Alignment.JustifyLastLine = true;
-
-            ws.Cell(++ro, co).Value = "ReadingOrder = ContextDependent";
-            ws.Cell(ro, co).Style.Alignment.ReadingOrder = XLAlignmentReadingOrderValues.ContextDependent;
-
-            ws.Cell(++ro, co).Value = "RelativeIndent = 2";
-            ws.Cell(ro, co).Style.Alignment.RelativeIndent = 2;
-
-            ws.Cell(++ro, co).Value = "ShrinkToFit = true";
-            ws.Cell(ro, co).Style.Alignment.ShrinkToFit = true;
-
-            ws.Cell(++ro, co).Value = "TextRotation = 45";
-            ws.Cell(ro, co).Style.Alignment.TextRotation = 45;
-
-            ws.Cell(++ro, co).Value = "TopToBottom = true";
-            ws.Cell(ro, co).Style.Alignment.TopToBottom = true;
-
-            ws.Cell(++ro, co).Value = "Vertical = Center";
-            ws.Cell(ro, co).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
-
-            ws.Cell(++ro, co).Value = "WrapText = true";
-            ws.Cell(ro, co).Style.Alignment.WrapText = true;
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleBorder.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleBorder.cs
deleted file mode 100644
index d151b27..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleBorder.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Styles
-{
-    public class StyleBorder : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Style Border");
-
-            var co = 2;
-            var ro = 1;
-
-            ws.Cell(++ro, co).Value = "BottomBorder = Thick; BottomBorderColor = Red";
-            ws.Cell(ro, co).Style.Border.BottomBorder = XLBorderStyleValues.Thick;
-            ws.Cell(ro, co).Style.Border.BottomBorderColor = XLColor.Red;
-
-            ws.Cell(++ro, co).Value = "LeftBorder = Thick; LeftBorderColor = Blue";
-            ws.Cell(ro, co).Style.Border.LeftBorder = XLBorderStyleValues.Thick;
-            ws.Cell(ro, co).Style.Border.LeftBorderColor = XLColor.Blue;
-
-            ws.Cell(++ro, co).Value = "TopBorder = Thick; TopBorderColor = Yellow";
-            ws.Cell(ro, co).Style.Border.TopBorder = XLBorderStyleValues.Thick;
-            ws.Cell(ro, co).Style.Border.TopBorderColor = XLColor.Yellow;
-
-            ws.Cell(++ro, co).Value = "RightBorder = Thick; RightBorderColor = Black";
-            ws.Cell(ro, co).Style.Border.RightBorder = XLBorderStyleValues.Thick;
-            ws.Cell(ro, co).Style.Border.RightBorderColor = XLColor.Black;
-
-            ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalUp = true";
-            ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin;
-            ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red;
-            ws.Cell(ro, co).Style.Border.DiagonalUp = true;
-
-            ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalDown = true";
-            ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin;
-            ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red;
-            ws.Cell(ro, co).Style.Border.DiagonalDown = true;
-
-            ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalUp = true; DiagonalDown = true";
-            ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin;
-            ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red;
-            ws.Cell(ro, co).Style.Border.DiagonalUp = true;
-            ws.Cell(ro, co).Style.Border.DiagonalDown = true;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFill.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFill.cs
deleted file mode 100644
index f9edee2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFill.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-
-
-    public class StyleFill : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Style Fill");
-
-            var co = 2;
-            var ro = 1;
-
-            ws.Cell(++ro, co + 1).Value = "BackgroundColor = Red";
-            ws.Cell(ro, co).Style.Fill.BackgroundColor = XLColor.Red;
-
-            ws.Cell(++ro, co + 1).Value = "PatternType = DarkTrellis; PatternColor = Orange; PatternBackgroundColor = Blue";
-            ws.Cell(ro, co).Style.Fill.PatternType = XLFillPatternValues.DarkTrellis;
-            ws.Cell(ro, co).Style.Fill.PatternColor = XLColor.Orange;
-            ws.Cell(ro, co).Style.Fill.PatternBackgroundColor = XLColor.Blue;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFont.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFont.cs
deleted file mode 100644
index 43c86a3..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFont.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-    public class StyleFont : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Style Font");
-
-            var co = 2;
-            var ro = 1;
-            
-            ws.Cell(++ro, co).Value = "Bold";
-            ws.Cell(ro, co).Style.Font.Bold = true;
-
-            ws.Cell(++ro, co).Value = "FontColor - Red";
-            ws.Cell(ro, co).Style.Font.FontColor = XLColor.Red;
-
-            ws.Cell(++ro, co).Value = "FontFamilyNumbering - Script";
-            ws.Cell(ro, co).Style.Font.FontFamilyNumbering = XLFontFamilyNumberingValues.Script;
-
-            ws.Cell(++ro, co).Value = "FontName - Stencil";
-            ws.Cell(ro, co).Style.Font.FontName = "Stencil";
-
-            ws.Cell(++ro, co).Value = "FontSize - 15";
-            ws.Cell(ro, co).Style.Font.FontSize = 15;
-
-            ws.Cell(++ro, co).Value = "Italic - true";
-            ws.Cell(ro, co).Style.Font.Italic = true;
-
-            ws.Cell(++ro, co).Value = "Shadow - true";
-            ws.Cell(ro, co).Style.Font.Shadow = true;
-
-            ws.Cell(++ro, co).Value = "Strikethrough - true";
-            ws.Cell(ro, co).Style.Font.Strikethrough = true;
-
-            ws.Cell(++ro, co).Value = "Underline - Double";
-            ws.Cell(ro, co).Style.Font.Underline = XLFontUnderlineValues.Double;
-
-            ws.Cell(++ro, co).Value = "VerticalAlignment - Superscript";
-            ws.Cell(ro, co).Style.Font.VerticalAlignment = XLFontVerticalTextAlignmentValues.Superscript;
-
-            ws.Column(co).AdjustToContents();
-            
-            workbook.SaveAs(filePath);
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleNumberFormat.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleNumberFormat.cs
deleted file mode 100644
index 0972de5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleNumberFormat.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Styles
-{
-    public class StyleNumberFormat : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Constructors
-
-        // Public
-        public StyleNumberFormat()
-        {
-
-        }
-
-
-        // Private
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Style NumberFormat");
-
-            var co = 2;
-            var ro = 1;
-
-            ws.Cell(++ro, co).Value = "123456.789";
-            ws.Cell(ro, co).Style.NumberFormat.Format = "$ #,##0.00";
-
-            ws.Cell(++ro, co).Value = "12.345";
-            ws.Cell(ro, co).Style.NumberFormat.Format = "0000";
-
-            ws.Cell(++ro, co).Value = "12.345";
-            ws.Cell(ro, co).Style.NumberFormat.NumberFormatId = 3;
-
-            ws.Column(co).AdjustToContents();
-
-            workbook.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleRowsColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleRowsColumns.cs
deleted file mode 100644
index 4681ac9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleRowsColumns.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-    public class StyleRowsColumns : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Style Rows and Columns");
-
-            //Set the entire worksheet's cells to be bold and with a light cyan background
-            ws.Style.Font.Bold = true;
-            ws.Style.Fill.BackgroundColor = XLColor.LightCyan;
-
-            // Set the width of all columns in the worksheet
-            ws.Columns().Width = 5;
-
-            // Set the height of all rows in the worksheet
-            ws.Rows().Height = 20;
-
-            // Let's play with the rows and columns
-            ws.Rows(2, 3).Style.Fill.BackgroundColor = XLColor.Blue;
-            ws.Columns(3, 4).Style.Fill.BackgroundColor = XLColor.Orange;
-            ws.Rows(5, 5).Style.Fill.BackgroundColor = XLColor.Pink;
-            ws.Row(6).Style.Fill.BackgroundColor = XLColor.Brown;
-            ws.Column("E").Style.Fill.BackgroundColor = XLColor.Gray;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleWorksheet.cs
deleted file mode 100644
index 5669aaf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleWorksheet.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-    public class StyleWorksheet : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var workbook = new XLWorkbook();
-            var ws = workbook.Worksheets.Add("Style Worksheet");
-
-            ws.Style.Font.Bold = true;
-            ws.Style.Font.FontColor = XLColor.Red;
-            ws.Style.Fill.BackgroundColor = XLColor.Cyan;
-
-            // The following cells will be bold and red
-            // because we've specified those attributes to the entire worksheet
-            ws.Cell(1, 1).Value = "Test";
-            ws.Cell(1, 2).Value = "Case";
-
-            // Here we'll change the style of a single cell
-            ws.Cell(2, 1).Value = "Default";
-            ws.Cell(2, 1).Style = XLWorkbook.DefaultStyle;
-
-            // Let's play with some rows
-            ws.Row(4).Style = XLWorkbook.DefaultStyle;
-            ws.Row(4).Height = 20;
-            ws.Rows(5, 6).Style = XLWorkbook.DefaultStyle;
-            ws.Rows(5, 6).Height = 20;
-
-            // Let's play with some columns
-            ws.Column(4).Style = XLWorkbook.DefaultStyle;
-            ws.Column(4).Width = 5;
-            ws.Columns(5, 6).Style = XLWorkbook.DefaultStyle;
-            ws.Columns(5, 6).Width = 5;
-
-            workbook.SaveAs(filePath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs
deleted file mode 100644
index b736cff..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Drawing;
-using ClosedXML.Excel;
-
-
-namespace ClosedXML_Examples.Styles
-{
-    public class UsingColors : IXLExample
-    {
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Using Colors");
-
-            Int32 ro = 0;
-
-            // From Known color
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.Red;
-            ws.Cell(ro, 2).Value = "XLColor.Red";
-
-            // From Color not so known
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.Byzantine;
-            ws.Cell(ro, 2).Value = "XLColor.Byzantine";
-
-            ro++;
-
-            // FromArgb(Int32 argb) using Hex notation
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(0xFF00FF);
-            ws.Cell(ro, 2).Value = "XLColor.FromArgb(0xFF00FF)";
-
-            // FromArgb(Int32 argb) using an integer (you need to convert the hex value to an int)
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(16711935);
-            ws.Cell(ro, 2).Value = "XLColor.FromArgb(16711935)";
-
-            // FromArgb(Int32 r, Int32 g, Int32 b)
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 0, 255);
-            ws.Cell(ro, 2).Value = "XLColor.FromArgb(255, 0, 255)";
-
-            // FromArgb(Int32 a, Int32 r, Int32 g, Int32 b)
-            // Note: Excel ignores the alpha value
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(0, 255, 0, 255);
-            ws.Cell(ro, 2).Value = "XLColor.FromArgb(0, 255, 0, 255)";
-
-            ro++;
-
-            // FromColor(Color color)
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromColor(Color.Red);
-            ws.Cell(ro, 2).Value = "XLColor.FromColor(Color.Red)";
-
-            ro++;
-
-            // FromHtml(String htmlColor)
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromHtml("#FF996515");
-            ws.Cell(ro, 2).Value = "XLColor.FromHtml(\"#FF996515\")";
-
-            ro++;
-
-            // FromIndex(Int32 indexedColor)
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromIndex(25);
-            ws.Cell(ro, 2).Value = "XLColor.FromIndex(25)";
-
-            ro++;
-
-            // FromKnownColor(KnownColor knownColor)
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromKnownColor(KnownColor.Plum);
-            ws.Cell(ro, 2).Value = "XLColor.FromKnownColor(KnownColor.Plum)";
-
-            ro++;
-
-            // FromName(String colorName)
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromName("PowderBlue");
-            ws.Cell(ro, 2).Value = "XLColor.FromName(\"PowderBlue\")";
-
-            ro++;
-
-            // From Theme color
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1);
-            ws.Cell(ro, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent1)";
-
-            // From Theme color with tint
-            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1, 0.5);
-            ws.Cell(ro, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent1, 0.5)";
-
-
-            ws.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingPhonetics.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingPhonetics.cs
deleted file mode 100644
index aa727f2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingPhonetics.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Styles
-{
-    public class UsingPhonetics : IXLExample
-    {
-    
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Using Phonetics");
-
-            var cell = ws.Cell(1, 1);
-
-            // Phonetics are implemented as part of the Rich Text functionality. For more information see [Using Rich Text]
-            // First we add the text.
-            cell.RichText.AddText("みんなさんはお元気ですか。").SetFontSize(16);
-
-            // And then we add the phonetics
-            cell.RichText.Phonetics.SetFontSize(8);
-            cell.RichText.Phonetics.Add("げん", 7, 1);
-            cell.RichText.Phonetics.Add("き", 8, 1);
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingRichText.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingRichText.cs
deleted file mode 100644
index 200d1e9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingRichText.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using ClosedXML.Excel;
-
-namespace ClosedXML_Examples.Styles
-{
-    public class UsingRichText : IXLExample
-    {
-        #region Variables
-
-        // Public
-
-        // Private
-
-
-        #endregion
-
-        #region Properties
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Constructors
-
-        // Public
-
-
-
-        // Private
-
-
-        #endregion
-
-        #region Events
-
-        // Public
-
-        // Private
-
-        // Override
-
-
-        #endregion
-
-        #region Methods
-
-        // Public
-        public void Create(String filePath)
-        {
-            var wb = new XLWorkbook();
-            var ws = wb.Worksheets.Add("Rich Text");
-
-            // Let's start with a plain text and then decorate it...
-            var cell1 = ws.Cell(1, 1).SetValue("The show must go on...");
-
-            // We want everything in blue except the word show 
-            // (which we want in red and with Broadway Font)
-            cell1.Style.Font.FontColor = XLColor.Blue; // Set the color for the entire cell
-            cell1.RichText.Substring(4, 4)
-                .SetFontColor(XLColor.Red)
-                .SetFontName("Broadway"); // Set the color and font for the word "show"
-
-            // On the next example we'll start with an empty cell and add the rich text
-            var cell = ws.Cell(3, 1);
-
-            // Add the text parts
-            cell.RichText.AddText("Hello").SetFontColor(XLColor.Red);
-            cell.RichText.AddText(" BIG ").SetFontColor(XLColor.Blue).SetBold();
-            cell.RichText.AddText("World").SetFontColor(XLColor.Red);
-
-            // Here we're showing that even though we added three pieces of text
-            // you can treat then like a single one.
-            cell.RichText.Substring(4, 7).SetUnderline();
-
-            // Right now cell.RichText has the following 5 strings:
-            // 
-            // "Hell"  -> Red
-            // "o"     -> Red, Underlined
-            // " BIG " -> Blue, Underlined, Bold
-            // "W"     -> Red, Underlined
-            // "orld"  -> Red
-
-            // Of course you can loop through each piece of text and check its properties
-            foreach (var richText in cell.RichText)
-            {
-                if(richText.Bold)
-                    ws.Cell(3, 2).Value = String.Format("\"{0}\" is Bold.", richText.Text);
-            }
-            
-            ws.Columns().AdjustToContents();
-
-            wb.SaveAs(filePath);
-        }
-
-        // Private
-
-        // Override
-
-
-        #endregion
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/app.config b/ClosedXML/ClosedXML/ClosedXML_Examples/app.config
deleted file mode 100644
index cb2586b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/packages.config b/ClosedXML/ClosedXML/ClosedXML_Examples/packages.config
deleted file mode 100644
index 3a74e72..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML.snk b/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML.snk
deleted file mode 100644
index a17cff7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML.snk
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj b/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj
deleted file mode 100644
index f057b4d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj
+++ /dev/null
@@ -1,906 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5F43B12B-A900-40C6-9924-A0C0B032F791}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClosedXML</RootNamespace>
-    <AssemblyName>ClosedXML</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml">
-      <HintPath>..\DocumentFormat.OpenXml.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLAutoFilter.cs">
-      <Link>Excel\AutoFilters\IXLAutoFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLBaseAutoFilter.cs">
-      <Link>Excel\AutoFilters\IXLBaseAutoFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLCustomFilteredColumn.cs">
-      <Link>Excel\AutoFilters\IXLCustomFilteredColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLFilterColumn.cs">
-      <Link>Excel\AutoFilters\IXLFilterColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLFilterConnector.cs">
-      <Link>Excel\AutoFilters\IXLFilterConnector.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLFilteredColumn.cs">
-      <Link>Excel\AutoFilters\IXLFilteredColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLAutoFilter.cs">
-      <Link>Excel\AutoFilters\XLAutoFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLCustomFilteredColumn.cs">
-      <Link>Excel\AutoFilters\XLCustomFilteredColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilter.cs">
-      <Link>Excel\AutoFilters\XLFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilterColumn.cs">
-      <Link>Excel\AutoFilters\XLFilterColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilterConnector.cs">
-      <Link>Excel\AutoFilters\XLFilterConnector.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilteredColumn.cs">
-      <Link>Excel\AutoFilters\XLFilteredColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\CalcEngine.cs">
-      <Link>Excel\CalcEngine\CalcEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Expression.cs">
-      <Link>Excel\CalcEngine\Expression.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\ExpressionCache.cs">
-      <Link>Excel\CalcEngine\ExpressionCache.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\FunctionDefinition.cs">
-      <Link>Excel\CalcEngine\FunctionDefinition.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Database.cs">
-      <Link>Excel\CalcEngine\Functions\Database.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\DateAndTime.cs">
-      <Link>Excel\CalcEngine\Functions\DateAndTime.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Is.cs">
-      <Link>Excel\CalcEngine\Functions\Is.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Logical.cs">
-      <Link>Excel\CalcEngine\Functions\Logical.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\MathTrig.cs">
-      <Link>Excel\CalcEngine\Functions\MathTrig.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Statistical.cs">
-      <Link>Excel\CalcEngine\Functions\Statistical.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Tally.cs">
-      <Link>Excel\CalcEngine\Functions\Tally.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Text.cs">
-      <Link>Excel\CalcEngine\Functions\Text.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\XLMath.cs">
-      <Link>Excel\CalcEngine\Functions\XLMath.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\XLMatrix.cs">
-      <Link>Excel\CalcEngine\Functions\XLMatrix.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\Token.cs">
-      <Link>Excel\CalcEngine\Token.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CalcEngine\XLCalcEngine.cs">
-      <Link>Excel\CalcEngine\XLCalcEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Cells\IXLCell.cs">
-      <Link>Excel\Cells\IXLCell.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Cells\IXLCells.cs">
-      <Link>Excel\Cells\IXLCells.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Cells\XLCell.cs">
-      <Link>Excel\Cells\XLCell.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Cells\XLCells.cs">
-      <Link>Excel\Cells\XLCells.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Cells\XLCellsCollection.cs">
-      <Link>Excel\Cells\XLCellsCollection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Charts\IXLChart.cs">
-      <Link>Excel\Charts\IXLChart.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Charts\IXLCharts.cs">
-      <Link>Excel\Charts\IXLCharts.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Charts\XLChart.cs">
-      <Link>Excel\Charts\XLChart.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Charts\XLCharts.cs">
-      <Link>Excel\Charts\XLCharts.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Columns\IXLColumn.cs">
-      <Link>Excel\Columns\IXLColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Columns\IXLColumns.cs">
-      <Link>Excel\Columns\IXLColumns.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Columns\XLColumn.cs">
-      <Link>Excel\Columns\XLColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Columns\XLColumnCollection.cs">
-      <Link>Excel\Columns\XLColumnCollection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Columns\XLColumnParameters.cs">
-      <Link>Excel\Columns\XLColumnParameters.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Columns\XLColumns.cs">
-      <Link>Excel\Columns\XLColumns.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Comments\IXLComment.cs">
-      <Link>Excel\Comments\IXLComment.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Comments\XLComment.cs">
-      <Link>Excel\Comments\XLComment.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFColorScaleMax.cs">
-      <Link>Excel\ConditionalFormats\IXLCFColorScaleMax.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFColorScaleMid.cs">
-      <Link>Excel\ConditionalFormats\IXLCFColorScaleMid.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFColorScaleMin.cs">
-      <Link>Excel\ConditionalFormats\IXLCFColorScaleMin.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFDataBarMax.cs">
-      <Link>Excel\ConditionalFormats\IXLCFDataBarMax.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFDataBarMin.cs">
-      <Link>Excel\ConditionalFormats\IXLCFDataBarMin.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFIconSet.cs">
-      <Link>Excel\ConditionalFormats\IXLCFIconSet.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLConditionalFormat.cs">
-      <Link>Excel\ConditionalFormats\IXLConditionalFormat.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLConditionalFormats.cs">
-      <Link>Excel\ConditionalFormats\IXLConditionalFormats.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\IXLCFConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\IXLCFConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFCellIsConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFCellIsConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFColorScaleConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFColorScaleConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFContainsConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFContainsConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFConverters.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFConverters.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFDataBarConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFDataBarConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFEndsWithConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFEndsWithConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFIconSetConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFIconSetConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFIsBlankConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFIsBlankConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFIsErrorConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFIsErrorConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFNotBlankConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFNotBlankConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFNotContainsConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFNotContainsConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFNotErrorConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFNotErrorConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFStartsWithConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFStartsWithConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFTopConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFTopConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFUniqueConverter.cs">
-      <Link>Excel\ConditionalFormats\Save\XLCFUniqueConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFColorScaleMax.cs">
-      <Link>Excel\ConditionalFormats\XLCFColorScaleMax.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFColorScaleMid.cs">
-      <Link>Excel\ConditionalFormats\XLCFColorScaleMid.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFColorScaleMin.cs">
-      <Link>Excel\ConditionalFormats\XLCFColorScaleMin.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFDataBarMax.cs">
-      <Link>Excel\ConditionalFormats\XLCFDataBarMax.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFDataBarMin.cs">
-      <Link>Excel\ConditionalFormats\XLCFDataBarMin.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFIconSet.cs">
-      <Link>Excel\ConditionalFormats\XLCFIconSet.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLConditionalFormat.cs">
-      <Link>Excel\ConditionalFormats\XLConditionalFormat.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLConditionalFormats.cs">
-      <Link>Excel\ConditionalFormats\XLConditionalFormats.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Coordinates\IXLAddress.cs">
-      <Link>Excel\Coordinate\IXLAddress.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Coordinates\XLAddress.cs">
-      <Link>Excel\Coordinate\XLAddress.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Coordinates\XLSheetPoint.cs">
-      <Link>Excel\Coordinate\XLSheetPoint.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Coordinates\XLSheetRange.cs">
-      <Link>Excel\Coordinate\XLSheetRange.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CustomProperties\IXLCustomProperties.cs">
-      <Link>Excel\CustomProperties\IXLCustomProperties.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CustomProperties\IXLCustomProperty.cs">
-      <Link>Excel\CustomProperties\IXLCustomProperty.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CustomProperties\XLCustomProperties.cs">
-      <Link>Excel\CustomProperties\XLCustomProperties.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\CustomProperties\XLCustomProperty.cs">
-      <Link>Excel\CustomProperties\XLCustomProperty.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\IXLDataValidation.cs">
-      <Link>Excel\DataValidation\IXLDataValidation.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\IXLDataValidations.cs">
-      <Link>Excel\DataValidation\IXLDataValidations.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\IXLValidationCriteria.cs">
-      <Link>Excel\DataValidation\IXLValidationCriteria.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDataValidation.cs">
-      <Link>Excel\DataValidation\XLDataValidation.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDataValidations.cs">
-      <Link>Excel\DataValidation\XLDataValidations.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDateCriteria.cs">
-      <Link>Excel\DataValidation\XLDateCriteria.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDecimalCriteria.cs">
-      <Link>Excel\DataValidation\XLDecimalCriteria.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLTextLengthCriteria.cs">
-      <Link>Excel\DataValidation\XLTextLengthCriteria.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLTimeCriteria.cs">
-      <Link>Excel\DataValidation\XLTimeCriteria.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLValidationCriteria.cs">
-      <Link>Excel\DataValidation\XLValidationCriteria.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\DataValidation\XLWholeNumberCriteria.cs">
-      <Link>Excel\DataValidation\XLWholeNumberCriteria.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\IXLDrawing.cs">
-      <Link>Excel\Drawings\IXLDrawing.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\IXLDrawingPosition.cs">
-      <Link>Excel\Drawings\IXLDrawingPosition.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingAlignment.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingAlignment.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingColorsAndLines.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingColorsAndLines.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingFont.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingFont.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingMargins.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingMargins.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingProperties.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingProperties.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingProtection.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingProtection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingSize.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingSize.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingStyle.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingStyle.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingWeb.cs">
-      <Link>Excel\Drawings\Style\IXLDrawingWeb.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingAlignment.cs">
-      <Link>Excel\Drawings\Style\XLDrawingAlignment.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingColorsAndLines.cs">
-      <Link>Excel\Drawings\Style\XLDrawingColorsAndLines.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingFont.cs">
-      <Link>Excel\Drawings\Style\XLDrawingFont.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingMargins.cs">
-      <Link>Excel\Drawings\Style\XLDrawingMargins.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingProperties.cs">
-      <Link>Excel\Drawings\Style\XLDrawingProperties.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingProtection.cs">
-      <Link>Excel\Drawings\Style\XLDrawingProtection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingSize.cs">
-      <Link>Excel\Drawings\Style\XLDrawingSize.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingStyle.cs">
-      <Link>Excel\Drawings\Style\XLDrawingStyle.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingWeb.cs">
-      <Link>Excel\Drawings\Style\XLDrawingWeb.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\XLDrawing.cs">
-      <Link>Excel\Drawings\XLDrawing.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Drawings\XLDrawingPosition.cs">
-      <Link>Excel\Drawings\XLDrawingPosition.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\EnumConverter.cs">
-      <Link>Excel\EnumConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Hyperlinks\IXLHyperlinks.cs">
-      <Link>Excel\Hyperlinks\IXLHyperlinks.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Hyperlinks\XLHyperlinks.cs">
-      <Link>Excel\Hyperlinks\XLHyperlinks.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Hyperlinks\XLHyperlink_Internal.cs">
-      <Link>Excel\Hyperlinks\XLHyperlink_Internal.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Hyperlinks\XLHyperlink_public.cs">
-      <Link>Excel\Hyperlinks\XLHyperlink_public.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\IXLOutline.cs">
-      <Link>Excel\IXLOutline.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\IXLSheetProtection.cs">
-      <Link>Excel\IXLSheetProtection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\IXLSheetView.cs">
-      <Link>Excel\IXLSheetView.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\IXLTheme.cs">
-      <Link>Excel\IXLTheme.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\IXLWorksheet.cs">
-      <Link>Excel\IXLWorksheet.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\IXLWorksheets.cs">
-      <Link>Excel\IXLWorksheets.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Misc\XLCallbackAction.cs">
-      <Link>Excel\Misc\XLCallbackAction.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Misc\XLDictionary.cs">
-      <Link>Excel\Misc\XLDictionary.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Misc\XLFormula.cs">
-      <Link>Excel\Misc\XLFormula.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Misc\XLIdManager.cs">
-      <Link>Excel\Misc\XLIdManager.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Misc\XLReentrantEnumerableSet.cs">
-      <Link>Excel\Misc\XLReentrantEnumerableSet.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\NamedRanges\IXLNamedRange.cs">
-      <Link>Excel\NamedRanges\IXLNamedRange.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\NamedRanges\IXLNamedRanges.cs">
-      <Link>Excel\NamedRanges\IXLNamedRanges.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\NamedRanges\XLNamedRange.cs">
-      <Link>Excel\NamedRanges\XLNamedRange.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\NamedRanges\XLNamedRanges.cs">
-      <Link>Excel\NamedRanges\XLNamedRanges.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLHeaderFooter.cs">
-      <Link>Excel\PageSetup\IXLHeaderFooter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLHFItem.cs">
-      <Link>Excel\PageSetup\IXLHFItem.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLMargins.cs">
-      <Link>Excel\PageSetup\IXLMargins.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLPageSetup.cs">
-      <Link>Excel\PageSetup\IXLPageSetup.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLPrintAreas.cs">
-      <Link>Excel\PageSetup\IXLPrintAreas.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\XLHeaderFooter.cs">
-      <Link>Excel\PageSetup\XLHeaderFooter.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\XLHFItem.cs">
-      <Link>Excel\PageSetup\XLHFItem.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\XLHFText.cs">
-      <Link>Excel\PageSetup\XLHFText.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\XLMargins.cs">
-      <Link>Excel\PageSetup\XLMargins.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\XLPageSetup.cs">
-      <Link>Excel\PageSetup\XLPageSetup.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PageSetup\XLPrintAreas.cs">
-      <Link>Excel\PageSetup\XLPrintAreas.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotField.cs">
-      <Link>Excel\PivotTables\IXLPivotField.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotFields.cs">
-      <Link>Excel\PivotTables\IXLPivotFields.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotTable.cs">
-      <Link>Excel\PivotTables\IXLPivotTable.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotTables.cs">
-      <Link>Excel\PivotTables\IXLPivotTables.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValue.cs">
-      <Link>Excel\PivotTables\PivotValues\IXLPivotValue.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValueCombination.cs">
-      <Link>Excel\PivotTables\PivotValues\IXLPivotValueCombination.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValueFormat.cs">
-      <Link>Excel\PivotTables\PivotValues\IXLPivotValueFormat.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValues.cs">
-      <Link>Excel\PivotTables\PivotValues\IXLPivotValues.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValue.cs">
-      <Link>Excel\PivotTables\PivotValues\XLPivotValue.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValueCombination.cs">
-      <Link>Excel\PivotTables\PivotValues\XLPivotValueCombination.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValueFormat.cs">
-      <Link>Excel\PivotTables\PivotValues\XLPivotValueFormat.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValues.cs">
-      <Link>Excel\PivotTables\PivotValues\XLPivotValues.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotField.cs">
-      <Link>Excel\PivotTables\XLPivotField.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotFields.cs">
-      <Link>Excel\PivotTables\XLPivotFields.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotTable.cs">
-      <Link>Excel\PivotTables\XLPivotTable.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotTables.cs">
-      <Link>Excel\PivotTables\XLPivotTables.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRange.cs">
-      <Link>Excel\Ranges\IXLRange.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeAddress.cs">
-      <Link>Excel\Ranges\IXLRangeAddress.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeBase.cs">
-      <Link>Excel\Ranges\IXLRangeBase.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeColumn.cs">
-      <Link>Excel\Ranges\IXLRangeColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeColumns.cs">
-      <Link>Excel\Ranges\IXLRangeColumns.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeRow.cs">
-      <Link>Excel\Ranges\IXLRangeRow.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeRows.cs">
-      <Link>Excel\Ranges\IXLRangeRows.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRanges.cs">
-      <Link>Excel\Ranges\IXLRanges.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\IXLSortElement.cs">
-      <Link>Excel\Ranges\Sort\IXLSortElement.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\IXLSortElements.cs">
-      <Link>Excel\Ranges\Sort\IXLSortElements.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\XLSortElement.cs">
-      <Link>Excel\Ranges\Sort\XLSortElement.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\XLSortElements.cs">
-      <Link>Excel\Ranges\Sort\XLSortElements.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRange.cs">
-      <Link>Excel\Ranges\XLRange.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeAddress.cs">
-      <Link>Excel\Ranges\XLRangeAddress.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeBase.cs">
-      <Link>Excel\Ranges\XLRangeBase.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeColumn.cs">
-      <Link>Excel\Ranges\XLRangeColumn.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeColumns.cs">
-      <Link>Excel\Ranges\XLRangeColumns.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeParameters.cs">
-      <Link>Excel\Ranges\XLRangeParameters.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeRow.cs">
-      <Link>Excel\Ranges\XLRangeRow.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeRows.cs">
-      <Link>Excel\Ranges\XLRangeRows.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Ranges\XLRanges.cs">
-      <Link>Excel\Ranges\XLRanges.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\IXLFormattedText.cs">
-      <Link>Excel\RichText\IXLFormattedText.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\IXLPhonetic.cs">
-      <Link>Excel\RichText\IXLPhonetic.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\IXLPhonetics.cs">
-      <Link>Excel\RichText\IXLPhonetics.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\IXLRichString.cs">
-      <Link>Excel\RichText\IXLRichString.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\IXLRichText.cs">
-      <Link>Excel\RichText\IXLRichText.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\XLFormattedText.cs">
-      <Link>Excel\RichText\XLFormattedText.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\XLPhonetic.cs">
-      <Link>Excel\RichText\XLPhonetic.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\XLPhonetics.cs">
-      <Link>Excel\RichText\XLPhonetics.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\XLRichString.cs">
-      <Link>Excel\RichText\XLRichString.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\RichText\XLRichText.cs">
-      <Link>Excel\RichText\XLRichText.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Rows\IXLRow.cs">
-      <Link>Excel\Rows\IXLRow.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Rows\IXLRows.cs">
-      <Link>Excel\Rows\IXLRows.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Rows\XLRow.cs">
-      <Link>Excel\Rows\XLRow.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Rows\XLRowCollection.cs">
-      <Link>Excel\Rows\XLRowCollection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Rows\XLRowParameters.cs">
-      <Link>Excel\Rows\XLRowParameters.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Rows\XLRows.cs">
-      <Link>Excel\Rows\XLRows.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\Colors\XLColor_Internal.cs">
-      <Link>Excel\Style\Colors\XLColor_Internal.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\Colors\XLColor_Public.cs">
-      <Link>Excel\Style\Colors\XLColor_Public.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\Colors\XLColor_Static.cs">
-      <Link>Excel\Style\Colors\XLColor_Static.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLAlignment.cs">
-      <Link>Excel\Style\IXLAlignment.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLBorder.cs">
-      <Link>Excel\Style\IXLBorder.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLFill.cs">
-      <Link>Excel\Style\IXLFill.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLFont.cs">
-      <Link>Excel\Style\IXLFont.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLFontBase.cs">
-      <Link>Excel\Style\IXLFontBase.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLNumberFormat.cs">
-      <Link>Excel\Style\IXLNumberFormat.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLNumberFormatBase.cs">
-      <Link>Excel\Style\IXLNumberFormatBase.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLProtection.cs">
-      <Link>Excel\Style\IXLProtection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLStyle.cs">
-      <Link>Excel\Style\IXLStyle.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\IXLStylized.cs">
-      <Link>Excel\Style\IXLStylized.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLAlignment.cs">
-      <Link>Excel\Style\XLAlignment.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLBorder.cs">
-      <Link>Excel\Style\XLBorder.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLFill.cs">
-      <Link>Excel\Style\XLFill.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLFont.cs">
-      <Link>Excel\Style\XLFont.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLNumberFormat.cs">
-      <Link>Excel\Style\XLNumberFormat.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLProtection.cs">
-      <Link>Excel\Style\XLProtection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLStyle.cs">
-      <Link>Excel\Style\XLStyle.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Style\XLStylizedContainer.cs">
-      <Link>Excel\Style\XLStylizedContainer.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\IXLTable.cs">
-      <Link>Excel\Tables\IXLTable.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableField.cs">
-      <Link>Excel\Tables\IXLTableField.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableRange.cs">
-      <Link>Excel\Tables\IXLTableRange.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableRow.cs">
-      <Link>Excel\Tables\IXLTableRow.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableRows.cs">
-      <Link>Excel\Tables\IXLTableRows.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\IXLTables.cs">
-      <Link>Excel\Tables\IXLTables.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\XLTable.cs">
-      <Link>Excel\Tables\XLTable.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\XLTableField.cs">
-      <Link>Excel\Tables\XLTableField.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\XLTableRange.cs">
-      <Link>Excel\Tables\XLTableRange.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\XLTableRow.cs">
-      <Link>Excel\Tables\XLTableRow.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\XLTableRows.cs">
-      <Link>Excel\Tables\XLTableRows.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\Tables\XLTables.cs">
-      <Link>Excel\Tables\XLTables.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLConstants.cs">
-      <Link>Excel\XLConstants.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLOutline.cs">
-      <Link>Excel\XLOutline.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLSheetProtection.cs">
-      <Link>Excel\XLSheetProtection.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLSheetView.cs">
-      <Link>Excel\XLSheetView.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLTheme.cs">
-      <Link>Excel\XLTheme.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorkbook.cs">
-      <Link>Excel\XLWorkbook.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorkbookProperties.cs">
-      <Link>Excel\XLWorkbookProperties.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorkbook_Load.cs">
-      <Link>Excel\XLWorkbook_Load.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorkbook_Save.cs">
-      <Link>Excel\XLWorkbook_Save.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorkbook_Save.NestedTypes.cs">
-      <Link>Excel\XLWorkbook_Save.NestedTypes.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorksheet.cs">
-      <Link>Excel\XLWorksheet.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorksheetInternals.cs">
-      <Link>Excel\XLWorksheetInternals.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWorksheets.cs">
-      <Link>Excel\XLWorksheets.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Excel\XLWSContentManager.cs">
-      <Link>Excel\XLWSContentManager.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Extensions.cs">
-      <Link>Extensions.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\PathHelper.cs">
-      <Link>PathHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\Utils\GraphicsUtils.cs">
-      <Link>Utils\GraphicsUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\ClosedXML\XLHelper.cs">
-      <Link>XLHelper.cs</Link>
-    </Compile>
-    <Compile Include="Excel\Style\XLStylizedEmpty.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ClosedXML.snk" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>IF EXIST $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(TargetDir)</PostBuildEvent>
-  </PropertyGroup>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Net3.5/Excel/Style/XLStylizedEmpty.cs b/ClosedXML/ClosedXML/ClosedXML_Net3.5/Excel/Style/XLStylizedEmpty.cs
deleted file mode 100644
index 9e059f9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Net3.5/Excel/Style/XLStylizedEmpty.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML.Excel
-{
-    internal class XLStylizedEmpty: IXLStylized
-    {
-        public XLStylizedEmpty(IXLStyle defaultStyle)
-        {
-            Style = defaultStyle;
-        }
-        public IXLStyle Style { get; set; }
-        
-        public IEnumerable<IXLStyle> Styles
-        {
-            get
-            {
-                UpdatingStyle = true;
-                yield return Style;
-                UpdatingStyle = false;
-            }
-        }
-
-        public bool UpdatingStyle { get; set; }
-
-        public IXLStyle InnerStyle { get; set; }
-
-        public IXLRanges RangesUsed
-        {
-            get { return new XLRanges(); }
-        }
-
-        public bool StyleChanged { get; set; }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Net3.5/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML_Net3.5/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1d41fcd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Net3.5/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClosedXML_Net3.5")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ClosedXML_Net3.5")]
-[assembly: AssemblyCopyright("Copyright © Manuel De Leon 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d627551d-470d-4a39-a5f1-5a71696b8200")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.75.0.0")]
-[assembly: AssemblyFileVersion("0.75.0.0")]
diff --git a/ClosedXML/ClosedXML/ClosedXML_Package/ClosedXML_Package.csproj b/ClosedXML/ClosedXML/ClosedXML_Package/ClosedXML_Package.csproj
deleted file mode 100644
index b36f788..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Package/ClosedXML_Package.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{69B3BDDF-C359-447C-AEB7-EBD8867DE528}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClosedXML_Package</RootNamespace>
-    <AssemblyName>ClosedXML_Package</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Ionic.Zip">
-      <HintPath>..\Ionic.Zip.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Package/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Package/Program.cs
deleted file mode 100644
index ec8f7c7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Package/Program.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Windows.Forms;
-using Ionic.Zip;
-
-namespace ClosedXML_Package
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-#if DEBUG
-            return;
-#endif
-            try
-            {
-                var targetPath = args[0]; 
-                //if (!targetPath.EndsWith("Release")) return;
-
-                var targetDll = String.Format(@"{0}\ClosedXML.dll", targetPath);
-                var targetXml = String.Format(@"{0}\ClosedXML.XML", targetPath);
-
-                if (!File.Exists(targetDll)) 
-                {
-                    MessageBox.Show("Missing: " + targetDll);
-                    return;
-                }
-                if (!File.Exists(targetXml))
-                {
-                    MessageBox.Show("Missing: " + targetXml);
-                    return;
-                }
-
-                Assembly assembly = Assembly.LoadFrom(targetDll);
-                Version ver = assembly.GetName().Version;
-                var targetZipPath = String.Format(@"{0}\ClosedXML_v{1}.zip", targetPath, ver);
-                var targetZipInfo = new FileInfo(targetZipPath);
-                if (targetZipInfo.Exists) targetZipInfo.Delete();
-
-                using (ZipFile zip = new ZipFile())
-                {
-                    zip.AddFile(targetDll, "");
-                    zip.AddFile(targetXml, "");
-                    zip.Save(targetZipPath);
-                }
-            }
-            catch (Exception ex)
-            {
-                var strMsg = "->" + ex.Message;
-                if (ex.InnerException != null)
-                    strMsg += Environment.NewLine + "=>" + ex.InnerException.Message;
-                MessageBox.Show(strMsg);
-            }
-
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Package/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML_Package/Properties/AssemblyInfo.cs
deleted file mode 100644
index a7e306e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Package/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClosedXML_Package")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("eCollege")]
-[assembly: AssemblyProduct("ClosedXML_Package")]
-[assembly: AssemblyCopyright("Copyright © eCollege 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("0005e3ad-3c3f-4446-a3ab-89fc837fb20f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ClosedXML/ClosedXML/ClosedXML_Package/app.config b/ClosedXML/ClosedXML/ClosedXML_Package/app.config
deleted file mode 100644
index cb2586b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Package/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj b/ClosedXML/ClosedXML/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj
deleted file mode 100644
index 9f6d804..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClosedXML_Sandbox</RootNamespace>
-    <AssemblyName>ClosedXML_Sandbox</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PerformanceRunner.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="OneRow.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
-      <Project>{bd5e6bfe-e837-4a35-bca9-39667d873a20}</Project>
-      <Name>ClosedXML</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ClosedXML_Examples\ClosedXML_Examples.csproj">
-      <Project>{03A518D0-1CB7-488E-861C-C4E782B27A46}</Project>
-      <Name>ClosedXML_Examples</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/OneRow.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/OneRow.cs
deleted file mode 100644
index 0dde282..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/OneRow.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.ComponentModel.DataAnnotations;
-
-namespace ClosedXML_Sandbox
-{
-    public class OneRow
-    {
-        [Display(Name = "Col01")]
-        public int Col01 { get; set; }
-
-        [Display(Name = "Col02")]
-        public string Col02 { get; set; }
-
-        [Display(Name = "Col03")]
-        public DateTime? Col03 { get; set; }
-
-        [Display(Name = "Col04")]
-        public TimeSpan? Col04 { get; set; }
-
-        [Display(Name = "Col05")]
-        public TimeSpan? Col05 { get; set; }
-
-        [Display(Name = "Col06")]
-        public TimeSpan? Col06 { get; set; }
-
-        [Display(Name = "Col07")]
-        public TimeSpan? Col07 { get; set; }
-
-        [Display(Name = "Col08")]
-        public TimeSpan? Col08 { get; set; }
-
-        [Display(Name = "Col09")]
-        public string Col09 { get; set; }
-
-        [Display(Name = "Col10")]
-        public decimal Col10 { get; set; }
-
-        [Display(Name = "Col11")]
-        public string Col11 { get; set; }
-
-        [Display(Name = "Col12")]
-        public bool Col12 { get; set; }
-
-        [Display(Name = "Col13")]
-        public bool Col13 { get; set; }
-
-        [Display(Name = "Col14")]
-        public string Col14 { get; set; }
-
-        [Display(Name = "Col15")]
-        public bool Col15 { get; set; }
-
-        [Display(Name = "Col16")]
-        public string Col16 { get; set; }
-
-        [Display(Name = "Col17")]
-        public string Col17 { get; set; }
-
-        [Display(Name = "Col18")]
-        public DateTime? Col18 { get; set; }
-
-        [Display(Name = "Col19")]
-        public string Col19 { get; set; }
-
-        [Display(Name = "Col20")]
-        public string Col20 { get; set; }
-
-        [Display(Name = "Col21")]
-        public string Col21 { get; set; }
-
-        [Display(Name = "Col22")]
-        public string Col22 { get; set; }
-
-        [Display(Name = "Col23")]
-        public string Col23 { get; set; }
-
-        [Display(Name = "Col24")]
-        public bool Col24 { get; set; }
-
-        [Display(Name = "Col25")]
-        public int? Col25 { get; set; }
-
-        [Display(Name = "Col26")]
-        public string Col26 { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/PerformanceRunner.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/PerformanceRunner.cs
deleted file mode 100644
index 97d3a31..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/PerformanceRunner.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using ClosedXML.Excel;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace ClosedXML_Sandbox
-{
-    internal class PerformanceRunner
-    {
-        public static void TimeAction(Action action)
-        {
-            var stopwatch = Stopwatch.StartNew();
-            action();
-            Console.WriteLine("Action done in " + stopwatch.Elapsed);
-        }
-
-        const int rowCount = 5000;
-        public static void RunInsertTable()
-        {
-            var rows = new List<OneRow>();
-
-            for (int i = 0; i < rowCount; i++)
-            {
-                var row = GenerateRow<OneRow>();
-                rows.Add(row);
-            }
-
-            var workbook = new XLWorkbook();
-            var worksheet = workbook.Worksheets.Add("Sheet 1");
-            worksheet.Cell(1, 1).InsertTable(rows);
-
-            CreateMergedCell(worksheet);
-
-            worksheet.Columns().AdjustToContents();
-
-            EmulateSave(workbook);
-        }
-
-        private static void CreateMergedCell(IXLWorksheet worksheet)
-        {
-            worksheet.Cell(rowCount + 2, 1).Value = "Merged cell";
-            var range = worksheet.Range(rowCount + 2, 1, rowCount + 2, 2);
-            range.Row(1).Merge();
-        }
-
-        private static void EmulateSave(XLWorkbook workbook)
-        {
-            using (MemoryStream memoryStream = new MemoryStream())
-            {
-                workbook.SaveAs(memoryStream);
-                memoryStream.Seek(0, SeekOrigin.Begin);
-                Console.WriteLine("Total bytes = " + memoryStream.ToArray().Length);
-            }
-        }
-
-        private static Random rnd = new Random();
-
-        private static T GenerateRow<T>() where T : new()
-        {
-            var row = new T();
-
-            var rowProps = row.GetType().GetProperties();
-
-            var strings = rowProps.Where(p => p.PropertyType == typeof(string));
-            var decimals = rowProps.Where(p => p.PropertyType == typeof(decimal));
-            var ints = rowProps.Where(p => p.PropertyType == typeof(int) || p.PropertyType == typeof(int?));
-            var dates = rowProps.Where(p => p.PropertyType == typeof(DateTime?));
-            var timeSpans = rowProps.Where(p => p.PropertyType == typeof(TimeSpan?));
-            var booleans = rowProps.Where(p => p.PropertyType == typeof(bool));
-
-            // Format strings
-            var tmpString = new StringBuilder();
-            var tmpStringLength = rnd.Next(5, 50);
-            for (int x = 0; x <= tmpStringLength; x++)
-            {
-                tmpString.Append((char)(rnd.Next(48, 120)));
-            }
-            foreach (var str in strings)
-            {
-                str.SetValue(row, tmpString.ToString());
-            }
-
-            // Format decimals
-            var tmpDec = (decimal)(rnd.Next(-10000, 100000) / (Math.Pow(10.0, rnd.Next(1, 4))));
-
-            foreach (var dec in decimals)
-            {
-                dec.SetValue(row, tmpDec);
-            }
-
-            // Format ints
-            var tmpInt = rnd.Next(-1000, 10000);
-
-            foreach (var intValue in ints)
-            {
-                intValue.SetValue(row, tmpInt);
-            }
-
-            // Format dates
-            var tmpDate = new DateTime(2012, 1, 1, 1, 1, 1);
-            tmpDate = tmpDate.AddSeconds(rnd.Next(-10000, 100000));
-            foreach (var dt in dates)
-            {
-                dt.SetValue(row, tmpDate);
-            }
-
-            // Format timespans
-            var tmpTimespan = new TimeSpan(rnd.Next(1, 24), rnd.Next(1, 60), rnd.Next(1, 60));
-
-            foreach (var ts in timeSpans)
-            {
-                ts.SetValue(row, tmpTimespan);
-            }
-
-            // Format booleans
-            var tmpBool = (rnd.Next(0, 2) > 0);
-            foreach (var bl in booleans)
-            {
-                bl.SetValue(row, tmpBool);
-            }
-
-            return row;
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
deleted file mode 100644
index f01eb1d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using ClosedXML.Excel;
-using ClosedXML;
-using System.Drawing;
-using System.IO;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml;
-namespace ClosedXML_Sandbox
-{
-    class Program
-    {
-        private static void Main(string[] args)
-        {
-            //var wb = new XLWorkbook();
-            //wb.SaveAs(@"c:\temp\saved.xlsx");
-            //Console.WriteLine("Done");
-            PerformanceRunner.TimeAction(PerformanceRunner.RunInsertTable);
-
-            Console.WriteLine("Press any key to continue");
-            Console.ReadKey();
-        }
-    }
-}
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Properties/AssemblyInfo.cs
deleted file mode 100644
index 942db94..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClosedXML_Sandbox")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("ClosedXML_Sandbox")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7a3783fd-4e1b-4c17-a745-e6bbb593bd45")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/app.config b/ClosedXML/ClosedXML/ClosedXML_Sandbox/app.config
deleted file mode 100644
index 22c902a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/packages.config b/ClosedXML/ClosedXML/ClosedXML_Sandbox/packages.config
deleted file mode 100644
index 3a74e72..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/ClosedXML_Sandbox_VB.vbproj b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/ClosedXML_Sandbox_VB.vbproj
deleted file mode 100644
index f5ca4a5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/ClosedXML_Sandbox_VB.vbproj
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>
-    </SchemaVersion>
-    <ProjectGuid>{E005997D-B192-461F-AA3E-44007A33A3DF}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <StartupObject>ClosedXML_Sandbox_VB.Module1</StartupObject>
-    <RootNamespace>ClosedXML_Sandbox_VB</RootNamespace>
-    <AssemblyName>ClosedXML_Sandbox_VB</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Console</MyType>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Module1.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
-      <Project>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</Project>
-      <Name>ClosedXML</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/Module1.vb b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/Module1.vb
deleted file mode 100644
index 1301cf1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/Module1.vb
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Imports ClosedXML
-Imports ClosedXML.Excel
-Imports System.IO
-Module Module1
-
-    Sub Main()
-        'Use this space to play with ClosedXML
-
-    End Sub
-
-End Module
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Application.Designer.vb b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Application.Designer.vb
deleted file mode 100644
index 9478349..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Application.Designer.vb
+++ /dev/null
@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.1
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Application.myapp b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Application.myapp
deleted file mode 100644
index 23b627f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Application.myapp
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <MySubMain>false</MySubMain>
-  <SingleInstance>false</SingleInstance>
-  <ShutdownMode>0</ShutdownMode>
-  <EnableVisualStyles>true</EnableVisualStyles>
-  <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>2</ApplicationType>
-  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/AssemblyInfo.vb b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/AssemblyInfo.vb
deleted file mode 100644
index c8e6786..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/AssemblyInfo.vb
+++ /dev/null
@@ -1,35 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following 
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("ClosedXML_Sandbox_VB")> 
-<Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("Microsoft")> 
-<Assembly: AssemblyProduct("ClosedXML_Sandbox_VB")> 
-<Assembly: AssemblyCopyright("Copyright © Microsoft 2010")> 
-<Assembly: AssemblyTrademark("")> 
-
-<Assembly: ComVisible(False)>
-
-'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("8d4ab706-3b83-4bae-899f-c943a2875d05")> 
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Version
-'      Minor Version 
-'      Build Number
-'      Revision
-'
-' You can specify all the values or you can default the Build and Revision Numbers 
-' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("1.0.*")> 
-
-<Assembly: AssemblyVersion("1.0.0.0")> 
-<Assembly: AssemblyFileVersion("1.0.0.0")> 
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Resources.Designer.vb b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Resources.Designer.vb
deleted file mode 100644
index f524b67..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Resources.Designer.vb
+++ /dev/null
@@ -1,62 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.1
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My.Resources
-    
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
-    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
-    Friend Module Resources
-
-        Private resourceMan As Global.System.Resources.ResourceManager
-
-        Private resourceCulture As Global.System.Globalization.CultureInfo
-
-        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
-            Get
-                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ClosedXML_Sandbox_VB.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-
-        '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set(ByVal value As Global.System.Globalization.CultureInfo)
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Resources.resx b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Resources.resx
deleted file mode 100644
index ffecec8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Settings.Designer.vb b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Settings.Designer.vb
deleted file mode 100644
index 5e637d7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Settings.Designer.vb
+++ /dev/null
@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.1
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"), _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Partial Friend NotInheritable Class MySettings
-        Inherits Global.System.Configuration.ApplicationSettingsBase
-
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
-
-#Region "My.Settings Auto-Save Functionality"
-#If _MyType = "WindowsForms" Then
-        Private Shared addedHandler As Boolean
-
-        Private Shared addedHandlerLockObject As New Object
-
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
-            If My.Application.SaveMySettingsOnExit Then
-                My.Settings.Save()
-            End If
-        End Sub
-#End If
-#End Region
-
-        Public Shared ReadOnly Property [Default]() As MySettings
-            Get
-
-#If _MyType = "WindowsForms" Then
-                   If Not addedHandler Then
-                        SyncLock addedHandlerLockObject
-                            If Not addedHandler Then
-                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                                addedHandler = True
-                            End If
-                        End SyncLock
-                    End If
-#End If
-                Return defaultInstance
-            End Get
-        End Property
-    End Class
-End Namespace
-
-Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
-    Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.ClosedXML_Sandbox_VB.My.MySettings
-            Get
-                Return Global.ClosedXML_Sandbox_VB.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Settings.settings b/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Settings.settings
deleted file mode 100644
index 377f56d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox_VB/My Project/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/ClosedXML.snk b/ClosedXML/ClosedXML/ClosedXML_Tests/ClosedXML.snk
deleted file mode 100644
index a17cff7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/ClosedXML.snk
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML/ClosedXML/ClosedXML_Tests/ClosedXML_Tests.csproj
deleted file mode 100644
index dbc5325..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/ClosedXML_Tests.csproj
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClosedXML_Tests</RootNamespace>
-    <AssemblyName>ClosedXML_Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Examples\AutoFilterTests.cs" />
-    <Compile Include="Examples\CommentsTests.cs" />
-    <Compile Include="Examples\ConditionalFormattingTests.cs" />
-    <Compile Include="Examples\PageSetupTests.cs" />
-    <Compile Include="Examples\RowsTests.cs" />
-    <Compile Include="Examples\StylesTests.cs" />
-    <Compile Include="ExcelDocsComparerTests.cs" />
-    <Compile Include="Excel\CalcEngine\IsTests.cs" />
-    <Compile Include="Excel\CalcEngine\LogicalTests.cs" />
-    <Compile Include="Excel\CalcEngine\TextTests.cs" />
-    <Compile Include="XLHelperTests.cs" />
-    <Compile Include="Excel\AutoFilters\AutoFilterTests.cs" />
-    <Compile Include="Excel\CalcEngine\DateAndTimeTests.cs" />
-    <Compile Include="Excel\CalcEngine\XLMathTests.cs" />
-    <Compile Include="Excel\CalcEngine\FunctionsTests.cs" />
-    <Compile Include="Excel\Cells\XLCellTests.cs" />
-    <Compile Include="Excel\Columns\ColumnTests.cs" />
-    <Compile Include="Excel\Coordinates\XLAddressTests.cs" />
-    <Compile Include="Excel\DataValidations\DataValidationTests.cs" />
-    <Compile Include="Excel\Misc\FormulaTests.cs" />
-    <Compile Include="Excel\Misc\StylesTests.cs" />
-    <Compile Include="Excel\Misc\XLWorkbookTests.cs" />
-    <Compile Include="Excel\Misc\ExtensionsTests.cs" />
-    <Compile Include="Excel\NamedRanges\NamedRangesTests.cs" />
-    <Compile Include="Excel\PivotTables\XLPivotTableTests.cs" />
-    <Compile Include="Excel\Ranges\RangeUsedTests.cs" />
-    <Compile Include="Excel\Ranges\MergedRangesTests.cs" />
-    <Compile Include="Excel\Ranges\CopyingRangesTests.cs" />
-    <Compile Include="Excel\Ranges\XLRangeAddressTests.cs" />
-    <Compile Include="Excel\Ranges\XLRangeBaseTests.cs" />
-    <Compile Include="Excel\Ranges\InsertingRangesTests.cs" />
-    <Compile Include="Excel\Rows\RowTests.cs" />
-    <Compile Include="Excel\Styles\ColorTests.cs" />
-    <Compile Include="Excel\Styles\XLFillTests.cs" />
-    <Compile Include="Excel\Tables\TablesTests.cs" />
-    <Compile Include="Excel\Worksheets\XLWorksheetTests.cs" />
-    <Compile Include="Utils\ExcelDocsComparer.cs" />
-    <Compile Include="Examples\DeleteTests.cs" />
-    <Compile Include="Examples\LoadingTests.cs" />
-    <Compile Include="Examples\MiscTests.cs" />
-    <Compile Include="Excel\Misc\XlHelperTests.cs" />
-    <Compile Include="Examples\ColumnsTests.cs" />
-    <Compile Include="Excel\Misc\CopyContentsTests.cs" />
-    <Compile Include="Examples\RangesTests.cs" />
-    <Compile Include="Utils\PackageHelper.cs" />
-    <Compile Include="Utils\ResourceFileExtractor.cs" />
-    <Compile Include="Utils\StreamHelper.cs" />
-    <Compile Include="TestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Excel\RichText\XLRichStringTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
-      <Project>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</Project>
-      <Name>ClosedXML</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ClosedXML_Examples\ClosedXML_Examples.csproj">
-      <Project>{03A518D0-1CB7-488E-861C-C4E782B27A46}</Project>
-      <Name>ClosedXML_Examples</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource\Examples\Columns\ColumnCells.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Columns\ColumnCollection.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Columns\ColumnSettings.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Columns\DeletingColumns.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Columns\InsertColumns.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Delete\RemoveRows.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Loading\ChangingBasicTable.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\AddingDataSet.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\AddingDataTableAsWorksheet.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\AdjustToContents.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\AutoFilter.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\BlankCells.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\CellValues.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\Collections.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\DataTypes.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\DataValidation.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\Formulas.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\FreezePanes.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\HideSheets.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\HideUnhide.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\Hyperlinks.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\InsertingData.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\InsertingTables.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\LambdaExpressions.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\MergeCells.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\MergeMoves.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\Outline.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\SheetProtection.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\ShiftingFormulas.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\ShowCase.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\TabColors.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Misc\WorkbookProperties.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\PageSetup\HeaderFooters.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\PageSetup\Margins.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\PageSetup\Page.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\PageSetup\Sheets.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\PageSetup\SheetTab.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\PageSetup\TwoPages.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\ClearingRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\CopyingRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\DefiningRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\DeletingRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\InsertingDeletingColumns.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\InsertingDeletingRows.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\MultipleRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\NamedRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\ShiftingRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\SortExample.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\Sorting.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\TransposeRanges.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\TransposeRangesPlus.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Rows\InsertRows.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Rows\RowCells.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Rows\RowCollection.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Rows\RowSettings.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\DefaultStyles.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\StyleAlignment.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\StyleBorder.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\StyleFill.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\StyleFont.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\StyleNumberFormat.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\StyleRowsColumns.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\StyleWorksheet.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\UsingColors.xlsx" />
-    <EmbeddedResource Include="Resource\Misc\CopyRowContents.xlsx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource\Examples\Delete\DeleteFewWorksheets.xlsx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource\Examples\Misc\CopyingWorksheets.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\UsingTables.xlsx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource\Examples\Misc\CopyingRowsAndColumns.xlsx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource\Examples\Styles\UsingRichText.xlsx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource\Examples\Ranges\WalkingRanges.xlsx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource\Examples\Ranges\CurrentRowColumn.xlsx" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ClosedXML.snk" />
-    <EmbeddedResource Include="Resource\Examples\Misc\BasicTable.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Styles\PurpleWorksheet.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Comments\EditingComments.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\AutoFilter\TopBottomAutoFilter.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\AutoFilter\DynamicAutoFilter.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\AutoFilter\RegularAutoFilter.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\AutoFilter\CustomAutoFilter.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Comments\AddingComments.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFColorScaleLowHigh.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFColorScaleLowMidHigh.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFContains.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFEndsWith.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFEqualsNumber.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFEqualsString.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFIsBlank.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFIsError.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotBlank.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotContains.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotEqualsNumber.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotEqualsString.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotError.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFStartsWith.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFDataBar.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFIconSet.xlsx" />
-    <EmbeddedResource Include="Resource\Examples\Ranges\SelectingRanges.xlsx" />
-    <None Include="packages.config" />
-    <None Include="Resource\Misc\WorkbookProperties.xlsx" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/AutoFilterTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/AutoFilterTests.cs
deleted file mode 100644
index 5541af7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/AutoFilterTests.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using ClosedXML_Examples;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class AutoFilterTests
-    {
-        [Test]
-        public void CustomAutoFilter()
-        {
-            TestHelper.RunTestExample<CustomAutoFilter>(@"AutoFilter\CustomAutoFilter.xlsx");
-        }
-
-        [Test]
-        public void DynamicAutoFilter()
-        {
-            TestHelper.RunTestExample<DynamicAutoFilter>(@"AutoFilter\DynamicAutoFilter.xlsx");
-        }
-
-        [Test]
-        public void RegularAutoFilter()
-        {
-            TestHelper.RunTestExample<RegularAutoFilter>(@"AutoFilter\RegularAutoFilter.xlsx");
-        }
-
-        [Test]
-        public void TopBottomAutoFilter()
-        {
-            TestHelper.RunTestExample<TopBottomAutoFilter>(@"AutoFilter\TopBottomAutoFilter.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/ColumnsTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/ColumnsTests.cs
deleted file mode 100644
index c523d57..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/ColumnsTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using ClosedXML_Examples;
-using ClosedXML_Examples.Columns;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class ColumnsTests
-    {
-        [Test]
-        public void ColumnCells()
-        {
-            TestHelper.RunTestExample<ColumnCells>(@"Columns\ColumnCells.xlsx");
-        }
-
-        [Test]
-        public void ColumnCollections()
-        {
-            TestHelper.RunTestExample<ColumnCollection>(@"Columns\ColumnCollection.xlsx");
-        }
-
-        [Test]
-        public void ColumnSettings()
-        {
-            TestHelper.RunTestExample<ColumnSettings>(@"Columns\ColumnSettings.xlsx");
-        }
-
-        [Test]
-        public void DeletingColumns()
-        {
-            TestHelper.RunTestExample<DeletingColumns>(@"Columns\DeletingColumns.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/CommentsTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/CommentsTests.cs
deleted file mode 100644
index b4cb1e9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/CommentsTests.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using ClosedXML_Examples;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class CommentsTests
-    {
-        [Test]
-        public void AddingComments()
-        {
-            TestHelper.RunTestExample<AddingComments>(@"Comments\AddingComments.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/ConditionalFormattingTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/ConditionalFormattingTests.cs
deleted file mode 100644
index f5e9bcd..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/ConditionalFormattingTests.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using ClosedXML_Examples;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class ConditionalFormattingTests
-    {
-        [Test]
-        public void CFColorScaleLowHigh()
-        {
-            TestHelper.RunTestExample<CFColorScaleLowHigh>(@"ConditionalFormatting\CFColorScaleLowHigh.xlsx");
-        }
-
-        [Test]
-        public void CFColorScaleLowMidHigh()
-        {
-            TestHelper.RunTestExample<CFColorScaleLowMidHigh>(@"ConditionalFormatting\CFColorScaleLowMidHigh.xlsx");
-        }
-
-        [Test]
-        public void CFContains()
-        {
-            TestHelper.RunTestExample<CFContains>(@"ConditionalFormatting\CFContains.xlsx");
-        }
-
-        [Test]
-        public void CFDataBar()
-        {
-            TestHelper.RunTestExample<CFDataBar>(@"ConditionalFormatting\CFDataBar.xlsx");
-        }
-
-        [Test]
-        public void CFEndsWith()
-        {
-            TestHelper.RunTestExample<CFEndsWith>(@"ConditionalFormatting\CFEndsWith.xlsx");
-        }
-
-        [Test]
-        public void CFEqualsNumber()
-        {
-            TestHelper.RunTestExample<CFEqualsNumber>(@"ConditionalFormatting\CFEqualsNumber.xlsx");
-        }
-
-        [Test]
-        public void CFEqualsString()
-        {
-            TestHelper.RunTestExample<CFEqualsString>(@"ConditionalFormatting\CFEqualsString.xlsx");
-        }
-
-        [Test]
-        public void CFIconSet()
-        {
-            TestHelper.RunTestExample<CFIconSet>(@"ConditionalFormatting\CFIconSet.xlsx");
-        }
-
-        [Test]
-        public void CFIsBlank()
-        {
-            TestHelper.RunTestExample<CFIsBlank>(@"ConditionalFormatting\CFIsBlank.xlsx");
-        }
-
-        [Test]
-        public void CFIsError()
-        {
-            TestHelper.RunTestExample<CFIsError>(@"ConditionalFormatting\CFIsError.xlsx");
-        }
-
-        [Test]
-        public void CFNotBlank()
-        {
-            TestHelper.RunTestExample<CFNotBlank>(@"ConditionalFormatting\CFNotBlank.xlsx");
-        }
-
-        [Test]
-        public void CFNotContains()
-        {
-            TestHelper.RunTestExample<CFNotContains>(@"ConditionalFormatting\CFNotContains.xlsx");
-        }
-
-        [Test]
-        public void CFNotEqualsNumber()
-        {
-            TestHelper.RunTestExample<CFNotEqualsNumber>(@"ConditionalFormatting\CFNotEqualsNumber.xlsx");
-        }
-
-        [Test]
-        public void CFNotEqualsString()
-        {
-            TestHelper.RunTestExample<CFNotEqualsString>(@"ConditionalFormatting\CFNotEqualsString.xlsx");
-        }
-
-        [Test]
-        public void CFNotError()
-        {
-            TestHelper.RunTestExample<CFNotError>(@"ConditionalFormatting\CFNotError.xlsx");
-        }
-
-        [Test]
-        public void CFStartsWith()
-        {
-            TestHelper.RunTestExample<CFStartsWith>(@"ConditionalFormatting\CFStartsWith.xlsx");
-        }
-
-        //
-        //[Test]
-        //public void XXX()
-        //{
-        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
-        //}
-        //
-        //[Test]
-        //public void XXX()
-        //{
-        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
-        //}
-        //
-        //[Test]
-        //public void XXX()
-        //{
-        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
-        //}
-        //
-        //[Test]
-        //public void XXX()
-        //{
-        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
-        //}
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/DeleteTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/DeleteTests.cs
deleted file mode 100644
index b6e56ee..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/DeleteTests.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using ClosedXML_Examples.Delete;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class DeleteTests
-    {
-        [Test]
-        public void DeleteFewWorksheets()
-        {
-            TestHelper.RunTestExample<DeleteFewWorksheets>(@"Delete\DeleteFewWorksheets.xlsx");
-        }
-
-        [Test]
-        public void RemoveRows()
-        {
-            TestHelper.RunTestExample<DeleteRows>(@"Delete\RemoveRows.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/LoadingTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/LoadingTests.cs
deleted file mode 100644
index 2391d19..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/LoadingTests.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using ClosedXML_Examples;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class LoadingTests
-    {
-        [Test]
-        public void ChangingBasicTable()
-        {
-            TestHelper.RunTestExample<ChangingBasicTable>(@"Loading\ChangingBasicTable.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/MiscTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/MiscTests.cs
deleted file mode 100644
index 2433aab..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/MiscTests.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using ClosedXML_Examples;
-using ClosedXML_Examples.Misc;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class MiscTests
-    {
-        [Test]
-        public void AddingDataSet()
-        {
-            TestHelper.RunTestExample<AddingDataSet>(@"Misc\AddingDataSet.xlsx");
-        }
-
-        [Test]
-        public void AddingDataTableAsWorksheet()
-        {
-            TestHelper.RunTestExample<AddingDataTableAsWorksheet>(@"Misc\AddingDataTableAsWorksheet.xlsx");
-        }
-
-        [Test]
-        public void AdjustToContents()
-        {
-            TestHelper.RunTestExample<AdjustToContents>(@"Misc\AdjustToContents.xlsx");
-        }
-
-        [Test]
-        public void AutoFilter()
-        {
-            TestHelper.RunTestExample<AutoFilter>(@"Misc\AutoFilter.xlsx");
-        }
-
-        [Test]
-        public void BasicTable()
-        {
-            TestHelper.RunTestExample<BasicTable>(@"Misc\BasicTable.xlsx");
-        }
-
-        [Test]
-        public void BlankCells()
-        {
-            TestHelper.RunTestExample<BlankCells>(@"Misc\BlankCells.xlsx");
-        }
-
-        [Test]
-        public void CellValues()
-        {
-            TestHelper.RunTestExample<CellValues>(@"Misc\CellValues.xlsx");
-        }
-
-        [Test]
-        public void Collections()
-        {
-            TestHelper.RunTestExample<Collections>(@"Misc\Collections.xlsx");
-        }
-
-        [Test]
-        public void CopyingRowsAndColumns()
-        {
-            TestHelper.RunTestExample<CopyingRowsAndColumns>(@"Misc\CopyingRowsAndColumns.xlsx");
-        }
-
-        [Test]
-        public void CopyingWorksheets()
-        {
-            TestHelper.RunTestExample<CopyingWorksheets>(@"Misc\CopyingWorksheets.xlsx");
-        }
-
-        [Test]
-        public void DataTypes()
-        {
-            TestHelper.RunTestExample<DataTypes>(@"Misc\DataTypes.xlsx");
-        }
-
-        [Test]
-        public void DataValidation()
-        {
-            TestHelper.RunTestExample<DataValidation>(@"Misc\DataValidation.xlsx");
-        }
-
-        [Test]
-        public void Formulas()
-        {
-            TestHelper.RunTestExample<Formulas>(@"Misc\Formulas.xlsx");
-        }
-
-        [Test]
-        public void FreezePanes()
-        {
-            TestHelper.RunTestExample<FreezePanes>(@"Misc\FreezePanes.xlsx");
-        }
-
-        [Test]
-        public void HideSheets()
-        {
-            TestHelper.RunTestExample<HideSheets>(@"Misc\HideSheets.xlsx");
-        }
-
-        [Test]
-        public void HideUnhide()
-        {
-            TestHelper.RunTestExample<HideUnhide>(@"Misc\HideUnhide.xlsx");
-        }
-
-        [Test]
-        public void Hyperlinks()
-        {
-            TestHelper.RunTestExample<Hyperlinks>(@"Misc\Hyperlinks.xlsx");
-        }
-
-        [Test]
-        public void InsertingData()
-        {
-            TestHelper.RunTestExample<InsertingData>(@"Misc\InsertingData.xlsx");
-        }
-
-        [Test]
-        public void InsertingTables()
-        {
-            TestHelper.RunTestExample<InsertingTables>(@"Misc\InsertingTables.xlsx");
-        }
-
-        [Test]
-        public void LambdaExpressions()
-        {
-            TestHelper.RunTestExample<LambdaExpressions>(@"Misc\LambdaExpressions.xlsx");
-        }
-
-        [Test]
-        public void MergeCells()
-        {
-            TestHelper.RunTestExample<MergeCells>(@"Misc\MergeCells.xlsx");
-        }
-
-        [Test]
-        public void MergeMoves()
-        {
-            TestHelper.RunTestExample<MergeMoves>(@"Misc\MergeMoves.xlsx");
-        }
-
-        [Test]
-        public void Outline()
-        {
-            TestHelper.RunTestExample<Outline>(@"Misc\Outline.xlsx");
-        }
-
-        [Test]
-        public void SheetProtection()
-        {
-            TestHelper.RunTestExample<SheetProtection>(@"Misc\SheetProtection.xlsx");
-        }
-
-        [Test]
-        public void ShiftingFormulas()
-        {
-            TestHelper.RunTestExample<ShiftingFormulas>(@"Misc\ShiftingFormulas.xlsx");
-        }
-
-        [Test]
-        public void ShowCase()
-        {
-            TestHelper.RunTestExample<ShowCase>(@"Misc\ShowCase.xlsx");
-        }
-
-        [Test]
-        public void TabColors()
-        {
-            TestHelper.RunTestExample<TabColors>(@"Misc\TabColors.xlsx");
-        }
-
-        [Test]
-        public void WorkbookProperties()
-        {
-            TestHelper.RunTestExample<WorkbookProperties>(@"Misc\WorkbookProperties.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/PageSetupTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/PageSetupTests.cs
deleted file mode 100644
index 588ef50..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/PageSetupTests.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using ClosedXML_Examples.PageSetup;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class PageSetupTests
-    {
-        [Test]
-        public void HeaderFooters()
-        {
-            TestHelper.RunTestExample<HeaderFooters>(@"PageSetup\HeaderFooters.xlsx");
-        }
-
-        [Test]
-        public void Margins()
-        {
-            TestHelper.RunTestExample<Margins>(@"PageSetup\Margins.xlsx");
-        }
-
-        [Test]
-        public void Page()
-        {
-            TestHelper.RunTestExample<Page>(@"PageSetup\Page.xlsx");
-        }
-
-        [Test]
-        public void SheetTab()
-        {
-            TestHelper.RunTestExample<SheetTab>(@"PageSetup\SheetTab.xlsx");
-        }
-
-        [Test]
-        public void Sheets()
-        {
-            TestHelper.RunTestExample<Sheets>(@"PageSetup\Sheets.xlsx");
-        }
-
-        [Test]
-        public void TwoPages()
-        {
-            TestHelper.RunTestExample<TwoPages>(@"PageSetup\TwoPages.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/RangesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/RangesTests.cs
deleted file mode 100644
index 07dae9f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/RangesTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using ClosedXML_Examples;
-using ClosedXML_Examples.Misc;
-using ClosedXML_Examples.Ranges;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class RangesTests
-    {
-        [Test]
-        public void ClearingRanges()
-        {
-            TestHelper.RunTestExample<ClearingRanges>(@"Ranges\ClearingRanges.xlsx");
-        }
-
-        [Test]
-        public void CopyingRanges()
-        {
-            TestHelper.RunTestExample<CopyingRanges>(@"Ranges\CopyingRanges.xlsx");
-        }
-
-        [Test]
-        public void CurrentRowColumn()
-        {
-            TestHelper.RunTestExample<CurrentRowColumn>(@"Ranges\CurrentRowColumn.xlsx");
-        }
-
-        [Test]
-        public void DefiningRanges()
-        {
-            TestHelper.RunTestExample<DefiningRanges>(@"Ranges\DefiningRanges.xlsx");
-        }
-
-        [Test]
-        public void DeletingRanges()
-        {
-            TestHelper.RunTestExample<DeletingRanges>(@"Ranges\DeletingRanges.xlsx");
-        }
-
-        [Test]
-        public void InsertingDeletingColumns()
-        {
-            TestHelper.RunTestExample<InsertingDeletingColumns>(@"Ranges\InsertingDeletingColumns.xlsx");
-        }
-
-        [Test]
-        public void InsertingDeletingRows()
-        {
-            TestHelper.RunTestExample<InsertingDeletingRows>(@"Ranges\InsertingDeletingRows.xlsx");
-        }
-
-        [Test]
-        public void MultipleRanges()
-        {
-            TestHelper.RunTestExample<MultipleRanges>(@"Ranges\MultipleRanges.xlsx");
-        }
-
-        [Test]
-        public void NamedRanges()
-        {
-            TestHelper.RunTestExample<NamedRanges>(@"Ranges\NamedRanges.xlsx");
-        }
-
-        [Test]
-        public void SelectingRanges()
-        {
-            TestHelper.RunTestExample<SelectingRanges>(@"Ranges\SelectingRanges.xlsx");
-        }
-
-        [Test]
-        public void ShiftingRanges()
-        {
-            TestHelper.RunTestExample<ShiftingRanges>(@"Ranges\ShiftingRanges.xlsx");
-        }
-
-        [Test]
-        public void SortExample()
-        {
-            TestHelper.RunTestExample<SortExample>(@"Ranges\SortExample.xlsx");
-        }
-
-        [Test]
-        public void Sorting()
-        {
-            TestHelper.RunTestExample<Sorting>(@"Ranges\Sorting.xlsx");
-        }
-
-        [Test]
-        public void TransposeRanges()
-        {
-            TestHelper.RunTestExample<TransposeRanges>(@"Ranges\TransposeRanges.xlsx");
-        }
-
-        [Test]
-        public void TransposeRangesPlus()
-        {
-            TestHelper.RunTestExample<TransposeRangesPlus>(@"Ranges\TransposeRangesPlus.xlsx");
-        }
-
-        [Test]
-        public void UsingTables()
-        {
-            TestHelper.RunTestExample<UsingTables>(@"Ranges\UsingTables.xlsx");
-        }
-
-        [Test]
-        public void WalkingRanges()
-        {
-            TestHelper.RunTestExample<WalkingRanges>(@"Ranges\WalkingRanges.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/RowsTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/RowsTests.cs
deleted file mode 100644
index 917a985..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/RowsTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using ClosedXML_Examples;
-using ClosedXML_Examples.Rows;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class RowsTests
-    {
-        [Test]
-        public void RowCells()
-        {
-            TestHelper.RunTestExample<RowCells>(@"Rows\RowCells.xlsx");
-        }
-
-        [Test]
-        public void RowCollection()
-        {
-            TestHelper.RunTestExample<RowCollection>(@"Rows\RowCollection.xlsx");
-        }
-
-        [Test]
-        public void RowSettings()
-        {
-            TestHelper.RunTestExample<RowSettings>(@"Rows\RowSettings.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/StylesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/StylesTests.cs
deleted file mode 100644
index 77e0bf4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Examples/StylesTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using ClosedXML_Examples.Styles;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Examples
-{
-    [TestFixture]
-    public class StylesTests
-    {
-        [Test]
-        public void DefaultStyles()
-        {
-            TestHelper.RunTestExample<DefaultStyles>(@"Styles\DefaultStyles.xlsx");
-        }
-
-        [Test]
-        public void PurpleWorksheet()
-        {
-            TestHelper.RunTestExample<PurpleWorksheet>(@"Styles\PurpleWorksheet.xlsx");
-        }
-
-        [Test]
-        public void StyleAlignment()
-        {
-            TestHelper.RunTestExample<StyleAlignment>(@"Styles\StyleAlignment.xlsx");
-        }
-
-        [Test]
-        public void StyleBorder()
-        {
-            TestHelper.RunTestExample<StyleBorder>(@"Styles\StyleBorder.xlsx");
-        }
-
-        [Test]
-        public void StyleFill()
-        {
-            TestHelper.RunTestExample<StyleFill>(@"Styles\StyleFill.xlsx");
-        }
-
-        [Test]
-        public void StyleFont()
-        {
-            TestHelper.RunTestExample<StyleFont>(@"Styles\StyleFont.xlsx");
-        }
-
-        [Test]
-        public void StyleNumberFormat()
-        {
-            TestHelper.RunTestExample<StyleNumberFormat>(@"Styles\StyleNumberFormat.xlsx");
-        }
-
-        [Test]
-        public void StyleRowsColumns()
-        {
-            TestHelper.RunTestExample<StyleRowsColumns>(@"Styles\StyleRowsColumns.xlsx");
-        }
-
-        [Test]
-        public void StyleWorksheet()
-        {
-            TestHelper.RunTestExample<StyleWorksheet>(@"Styles\StyleWorksheet.xlsx");
-        }
-
-        [Test]
-        public void UsingColors()
-        {
-            TestHelper.RunTestExample<UsingColors>(@"Styles\UsingColors.xlsx");
-        }
-
-        [Test]
-        public void UsingRichText()
-        {
-            TestHelper.RunTestExample<UsingRichText>(@"Styles\UsingRichText.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs
deleted file mode 100644
index c4e3e7d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class AutoFilterTests
-    {
-        [Test]
-        public void AutoFilterExpandsWithTable()
-        {
-            using (var wb = new XLWorkbook())
-            {
-                using (IXLWorksheet ws = wb.Worksheets.Add("Sheet1"))
-                {
-                    ws.FirstCell().SetValue("Categories")
-                        .CellBelow().SetValue("1")
-                        .CellBelow().SetValue("2");
-
-                    IXLTable table = ws.RangeUsed().CreateTable();
-
-                    var listOfArr = new List<Int32>();
-                    listOfArr.Add(3);
-                    listOfArr.Add(4);
-                    listOfArr.Add(5);
-                    listOfArr.Add(6);
-
-                    table.DataRange.InsertRowsBelow(listOfArr.Count - table.DataRange.RowCount());
-                    table.DataRange.FirstCell().InsertData(listOfArr.AsEnumerable());
-
-                    Assert.AreEqual("A1:A5", table.AutoFilter.Range.RangeAddress.ToStringRelative());
-                }
-            }
-        }
-
-        [Test]
-        public void AutoFilterSortWhenNotInFirstRow()
-        {
-            using (var wb = new XLWorkbook())
-            {
-                using (IXLWorksheet ws = wb.Worksheets.Add("Sheet1"))
-                {
-                    ws.Cell(3, 3).SetValue("Names")
-                        .CellBelow().SetValue("Manuel")
-                        .CellBelow().SetValue("Carlos")
-                        .CellBelow().SetValue("Dominic");
-                    ws.RangeUsed().SetAutoFilter().Sort();
-                    Assert.AreEqual(ws.Cell(4, 3).GetString(), "Carlos");
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/DateAndTimeTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/DateAndTimeTests.cs
deleted file mode 100644
index a5c20dc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/DateAndTimeTests.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-using System;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.DataValidations
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class DateAndTimeTests
-    {
-        [Test]
-        public void Date()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Date(2008, 1, 1)");
-            Assert.AreEqual(39448, actual);
-        }
-
-        [Test]
-        public void Datevalue()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("DateValue(\"8/22/2008\")");
-            Assert.AreEqual(39682, actual);
-        }
-
-        [Test]
-        public void Day()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Day(\"8/22/2008\")");
-            Assert.AreEqual(22, actual);
-        }
-
-        [Test]
-        public void Days360_Default()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Days360(\"1/30/2008\", \"2/1/2008\")");
-            Assert.AreEqual(1, actual);
-        }
-
-        [Test]
-        public void Days360_Europe1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"1/1/2008\", \"3/31/2008\",TRUE)");
-            Assert.AreEqual(89, actual);
-        }
-
-        [Test]
-        public void Days360_Europe2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"3/31/2008\", \"1/1/2008\",TRUE)");
-            Assert.AreEqual(-89, actual);
-        }
-
-        [Test]
-        public void Days360_US1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"1/1/2008\", \"3/31/2008\",FALSE)");
-            Assert.AreEqual(90, actual);
-        }
-
-        [Test]
-        public void Days360_US2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"3/31/2008\", \"1/1/2008\",FALSE)");
-            Assert.AreEqual(-89, actual);
-        }
-
-        [Test]
-        public void EDate_Negative1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/1/2008\", -1)");
-            Assert.AreEqual(new DateTime(2008, 2, 1), actual);
-        }
-
-        [Test]
-        public void EDate_Negative2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/31/2008\", -1)");
-            Assert.AreEqual(new DateTime(2008, 2, 29), actual);
-        }
-
-        [Test]
-        public void EDate_Positive1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/1/2008\", 1)");
-            Assert.AreEqual(new DateTime(2008, 4, 1), actual);
-        }
-
-        [Test]
-        public void EDate_Positive2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/31/2008\", 1)");
-            Assert.AreEqual(new DateTime(2008, 4, 30), actual);
-        }
-
-        [Test]
-        public void EOMonth_Negative()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("EOMonth(\"3/1/2008\", -1)");
-            Assert.AreEqual(new DateTime(2008, 2, 29), actual);
-        }
-
-        [Test]
-        public void EOMonth_Positive()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("EOMonth(\"3/31/2008\", 1)");
-            Assert.AreEqual(new DateTime(2008, 4, 30), actual);
-        }
-
-        [Test]
-        public void Hour()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Hour(\"8/22/2008 3:30:45 PM\")");
-            Assert.AreEqual(15, actual);
-        }
-
-        [Test]
-        public void Minute()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Minute(\"8/22/2008 3:30:45 AM\")");
-            Assert.AreEqual(30, actual);
-        }
-
-        [Test]
-        public void Month()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Month(\"8/22/2008\")");
-            Assert.AreEqual(8, actual);
-        }
-
-        [Test]
-        public void Networkdays_MultipleHolidaysGiven()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Date")
-                .CellBelow().SetValue(new DateTime(2008, 10, 1))
-                .CellBelow().SetValue(new DateTime(2009, 3, 1))
-                .CellBelow().SetValue(new DateTime(2008, 11, 26))
-                .CellBelow().SetValue(new DateTime(2008, 12, 4))
-                .CellBelow().SetValue(new DateTime(2009, 1, 21));
-            Object actual = ws.Evaluate("Networkdays(A2,A3,A4:A6)");
-            Assert.AreEqual(105, actual);
-        }
-
-        [Test]
-        public void Networkdays_NoHolidaysGiven()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Networkdays(\"10/01/2008\", \"3/01/2009\")");
-            Assert.AreEqual(108, actual);
-        }
-
-        [Test]
-        public void Networkdays_OneHolidaysGiven()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Networkdays(\"10/01/2008\", \"3/01/2009\", \"11/26/2008\")");
-            Assert.AreEqual(107, actual);
-        }
-
-        [Test]
-        public void Second()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Second(\"8/22/2008 3:30:45 AM\")");
-            Assert.AreEqual(45, actual);
-        }
-
-        [Test]
-        public void Time()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Time(1,2,3)");
-            Assert.AreEqual(new TimeSpan(1, 2, 3), actual);
-        }
-
-        [Test]
-        public void TimeValue1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("TimeValue(\"2:24 AM\")");
-            Assert.IsTrue(XLHelper.AreEqual(0.1, (double) actual));
-        }
-
-        [Test]
-        public void TimeValue2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("TimeValue(\"22-Aug-2008 6:35 AM\")");
-            Assert.IsTrue(XLHelper.AreEqual(0.27430555555555558, (double) actual));
-        }
-
-        [Test]
-        public void Today()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Today()");
-            Assert.AreEqual(DateTime.Now.Date, actual);
-        }
-
-        [Test]
-        public void Weekday_1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\", 1)");
-            Assert.AreEqual(5, actual);
-        }
-
-        [Test]
-        public void Weekday_2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\", 2)");
-            Assert.AreEqual(4, actual);
-        }
-
-        [Test]
-        public void Weekday_3()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\", 3)");
-            Assert.AreEqual(3, actual);
-        }
-
-        [Test]
-        public void Weekday_Omitted()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\")");
-            Assert.AreEqual(5, actual);
-        }
-
-        [Test]
-        public void Weeknum_1()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2000\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_10()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2004\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_11()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2005\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_12()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2005\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_13()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2006\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_14()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2006\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_15()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2007\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_16()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2007\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_17()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2008\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_18()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2008\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_19()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2009\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_2()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2000\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_20()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2009\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_3()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2001\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_4()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2001\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_5()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2002\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_6()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2002\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_7()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2003\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_8()
-        {
-            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2003\", 2)"));
-        }
-
-        [Test]
-        public void Weeknum_9()
-        {
-            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2004\", 1)"));
-        }
-
-        [Test]
-        public void Weeknum_Default()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2008\")");
-            Assert.AreEqual(11, actual);
-        }
-
-        [Test]
-        public void Workdays_MultipleHolidaysGiven()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Date")
-                .CellBelow().SetValue(new DateTime(2008, 10, 1))
-                .CellBelow().SetValue(151)
-                .CellBelow().SetValue(new DateTime(2008, 11, 26))
-                .CellBelow().SetValue(new DateTime(2008, 12, 4))
-                .CellBelow().SetValue(new DateTime(2009, 1, 21));
-            Object actual = ws.Evaluate("Workday(A2,A3,A4:A6)");
-            Assert.AreEqual(new DateTime(2009, 5, 5), actual);
-        }
-
-
-        [Test]
-        public void Workdays_NoHolidaysGiven()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Workday(\"10/01/2008\", 151)");
-            Assert.AreEqual(new DateTime(2009, 4, 30), actual);
-        }
-
-        [Test]
-        public void Workdays_OneHolidaysGiven()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Workday(\"10/01/2008\", 152, \"11/26/2008\")");
-            Assert.AreEqual(new DateTime(2009, 5, 4), actual);
-        }
-
-        [Test]
-        public void Year()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Year(\"8/22/2008\")");
-            Assert.AreEqual(2008, actual);
-        }
-
-        [Test]
-        public void Yearfrac_1_base0()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",0)");
-            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_1_base1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",1)");
-            Assert.IsTrue(XLHelper.AreEqual(0.24590163934426229, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_1_base2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",2)");
-            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_1_base3()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",3)");
-            Assert.IsTrue(XLHelper.AreEqual(0.24657534246575341, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_1_base4()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",4)");
-            Assert.IsTrue(XLHelper.AreEqual(0.24722222222222223, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_2_base0()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",0)");
-            Assert.IsTrue(XLHelper.AreEqual(5.25, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_2_base1()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",1)");
-            Assert.IsTrue(XLHelper.AreEqual(5.24452554744526, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_2_base2()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",2)");
-            Assert.IsTrue(XLHelper.AreEqual(5.32222222222222, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_2_base3()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",3)");
-            Assert.IsTrue(XLHelper.AreEqual(5.24931506849315, (double) actual));
-        }
-
-        [Test]
-        public void Yearfrac_2_base4()
-        {
-            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",4)");
-            Assert.IsTrue(XLHelper.AreEqual(5.24722222222222, (double) actual));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/FunctionsTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/FunctionsTests.cs
deleted file mode 100644
index f43aa6a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/FunctionsTests.cs
+++ /dev/null
@@ -1,622 +0,0 @@
-using System;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.CalcEngine
-{
-
-    [TestFixture]
-    public class FunctionsTests
-    {
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            // Make sure tests run on a deterministic culture
-            System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
-        }
-
-        [Test]
-        public void Asc()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Asc(""Text"")");
-            Assert.AreEqual("Text", actual);
-        }
-
-        [Test]
-        public void Clean()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(String.Format(@"Clean(""A{0}B"")", Environment.NewLine));
-            Assert.AreEqual("AB", actual);
-        }
-
-        [Test]
-        public void Combin()
-        {
-            object actual1 = XLWorkbook.EvaluateExpr("Combin(200, 2)");
-            Assert.AreEqual(19900.0, actual1);
-
-            object actual2 = XLWorkbook.EvaluateExpr("Combin(20.1, 2.9)");
-            Assert.AreEqual(190.0, actual2);
-        }
-
-        [Test]
-        public void Degrees()
-        {
-            object actual1 = XLWorkbook.EvaluateExpr("Degrees(180)");
-            Assert.IsTrue(Math.PI - (double) actual1 < XLHelper.Epsilon);
-        }
-
-        [Test]
-        public void Dollar()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Dollar(12345.123)");
-            Assert.AreEqual(TestHelper.CurrencySymbol + "12,345.12", actual);
-
-            actual = XLWorkbook.EvaluateExpr("Dollar(12345.123, 1)");
-            Assert.AreEqual(TestHelper.CurrencySymbol + "12,345.1", actual);
-        }
-
-        [Test]
-        public void Even()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Even(3)");
-            Assert.AreEqual(4, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Even(2)");
-            Assert.AreEqual(2, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Even(-1)");
-            Assert.AreEqual(-2, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Even(-2)");
-            Assert.AreEqual(-2, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Even(0)");
-            Assert.AreEqual(0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Even(1.5)");
-            Assert.AreEqual(2, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Even(2.01)");
-            Assert.AreEqual(4, actual);
-        }
-
-        [Test]
-        public void Exact()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr("Exact(\"A\", \"A\")");
-            Assert.AreEqual(true, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Exact(\"A\", \"a\")");
-            Assert.AreEqual(false, actual);
-        }
-
-        [Test]
-        public void Fact()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Fact(5.9)");
-            Assert.AreEqual(120.0, actual);
-        }
-
-        [Test]
-        public void FactDouble()
-        {
-            object actual1 = XLWorkbook.EvaluateExpr("FactDouble(6)");
-            Assert.AreEqual(48.0, actual1);
-            object actual2 = XLWorkbook.EvaluateExpr("FactDouble(7)");
-            Assert.AreEqual(105.0, actual2);
-        }
-
-        [Test]
-        public void Fixed()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr("Fixed(12345.123)");
-            Assert.AreEqual("12,345.12", actual);
-
-            actual = XLWorkbook.EvaluateExpr("Fixed(12345.123, 1)");
-            Assert.AreEqual("12,345.1", actual);
-
-            actual = XLWorkbook.EvaluateExpr("Fixed(12345.123, 1, FALSE)");
-            Assert.AreEqual("12345.1", actual);
-        }
-
-        [Test]
-        public void Formula_from_another_sheet()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws1 = wb.AddWorksheet("ws1");
-            ws1.FirstCell().SetValue(1).CellRight().SetFormulaA1("A1 + 1");
-            IXLWorksheet ws2 = wb.AddWorksheet("ws2");
-            ws2.FirstCell().SetFormulaA1("ws1!B1 + 1");
-            object v = ws2.FirstCell().Value;
-            Assert.AreEqual(3.0, v);
-        }
-
-        [Test]
-        public void Gcd()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Gcd(24, 36)");
-            Assert.AreEqual(12, actual);
-
-            object actual1 = XLWorkbook.EvaluateExpr("Gcd(5, 0)");
-            Assert.AreEqual(5, actual1);
-
-            object actual2 = XLWorkbook.EvaluateExpr("Gcd(0, 5)");
-            Assert.AreEqual(5, actual2);
-
-            object actual3 = XLWorkbook.EvaluateExpr("Gcd(240, 360, 30)");
-            Assert.AreEqual(30, actual3);
-        }
-
-        [Test]
-        public void Lcm()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Lcm(24, 36)");
-            Assert.AreEqual(72, actual);
-
-            object actual1 = XLWorkbook.EvaluateExpr("Lcm(5, 0)");
-            Assert.AreEqual(0, actual1);
-
-            object actual2 = XLWorkbook.EvaluateExpr("Lcm(0, 5)");
-            Assert.AreEqual(0, actual2);
-
-            object actual3 = XLWorkbook.EvaluateExpr("Lcm(240, 360, 30)");
-            Assert.AreEqual(720, actual3);
-        }
-
-        [Test]
-        public void MDetem()
-        {
-            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
-            ws.Cell("A1").SetValue(2).CellRight().SetValue(4);
-            ws.Cell("A2").SetValue(3).CellRight().SetValue(5);
-
-
-            Object actual;
-
-            ws.Cell("A5").FormulaA1 = "MDeterm(A1:B2)";
-            actual = ws.Cell("A5").Value;
-
-            Assert.IsTrue(XLHelper.AreEqual(-2.0, (double) actual));
-
-            ws.Cell("A6").FormulaA1 = "Sum(A5)";
-            actual = ws.Cell("A6").Value;
-
-            Assert.IsTrue(XLHelper.AreEqual(-2.0, (double) actual));
-
-            ws.Cell("A7").FormulaA1 = "Sum(MDeterm(A1:B2))";
-            actual = ws.Cell("A7").Value;
-
-            Assert.IsTrue(XLHelper.AreEqual(-2.0, (double) actual));
-        }
-
-        [Test]
-        public void MInverse()
-        {
-            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
-            ws.Cell("A1").SetValue(1).CellRight().SetValue(2).CellRight().SetValue(1);
-            ws.Cell("A2").SetValue(3).CellRight().SetValue(4).CellRight().SetValue(-1);
-            ws.Cell("A3").SetValue(0).CellRight().SetValue(2).CellRight().SetValue(0);
-
-
-            Object actual;
-
-            ws.Cell("A5").FormulaA1 = "MInverse(A1:C3)";
-            actual = ws.Cell("A5").Value;
-
-            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
-
-            ws.Cell("A6").FormulaA1 = "Sum(A5)";
-            actual = ws.Cell("A6").Value;
-
-            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
-
-            ws.Cell("A7").FormulaA1 = "Sum(MInverse(A1:C3))";
-            actual = ws.Cell("A7").Value;
-
-            Assert.IsTrue(XLHelper.AreEqual(0.5, (double) actual));
-        }
-
-        [Test]
-        public void MMult()
-        {
-            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
-            ws.Cell("A1").SetValue(2).CellRight().SetValue(4);
-            ws.Cell("A2").SetValue(3).CellRight().SetValue(5);
-            ws.Cell("A3").SetValue(2).CellRight().SetValue(4);
-            ws.Cell("A4").SetValue(3).CellRight().SetValue(5);
-
-            Object actual;
-
-            ws.Cell("A5").FormulaA1 = "MMult(A1:B2, A3:B4)";
-            actual = ws.Cell("A5").Value;
-
-            Assert.AreEqual(16.0, actual);
-
-            ws.Cell("A6").FormulaA1 = "Sum(A5)";
-            actual = ws.Cell("A6").Value;
-
-            Assert.AreEqual(16.0, actual);
-
-            ws.Cell("A7").FormulaA1 = "Sum(MMult(A1:B2, A3:B4))";
-            actual = ws.Cell("A7").Value;
-
-            Assert.AreEqual(102.0, actual);
-        }
-
-        [Test]
-        public void MRound()
-        {
-            object actual = XLWorkbook.EvaluateExpr("MRound(10, 3)");
-            Assert.AreEqual(9m, actual);
-
-            object actual3 = XLWorkbook.EvaluateExpr("MRound(10.5, 3)");
-            Assert.AreEqual(12m, actual3);
-
-            object actual4 = XLWorkbook.EvaluateExpr("MRound(10.4, 3)");
-            Assert.AreEqual(9m, actual4);
-
-            object actual1 = XLWorkbook.EvaluateExpr("MRound(-10, -3)");
-            Assert.AreEqual(-9m, actual1);
-
-            object actual2 = XLWorkbook.EvaluateExpr("MRound(1.3, 0.2)");
-            Assert.AreEqual(1.4m, actual2);
-        }
-
-        [Test]
-        public void Mod()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Mod(3, 2)");
-            Assert.AreEqual(1, actual);
-
-            object actual1 = XLWorkbook.EvaluateExpr("Mod(-3, 2)");
-            Assert.AreEqual(1, actual1);
-
-            object actual2 = XLWorkbook.EvaluateExpr("Mod(3, -2)");
-            Assert.AreEqual(-1, actual2);
-
-            object actual3 = XLWorkbook.EvaluateExpr("Mod(-3, -2)");
-            Assert.AreEqual(-1, actual3);
-        }
-
-        [Test]
-        public void Multinomial()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Multinomial(2,3,4)");
-            Assert.AreEqual(1260.0, actual);
-        }
-
-        [Test]
-        public void Odd()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Odd(1.5)");
-            Assert.AreEqual(3, actual);
-
-            object actual1 = XLWorkbook.EvaluateExpr("Odd(3)");
-            Assert.AreEqual(3, actual1);
-
-            object actual2 = XLWorkbook.EvaluateExpr("Odd(2)");
-            Assert.AreEqual(3, actual2);
-
-            object actual3 = XLWorkbook.EvaluateExpr("Odd(-1)");
-            Assert.AreEqual(-1, actual3);
-
-            object actual4 = XLWorkbook.EvaluateExpr("Odd(-2)");
-            Assert.AreEqual(-3, actual4);
-
-            actual = XLWorkbook.EvaluateExpr("Odd(0)");
-            Assert.AreEqual(1, actual);
-        }
-
-        [Test]
-        public void Product()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Product(2,3,4)");
-            Assert.AreEqual(24.0, actual);
-        }
-
-        [Test]
-        public void Quotient()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Quotient(5,2)");
-            Assert.AreEqual(2, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Quotient(4.5,3.1)");
-            Assert.AreEqual(1, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Quotient(-10,3)");
-            Assert.AreEqual(-3, actual);
-        }
-
-        [Test]
-        public void Radians()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Radians(270)");
-            Assert.IsTrue(Math.Abs(4.71238898038469 - (double) actual) < XLHelper.Epsilon);
-        }
-
-        [Test]
-        public void Roman()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Roman(3046, 1)");
-            Assert.AreEqual("MMMXLVI", actual);
-
-            actual = XLWorkbook.EvaluateExpr("Roman(270)");
-            Assert.AreEqual("CCLXX", actual);
-
-            actual = XLWorkbook.EvaluateExpr("Roman(3999, true)");
-            Assert.AreEqual("MMMCMXCIX", actual);
-        }
-
-        [Test]
-        public void Round()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Round(2.15, 1)");
-            Assert.AreEqual(2.2, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Round(2.149, 1)");
-            Assert.AreEqual(2.1, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Round(-1.475, 2)");
-            Assert.AreEqual(-1.48, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Round(21.5, -1)");
-            Assert.AreEqual(20.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Round(626.3, -3)");
-            Assert.AreEqual(1000.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Round(1.98, -1)");
-            Assert.AreEqual(0.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("Round(-50.55, -2)");
-            Assert.AreEqual(-100.0, actual);
-        }
-
-        [Test]
-        public void RoundDown()
-        {
-            object actual = XLWorkbook.EvaluateExpr("RoundDown(3.2, 0)");
-            Assert.AreEqual(3.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundDown(76.9, 0)");
-            Assert.AreEqual(76.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundDown(3.14159, 3)");
-            Assert.AreEqual(3.141, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundDown(-3.14159, 1)");
-            Assert.AreEqual(-3.1, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundDown(31415.92654, -2)");
-            Assert.AreEqual(31400.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundDown(0, 3)");
-            Assert.AreEqual(0.0, actual);
-        }
-
-        [Test]
-        public void RoundUp()
-        {
-            object actual = XLWorkbook.EvaluateExpr("RoundUp(3.2, 0)");
-            Assert.AreEqual(4.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundUp(76.9, 0)");
-            Assert.AreEqual(77.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundUp(3.14159, 3)");
-            Assert.AreEqual(3.142, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundUp(-3.14159, 1)");
-            Assert.AreEqual(-3.2, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundUp(31415.92654, -2)");
-            Assert.AreEqual(31500.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr("RoundUp(0, 3)");
-            Assert.AreEqual(0.0, actual);
-        }
-
-        [Test]
-        public void SeriesSum()
-        {
-            object actual = XLWorkbook.EvaluateExpr("SERIESSUM(2,3,4,5)");
-            Assert.AreEqual(40.0, actual);
-
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.Cell("A2").FormulaA1 = "PI()/4";
-            ws.Cell("A3").Value = 1;
-            ws.Cell("A4").FormulaA1 = "-1/FACT(2)";
-            ws.Cell("A5").FormulaA1 = "1/FACT(4)";
-            ws.Cell("A6").FormulaA1 = "-1/FACT(6)";
-
-            actual = ws.Evaluate("SERIESSUM(A2,0,2,A3:A6)");
-            Assert.IsTrue(Math.Abs(0.70710321482284566 - (double) actual) < XLHelper.Epsilon);
-        }
-
-        [Test]
-        public void SqrtPi()
-        {
-            object actual = XLWorkbook.EvaluateExpr("SqrtPi(1)");
-            Assert.IsTrue(Math.Abs(1.7724538509055159 - (double) actual) < XLHelper.Epsilon);
-
-            actual = XLWorkbook.EvaluateExpr("SqrtPi(2)");
-            Assert.IsTrue(Math.Abs(2.5066282746310002 - (double) actual) < XLHelper.Epsilon);
-        }
-
-        [Test]
-        public void SubtotalAverage()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Subtotal(1,2,3)");
-            Assert.AreEqual(2.5, actual);
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(1,""A"",3, 2)");
-            Assert.AreEqual(2.5, actual);
-        }
-
-        [Test]
-        public void SubtotalCount()
-        {
-            object actual = XLWorkbook.EvaluateExpr("Subtotal(2,2,3)");
-            Assert.AreEqual(2.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(2,""A"",3)");
-            Assert.AreEqual(2.0, actual);
-        }
-
-        [Test]
-        public void SubtotalCountA()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr("Subtotal(3,2,3)");
-            Assert.AreEqual(2.0, actual);
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(3,"""",3)");
-            Assert.AreEqual(1.0, actual);
-        }
-
-        [Test]
-        public void SubtotalMax()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(4,2,3,""A"")");
-            Assert.AreEqual(3.0, actual);
-        }
-
-        [Test]
-        public void SubtotalMin()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(5,2,3,""A"")");
-            Assert.AreEqual(2.0, actual);
-        }
-
-        [Test]
-        public void SubtotalProduct()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(6,2,3,""A"")");
-            Assert.AreEqual(6.0, actual);
-        }
-
-        [Test]
-        public void SubtotalStDev()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(7,2,3,""A"")");
-            Assert.IsTrue(Math.Abs(0.70710678118654757 - (double) actual) < XLHelper.Epsilon);
-        }
-
-        [Test]
-        public void SubtotalStDevP()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(8,2,3,""A"")");
-            Assert.AreEqual(0.5, actual);
-        }
-
-        [Test]
-        public void SubtotalSum()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(9,2,3,""A"")");
-            Assert.AreEqual(5.0, actual);
-        }
-
-        [Test]
-        public void SubtotalVar()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(10,2,3,""A"")");
-            Assert.IsTrue(Math.Abs(0.5 - (double) actual) < XLHelper.Epsilon);
-        }
-
-        [Test]
-        public void SubtotalVarP()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"Subtotal(11,2,3,""A"")");
-            Assert.AreEqual(0.25, actual);
-        }
-
-        [Test]
-        public void Sum()
-        {
-            IXLCell cell = new XLWorkbook().AddWorksheet("Sheet1").FirstCell();
-            IXLCell fCell = cell.SetValue(1).CellBelow().SetValue(2).CellBelow();
-            fCell.FormulaA1 = "sum(A1:A2)";
-
-            Assert.AreEqual(3.0, fCell.Value);
-        }
-
-        [Test]
-        public void SumSq()
-        {
-            Object actual;
-
-            actual = XLWorkbook.EvaluateExpr(@"SumSq(3,4)");
-            Assert.AreEqual(25.0, actual);
-        }
-
-        [Test]
-        public void TextConcat()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.Cell("A1").Value = 1;
-            ws.Cell("A2").Value = 1;
-            ws.Cell("B1").Value = 1;
-            ws.Cell("B2").Value = 1;
-
-            ws.Cell("C1").FormulaA1 = "\"The total value is: \" & SUM(A1:B2)";
-
-            object r = ws.Cell("C1").Value;
-            Assert.AreEqual("The total value is: 4", r.ToString());
-        }
-
-        [Test]
-        public void Trim()
-        {
-            Assert.AreEqual("Test", XLWorkbook.EvaluateExpr("Trim(\"Test    \")"));
-
-            //Should not trim non breaking space
-            //See http://office.microsoft.com/en-us/excel-help/trim-function-HP010062581.aspx
-            Assert.AreEqual("Test\u00A0", XLWorkbook.EvaluateExpr("Trim(\"Test\u00A0 \")"));
-        }
-
-        [Test]
-        public void TestEmptyTallyOperations()
-        {
-            //In these test no values have been set
-            XLWorkbook wb = new XLWorkbook();
-            wb.Worksheets.Add("TallyTests");
-            var cell = wb.Worksheet(1).Cell(1, 1).SetFormulaA1("=MAX(D1,D2)");
-            Assert.AreEqual(0, cell.Value); 
-            cell = wb.Worksheet(1).Cell(2, 1).SetFormulaA1("=MIN(D1,D2)");
-            Assert.AreEqual(0, cell.Value);
-            cell = wb.Worksheet(1).Cell(3, 1).SetFormulaA1("=SUM(D1,D2)");
-            Assert.AreEqual(0, cell.Value);
-            cell = wb.Worksheet(1).Cell(3, 1).SetFormulaA1("=AVERAGE(D1,D2)");
-            Assert.AreEqual(0, cell.Value);
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/IsTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/IsTests.cs
deleted file mode 100644
index 2d98c68..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/IsTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.CalcEngine
-{
-
-    [TestFixture]
-    public class IsTests
-    {
-        [Test]
-        public void IsBlank_true()
-        {
-            var ws = new XLWorkbook().AddWorksheet("Sheet");
-            var actual = ws.Evaluate("=IsBlank(A1)");
-            Assert.AreEqual(true, actual);
-        }
-
-        [Test]
-        public void IsBlank_false()
-        {
-            var ws = new XLWorkbook().AddWorksheet("Sheet");
-            ws.Cell("A1").Value = " ";
-            var actual = ws.Evaluate("=IsBlank(A1)");
-            Assert.AreEqual(false, actual);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/LogicalTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/LogicalTests.cs
deleted file mode 100644
index c3aeee4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/LogicalTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.CalcEngine
-{
-
-    [TestFixture]
-    public class LogicalTests
-    {
-        [Test]
-        public void If_2_Params_true()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 1, ""T"")");
-            Assert.AreEqual("T", actual);
-        }
-        [Test]
-        public void If_2_Params_false()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 2, ""T"")");
-            Assert.AreEqual(false, actual);
-        }
-
-        [Test]
-        public void If_3_Params_true()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 1, ""T"", ""F"")");
-            Assert.AreEqual("T", actual);
-        }
-        [Test]
-        public void If_3_Params_false()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 2, ""T"", ""F"")");
-            Assert.AreEqual("F", actual);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
deleted file mode 100644
index ebb55e9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.CalcEngine
-{
-    [TestFixture]
-    public class TextTests
-    {
-        [Test]
-        public void Left_Default()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Left(""ABC"")");
-            Assert.AreEqual("A", actual);
-        }
-
-        [Test]
-        public void Left_Value()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Left(""ABC"", 2)");
-            Assert.AreEqual("AB", actual);
-        }
-
-        [Test]
-        public void Left_BiggerThanLength()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Left(""ABC"", 5)");
-            Assert.AreEqual("ABC", actual);
-        }
-
-        [Test]
-        public void Left_Empty()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Left("""")");
-            Assert.AreEqual("", actual);
-        }
-
-        [Test]
-        public void Right_Default()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Right(""ABC"")");
-            Assert.AreEqual("C", actual);
-        }
-
-        [Test]
-        public void Right_Value()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Right(""ABC"", 2)");
-            Assert.AreEqual("BC", actual);
-        }
-
-        [Test]
-        public void Right_BiggerThanLength()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Right(""ABC"", 5)");
-            Assert.AreEqual("ABC", actual);
-        }
-
-        [Test]
-        public void Right_Empty()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Right("""")");
-            Assert.AreEqual("", actual);
-        }
-
-
-        
-        [Test]
-        public void Mid_Value()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Mid(""ABC"", 2, 2)");
-            Assert.AreEqual("BC", actual);
-        }
-
-        [Test]
-        public void Mid_BiggerThanLength()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Mid(""ABC"", 1, 5)");
-            Assert.AreEqual("ABC", actual);
-        }
-
-        [Test]
-        public void Mid_StartAfter()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Mid(""ABC"", 5, 5)");
-            Assert.AreEqual("", actual);
-        }
-
-        [Test]
-        public void Mid_Empty()
-        {
-            Object actual = XLWorkbook.EvaluateExpr(@"Mid("""", 1, 1)");
-            Assert.AreEqual("", actual);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/XLMathTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/XLMathTests.cs
deleted file mode 100644
index aaade5c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/CalcEngine/XLMathTests.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using ClosedXML.Excel.CalcEngine.Functions;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.CalcEngine
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class XLMathTests
-    {
-        [Test]
-        public void IsEven()
-        {
-            Assert.IsTrue(XLMath.IsEven(2));
-            Assert.IsFalse(XLMath.IsEven(3));
-        }
-
-        [Test]
-        public void IsOdd()
-        {
-            Assert.IsTrue(XLMath.IsOdd(3));
-            Assert.IsFalse(XLMath.IsOdd(2));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Cells/XLCellTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Cells/XLCellTests.cs
deleted file mode 100644
index 408d16e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Cells/XLCellTests.cs
+++ /dev/null
@@ -1,331 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class XLCellTests
-    {
-        [Test]
-        public void CellsUsed()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            ws.Cell(1, 1);
-            ws.Cell(2, 2);
-            int count = ws.Range("A1:B2").CellsUsed().Count();
-            Assert.AreEqual(0, count);
-        }
-
-        [Test]
-        public void CellsUsedIncludeStyles1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            ws.Row(3).Style.Fill.BackgroundColor = XLColor.Red;
-            ws.Column(3).Style.Fill.BackgroundColor = XLColor.Red;
-            ws.Cell(2, 2).Value = "ASDF";
-            var range = ws.RangeUsed(true).RangeAddress.ToString();
-            Assert.AreEqual("B2:C3", range);
-        }
-
-        [Test]
-        public void CellsUsedIncludeStyles2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            ws.Row(2).Style.Fill.BackgroundColor = XLColor.Red;
-            ws.Column(2).Style.Fill.BackgroundColor = XLColor.Red;
-            ws.Cell(3, 3).Value = "ASDF";
-            var range = ws.RangeUsed(true).RangeAddress.ToString();
-            Assert.AreEqual("B2:C3", range);
-        }
-
-        [Test]
-        public void CellsUsedIncludeStyles3()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            var range = ws.RangeUsed(true);
-            Assert.AreEqual(null, range);
-        }
-
-        [Test]
-        public void Double_Infinity_is_a_string()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell("A1");
-            var doubleList = new List<Double> {1.0/0.0};
-
-            cell.Value = doubleList.AsEnumerable();
-            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
-        }
-
-        [Test]
-        public void Double_NaN_is_a_string()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell("A1");
-            var doubleList = new List<Double> {0.0/0.0};
-
-            cell.Value = doubleList.AsEnumerable();
-            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
-        }
-
-        [Test]
-        public void InsertData1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRange range = ws.Cell(2, 2).InsertData(new[] {"a", "b", "c"});
-            Assert.AreEqual("'Sheet1'!B2:B4", range.ToString());
-        }
-
-        [Test]
-        public void IsEmpty1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            bool actual = cell.IsEmpty();
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            bool actual = cell.IsEmpty(true);
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty3()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Style.Fill.BackgroundColor = XLColor.Red;
-            bool actual = cell.IsEmpty();
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty4()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Style.Fill.BackgroundColor = XLColor.Red;
-            bool actual = cell.IsEmpty(false);
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty5()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Style.Fill.BackgroundColor = XLColor.Red;
-            bool actual = cell.IsEmpty(true);
-            bool expected = false;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty6()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Value = "X";
-            bool actual = cell.IsEmpty();
-            bool expected = false;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void NaN_is_not_a_number()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell("A1");
-            cell.Value = "NaN";
-
-            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
-        }
-
-        [Test]
-        public void Nan_is_not_a_number()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell("A1");
-            cell.Value = "Nan";
-
-            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
-        }
-
-        [Test]
-        public void TryGetValue_Boolean_Bad()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            Boolean outValue;
-            IXLCell cell = ws.Cell("A1").SetValue("ABC");
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsFalse(success);
-        }
-
-        [Test]
-        public void TryGetValue_Boolean_False()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            Boolean outValue;
-            IXLCell cell = ws.Cell("A1").SetValue(false);
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.IsFalse(outValue);
-        }
-
-        [Test]
-        public void TryGetValue_Boolean_Good()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            Boolean outValue;
-            IXLCell cell = ws.Cell("A1").SetValue("True");
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.IsTrue(outValue);
-        }
-
-        [Test]
-        public void TryGetValue_Boolean_True()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            Boolean outValue;
-            IXLCell cell = ws.Cell("A1").SetValue(true);
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.IsTrue(outValue);
-        }
-
-        [Test]
-        public void TryGetValue_RichText_Bad()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText outValue;
-            IXLCell cell = ws.Cell("A1").SetValue("Anything");
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.AreEqual(cell.RichText, outValue);
-            Assert.AreEqual("Anything", outValue.ToString());
-        }
-
-        [Test]
-        public void TryGetValue_RichText_Good()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText outValue;
-            IXLCell cell = ws.Cell("A1");
-            cell.RichText.AddText("Anything");
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.AreEqual(cell.RichText, outValue);
-        }
-
-        [Test]
-        public void TryGetValue_TimeSpan_BadString()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            TimeSpan outValue;
-            string timeSpan = "ABC";
-            bool success = ws.Cell("A1").SetValue(timeSpan).TryGetValue(out outValue);
-            Assert.IsFalse(success);
-        }
-
-        [Test]
-        public void TryGetValue_TimeSpan_Good()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            TimeSpan outValue;
-            var timeSpan = new TimeSpan(1, 1, 1);
-            bool success = ws.Cell("A1").SetValue(timeSpan).TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.AreEqual(timeSpan, outValue);
-        }
-
-        [Test]
-        public void TryGetValue_TimeSpan_GoodString()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            TimeSpan outValue;
-            var timeSpan = new TimeSpan(1, 1, 1);
-            bool success = ws.Cell("A1").SetValue(timeSpan.ToString()).TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.AreEqual(timeSpan, outValue);
-        }
-
-        [Test]
-        public void TryGetValue_sbyte_Bad()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            sbyte outValue;
-            IXLCell cell = ws.Cell("A1").SetValue(255);
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsFalse(success);
-        }
-
-        [Test]
-        public void TryGetValue_sbyte_Bad2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            sbyte outValue;
-            IXLCell cell = ws.Cell("A1").SetValue("255");
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsFalse(success);
-        }
-
-        [Test]
-        public void TryGetValue_sbyte_Good()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            sbyte outValue;
-            IXLCell cell = ws.Cell("A1").SetValue(5);
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.AreEqual(5, outValue);
-        }
-
-        [Test]
-        public void TryGetValue_sbyte_Good2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            sbyte outValue;
-            IXLCell cell = ws.Cell("A1").SetValue("5");
-            bool success = cell.TryGetValue(out outValue);
-            Assert.IsTrue(success);
-            Assert.AreEqual(5, outValue);
-        }
-
-        [Test]
-        public void ValueSetToEmptyString()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Value = new DateTime(2000, 1, 2);
-            cell.Value = String.Empty;
-            string actual = cell.GetString();
-            string expected = String.Empty;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void ValueSetToNull()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Value = new DateTime(2000, 1, 2);
-            cell.Value = null;
-            string actual = cell.GetString();
-            string expected = String.Empty;
-            Assert.AreEqual(expected, actual);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Columns/ColumnTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Columns/ColumnTests.cs
deleted file mode 100644
index 0a98c4f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Columns/ColumnTests.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class ColumnTests
-    {
-        [Test]
-        public void ColumnUsed()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(2, 1).SetValue("Test");
-            ws.Cell(3, 1).SetValue("Test");
-
-            IXLRangeColumn fromColumn = ws.Column(1).ColumnUsed();
-            Assert.AreEqual("A2:A3", fromColumn.RangeAddress.ToStringRelative());
-
-            IXLRangeColumn fromRange = ws.Range("A1:A5").FirstColumn().ColumnUsed();
-            Assert.AreEqual("A2:A3", fromRange.RangeAddress.ToStringRelative());
-        }
-
-        [Test]
-        public void CopyColumn()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Test").Style.Font.SetBold();
-            ws.FirstColumn().CopyTo(ws.Column(2));
-
-            Assert.IsTrue(ws.Cell("B1").Style.Font.Bold);
-        }
-
-        [Test]
-        public void InsertingColumnsBefore1()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-
-            ws.Columns("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
-            ws.Column(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
-            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
-
-            IXLColumn column1 = ws.Column(1);
-            IXLColumn column2 = ws.Column(2);
-            IXLColumn column3 = ws.Column(3);
-
-            IXLColumn columnIns = ws.Column(1).InsertColumnsBefore(1).First();
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Column(3).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", ws.Column(3).Cell(2).GetString());
-
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, columnIns.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, columnIns.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, columnIns.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, column1.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column1.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column1.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, column2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, column2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, column2.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column3.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", column2.Cell(2).GetString());
-        }
-
-        [Test]
-        public void InsertingColumnsBefore2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-
-            ws.Columns("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
-            ws.Column(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
-            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
-
-            IXLColumn column1 = ws.Column(1);
-            IXLColumn column2 = ws.Column(2);
-            IXLColumn column3 = ws.Column(3);
-
-            IXLColumn columnIns = ws.Column(2).InsertColumnsBefore(1).First();
-            string outputPath = Path.Combine(TestHelper.TestsOutputDirectory, @"ForTesting\Sandbox.xlsx");
-            wb.SaveAs(outputPath);
-
-            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Column(3).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", ws.Column(3).Cell(2).GetString());
-
-
-            Assert.AreEqual(XLColor.Red, columnIns.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, columnIns.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, columnIns.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, column1.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column1.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column1.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, column2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, column2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, column2.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column3.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", column2.Cell(2).GetString());
-        }
-
-        [Test]
-        public void InsertingColumnsBefore3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-
-            ws.Columns("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
-            ws.Column(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
-            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
-
-            IXLColumn column1 = ws.Column(1);
-            IXLColumn column2 = ws.Column(2);
-            IXLColumn column3 = ws.Column(3);
-
-            IXLColumn columnIns = ws.Column(3).InsertColumnsBefore(1).First();
-
-            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Column(2).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Column(2).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Column(2).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Column(3).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", ws.Column(2).Cell(2).GetString());
-
-
-            Assert.AreEqual(XLColor.Yellow, columnIns.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, columnIns.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, columnIns.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, column1.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column1.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column1.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, column2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, column2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, column2.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, column3.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", column2.Cell(2).GetString());
-        }
-
-        [Test]
-        public void NoColumnsUsed()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            Int32 count = 0;
-
-            foreach (IXLColumn row in ws.ColumnsUsed())
-                count++;
-
-            foreach (IXLRangeColumn row in ws.Range("A1:C3").ColumnsUsed())
-                count++;
-
-            Assert.AreEqual(0, count);
-        }
-
-        [Test]
-        public void UngroupFromAll()
-        {
-            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
-            ws.Columns(1, 2).Group();
-            ws.Columns(1, 2).Ungroup(true);
-        }
-
-        [Test]
-        public void LastColumnUsed()
-        {
-            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
-            ws.Cell("A1").Value = "A1";
-            ws.Cell("B1").Value = "B1";
-            ws.Cell("A2").Value = "A2";
-            var lastCoUsed = ws.LastColumnUsed().ColumnNumber();
-            Assert.AreEqual(2, lastCoUsed);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Coordinates/XLAddressTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Coordinates/XLAddressTests.cs
deleted file mode 100644
index 526ae67..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Coordinates/XLAddressTests.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class XLAddressTests
-    {
-        [Test]
-        public void ToStringTest()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLAddress address = ws.Cell(1, 1).Address;
-
-            Assert.AreEqual("A1", address.ToString());
-            Assert.AreEqual("A1", address.ToString(XLReferenceStyle.A1));
-            Assert.AreEqual("R1C1", address.ToString(XLReferenceStyle.R1C1));
-            Assert.AreEqual("A1", address.ToString(XLReferenceStyle.Default));
-
-            Assert.AreEqual("A1", address.ToStringRelative());
-            Assert.AreEqual("'Sheet1'!A1", address.ToStringRelative(true));
-
-            Assert.AreEqual("$A$1", address.ToStringFixed());
-            Assert.AreEqual("$A$1", address.ToStringFixed(XLReferenceStyle.A1));
-            Assert.AreEqual("R1C1", address.ToStringFixed(XLReferenceStyle.R1C1));
-            Assert.AreEqual("$A$1", address.ToStringFixed(XLReferenceStyle.Default));
-            Assert.AreEqual("'Sheet1'!$A$1", address.ToStringFixed(XLReferenceStyle.A1, true));
-            Assert.AreEqual("'Sheet1'!R1C1", address.ToStringFixed(XLReferenceStyle.R1C1, true));
-            Assert.AreEqual("'Sheet1'!$A$1", address.ToStringFixed(XLReferenceStyle.Default, true));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/DataValidations/DataValidationTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/DataValidations/DataValidationTests.cs
deleted file mode 100644
index 4a31837..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/DataValidations/DataValidationTests.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.DataValidations
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class DataValidationTests
-    {
-        [Test]
-        public void Validation_1()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Data Validation Issue");
-            IXLCell cell = ws.Cell("E1");
-            cell.SetValue("Value 1");
-            cell = cell.CellBelow();
-            cell.SetValue("Value 2");
-            cell = cell.CellBelow();
-            cell.SetValue("Value 3");
-            cell = cell.CellBelow();
-            cell.SetValue("Value 4");
-            cell = cell.CellBelow();
-
-            ws.Cell("A1").SetValue("Cell below has Validation Only.");
-            cell = ws.Cell("A2");
-            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
-
-            ws.Cell("B1").SetValue("Cell below has Validation with a title.");
-            cell = ws.Cell("B2");
-            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
-            cell.DataValidation.InputTitle = "Title for B2";
-
-            Assert.AreEqual(cell.DataValidation.AllowedValues, XLAllowedValues.List);
-            Assert.AreEqual(cell.DataValidation.Value, "'Data Validation Issue'!$E$1:$E$4");
-            Assert.AreEqual(cell.DataValidation.InputTitle, "Title for B2");
-
-
-            ws.Cell("C1").SetValue("Cell below has Validation with a message.");
-            cell = ws.Cell("C2");
-            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
-            cell.DataValidation.InputMessage = "Message for C2";
-
-            Assert.AreEqual(cell.DataValidation.AllowedValues, XLAllowedValues.List);
-            Assert.AreEqual(cell.DataValidation.Value, "'Data Validation Issue'!$E$1:$E$4");
-            Assert.AreEqual(cell.DataValidation.InputMessage, "Message for C2");
-
-            ws.Cell("D1").SetValue("Cell below has Validation with title and message.");
-            cell = ws.Cell("D2");
-            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
-            cell.DataValidation.InputTitle = "Title for D2";
-            cell.DataValidation.InputMessage = "Message for D2";
-
-            Assert.AreEqual(cell.DataValidation.AllowedValues, XLAllowedValues.List);
-            Assert.AreEqual(cell.DataValidation.Value, "'Data Validation Issue'!$E$1:$E$4");
-            Assert.AreEqual(cell.DataValidation.InputTitle, "Title for D2");
-            Assert.AreEqual(cell.DataValidation.InputMessage, "Message for D2");
-        }
-
-        [Test]
-        public void Validation_2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell("A1").SetValue("A");
-            ws.Cell("B1").SetDataValidation().Custom("Sheet1!A1");
-
-            IXLWorksheet ws2 = wb.AddWorksheet("Sheet2");
-            ws2.Cell("A1").SetValue("B");
-            ws.Cell("B1").CopyTo(ws2.Cell("B1"));
-
-            Assert.AreEqual("Sheet1!A1", ws2.Cell("B1").DataValidation.Value);
-        }
-
-        [Test]
-        public void Validation_3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell("A1").SetValue("A");
-            ws.Cell("B1").SetDataValidation().Custom("A1");
-            ws.FirstRow().InsertRowsAbove(1);
-
-            Assert.AreEqual("A2", ws.Cell("B2").DataValidation.Value);
-        }
-
-        [Test]
-        public void Validation_4()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell("A1").SetValue("A");
-            ws.Cell("B1").SetDataValidation().Custom("A1");
-            ws.Cell("B1").CopyTo(ws.Cell("B2"));
-            Assert.AreEqual("A2", ws.Cell("B2").DataValidation.Value);
-        }
-
-        [Test]
-        public void Validation_5()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell("A1").SetValue("A");
-            ws.Cell("B1").SetDataValidation().Custom("A1");
-            ws.FirstColumn().InsertColumnsBefore(1);
-
-            Assert.AreEqual("B1", ws.Cell("C1").DataValidation.Value);
-        }
-
-        [Test]
-        public void Validation_6()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell("A1").SetValue("A");
-            ws.Cell("B1").SetDataValidation().Custom("A1");
-            ws.Cell("B1").CopyTo(ws.Cell("C1"));
-            Assert.AreEqual("B1", ws.Cell("C1").DataValidation.Value);
-        }
-
-        [Test]
-        public void Validation_persists_on_Cell_DataValidation()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("People");
-
-            ws.FirstCell().SetValue("Categories")
-                .CellBelow().SetValue("A")
-                .CellBelow().SetValue("B");
-
-            IXLTable table = ws.RangeUsed().CreateTable();
-
-            IXLDataValidation dv = table.DataRange.SetDataValidation();
-            dv.ErrorTitle = "Error";
-
-            Assert.AreEqual("Error", table.DataRange.FirstCell().DataValidation.ErrorTitle);
-        }
-
-        [Test]
-        public void Validation_persists_on_Worksheet_DataValidations()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("People");
-
-            ws.FirstCell().SetValue("Categories")
-                .CellBelow().SetValue("A");
-
-            IXLTable table = ws.RangeUsed().CreateTable();
-
-            IXLDataValidation dv = table.DataRange.SetDataValidation();
-            dv.ErrorTitle = "Error";
-
-            Assert.AreEqual("Error", ws.DataValidations.Single().ErrorTitle);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/CopyContentsTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/CopyContentsTests.cs
deleted file mode 100644
index ce055cc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/CopyContentsTests.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.Misc
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class CopyContentsTests
-    {
-        private static void CopyRowAsRange(IXLWorksheet originalSheet, int originalRowNumber, IXLWorksheet destSheet,
-            int destRowNumber)
-        {
-            {
-                IXLRow destinationRow = destSheet.Row(destRowNumber);
-                destinationRow.Clear();
-
-                IXLRow originalRow = originalSheet.Row(originalRowNumber);
-                int columnNumber = originalRow.LastCellUsed(true).Address.ColumnNumber;
-
-                IXLRange originalRange = originalSheet.Range(originalRowNumber, 1, originalRowNumber, columnNumber);
-                IXLRange destRange = destSheet.Range(destRowNumber, 1, destRowNumber, columnNumber);
-                originalRange.CopyTo(destRange);
-            }
-        }
-
-        [Test]
-        public void CopyConditionalFormatsCount()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().AddConditionalFormat().WhenContains("1").Fill.SetBackgroundColor(XLColor.Blue);
-            ws.Cell("A2").Value = ws.FirstCell();
-            Assert.AreEqual(2, ws.ConditionalFormats.Count());
-        }
-
-        [Test]
-        public void CopyConditionalFormatsFixedNum()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.Cell("A1").Value = "1";
-            ws.Cell("B1").Value = "1";
-            ws.Cell("A1").AddConditionalFormat().WhenEquals(1).Fill.SetBackgroundColor(XLColor.Blue);
-            ws.Cell("A2").Value = ws.Cell("A1");
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
-        }
-
-        [Test]
-        public void CopyConditionalFormatsFixedString()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.Cell("A1").Value = "A";
-            ws.Cell("B1").Value = "B";
-            ws.Cell("A1").AddConditionalFormat().WhenEquals("A").Fill.SetBackgroundColor(XLColor.Blue);
-            ws.Cell("A2").Value = ws.Cell("A1");
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "A" && !v.Value.IsFormula)));
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "A" && !v.Value.IsFormula)));
-        }
-
-        [Test]
-        public void CopyConditionalFormatsFixedStringNum()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.Cell("A1").Value = "1";
-            ws.Cell("B1").Value = "1";
-            ws.Cell("A1").AddConditionalFormat().WhenEquals("1").Fill.SetBackgroundColor(XLColor.Blue);
-            ws.Cell("A2").Value = ws.Cell("A1");
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
-        }
-
-        [Test]
-        public void CopyConditionalFormatsRelative()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.Cell("A1").Value = "1";
-            ws.Cell("B1").Value = "1";
-            ws.Cell("A1").AddConditionalFormat().WhenEquals("=B1").Fill.SetBackgroundColor(XLColor.Blue);
-            ws.Cell("A2").Value = ws.Cell("A1");
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "B1" && v.Value.IsFormula)));
-            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "B2" && v.Value.IsFormula)));
-        }
-
-        [Test]
-        public void TestRowCopyContents()
-        {
-            var workbook = new XLWorkbook();
-            IXLWorksheet originalSheet = workbook.Worksheets.Add("original");
-            IXLWorksheet copyRowSheet = workbook.Worksheets.Add("copy row");
-            IXLWorksheet copyRowAsRangeSheet = workbook.Worksheets.Add("copy row as range");
-            IXLWorksheet copyRangeSheet = workbook.Worksheets.Add("copy range");
-
-            originalSheet.Cell("A2").SetValue("test value");
-            originalSheet.Range("A2:E2").Merge();
-
-            {
-                IXLRange originalRange = originalSheet.Range("A2:E2");
-                IXLRange destinationRange = copyRangeSheet.Range("A2:E2");
-
-                originalRange.CopyTo(destinationRange);
-            }
-            CopyRowAsRange(originalSheet, 2, copyRowAsRangeSheet, 3);
-            {
-                IXLRow originalRow = originalSheet.Row(2);
-                IXLRow destinationRow = copyRowSheet.Row(2);
-                copyRowSheet.Cell("G2").Value = "must be removed after copy";
-                originalRow.CopyTo(destinationRow);
-            }
-            TestHelper.SaveWorkbook(workbook, @"Misc\CopyRowContents.xlsx");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/ExtensionsTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/ExtensionsTests.cs
deleted file mode 100644
index ed82689..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/ExtensionsTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using ClosedXML.Excel;
-using NUnit.Framework;
-using DocumentFormat.OpenXml;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class ExtensionsTests
-    {
-        [Test]
-        public void FixNewLines()
-        {
-            Assert.AreEqual("\n".FixNewLines(), Environment.NewLine);
-            Assert.AreEqual("\r\n".FixNewLines(), Environment.NewLine);
-            Assert.AreEqual("\rS\n".FixNewLines(), "\rS" + Environment.NewLine);
-            Assert.AreEqual("\r\n\n".FixNewLines(), Environment.NewLine + Environment.NewLine);
-        }
-
-        [Test]
-        public void DoubleSaveRound()
-        {
-            Double value = 1234.1234567;
-            Assert.AreEqual(value.SaveRound(), Math.Round(value, 6));
-        }
-
-        [Test]
-        public void DoubleValueSaveRound()
-        {
-            Double value = 1234.1234567;
-            Assert.AreEqual(new DoubleValue(value).SaveRound().Value, Math.Round(value, 6));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/FormulaTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/FormulaTests.cs
deleted file mode 100644
index 9d7cc15..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/FormulaTests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class FormulaTests
-    {
-        [Test]
-        public void CopyFormula()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell("A1").FormulaA1 = "B1";
-            ws.Cell("A1").CopyTo("A2");
-            Assert.AreEqual("B2", ws.Cell("A2").FormulaA1);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/StylesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/StylesTests.cs
deleted file mode 100644
index a00a47e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/StylesTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.Misc
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class StylesTests
-    {
-        private static void SetupBorders(IXLRange range)
-        {
-            range.FirstRow().Cell(1).Style.Border.TopBorder = XLBorderStyleValues.None;
-            range.FirstRow().Cell(2).Style.Border.TopBorder = XLBorderStyleValues.Thick;
-            range.FirstRow().Cell(3).Style.Border.TopBorder = XLBorderStyleValues.Double;
-
-            range.LastRow().Cell(1).Style.Border.BottomBorder = XLBorderStyleValues.None;
-            range.LastRow().Cell(2).Style.Border.BottomBorder = XLBorderStyleValues.Thick;
-            range.LastRow().Cell(3).Style.Border.BottomBorder = XLBorderStyleValues.Double;
-
-            range.FirstColumn().Cell(1).Style.Border.LeftBorder = XLBorderStyleValues.None;
-            range.FirstColumn().Cell(2).Style.Border.LeftBorder = XLBorderStyleValues.Thick;
-            range.FirstColumn().Cell(3).Style.Border.LeftBorder = XLBorderStyleValues.Double;
-
-            range.LastColumn().Cell(1).Style.Border.RightBorder = XLBorderStyleValues.None;
-            range.LastColumn().Cell(2).Style.Border.RightBorder = XLBorderStyleValues.Thick;
-            range.LastColumn().Cell(3).Style.Border.RightBorder = XLBorderStyleValues.Double;
-        }
-
-        [Test]
-        public void InsideBorderTest()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            IXLRange range = ws.Range("B2:D4");
-
-            SetupBorders(range);
-
-            range.Style.Border.InsideBorder = XLBorderStyleValues.Thin;
-            range.Style.Border.InsideBorderColor = XLColor.Red;
-
-            IXLCell center = range.Cell(2, 2);
-
-            Assert.AreEqual(XLColor.Red, center.Style.Border.TopBorderColor);
-            Assert.AreEqual(XLColor.Red, center.Style.Border.BottomBorderColor);
-            Assert.AreEqual(XLColor.Red, center.Style.Border.LeftBorderColor);
-            Assert.AreEqual(XLColor.Red, center.Style.Border.RightBorderColor);
-
-            Assert.AreEqual(XLBorderStyleValues.None, range.FirstRow().Cell(1).Style.Border.TopBorder);
-            Assert.AreEqual(XLBorderStyleValues.Thick, range.FirstRow().Cell(2).Style.Border.TopBorder);
-            Assert.AreEqual(XLBorderStyleValues.Double, range.FirstRow().Cell(3).Style.Border.TopBorder);
-
-            Assert.AreEqual(XLBorderStyleValues.None, range.LastRow().Cell(1).Style.Border.BottomBorder);
-            Assert.AreEqual(XLBorderStyleValues.Thick, range.LastRow().Cell(2).Style.Border.BottomBorder);
-            Assert.AreEqual(XLBorderStyleValues.Double, range.LastRow().Cell(3).Style.Border.BottomBorder);
-
-            Assert.AreEqual(XLBorderStyleValues.None, range.FirstColumn().Cell(1).Style.Border.LeftBorder);
-            Assert.AreEqual(XLBorderStyleValues.Thick, range.FirstColumn().Cell(2).Style.Border.LeftBorder);
-            Assert.AreEqual(XLBorderStyleValues.Double, range.FirstColumn().Cell(3).Style.Border.LeftBorder);
-
-            Assert.AreEqual(XLBorderStyleValues.None, range.LastColumn().Cell(1).Style.Border.RightBorder);
-            Assert.AreEqual(XLBorderStyleValues.Thick, range.LastColumn().Cell(2).Style.Border.RightBorder);
-            Assert.AreEqual(XLBorderStyleValues.Double, range.LastColumn().Cell(3).Style.Border.RightBorder);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/XLWorkbookTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/XLWorkbookTests.cs
deleted file mode 100644
index 601bc06..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/XLWorkbookTests.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class XLWorkbookTests
-    {
-        [Test]
-        public void Cell1()
-        {
-            var wb = new XLWorkbook();
-            IXLCell cell = wb.Cell("ABC");
-            Assert.IsNull(cell);
-        }
-
-        [Test]
-        public void Cell2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
-            IXLCell cell = wb.Cell("Sheet1!Result");
-            Assert.IsNotNull(cell);
-            Assert.AreEqual(1, cell.GetValue<Int32>());
-        }
-
-        [Test]
-        public void Cell3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result");
-            IXLCell cell = wb.Cell("Sheet1!Result");
-            Assert.IsNotNull(cell);
-            Assert.AreEqual(1, cell.GetValue<Int32>());
-        }
-
-        [Test]
-        public void Cells1()
-        {
-            var wb = new XLWorkbook();
-            IXLCells cells = wb.Cells("ABC");
-            Assert.IsNotNull(cells);
-            Assert.AreEqual(0, cells.Count());
-        }
-
-        [Test]
-        public void Cells2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
-            IXLCells cells = wb.Cells("Sheet1!Result, ABC");
-            Assert.IsNotNull(cells);
-            Assert.AreEqual(1, cells.Count());
-            Assert.AreEqual(1, cells.First().GetValue<Int32>());
-        }
-
-        [Test]
-        public void Cells3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result");
-            IXLCells cells = wb.Cells("Sheet1!Result, ABC");
-            Assert.IsNotNull(cells);
-            Assert.AreEqual(1, cells.Count());
-            Assert.AreEqual(1, cells.First().GetValue<Int32>());
-        }
-
-        [Test]
-        public void NamedRange1()
-        {
-            var wb = new XLWorkbook();
-            IXLNamedRange range = wb.NamedRange("ABC");
-            Assert.IsNull(range);
-        }
-
-        [Test]
-        public void NamedRange2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
-            IXLNamedRange range = wb.NamedRange("Sheet1!Result");
-            Assert.IsNotNull(range);
-            Assert.AreEqual(1, range.Ranges.Count);
-            Assert.AreEqual(1, range.Ranges.Cells().Count());
-            Assert.AreEqual(1, range.Ranges.First().FirstCell().GetValue<Int32>());
-        }
-
-        [Test]
-        public void NamedRange3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            IXLNamedRange range = wb.NamedRange("Sheet1!Result");
-            Assert.IsNull(range);
-        }
-
-        [Test]
-        public void NamedRange4()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result");
-            IXLNamedRange range = wb.NamedRange("Sheet1!Result");
-            Assert.IsNotNull(range);
-            Assert.AreEqual(1, range.Ranges.Count);
-            Assert.AreEqual(1, range.Ranges.Cells().Count());
-            Assert.AreEqual(1, range.Ranges.First().FirstCell().GetValue<Int32>());
-        }
-
-        [Test]
-        public void Range1()
-        {
-            var wb = new XLWorkbook();
-            IXLRange range = wb.Range("ABC");
-            Assert.IsNull(range);
-        }
-
-        [Test]
-        public void Range2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
-            IXLRange range = wb.Range("Sheet1!Result");
-            Assert.IsNotNull(range);
-            Assert.AreEqual(1, range.Cells().Count());
-            Assert.AreEqual(1, range.FirstCell().GetValue<Int32>());
-        }
-
-        [Test]
-        public void Range3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result");
-            IXLRange range = wb.Range("Sheet1!Result");
-            Assert.IsNotNull(range);
-            Assert.AreEqual(1, range.Cells().Count());
-            Assert.AreEqual(1, range.FirstCell().GetValue<Int32>());
-        }
-
-        [Test]
-        public void Ranges1()
-        {
-            var wb = new XLWorkbook();
-            IXLRanges ranges = wb.Ranges("ABC");
-            Assert.IsNotNull(ranges);
-            Assert.AreEqual(0, ranges.Count());
-        }
-
-        [Test]
-        public void Ranges2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
-            IXLRanges ranges = wb.Ranges("Sheet1!Result, ABC");
-            Assert.IsNotNull(ranges);
-            Assert.AreEqual(1, ranges.Cells().Count());
-            Assert.AreEqual(1, ranges.First().FirstCell().GetValue<Int32>());
-        }
-
-        [Test]
-        public void Ranges3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue(1).AddToNamed("Result");
-            IXLRanges ranges = wb.Ranges("Sheet1!Result, ABC");
-            Assert.IsNotNull(ranges);
-            Assert.AreEqual(1, ranges.Cells().Count());
-            Assert.AreEqual(1, ranges.First().FirstCell().GetValue<Int32>());
-        }
-
-        [Test]
-        public void WbNamedCell()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell");
-            Assert.AreEqual("Test", wb.Cell("TestCell").GetString());
-            Assert.AreEqual("Test", ws.Cell("TestCell").GetString());
-        }
-
-        [Test]
-        public void WbNamedCells()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell");
-            ws.Cell(2, 1).SetValue("B").AddToNamed("Test2");
-            IXLCells wbCells = wb.Cells("TestCell, Test2");
-            Assert.AreEqual("Test", wbCells.First().GetString());
-            Assert.AreEqual("B", wbCells.Last().GetString());
-
-            IXLCells wsCells = ws.Cells("TestCell, Test2");
-            Assert.AreEqual("Test", wsCells.First().GetString());
-            Assert.AreEqual("B", wsCells.Last().GetString());
-        }
-
-        [Test]
-        public void WbNamedRange()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("A");
-            ws.Cell(2, 1).SetValue("B");
-            IXLRange original = ws.Range("A1:A2");
-            original.AddToNamed("TestRange");
-            Assert.AreEqual(original.RangeAddress.ToStringFixed(), wb.Range("TestRange").RangeAddress.ToString());
-            Assert.AreEqual(original.RangeAddress.ToStringFixed(), ws.Range("TestRange").RangeAddress.ToString());
-        }
-
-        [Test]
-        public void WbNamedRanges()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("A");
-            ws.Cell(2, 1).SetValue("B");
-            ws.Cell(3, 1).SetValue("C").AddToNamed("Test2");
-            IXLRange original = ws.Range("A1:A2");
-            original.AddToNamed("TestRange");
-            IXLRanges wbRanges = wb.Ranges("TestRange, Test2");
-            Assert.AreEqual(original.RangeAddress.ToStringFixed(), wbRanges.First().RangeAddress.ToString());
-            Assert.AreEqual("$A$3:$A$3", wbRanges.Last().RangeAddress.ToStringFixed());
-
-            IXLRanges wsRanges = wb.Ranges("TestRange, Test2");
-            Assert.AreEqual(original.RangeAddress.ToStringFixed(), wsRanges.First().RangeAddress.ToString());
-            Assert.AreEqual("$A$3:$A$3", wsRanges.Last().RangeAddress.ToStringFixed());
-        }
-
-        [Test]
-        public void WbNamedRangesOneString()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            wb.NamedRanges.Add("TestRange", "Sheet1!$A$1,Sheet1!$A$3");
-
-            IXLRanges wbRanges = ws.Ranges("TestRange");
-            Assert.AreEqual("$A$1:$A$1", wbRanges.First().RangeAddress.ToStringFixed());
-            Assert.AreEqual("$A$3:$A$3", wbRanges.Last().RangeAddress.ToStringFixed());
-
-            IXLRanges wsRanges = ws.Ranges("TestRange");
-            Assert.AreEqual("$A$1:$A$1", wsRanges.First().RangeAddress.ToStringFixed());
-            Assert.AreEqual("$A$3:$A$3", wsRanges.Last().RangeAddress.ToStringFixed());
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/XlHelperTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/XlHelperTests.cs
deleted file mode 100644
index 98e4685..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Misc/XlHelperTests.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class XlHelperTests
-    {
-        private static void CheckColumnNumber(int column)
-        {
-            Assert.AreEqual(column, XLHelper.GetColumnNumberFromLetter(XLHelper.GetColumnLetterFromNumber(column)));
-        }
-
-        [Test]
-        public void InvalidA1Addresses()
-        {
-            Assert.IsFalse(XLHelper.IsValidA1Address(""));
-            Assert.IsFalse(XLHelper.IsValidA1Address("A"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("a"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("-1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("AAAA1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("XFG1"));
-
-            Assert.IsFalse(XLHelper.IsValidA1Address("@A1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("@AA1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("@AAA1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("[A1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("[AA1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("[AAA1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("{A1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("{AA1"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("{AAA1"));
-
-            Assert.IsFalse(XLHelper.IsValidA1Address("A1@"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("AA1@"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("AAA1@"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("A1["));
-            Assert.IsFalse(XLHelper.IsValidA1Address("AA1["));
-            Assert.IsFalse(XLHelper.IsValidA1Address("AAA1["));
-            Assert.IsFalse(XLHelper.IsValidA1Address("A1{"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("AA1{"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("AAA1{"));
-
-            Assert.IsFalse(XLHelper.IsValidA1Address("@A1@"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("@AA1@"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("@AAA1@"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("[A1["));
-            Assert.IsFalse(XLHelper.IsValidA1Address("[AA1["));
-            Assert.IsFalse(XLHelper.IsValidA1Address("[AAA1["));
-            Assert.IsFalse(XLHelper.IsValidA1Address("{A1{"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("{AA1{"));
-            Assert.IsFalse(XLHelper.IsValidA1Address("{AAA1{"));
-        }
-
-        [Test]
-        public void PlusAA1_Is_Not_an_address()
-        {
-            Assert.IsFalse(XLHelper.IsValidA1Address("+AA1"));
-        }
-
-        [Test]
-        public void TestConvertColumnLetterToNumberAnd()
-        {
-            CheckColumnNumber(1);
-            CheckColumnNumber(27);
-            CheckColumnNumber(28);
-            CheckColumnNumber(52);
-            CheckColumnNumber(53);
-            CheckColumnNumber(1000);
-        }
-
-        [Test]
-        public void ValidA1Addresses()
-        {
-            Assert.IsTrue(XLHelper.IsValidA1Address("A1"));
-            Assert.IsTrue(XLHelper.IsValidA1Address("A" + XLHelper.MaxRowNumber));
-            Assert.IsTrue(XLHelper.IsValidA1Address("Z1"));
-            Assert.IsTrue(XLHelper.IsValidA1Address("Z" + XLHelper.MaxRowNumber));
-
-            Assert.IsTrue(XLHelper.IsValidA1Address("AA1"));
-            Assert.IsTrue(XLHelper.IsValidA1Address("AA" + XLHelper.MaxRowNumber));
-            Assert.IsTrue(XLHelper.IsValidA1Address("ZZ1"));
-            Assert.IsTrue(XLHelper.IsValidA1Address("ZZ" + XLHelper.MaxRowNumber));
-
-            Assert.IsTrue(XLHelper.IsValidA1Address("AAA1"));
-            Assert.IsTrue(XLHelper.IsValidA1Address("AAA" + XLHelper.MaxRowNumber));
-            Assert.IsTrue(XLHelper.IsValidA1Address(XLHelper.MaxColumnLetter + "1"));
-            Assert.IsTrue(XLHelper.IsValidA1Address(XLHelper.MaxColumnLetter + XLHelper.MaxRowNumber));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/NamedRanges/NamedRangesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/NamedRanges/NamedRangesTests.cs
deleted file mode 100644
index be482fb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/NamedRanges/NamedRangesTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class NamedRangesTests
-    {
-        [Test]
-        public void MovingRanges()
-        {
-            var wb = new XLWorkbook();
-
-            IXLWorksheet sheet1 = wb.Worksheets.Add("Sheet1");
-            IXLWorksheet sheet2 = wb.Worksheets.Add("Sheet2");
-
-            wb.NamedRanges.Add("wbNamedRange",
-                "Sheet1!$B$2,Sheet1!$B$3:$C$3,Sheet2!$D$3:$D$4,Sheet1!$6:$7,Sheet1!$F:$G");
-            sheet1.NamedRanges.Add("sheet1NamedRange",
-                "Sheet1!$B$2,Sheet1!$B$3:$C$3,Sheet2!$D$3:$D$4,Sheet1!$6:$7,Sheet1!$F:$G");
-            sheet2.NamedRanges.Add("sheet2NamedRange", "Sheet1!A1,Sheet2!A1");
-
-            sheet1.Row(1).InsertRowsAbove(2);
-            sheet1.Row(1).Delete();
-            sheet1.Column(1).InsertColumnsBefore(2);
-            sheet1.Column(1).Delete();
-
-
-            Assert.AreEqual("'Sheet1'!$C$3,'Sheet1'!$C$4:$D$4,Sheet2!$D$3:$D$4,'Sheet1'!$7:$8,'Sheet1'!$G:$H",
-                wb.NamedRanges.First().RefersTo);
-            Assert.AreEqual("'Sheet1'!$C$3,'Sheet1'!$C$4:$D$4,Sheet2!$D$3:$D$4,'Sheet1'!$7:$8,'Sheet1'!$G:$H",
-                sheet1.NamedRanges.First().RefersTo);
-            Assert.AreEqual("'Sheet1'!B2,Sheet2!A1", sheet2.NamedRanges.First().RefersTo);
-        }
-
-        [Test]
-        public void WbContainsWsNamedRange()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().AddToNamed("Name", XLScope.Worksheet);
-
-            Assert.IsTrue(wb.NamedRanges.Contains("Sheet1!Name"));
-            Assert.IsFalse(wb.NamedRanges.Contains("Sheet1!NameX"));
-
-            Assert.IsNotNull(wb.NamedRange("Sheet1!Name"));
-            Assert.IsNull(wb.NamedRange("Sheet1!NameX"));
-
-            IXLNamedRange range1;
-            Boolean result1 = wb.NamedRanges.TryGetValue("Sheet1!Name", out range1);
-            Assert.IsTrue(result1);
-            Assert.IsNotNull(range1);
-
-            IXLNamedRange range2;
-            Boolean result2 = wb.NamedRanges.TryGetValue("Sheet1!NameX", out range2);
-            Assert.IsFalse(result2);
-            Assert.IsNull(range2);
-        }
-
-        [Test]
-        public void WorkbookContainsNamedRange()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().AddToNamed("Name");
-
-            Assert.IsTrue(wb.NamedRanges.Contains("Name"));
-            Assert.IsFalse(wb.NamedRanges.Contains("NameX"));
-
-            Assert.IsNotNull(wb.NamedRange("Name"));
-            Assert.IsNull(wb.NamedRange("NameX"));
-
-            IXLNamedRange range1;
-            Boolean result1 = wb.NamedRanges.TryGetValue("Name", out range1);
-            Assert.IsTrue(result1);
-            Assert.IsNotNull(range1);
-
-            IXLNamedRange range2;
-            Boolean result2 = wb.NamedRanges.TryGetValue("NameX", out range2);
-            Assert.IsFalse(result2);
-            Assert.IsNull(range2);
-        }
-
-        [Test]
-        public void WorksheetContainsNamedRange()
-        {
-            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
-            ws.FirstCell().AddToNamed("Name", XLScope.Worksheet);
-
-            Assert.IsTrue(ws.NamedRanges.Contains("Name"));
-            Assert.IsFalse(ws.NamedRanges.Contains("NameX"));
-
-            Assert.IsNotNull(ws.NamedRange("Name"));
-            Assert.IsNull(ws.NamedRange("NameX"));
-
-            IXLNamedRange range1;
-            Boolean result1 = ws.NamedRanges.TryGetValue("Name", out range1);
-            Assert.IsTrue(result1);
-            Assert.IsNotNull(range1);
-
-            IXLNamedRange range2;
-            Boolean result2 = ws.NamedRanges.TryGetValue("NameX", out range2);
-            Assert.IsFalse(result2);
-            Assert.IsNull(range2);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/PivotTables/XLPivotTableTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/PivotTables/XLPivotTableTests.cs
deleted file mode 100644
index dadb7f9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/PivotTables/XLPivotTableTests.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class XLPivotTableTests
-    {
-        //[Test]
-        //public void CreateTable()
-        //{
-        //    var ws = new XLWorkbook().Worksheets.Add("Sheet1");
-
-
-        //}
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/CopyingRangesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/CopyingRangesTests.cs
deleted file mode 100644
index 99c9aaf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/CopyingRangesTests.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Drawing;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class CopyingRangesTests
-    {
-        [Test]
-        public void CopyingColumns()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
-            IXLColumn column1 = ws.Column(1);
-            column1.Cell(1).Style.Fill.SetBackgroundColor(XLColor.Red);
-            column1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.FromArgb(1, 1, 1));
-            column1.Cell(3).Style.Fill.SetBackgroundColor(XLColor.FromHtml("#CCCCCC"));
-            column1.Cell(4).Style.Fill.SetBackgroundColor(XLColor.FromIndex(26));
-            column1.Cell(5).Style.Fill.SetBackgroundColor(XLColor.FromKnownColor(KnownColor.MediumSeaGreen));
-            column1.Cell(6).Style.Fill.SetBackgroundColor(XLColor.FromName("Blue"));
-            column1.Cell(7).Style.Fill.SetBackgroundColor(XLColor.FromTheme(XLThemeColor.Accent3));
-
-            ws.Cell(1, 2).Value = column1;
-            ws.Cell(1, 3).Value = column1.Column(1, 7);
-
-            IXLColumn column2 = ws.Column(2);
-            Assert.AreEqual(XLColor.Red, column2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), column2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), column2.Cell(3).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromIndex(26), column2.Cell(4).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen),
-                column2.Cell(5).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromName("Blue"), column2.Cell(6).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), column2.Cell(7).Style.Fill.BackgroundColor);
-
-            IXLColumn column3 = ws.Column(3);
-            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), column3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), column3.Cell(3).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromIndex(26), column3.Cell(4).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen),
-                column3.Cell(5).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromName("Blue"), column3.Cell(6).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), column3.Cell(7).Style.Fill.BackgroundColor);
-        }
-
-        [Test]
-        public void CopyingRows()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
-            IXLRow row1 = ws.Row(1);
-            row1.Cell(1).Style.Fill.SetBackgroundColor(XLColor.Red);
-            row1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.FromArgb(1, 1, 1));
-            row1.Cell(3).Style.Fill.SetBackgroundColor(XLColor.FromHtml("#CCCCCC"));
-            row1.Cell(4).Style.Fill.SetBackgroundColor(XLColor.FromIndex(26));
-            row1.Cell(5).Style.Fill.SetBackgroundColor(XLColor.FromKnownColor(KnownColor.MediumSeaGreen));
-            row1.Cell(6).Style.Fill.SetBackgroundColor(XLColor.FromName("Blue"));
-            row1.Cell(7).Style.Fill.SetBackgroundColor(XLColor.FromTheme(XLThemeColor.Accent3));
-
-            ws.Cell(2, 1).Value = row1;
-            ws.Cell(3, 1).Value = row1.Row(1, 7);
-
-            IXLRow row2 = ws.Row(2);
-            Assert.AreEqual(XLColor.Red, row2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), row2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), row2.Cell(3).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromIndex(26), row2.Cell(4).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen), row2.Cell(5).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromName("Blue"), row2.Cell(6).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), row2.Cell(7).Style.Fill.BackgroundColor);
-
-            IXLRow row3 = ws.Row(3);
-            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), row3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), row3.Cell(3).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromIndex(26), row3.Cell(4).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen), row3.Cell(5).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromName("Blue"), row3.Cell(6).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), row3.Cell(7).Style.Fill.BackgroundColor);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs
deleted file mode 100644
index dcda221..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class InsertingRangesTests
-    {
-        [Test]
-        public void InsertingColumnsPreservesFormatting()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-            IXLColumn column1 = ws.Column(1);
-            column1.Style.Fill.SetBackgroundColor(XLColor.FrenchLilac);
-            column1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.Fulvous);
-            IXLColumn column2 = ws.Column(2);
-            column2.Style.Fill.SetBackgroundColor(XLColor.Xanadu);
-            column2.Cell(2).Style.Fill.SetBackgroundColor(XLColor.MacaroniAndCheese);
-
-            column1.InsertColumnsAfter(1);
-            column1.InsertColumnsBefore(1);
-            column2.InsertColumnsBefore(1);
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FrenchLilac, ws.Column(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FrenchLilac, ws.Column(3).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FrenchLilac, ws.Column(4).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Xanadu, ws.Column(5).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Cell(2, 1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 3).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 4).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.MacaroniAndCheese, ws.Cell(2, 5).Style.Fill.BackgroundColor);
-        }
-
-        [Test]
-        public void InsertingRowsAbove()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
-            ws.Cell("B3").SetValue("X")
-                .CellBelow().SetValue("B");
-
-            IXLRangeRow r = ws.Range("B4").InsertRowsAbove(1).First();
-            r.Cell(1).SetValue("A");
-
-            Assert.AreEqual("X", ws.Cell("B3").GetString());
-            Assert.AreEqual("A", ws.Cell("B4").GetString());
-            Assert.AreEqual("B", ws.Cell("B5").GetString());
-        }
-
-        [Test]
-        public void InsertingRowsPreservesFormatting()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-            IXLRow row1 = ws.Row(1);
-            row1.Style.Fill.SetBackgroundColor(XLColor.FrenchLilac);
-            row1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.Fulvous);
-            IXLRow row2 = ws.Row(2);
-            row2.Style.Fill.SetBackgroundColor(XLColor.Xanadu);
-            row2.Cell(2).Style.Fill.SetBackgroundColor(XLColor.MacaroniAndCheese);
-
-            row1.InsertRowsBelow(1);
-            row1.InsertRowsAbove(1);
-            row2.InsertRowsAbove(1);
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FrenchLilac, ws.Row(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FrenchLilac, ws.Row(3).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.FrenchLilac, ws.Row(4).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Xanadu, ws.Row(5).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Cell(1, 2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Fulvous, ws.Cell(3, 2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Fulvous, ws.Cell(4, 2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.MacaroniAndCheese, ws.Cell(5, 2).Style.Fill.BackgroundColor);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs
deleted file mode 100644
index fad6c2e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class MergedRangesTests
-    {
-        [Test]
-        public void LastCellFromMerge()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-            ws.Range("B2:D4").Merge();
-
-            string first = ws.FirstCellUsed(true).Address.ToStringRelative();
-            string last = ws.LastCellUsed(true).Address.ToStringRelative();
-
-            Assert.AreEqual("B2", first);
-            Assert.AreEqual("D4", last);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/RangeUsedTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/RangeUsedTests.cs
deleted file mode 100644
index 5ec0500..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/RangeUsedTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class RangeUsedTests
-    {
-        [Test]
-        public void CanGetNamedFromAnother()
-        {
-            var wb = new XLWorkbook();
-            var ws1 = wb.Worksheets.Add("Sheet1");
-            ws1.Cell("A1").SetValue(1).AddToNamed("value1");
-            
-            Assert.AreEqual(1, wb.Cell("value1").GetValue<int>());
-            Assert.AreEqual(1, wb.Range("value1").FirstCell().GetValue<int>());
-
-            Assert.AreEqual(1, ws1.Cell("value1").GetValue<int>());
-            Assert.AreEqual(1, ws1.Range("value1").FirstCell().GetValue<int>());
-
-            var ws2 = wb.Worksheets.Add("Sheet2");
-
-            ws2.Cell("A1").SetFormulaA1("=value1").AddToNamed("value2");
-
-            Assert.AreEqual(1, wb.Cell("value2").GetValue<int>());
-            Assert.AreEqual(1, wb.Range("value2").FirstCell().GetValue<int>());
-
-            Assert.AreEqual(1, ws2.Cell("value1").GetValue<int>());
-            Assert.AreEqual(1, ws2.Range("value1").FirstCell().GetValue<int>());
-
-            Assert.AreEqual(1, ws2.Cell("value2").GetValue<int>());
-            Assert.AreEqual(1, ws2.Range("value2").FirstCell().GetValue<int>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/XLRangeAddressTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/XLRangeAddressTests.cs
deleted file mode 100644
index f4e223a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/XLRangeAddressTests.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class XLRangeAddressTests
-    {
-        [Test]
-        public void ToStringTest()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRangeAddress address = ws.Cell(1, 1).AsRange().RangeAddress;
-
-            Assert.AreEqual("A1:A1", address.ToString());
-
-            Assert.AreEqual("A1:A1", address.ToStringRelative());
-            Assert.AreEqual("'Sheet1'!A1:A1", address.ToStringRelative(true));
-
-            Assert.AreEqual("$A$1:$A$1", address.ToStringFixed());
-            Assert.AreEqual("$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.A1));
-            Assert.AreEqual("R1C1:R1C1", address.ToStringFixed(XLReferenceStyle.R1C1));
-            Assert.AreEqual("$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.Default));
-            Assert.AreEqual("'Sheet1'!$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.A1, true));
-            Assert.AreEqual("'Sheet1'!R1C1:R1C1", address.ToStringFixed(XLReferenceStyle.R1C1, true));
-            Assert.AreEqual("'Sheet1'!$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.Default, true));
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs
deleted file mode 100644
index c90f624..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class XLRangeBaseTests
-    {
-        [Test]
-        public void IsEmpty1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            IXLRange range = ws.Range("A1:B2");
-            bool actual = range.IsEmpty();
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            IXLRange range = ws.Range("A1:B2");
-            bool actual = range.IsEmpty(true);
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty3()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Style.Fill.BackgroundColor = XLColor.Red;
-            IXLRange range = ws.Range("A1:B2");
-            bool actual = range.IsEmpty();
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty4()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Style.Fill.BackgroundColor = XLColor.Red;
-            IXLRange range = ws.Range("A1:B2");
-            bool actual = range.IsEmpty(false);
-            bool expected = true;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty5()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Style.Fill.BackgroundColor = XLColor.Red;
-            IXLRange range = ws.Range("A1:B2");
-            bool actual = range.IsEmpty(true);
-            bool expected = false;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void IsEmpty6()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.Value = "X";
-            IXLRange range = ws.Range("A1:B2");
-            bool actual = range.IsEmpty();
-            bool expected = false;
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void SingleCell()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).Value = "Hello World!";
-            wb.NamedRanges.Add("SingleCell", "Sheet1!$A$1");
-            IXLRange range = wb.Range("SingleCell");
-            Assert.AreEqual(1, range.CellsUsed().Count());
-            Assert.AreEqual("Hello World!", range.CellsUsed().Single().GetString());
-        }
-
-        [Test]
-        public void TableRange()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            IXLRangeColumn rangeColumn = ws.Column(1).Column(1, 4);
-            rangeColumn.Cell(1).Value = "FName";
-            rangeColumn.Cell(2).Value = "John";
-            rangeColumn.Cell(3).Value = "Hank";
-            rangeColumn.Cell(4).Value = "Dagny";
-            IXLTable table = rangeColumn.CreateTable();
-            wb.NamedRanges.Add("FNameColumn", String.Format("{0}[{1}]", table.Name, "FName"));
-
-            IXLRange namedRange = wb.Range("FNameColumn");
-            Assert.AreEqual(3, namedRange.Cells().Count());
-            Assert.IsTrue(
-                namedRange.CellsUsed().Select(cell => cell.GetString()).SequenceEqual(new[] {"John", "Hank", "Dagny"}));
-        }
-
-        [Test]
-        public void WsNamedCell()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell", XLScope.Worksheet);
-            Assert.AreEqual("Test", ws.Cell("TestCell").GetString());
-        }
-
-        [Test]
-        public void WsNamedCells()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell", XLScope.Worksheet);
-            ws.Cell(2, 1).SetValue("B");
-            IXLCells cells = ws.Cells("TestCell, A2");
-            Assert.AreEqual("Test", cells.First().GetString());
-            Assert.AreEqual("B", cells.Last().GetString());
-        }
-
-        [Test]
-        public void WsNamedRange()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("A");
-            ws.Cell(2, 1).SetValue("B");
-            IXLRange original = ws.Range("A1:A2");
-            original.AddToNamed("TestRange", XLScope.Worksheet);
-            IXLRange named = ws.Range("TestRange");
-            Assert.AreEqual(original.RangeAddress.ToStringFixed(), named.RangeAddress.ToString());
-        }
-
-        [Test]
-        public void WsNamedRanges()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 1).SetValue("A");
-            ws.Cell(2, 1).SetValue("B");
-            ws.Cell(3, 1).SetValue("C");
-            IXLRange original = ws.Range("A1:A2");
-            original.AddToNamed("TestRange", XLScope.Worksheet);
-            IXLRanges namedRanges = ws.Ranges("TestRange, A3");
-            Assert.AreEqual(original.RangeAddress.ToStringFixed(), namedRanges.First().RangeAddress.ToString());
-            Assert.AreEqual("$A$3:$A$3", namedRanges.Last().RangeAddress.ToStringFixed());
-        }
-
-        [Test]
-        public void WsNamedRangesOneString()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.NamedRanges.Add("TestRange", "Sheet1!$A$1,Sheet1!$A$3");
-            IXLRanges namedRanges = ws.Ranges("TestRange");
-
-            Assert.AreEqual("$A$1:$A$1", namedRanges.First().RangeAddress.ToStringFixed());
-            Assert.AreEqual("$A$3:$A$3", namedRanges.Last().RangeAddress.ToStringFixed());
-        }
-
-        //[Test]
-        //public void WsNamedRangeLiteral()
-        //{
-        //    var wb = new XLWorkbook();
-        //    var ws = wb.Worksheets.Add("Sheet1");
-        //    ws.NamedRanges.Add("TestRange", "\"Hello\"");
-        //    using (MemoryStream memoryStream = new MemoryStream())
-        //    {
-        //        wb.SaveAs(memoryStream);
-        //        var wb2 = new XLWorkbook(memoryStream);
-        //        var text = wb2.Worksheet("Sheet1").NamedRanges.First()
-        //        memoryStream.Close();
-        //    }
-
-
-        //}
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/RichText/XLRichStringTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/RichText/XLRichStringTests.cs
deleted file mode 100644
index 062285b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/RichText/XLRichStringTests.cs
+++ /dev/null
@@ -1,676 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    /// <summary>
-    ///     This is a test class for XLRichStringTests and is intended
-    ///     to contain all XLRichStringTests Unit Tests
-    /// </summary>
-    [TestFixture]
-    public class XLRichStringTests
-    {
-        [Test]
-        public void AccessRichTextTest1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.RichText.AddText("12");
-            cell.DataType = XLCellValues.Number;
-
-            Assert.AreEqual(12.0, cell.GetDouble());
-
-            IXLRichText richText = cell.RichText;
-
-            Assert.AreEqual("12", richText.ToString());
-
-            richText.AddText("34");
-
-            Assert.AreEqual("1234", cell.GetString());
-
-            Assert.AreEqual(XLCellValues.Number, cell.DataType);
-
-            Assert.AreEqual(1234.0, cell.GetDouble());
-        }
-
-        /// <summary>
-        ///     A test for AddText
-        /// </summary>
-        [Test]
-        public void AddTextTest1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            IXLRichText richString = cell.RichText;
-
-            string text = "Hello";
-            richString.AddText(text).SetBold().SetFontColor(XLColor.Red);
-
-            Assert.AreEqual(cell.GetString(), text);
-            Assert.AreEqual(cell.RichText.First().Bold, true);
-            Assert.AreEqual(cell.RichText.First().FontColor, XLColor.Red);
-
-            Assert.AreEqual(1, richString.Count);
-
-            richString.AddText("World");
-            Assert.AreEqual(richString.First().Text, text, "Item in collection is not the same as the one returned");
-        }
-
-        [Test]
-        public void AddTextTest2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            Int32 number = 123;
-
-            cell.SetValue(number).Style
-                .Font.SetBold()
-                .Font.SetFontColor(XLColor.Red);
-
-            string text = number.ToString();
-
-            Assert.AreEqual(cell.RichText.ToString(), text);
-            Assert.AreEqual(cell.RichText.First().Bold, true);
-            Assert.AreEqual(cell.RichText.First().FontColor, XLColor.Red);
-
-            Assert.AreEqual(1, cell.RichText.Count);
-
-            cell.RichText.AddText("World");
-            Assert.AreEqual(cell.RichText.First().Text, text, "Item in collection is not the same as the one returned");
-        }
-
-        [Test]
-        public void AddTextTest3()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            Int32 number = 123;
-            cell.Value = number;
-            cell.Style
-                .Font.SetBold()
-                .Font.SetFontColor(XLColor.Red);
-
-            string text = number.ToString();
-
-            Assert.AreEqual(cell.RichText.ToString(), text);
-            Assert.AreEqual(cell.RichText.First().Bold, true);
-            Assert.AreEqual(cell.RichText.First().FontColor, XLColor.Red);
-
-            Assert.AreEqual(1, cell.RichText.Count);
-
-            cell.RichText.AddText("World");
-            Assert.AreEqual(cell.RichText.First().Text, text, "Item in collection is not the same as the one returned");
-        }
-
-        /// <summary>
-        ///     A test for Clear
-        /// </summary>
-        [Test]
-        public void ClearTest()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-            richString.AddText(" ");
-            richString.AddText("World!");
-
-            richString.ClearText();
-            String expected = String.Empty;
-            String actual = richString.ToString();
-            Assert.AreEqual(expected, actual);
-
-            Assert.AreEqual(0, richString.Count);
-        }
-
-        [Test]
-        public void CountTest()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-            richString.AddText(" ");
-            richString.AddText("World!");
-
-            Assert.AreEqual(3, richString.Count);
-        }
-
-        [Test]
-        public void HasRichTextTest1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLCell cell = ws.Cell(1, 1);
-            cell.RichText.AddText("123");
-
-            Assert.AreEqual(true, cell.HasRichText);
-
-            cell.DataType = XLCellValues.Text;
-
-            Assert.AreEqual(true, cell.HasRichText);
-
-            cell.DataType = XLCellValues.Number;
-
-            Assert.AreEqual(false, cell.HasRichText);
-
-            cell.RichText.AddText("123");
-
-            Assert.AreEqual(true, cell.HasRichText);
-
-            cell.Value = 123;
-
-            Assert.AreEqual(false, cell.HasRichText);
-
-            cell.RichText.AddText("123");
-
-            Assert.AreEqual(true, cell.HasRichText);
-
-            cell.SetValue("123");
-
-            Assert.AreEqual(false, cell.HasRichText);
-        }
-
-        /// <summary>
-        ///     A test for Characters
-        /// </summary>
-        [Test]
-        public void Substring_All_From_OneString()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(0);
-
-            Assert.AreEqual(richString.First(), actual.First());
-
-            Assert.AreEqual(1, actual.Count);
-
-            actual.First().SetBold();
-
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.First().Bold);
-        }
-
-        [Test]
-        public void Substring_All_From_ThreeStrings()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Good Morning");
-            richString.AddText(" my ");
-            richString.AddText("neighbors!");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(0);
-
-            Assert.AreEqual(richString.ElementAt(0), actual.ElementAt(0));
-            Assert.AreEqual(richString.ElementAt(1), actual.ElementAt(1));
-            Assert.AreEqual(richString.ElementAt(2), actual.ElementAt(2));
-
-            Assert.AreEqual(3, actual.Count);
-            Assert.AreEqual(3, richString.Count);
-
-            actual.First().SetBold();
-
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.First().Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.Last().Bold);
-        }
-
-        [Test]
-        public void Substring_From_OneString_End()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(2);
-
-            Assert.AreEqual(1, actual.Count); // substring was in one piece
-
-            Assert.AreEqual(2, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("llo", actual.First().Text);
-
-            Assert.AreEqual("He", richString.First().Text);
-            Assert.AreEqual("llo", richString.Last().Text);
-
-            actual.First().SetBold();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Bold);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Bold);
-
-            richString.Last().SetItalic();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Italic);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Italic);
-
-            Assert.AreEqual(true, actual.First().Italic);
-
-            richString.SetFontSize(20);
-
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.First().FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.Last().FontSize);
-
-            Assert.AreEqual(20, actual.First().FontSize);
-        }
-
-        [Test]
-        public void Substring_From_OneString_Middle()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(2, 2);
-
-            Assert.AreEqual(1, actual.Count); // substring was in one piece
-
-            Assert.AreEqual(3, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("ll", actual.First().Text);
-
-            Assert.AreEqual("He", richString.First().Text);
-            Assert.AreEqual("ll", richString.ElementAt(1).Text);
-            Assert.AreEqual("o", richString.Last().Text);
-
-            actual.First().SetBold();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Bold);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.Last().Bold);
-
-            richString.Last().SetItalic();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Italic);
-
-            Assert.AreEqual(false, actual.First().Italic);
-
-            richString.SetFontSize(20);
-
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.First().FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.Last().FontSize);
-
-            Assert.AreEqual(20, actual.First().FontSize);
-        }
-
-        [Test]
-        public void Substring_From_OneString_Start()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(0, 2);
-
-            Assert.AreEqual(1, actual.Count); // substring was in one piece
-
-            Assert.AreEqual(2, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("He", actual.First().Text);
-
-            Assert.AreEqual("He", richString.First().Text);
-            Assert.AreEqual("llo", richString.Last().Text);
-
-            actual.First().SetBold();
-
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.First().Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.Last().Bold);
-
-            richString.Last().SetItalic();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Italic);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Italic);
-
-            Assert.AreEqual(false, actual.First().Italic);
-
-            richString.SetFontSize(20);
-
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.First().FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.Last().FontSize);
-
-            Assert.AreEqual(20, actual.First().FontSize);
-        }
-
-        [Test]
-        public void Substring_From_ThreeStrings_End1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Good Morning");
-            richString.AddText(" my ");
-            richString.AddText("neighbors!");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(21);
-
-            Assert.AreEqual(1, actual.Count); // substring was in one piece
-
-            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("bors!", actual.First().Text);
-
-            Assert.AreEqual("Good Morning", richString.ElementAt(0).Text);
-            Assert.AreEqual(" my ", richString.ElementAt(1).Text);
-            Assert.AreEqual("neigh", richString.ElementAt(2).Text);
-            Assert.AreEqual("bors!", richString.ElementAt(3).Text);
-
-            actual.First().SetBold();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
-
-            richString.Last().SetItalic();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
-
-            Assert.AreEqual(true, actual.First().Italic);
-
-            richString.SetFontSize(20);
-
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
-
-            Assert.AreEqual(20, actual.First().FontSize);
-        }
-
-        [Test]
-        public void Substring_From_ThreeStrings_End2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Good Morning");
-            richString.AddText(" my ");
-            richString.AddText("neighbors!");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(13);
-
-            Assert.AreEqual(2, actual.Count);
-
-            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("my ", actual.ElementAt(0).Text);
-            Assert.AreEqual("neighbors!", actual.ElementAt(1).Text);
-
-            Assert.AreEqual("Good Morning", richString.ElementAt(0).Text);
-            Assert.AreEqual(" ", richString.ElementAt(1).Text);
-            Assert.AreEqual("my ", richString.ElementAt(2).Text);
-            Assert.AreEqual("neighbors!", richString.ElementAt(3).Text);
-
-            actual.ElementAt(1).SetBold();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
-
-            richString.Last().SetItalic();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
-
-            Assert.AreEqual(false, actual.ElementAt(0).Italic);
-            Assert.AreEqual(true, actual.ElementAt(1).Italic);
-
-            richString.SetFontSize(20);
-
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
-
-            Assert.AreEqual(20, actual.ElementAt(0).FontSize);
-            Assert.AreEqual(20, actual.ElementAt(1).FontSize);
-        }
-
-        [Test]
-        public void Substring_From_ThreeStrings_Mid1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Good Morning");
-            richString.AddText(" my ");
-            richString.AddText("neighbors!");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(5, 10);
-
-            Assert.AreEqual(2, actual.Count);
-
-            Assert.AreEqual(5, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("Morning", actual.ElementAt(0).Text);
-            Assert.AreEqual(" my", actual.ElementAt(1).Text);
-
-            Assert.AreEqual("Good ", richString.ElementAt(0).Text);
-            Assert.AreEqual("Morning", richString.ElementAt(1).Text);
-            Assert.AreEqual(" my", richString.ElementAt(2).Text);
-            Assert.AreEqual(" ", richString.ElementAt(3).Text);
-            Assert.AreEqual("neighbors!", richString.ElementAt(4).Text);
-        }
-
-        [Test]
-        public void Substring_From_ThreeStrings_Mid2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Good Morning");
-            richString.AddText(" my ");
-            richString.AddText("neighbors!");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(5, 15);
-
-            Assert.AreEqual(3, actual.Count);
-
-            Assert.AreEqual(5, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("Morning", actual.ElementAt(0).Text);
-            Assert.AreEqual(" my ", actual.ElementAt(1).Text);
-            Assert.AreEqual("neig", actual.ElementAt(2).Text);
-
-            Assert.AreEqual("Good ", richString.ElementAt(0).Text);
-            Assert.AreEqual("Morning", richString.ElementAt(1).Text);
-            Assert.AreEqual(" my ", richString.ElementAt(2).Text);
-            Assert.AreEqual("neig", richString.ElementAt(3).Text);
-            Assert.AreEqual("hbors!", richString.ElementAt(4).Text);
-        }
-
-        [Test]
-        public void Substring_From_ThreeStrings_Start1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Good Morning");
-            richString.AddText(" my ");
-            richString.AddText("neighbors!");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(0, 4);
-
-            Assert.AreEqual(1, actual.Count); // substring was in one piece
-
-            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("Good", actual.First().Text);
-
-            Assert.AreEqual("Good", richString.ElementAt(0).Text);
-            Assert.AreEqual(" Morning", richString.ElementAt(1).Text);
-            Assert.AreEqual(" my ", richString.ElementAt(2).Text);
-            Assert.AreEqual("neighbors!", richString.ElementAt(3).Text);
-
-            actual.First().SetBold();
-
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
-
-            richString.First().SetItalic();
-
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
-
-            Assert.AreEqual(true, actual.First().Italic);
-
-            richString.SetFontSize(20);
-
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
-
-            Assert.AreEqual(20, actual.First().FontSize);
-        }
-
-        [Test]
-        public void Substring_From_ThreeStrings_Start2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Good Morning");
-            richString.AddText(" my ");
-            richString.AddText("neighbors!");
-
-            IXLFormattedText<IXLRichText> actual = richString.Substring(0, 15);
-
-            Assert.AreEqual(2, actual.Count);
-
-            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
-
-            Assert.AreEqual("Good Morning", actual.ElementAt(0).Text);
-            Assert.AreEqual(" my", actual.ElementAt(1).Text);
-
-            Assert.AreEqual("Good Morning", richString.ElementAt(0).Text);
-            Assert.AreEqual(" my", richString.ElementAt(1).Text);
-            Assert.AreEqual(" ", richString.ElementAt(2).Text);
-            Assert.AreEqual("neighbors!", richString.ElementAt(3).Text);
-
-            actual.ElementAt(1).SetBold();
-
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
-
-            richString.First().SetItalic();
-
-            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
-            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
-
-            Assert.AreEqual(true, actual.ElementAt(0).Italic);
-            Assert.AreEqual(false, actual.ElementAt(1).Italic);
-
-            richString.SetFontSize(20);
-
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
-            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
-
-            Assert.AreEqual(20, actual.ElementAt(0).FontSize);
-            Assert.AreEqual(20, actual.ElementAt(1).FontSize);
-        }
-
-        [Test]
-        [ExpectedException(typeof (IndexOutOfRangeException))]
-        public void Substring_IndexOutsideRange1()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-
-            IXLFormattedText<IXLRichText> richText = richString.Substring(50);
-        }
-
-        [Test]
-        [ExpectedException(typeof (IndexOutOfRangeException))]
-        public void Substring_IndexOutsideRange2()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-            richString.AddText("World");
-
-            IXLFormattedText<IXLRichText> richText = richString.Substring(50);
-        }
-
-        [Test]
-        [ExpectedException(typeof (IndexOutOfRangeException))]
-        public void Substring_IndexOutsideRange3()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-
-            IXLFormattedText<IXLRichText> richText = richString.Substring(1, 10);
-        }
-
-        [Test]
-        [ExpectedException(typeof (IndexOutOfRangeException))]
-        public void Substring_IndexOutsideRange4()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-            richString.AddText("World");
-
-            IXLFormattedText<IXLRichText> richText = richString.Substring(5, 20);
-        }
-
-        /// <summary>
-        ///     A test for ToString
-        /// </summary>
-        [Test]
-        public void ToStringTest()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            IXLRichText richString = ws.Cell(1, 1).RichText;
-
-            richString.AddText("Hello");
-            richString.AddText(" ");
-            richString.AddText("World");
-            string expected = "Hello World";
-            string actual = richString.ToString();
-            Assert.AreEqual(expected, actual);
-
-            richString.AddText("!");
-            expected = "Hello World!";
-            actual = richString.ToString();
-            Assert.AreEqual(expected, actual);
-
-            richString.ClearText();
-            expected = String.Empty;
-            actual = richString.ToString();
-            Assert.AreEqual(expected, actual);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Rows/RowTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Rows/RowTests.cs
deleted file mode 100644
index 2afe01f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Rows/RowTests.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class RowTests
-    {
-        [Test]
-        public void CopyRow()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Test").Style.Font.SetBold();
-            ws.FirstRow().CopyTo(ws.Row(2));
-
-            Assert.IsTrue(ws.Cell("A2").Style.Font.Bold);
-        }
-
-        [Test]
-        public void InsertingRowsAbove1()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-
-            ws.Rows("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
-            ws.Row(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
-            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
-
-            IXLRow row1 = ws.Row(1);
-            IXLRow row2 = ws.Row(2);
-            IXLRow row3 = ws.Row(3);
-
-            IXLRow rowIns = ws.Row(1).InsertRowsAbove(1).First();
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Row(3).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", ws.Row(3).Cell(2).GetString());
-
-
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, rowIns.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, rowIns.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(ws.Style.Fill.BackgroundColor, rowIns.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, row1.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row1.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row1.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, row2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, row2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, row2.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row3.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", row2.Cell(2).GetString());
-        }
-
-        [Test]
-        public void InsertingRowsAbove2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-
-            ws.Rows("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
-            ws.Row(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
-            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
-
-            IXLRow row1 = ws.Row(1);
-            IXLRow row2 = ws.Row(2);
-            IXLRow row3 = ws.Row(3);
-
-            IXLRow rowIns = ws.Row(2).InsertRowsAbove(1).First();
-
-            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Row(3).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", ws.Row(3).Cell(2).GetString());
-
-
-            Assert.AreEqual(XLColor.Red, rowIns.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, rowIns.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, rowIns.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, row1.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row1.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row1.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, row2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, row2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, row2.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row3.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", row2.Cell(2).GetString());
-        }
-
-        [Test]
-        public void InsertingRowsAbove3()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-
-            ws.Rows("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
-            ws.Row(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
-            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
-
-            IXLRow row1 = ws.Row(1);
-            IXLRow row2 = ws.Row(2);
-            IXLRow row3 = ws.Row(3);
-
-            IXLRow rowIns = ws.Row(3).InsertRowsAbove(1).First();
-
-            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Row(2).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Row(2).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Row(2).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, ws.Row(3).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", ws.Row(2).Cell(2).GetString());
-
-
-            Assert.AreEqual(XLColor.Yellow, rowIns.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, rowIns.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, rowIns.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, row1.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row1.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row1.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Yellow, row2.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Green, row2.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Yellow, row2.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row3.Cell(2).Style.Fill.BackgroundColor);
-            Assert.AreEqual(XLColor.Red, row3.Cell(3).Style.Fill.BackgroundColor);
-
-            Assert.AreEqual("X", row2.Cell(2).GetString());
-        }
-
-        [Test]
-        public void NoRowsUsed()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            Int32 count = 0;
-
-            foreach (IXLRow row in ws.RowsUsed())
-                count++;
-
-            foreach (IXLRangeRow row in ws.Range("A1:C3").RowsUsed())
-                count++;
-
-            Assert.AreEqual(0, count);
-        }
-
-        [Test]
-        public void RowUsed()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            ws.Cell(1, 2).SetValue("Test");
-            ws.Cell(1, 3).SetValue("Test");
-
-            IXLRangeRow fromRow = ws.Row(1).RowUsed();
-            Assert.AreEqual("B1:C1", fromRow.RangeAddress.ToStringRelative());
-
-            IXLRangeRow fromRange = ws.Range("A1:E1").FirstRow().RowUsed();
-            Assert.AreEqual("B1:C1", fromRange.RangeAddress.ToStringRelative());
-        }
-
-
-        [Test]
-        public void UngroupFromAll()
-        {
-            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
-            ws.Rows(1, 2).Group();
-            ws.Rows(1, 2).Ungroup(true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Styles/ColorTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Styles/ColorTests.cs
deleted file mode 100644
index 793c39e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Styles/ColorTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Drawing;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class ColorTests
-    {
-        [Test]
-        public void ColorEqualOperatorInPlace()
-        {
-            Assert.IsTrue(XLColor.Black == XLColor.Black);
-        }
-
-        [Test]
-        public void ColorNotEqualOperatorInPlace()
-        {
-            Assert.IsFalse(XLColor.Black != XLColor.Black);
-        }
-
-        [Test]
-        public void DefaultColorIndex64isTransparentWhite()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            XLColor color = ws.FirstCell().Style.Fill.BackgroundColor;
-            Assert.AreEqual(XLColorType.Indexed, color.ColorType);
-            Assert.AreEqual(64, color.Indexed);
-            Assert.AreEqual(Color.Transparent, color.Color);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Styles/XLFillTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Styles/XLFillTests.cs
deleted file mode 100644
index 37d06c7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Styles/XLFillTests.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class XLFillTests
-    {
-        [Test]
-        public void BackgroundColorSetsPattern()
-        {
-            var fill = new XLFill {BackgroundColor = XLColor.Blue};
-            Assert.AreEqual(XLFillPatternValues.Solid, fill.PatternType);
-        }
-
-        [Test]
-        public void BackgroundNoColorSetsPatternNone()
-        {
-            var fill = new XLFill {BackgroundColor = XLColor.NoColor};
-            Assert.AreEqual(XLFillPatternValues.None, fill.PatternType);
-        }
-
-        [Test]
-        public void BackgroundPatternEqualCheck()
-        {
-            var fill1 = new XLFill {PatternBackgroundColor = XLColor.Blue};
-            var fill2 = new XLFill {PatternBackgroundColor = XLColor.Blue};
-            Assert.IsTrue(fill1.Equals(fill2));
-        }
-
-        [Test]
-        public void BackgroundPatternNotEqualCheck()
-        {
-            var fill1 = new XLFill {PatternBackgroundColor = XLColor.Blue};
-            var fill2 = new XLFill {PatternBackgroundColor = XLColor.Red};
-            Assert.IsFalse(fill1.Equals(fill2));
-        }
-
-        [Test]
-        public void BackgroundWithConditionalFormat()
-        {
-            var workbook = new XLWorkbook();
-            var worksheet = workbook.AddWorksheet("Test");
-            worksheet.Cell(2, 2).SetValue("Text");
-            var cf = worksheet.Cell(2, 2).AddConditionalFormat();
-            var style = cf.WhenNotBlank();
-            style
-                    .Border.SetOutsideBorder(XLBorderStyleValues.Thick)
-                    .Border.SetOutsideBorderColor(XLColor.Blue);
-
-            Assert.AreEqual(style.Border.BottomBorder, XLBorderStyleValues.Thick);
-            Assert.AreEqual(style.Border.TopBorder, XLBorderStyleValues.Thick);
-            Assert.AreEqual(style.Border.LeftBorder, XLBorderStyleValues.Thick);
-            Assert.AreEqual(style.Border.RightBorder, XLBorderStyleValues.Thick);
-
-            Assert.AreEqual(style.Border.BottomBorderColor, XLColor.Blue);
-            Assert.AreEqual(style.Border.TopBorderColor, XLColor.Blue);
-            Assert.AreEqual(style.Border.LeftBorderColor, XLColor.Blue);
-            Assert.AreEqual(style.Border.RightBorderColor, XLColor.Blue);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Tables/TablesTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Tables/TablesTests.cs
deleted file mode 100644
index 8bd1f63..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Tables/TablesTests.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel
-{
-    /// <summary>
-    ///     Summary description for UnitTest1
-    /// </summary>
-    [TestFixture]
-    public class TablesTests
-    {
-        public class TestObject
-        {
-            public String Column1 { get; set; }
-            public String Column2 { get; set; }
-        }
-
-        [Test]
-        public void CanSaveTableCreatedFromEmptyDataTable()
-        {
-            var dt = new DataTable("sheet1");
-            dt.Columns.Add("col1", typeof (string));
-            dt.Columns.Add("col2", typeof (double));
-
-            var wb = new XLWorkbook();
-            wb.AddWorksheet(dt);
-
-            using (var ms = new MemoryStream())
-                wb.SaveAs(ms);
-        }
-
-        [Test]
-        public void CanSaveTableCreatedFromSingleRow()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Title");
-            ws.Range("A1").CreateTable();
-
-            using (var ms = new MemoryStream())
-                wb.SaveAs(ms);
-        }
-
-        [Test]
-        public void CreatingATableFromHeadersPushCellsBelow()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Title")
-                .CellBelow().SetValue("X");
-            ws.Range("A1").CreateTable();
-
-            Assert.AreEqual(ws.Cell("A2").GetString(), String.Empty);
-            Assert.AreEqual(ws.Cell("A3").GetString(), "X");
-        }
-
-        [Test]
-        public void Inserting_Column_Sets_Header()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Categories")
-                .CellBelow().SetValue("A")
-                .CellBelow().SetValue("B")
-                .CellBelow().SetValue("C");
-
-            IXLTable table = ws.RangeUsed().CreateTable();
-            table.InsertColumnsAfter(1);
-            Assert.AreEqual("Column2", table.HeadersRow().LastCell().GetString());
-        }
-
-        [Test]
-        public void SavingLoadingTableWithNewLineInHeader()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            string columnName = "Line1" + Environment.NewLine + "Line2";
-            ws.FirstCell().SetValue(columnName)
-                .CellBelow().SetValue("A");
-            ws.RangeUsed().CreateTable();
-            using (var ms = new MemoryStream())
-            {
-                wb.SaveAs(ms);
-                var wb2 = new XLWorkbook(ms);
-                IXLWorksheet ws2 = wb2.Worksheet(1);
-                IXLTable table2 = ws2.Table(0);
-                string fieldName = table2.Field(0).Name;
-                Assert.AreEqual("Line1\nLine2", fieldName);
-            }
-        }
-
-        [Test]
-        public void SavingLoadingTableWithNewLineInHeader2()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Test");
-
-            var dt = new DataTable();
-            string columnName = "Line1" + Environment.NewLine + "Line2";
-            dt.Columns.Add(columnName);
-
-            DataRow dr = dt.NewRow();
-            dr[columnName] = "some text";
-            dt.Rows.Add(dr);
-            ws.Cell(1, 1).InsertTable(dt.AsEnumerable());
-
-            IXLTable table1 = ws.Table(0);
-            string fieldName1 = table1.Field(0).Name;
-            Assert.AreEqual(columnName, fieldName1);
-
-            using (var ms = new MemoryStream())
-            {
-                wb.SaveAs(ms);
-                var wb2 = new XLWorkbook(ms);
-                IXLWorksheet ws2 = wb2.Worksheet(1);
-                IXLTable table2 = ws2.Table(0);
-                string fieldName2 = table2.Field(0).Name;
-                Assert.AreEqual("Line1\nLine2", fieldName2);
-            }
-        }
-
-        [Test]
-        public void TableCreatedFromEmptyDataTable()
-        {
-            var dt = new DataTable("sheet1");
-            dt.Columns.Add("col1", typeof (string));
-            dt.Columns.Add("col2", typeof (double));
-
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().InsertTable(dt);
-            Assert.AreEqual(2, ws.Tables.First().ColumnCount());
-        }
-
-        [Test]
-        public void TableCreatedFromEmptyListOfInt()
-        {
-            var l = new List<Int32>();
-
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().InsertTable(l);
-            Assert.AreEqual(1, ws.Tables.First().ColumnCount());
-        }
-
-        [Test]
-        public void TableCreatedFromEmptyListOfObject()
-        {
-            var l = new List<TestObject>();
-
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().InsertTable(l);
-            Assert.AreEqual(2, ws.Tables.First().ColumnCount());
-        }
-
-        [Test]
-        public void TableInsertAboveFromData()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Value");
-
-            IXLTable table = ws.Range("A1:A2").CreateTable();
-            table.SetShowTotalsRow()
-                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
-
-            IXLTableRow row = table.DataRange.FirstRow();
-            row.Field("Value").Value = 3;
-            row = table.DataRange.InsertRowsAbove(1).First();
-            row.Field("Value").Value = 2;
-            row = table.DataRange.InsertRowsAbove(1).First();
-            row.Field("Value").Value = 1;
-
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
-
-            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
-            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
-            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
-
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
-        }
-
-        [Test]
-        public void TableInsertAboveFromRows()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Value");
-
-            IXLTable table = ws.Range("A1:A2").CreateTable();
-            table.SetShowTotalsRow()
-                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox1.xlsx");
-            IXLTableRow row = table.DataRange.FirstRow();
-            row.Field("Value").Value = 3;
-            row = row.InsertRowsAbove(1).First();
-            row.Field("Value").Value = 2;
-            row = row.InsertRowsAbove(1).First();
-            row.Field("Value").Value = 1;
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox2.xlsx");
-
-            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
-            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
-            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
-
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
-        }
-
-        [Test]
-        public void TableInsertBelowFromData()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Value");
-
-            IXLTable table = ws.Range("A1:A2").CreateTable();
-            table.SetShowTotalsRow()
-                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
-
-            IXLTableRow row = table.DataRange.FirstRow();
-            row.Field("Value").Value = 1;
-            row = table.DataRange.InsertRowsBelow(1).First();
-            row.Field("Value").Value = 2;
-            row = table.DataRange.InsertRowsBelow(1).First();
-            row.Field("Value").Value = 3;
-
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
-
-            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
-            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
-            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
-        }
-
-        [Test]
-        public void TableInsertBelowFromRows()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Value");
-
-            IXLTable table = ws.Range("A1:A2").CreateTable();
-            table.SetShowTotalsRow()
-                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
-
-            IXLTableRow row = table.DataRange.FirstRow();
-            row.Field("Value").Value = 1;
-            row = row.InsertRowsBelow(1).First();
-            row.Field("Value").Value = 2;
-            row = row.InsertRowsBelow(1).First();
-            row.Field("Value").Value = 3;
-
-            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
-            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
-            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
-
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
-        }
-
-        [Test]
-        public void TableShowHeader()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().SetValue("Categories")
-                .CellBelow().SetValue("A")
-                .CellBelow().SetValue("B")
-                .CellBelow().SetValue("C");
-
-            ws.RangeUsed().CreateTable().SetShowHeaderRow(false);
-
-            IXLTable table = ws.Tables.First();
-
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox1.xlsx");
-
-            Assert.IsTrue(ws.Cell(1, 1).IsEmpty(true));
-            Assert.AreEqual(null, table.HeadersRow());
-            Assert.AreEqual("A", table.DataRange.FirstRow().Field("Categories").GetString());
-            Assert.AreEqual("C", table.DataRange.LastRow().Field("Categories").GetString());
-            Assert.AreEqual("A", table.DataRange.FirstCell().GetString());
-            Assert.AreEqual("C", table.DataRange.LastCell().GetString());
-
-            table.SetShowHeaderRow();
-            IXLRangeRow headerRow = table.HeadersRow();
-            Assert.AreNotEqual(null, headerRow);
-            Assert.AreEqual("Categories", headerRow.Cell(1).GetString());
-
-
-            table.SetShowHeaderRow(false);
-
-            ws.FirstCell().SetValue("x");
-
-            table.SetShowHeaderRow();
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox2.xlsx");
-
-            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox3.xlsx");
-
-            Assert.AreEqual("x", ws.FirstCell().GetString());
-            Assert.AreEqual("Categories", ws.Cell("A2").GetString());
-            Assert.AreNotEqual(null, headerRow);
-            Assert.AreEqual("A", table.DataRange.FirstRow().Field("Categories").GetString());
-            Assert.AreEqual("C", table.DataRange.LastRow().Field("Categories").GetString());
-            Assert.AreEqual("A", table.DataRange.FirstCell().GetString());
-            Assert.AreEqual("C", table.DataRange.LastCell().GetString());
-        }
-
-        [Test]
-        public void ChangeFieldName()
-        {
-            XLWorkbook wb = new XLWorkbook(); //( @"c:\temp\test.xlsx");
-
-            var ws = wb.AddWorksheet("Sheet");
-            ws.Cell("A1").SetValue("FName")
-                .CellBelow().SetValue("John");
-
-            ws.Cell("B1").SetValue("LName")
-                .CellBelow().SetValue("Doe");
-
-            var tbl = ws.RangeUsed().CreateTable();
-            var nameBefore = tbl.Field(tbl.Fields.Last().Index).Name;
-            tbl.Field(tbl.Fields.Last().Index).Name = "LastName";
-            var nameAfter = tbl.Field(tbl.Fields.Last().Index).Name;
-
-            var cellValue = ws.Cell("B1").GetString();
-
-            Assert.AreEqual("LName", nameBefore);
-            Assert.AreEqual("LastName", nameAfter);
-            Assert.AreEqual("LastName", cellValue);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Worksheets/XLWorksheetTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Worksheets/XLWorksheetTests.cs
deleted file mode 100644
index e5bf666..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Excel/Worksheets/XLWorksheetTests.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class XLWorksheetTests
-    {
-        [Test]
-        public void ColumnCountTime()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            DateTime start = DateTime.Now;
-            ws.ColumnCount();
-            DateTime end = DateTime.Now;
-            Assert.IsTrue((end - start).TotalMilliseconds < 500);
-        }
-
-        [Test]
-        public void CopyConditionalFormatsCount()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
-            ws.FirstCell().AddConditionalFormat().WhenContains("1").Fill.SetBackgroundColor(XLColor.Blue);
-            IXLWorksheet ws2 = ws.CopyTo("Sheet2");
-            Assert.AreEqual(1, ws2.ConditionalFormats.Count());
-        }
-
-        [Test]
-        public void DeletingSheets1()
-        {
-            var wb = new XLWorkbook();
-            wb.Worksheets.Add("Sheet3");
-            wb.Worksheets.Add("Sheet2");
-            wb.Worksheets.Add("Sheet1", 1);
-
-            wb.Worksheet("Sheet3").Delete();
-
-            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
-            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
-            Assert.AreEqual(2, wb.Worksheets.Count);
-        }
-
-        [Test]
-        public void InsertingSheets1()
-        {
-            var wb = new XLWorkbook();
-            wb.Worksheets.Add("Sheet1");
-            wb.Worksheets.Add("Sheet2");
-            wb.Worksheets.Add("Sheet3");
-
-            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
-            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
-            Assert.AreEqual("Sheet3", wb.Worksheet(3).Name);
-        }
-
-        [Test]
-        public void InsertingSheets2()
-        {
-            var wb = new XLWorkbook();
-            wb.Worksheets.Add("Sheet2");
-            wb.Worksheets.Add("Sheet1", 1);
-            wb.Worksheets.Add("Sheet3");
-
-            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
-            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
-            Assert.AreEqual("Sheet3", wb.Worksheet(3).Name);
-        }
-
-        [Test]
-        public void InsertingSheets3()
-        {
-            var wb = new XLWorkbook();
-            wb.Worksheets.Add("Sheet3");
-            wb.Worksheets.Add("Sheet2", 1);
-            wb.Worksheets.Add("Sheet1", 1);
-
-
-            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
-            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
-            Assert.AreEqual("Sheet3", wb.Worksheet(3).Name);
-        }
-
-        [Test]
-        public void MergedRanges()
-        {
-            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
-            ws.Range("A1:B2").Merge();
-            ws.Range("C1:D3").Merge();
-            ws.Range("D2:E2").Merge();
-
-            Assert.AreEqual(2, ws.MergedRanges.Count);
-            Assert.AreEqual("A1:B2", ws.MergedRanges.First().RangeAddress.ToStringRelative());
-            Assert.AreEqual("D2:E2", ws.MergedRanges.Last().RangeAddress.ToStringRelative());
-        }
-
-        [Test]
-        public void RowCountTime()
-        {
-            var wb = new XLWorkbook();
-            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
-            DateTime start = DateTime.Now;
-            ws.RowCount();
-            DateTime end = DateTime.Now;
-            Assert.IsTrue((end - start).TotalMilliseconds < 500);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/ExcelDocsComparerTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/ExcelDocsComparerTests.cs
deleted file mode 100644
index 3397f25..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/ExcelDocsComparerTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System.IO;
-using ClosedXML_Examples;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    [TestFixture]
-    public class ExcelDocsComparerTests
-    {
-        [Test]
-        public void CheckEqual()
-        {
-            string left = ExampleHelper.GetTempFilePath("left.xlsx");
-            string right = ExampleHelper.GetTempFilePath("right.xlsx");
-            try
-            {
-                new BasicTable().Create(left);
-                new BasicTable().Create(right);
-                string message;
-                Assert.IsTrue(ExcelDocsComparer.Compare(left, right, out message));
-            }
-            finally
-            {
-                if (File.Exists(left))
-                {
-                    File.Delete(left);
-                }
-                if (File.Exists(right))
-                {
-                    File.Delete(right);
-                }
-            }
-        }
-
-        [Test]
-        public void CheckNonEqual()
-        {
-            string left = ExampleHelper.GetTempFilePath("left.xlsx");
-            string right = ExampleHelper.GetTempFilePath("right.xlsx");
-            try
-            {
-                new BasicTable().Create(left);
-                new HelloWorld().Create(right);
-
-                string message;
-                Assert.IsFalse(ExcelDocsComparer.Compare(left, right, out message));
-            }
-            finally
-            {
-                if (File.Exists(left))
-                {
-                    File.Delete(left);
-                }
-                if (File.Exists(right))
-                {
-                    File.Delete(right);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index f11097e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyTitle("ClosedXML_Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("ClosedXML_Tests")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("a16b867e-6b00-4ccc-a368-c9f9b14e0e6a")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/CustomAutoFilter.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/CustomAutoFilter.xlsx
deleted file mode 100644
index bd4afd7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/CustomAutoFilter.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/DynamicAutoFilter.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/DynamicAutoFilter.xlsx
deleted file mode 100644
index ee8699b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/DynamicAutoFilter.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/RegularAutoFilter.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/RegularAutoFilter.xlsx
deleted file mode 100644
index 42ca177..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/RegularAutoFilter.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/TopBottomAutoFilter.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/TopBottomAutoFilter.xlsx
deleted file mode 100644
index 62fcdec..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/AutoFilter/TopBottomAutoFilter.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnCells.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnCells.xlsx
deleted file mode 100644
index d7722ef..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnCells.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnCollection.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnCollection.xlsx
deleted file mode 100644
index 8f90b9c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnCollection.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnSettings.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnSettings.xlsx
deleted file mode 100644
index 15fc2a2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/ColumnSettings.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/DeletingColumns.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/DeletingColumns.xlsx
deleted file mode 100644
index 749fbec..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/DeletingColumns.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/InsertColumns.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/InsertColumns.xlsx
deleted file mode 100644
index 49515b1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Columns/InsertColumns.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Comments/AddingComments.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Comments/AddingComments.xlsx
deleted file mode 100644
index fc2f06a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Comments/AddingComments.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Comments/EditingComments.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Comments/EditingComments.xlsx
deleted file mode 100644
index b0bde50..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Comments/EditingComments.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowHigh.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowHigh.xlsx
deleted file mode 100644
index 79c8daf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowHigh.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowMidHigh.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowMidHigh.xlsx
deleted file mode 100644
index dc0fc2f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowMidHigh.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFContains.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFContains.xlsx
deleted file mode 100644
index 020491e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFContains.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFDataBar.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFDataBar.xlsx
deleted file mode 100644
index 7dd6722..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFDataBar.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEndsWith.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEndsWith.xlsx
deleted file mode 100644
index 302f55f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEndsWith.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsNumber.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsNumber.xlsx
deleted file mode 100644
index 8bbdeb9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsNumber.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsString.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsString.xlsx
deleted file mode 100644
index 9217bc8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsString.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIconSet.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIconSet.xlsx
deleted file mode 100644
index da22b7b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIconSet.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsBlank.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsBlank.xlsx
deleted file mode 100644
index c6a9610..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsBlank.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsError.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsError.xlsx
deleted file mode 100644
index d273851..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsError.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotBlank.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotBlank.xlsx
deleted file mode 100644
index 00671c0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotBlank.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotContains.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotContains.xlsx
deleted file mode 100644
index b009cb4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotContains.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsNumber.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsNumber.xlsx
deleted file mode 100644
index 414c031..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsNumber.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsString.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsString.xlsx
deleted file mode 100644
index c0e0f9a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsString.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotError.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotError.xlsx
deleted file mode 100644
index ed1e46e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotError.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFStartsWith.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFStartsWith.xlsx
deleted file mode 100644
index d89fc73..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFStartsWith.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Delete/DeleteFewWorksheets.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Delete/DeleteFewWorksheets.xlsx
deleted file mode 100644
index 84e8047..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Delete/DeleteFewWorksheets.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Delete/RemoveRows.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Delete/RemoveRows.xlsx
deleted file mode 100644
index 5a6489e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Delete/RemoveRows.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Loading/ChangingBasicTable.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Loading/ChangingBasicTable.xlsx
deleted file mode 100644
index 2b7ee46..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Loading/ChangingBasicTable.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx
deleted file mode 100644
index 63fc973..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx
deleted file mode 100644
index c23276f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AdjustToContents.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AdjustToContents.xlsx
deleted file mode 100644
index 922c70c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AdjustToContents.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AutoFilter.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AutoFilter.xlsx
deleted file mode 100644
index f32b368..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/AutoFilter.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/BasicTable.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/BasicTable.xlsx
deleted file mode 100644
index 3a4a2f7..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/BasicTable.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/BlankCells.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/BlankCells.xlsx
deleted file mode 100644
index cf74d73..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/BlankCells.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CellValues.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CellValues.xlsx
deleted file mode 100644
index 283b632..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CellValues.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Collections.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Collections.xlsx
deleted file mode 100644
index 4270b1f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Collections.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CopyingRowsAndColumns.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CopyingRowsAndColumns.xlsx
deleted file mode 100644
index 9df4b4d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CopyingRowsAndColumns.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
deleted file mode 100644
index f18e03a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/DataTypes.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/DataTypes.xlsx
deleted file mode 100644
index b885488..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/DataTypes.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/DataValidation.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/DataValidation.xlsx
deleted file mode 100644
index 817bef8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/DataValidation.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Formulas.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Formulas.xlsx
deleted file mode 100644
index 479293f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Formulas.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/FreezePanes.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/FreezePanes.xlsx
deleted file mode 100644
index acc3467..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/FreezePanes.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/HideSheets.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/HideSheets.xlsx
deleted file mode 100644
index a33099e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/HideSheets.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/HideUnhide.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/HideUnhide.xlsx
deleted file mode 100644
index d3234d8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/HideUnhide.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Hyperlinks.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Hyperlinks.xlsx
deleted file mode 100644
index d99687a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Hyperlinks.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/InsertingData.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/InsertingData.xlsx
deleted file mode 100644
index de32781..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/InsertingData.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx
deleted file mode 100644
index 82ab54e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/LambdaExpressions.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/LambdaExpressions.xlsx
deleted file mode 100644
index bf79366..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/LambdaExpressions.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/MergeCells.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/MergeCells.xlsx
deleted file mode 100644
index ef0eac1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/MergeCells.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/MergeMoves.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/MergeMoves.xlsx
deleted file mode 100644
index 411137e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/MergeMoves.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Outline.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Outline.xlsx
deleted file mode 100644
index e52b732..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/Outline.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/SheetProtection.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/SheetProtection.xlsx
deleted file mode 100644
index 4302e87..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/SheetProtection.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/ShiftingFormulas.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/ShiftingFormulas.xlsx
deleted file mode 100644
index 256e407..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/ShiftingFormulas.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx
deleted file mode 100644
index 529ee5d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/TabColors.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/TabColors.xlsx
deleted file mode 100644
index 6ea980e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/TabColors.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/WorkbookProperties.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/WorkbookProperties.xlsx
deleted file mode 100644
index 4cfdf84..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Misc/WorkbookProperties.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/HeaderFooters.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/HeaderFooters.xlsx
deleted file mode 100644
index b351a9b..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/HeaderFooters.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Margins.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Margins.xlsx
deleted file mode 100644
index 8a4297e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Margins.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Page.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Page.xlsx
deleted file mode 100644
index 9bab088..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Page.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/SheetTab.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/SheetTab.xlsx
deleted file mode 100644
index 57dd33e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/SheetTab.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Sheets.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Sheets.xlsx
deleted file mode 100644
index cea86d2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/Sheets.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/TwoPages.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/TwoPages.xlsx
deleted file mode 100644
index 7c0e26f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/PageSetup/TwoPages.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/ClearingRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/ClearingRanges.xlsx
deleted file mode 100644
index e1e0b66..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/ClearingRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/CopyingRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/CopyingRanges.xlsx
deleted file mode 100644
index 1142171..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/CopyingRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/CurrentRowColumn.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/CurrentRowColumn.xlsx
deleted file mode 100644
index 151348f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/CurrentRowColumn.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/DefiningRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/DefiningRanges.xlsx
deleted file mode 100644
index 6e1e9b2..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/DefiningRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/DeletingRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/DeletingRanges.xlsx
deleted file mode 100644
index b828455..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/DeletingRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingColumns.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingColumns.xlsx
deleted file mode 100644
index 8885e55..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingColumns.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingRows.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingRows.xlsx
deleted file mode 100644
index a22f6eb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingRows.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/MultipleRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/MultipleRanges.xlsx
deleted file mode 100644
index 911dddf..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/MultipleRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/NamedRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/NamedRanges.xlsx
deleted file mode 100644
index efaa38d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/NamedRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/SelectingRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/SelectingRanges.xlsx
deleted file mode 100644
index a855f67..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/SelectingRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/ShiftingRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/ShiftingRanges.xlsx
deleted file mode 100644
index 65d84df..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/ShiftingRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/SortExample.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/SortExample.xlsx
deleted file mode 100644
index 10ab6bc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/SortExample.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/Sorting.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/Sorting.xlsx
deleted file mode 100644
index 624b385..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/Sorting.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRanges.xlsx
deleted file mode 100644
index 82ee38c..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRangesPlus.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRangesPlus.xlsx
deleted file mode 100644
index 87938f5..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRangesPlus.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx
deleted file mode 100644
index 1a58ba4..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/WalkingRanges.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/WalkingRanges.xlsx
deleted file mode 100644
index 585fb9e..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Ranges/WalkingRanges.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/InsertRows.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/InsertRows.xlsx
deleted file mode 100644
index 8dc30a9..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/InsertRows.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowCells.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowCells.xlsx
deleted file mode 100644
index 9acc1fc..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowCells.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowCollection.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowCollection.xlsx
deleted file mode 100644
index 7dce5fb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowCollection.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowSettings.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowSettings.xlsx
deleted file mode 100644
index 1100ecb..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Rows/RowSettings.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/DefaultStyles.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/DefaultStyles.xlsx
deleted file mode 100644
index 66d412d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/DefaultStyles.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/PurpleWorksheet.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/PurpleWorksheet.xlsx
deleted file mode 100644
index 69af642..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/PurpleWorksheet.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleAlignment.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleAlignment.xlsx
deleted file mode 100644
index 8c58cda..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleAlignment.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleBorder.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleBorder.xlsx
deleted file mode 100644
index 35e6214..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleBorder.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleFill.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleFill.xlsx
deleted file mode 100644
index 77890c0..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleFill.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleFont.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleFont.xlsx
deleted file mode 100644
index d9f96a6..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleFont.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleNumberFormat.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleNumberFormat.xlsx
deleted file mode 100644
index 43d61e1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleNumberFormat.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleRowsColumns.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleRowsColumns.xlsx
deleted file mode 100644
index 9f043d8..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleRowsColumns.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleWorksheet.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleWorksheet.xlsx
deleted file mode 100644
index 838a240..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/StyleWorksheet.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/UsingColors.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/UsingColors.xlsx
deleted file mode 100644
index a86b50d..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/UsingColors.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/UsingRichText.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/UsingRichText.xlsx
deleted file mode 100644
index 1497f96..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Examples/Styles/UsingRichText.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Misc/CopyRowContents.xlsx b/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Misc/CopyRowContents.xlsx
deleted file mode 100644
index ce9e7b1..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Resource/Misc/CopyRowContents.xlsx
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/TestHelper.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/TestHelper.cs
deleted file mode 100644
index eb02623..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/TestHelper.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using ClosedXML.Excel;
-using ClosedXML_Examples;
-using DocumentFormat.OpenXml.Drawing;
-using NUnit.Framework;
-using Path = System.IO.Path;
-
-namespace ClosedXML_Tests
-{
-    internal static class TestHelper
-    {
-        public static string CurrencySymbol
-        {
-            get { return Thread.CurrentThread.CurrentCulture.NumberFormat.CurrencySymbol; }
-        }
-
-        //Note: Run example tests parameters
-        public static string TestsOutputDirectory
-        {
-            get { 
-                return Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); 
-            }
-
-        }
-
-        public const string ActualTestResultPostFix = "";
-        public static readonly string TestsExampleOutputDirectory = Path.Combine(TestsOutputDirectory, "Examples");
-        
-        private const bool CompareWithResources = true;
-
-        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(null, ".Resource.Examples.");
-
-        public static void SaveWorkbook(XLWorkbook workbook, string fileName)
-        {
-            workbook.SaveAs(Path.Combine(TestsOutputDirectory, fileName));
-        }
-
-        public static void RunTestExample<T>(string filePartName)
-                where T : IXLExample, new()
-        {
-            // Make sure tests run on a deterministic culture
-            Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
-
-            var example = new T();
-            string filePath1 = Path.Combine(TestsExampleOutputDirectory, filePartName);
-
-            var extension = Path.GetExtension(filePath1);
-            var directory = Path.GetDirectoryName(filePath1);
-
-            var fileName= Path.GetFileNameWithoutExtension(filePath1);
-            fileName += ActualTestResultPostFix;
-            fileName = Path.ChangeExtension(fileName, extension);
-
-            filePath1 = Path.Combine(directory, "z" + fileName);
-            var filePath2 = Path.Combine(directory, fileName);
-            //Run test
-            example.Create(filePath1);
-            new XLWorkbook(filePath1).SaveAs(filePath2);
-            bool success = true;
-#pragma warning disable 162
-            try
-            {
-                //Compare
-                // ReSharper disable ConditionIsAlwaysTrueOrFalse
-                if (CompareWithResources)
-                        // ReSharper restore ConditionIsAlwaysTrueOrFalse
-
-                {
-                    string resourcePath = filePartName.Replace('\\', '.').TrimStart('.');
-                    using (var streamExpected = _extractor.ReadFileFromResToStream(resourcePath))
-                    using (var streamActual = File.OpenRead(filePath2))
-                    {
-                        string message;
-                        success = ExcelDocsComparer.Compare(streamActual, streamExpected, out message);
-                        var formattedMessage =
-                            String.Format(
-                                "Actual file '{0}' is different than the expected file '{1}'. The difference is: '{2}'",
-                                filePath2, resourcePath, message);
-
-                        Assert.IsTrue(success, formattedMessage);
-                    }
-                }
-            }
-            finally
-            {
-                //if (success && File.Exists(filePath)) File.Delete(filePath);
-            }
-#pragma warning restore 162
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/ExcelDocsComparer.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/ExcelDocsComparer.cs
deleted file mode 100644
index 25dc07f..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/ExcelDocsComparer.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.IO;
-using System.IO.Packaging;
-
-namespace ClosedXML_Tests
-{
-    internal static class ExcelDocsComparer
-    {
-        public static bool Compare(string left, string right, out string message)
-        {
-            using (FileStream leftStream = File.OpenRead(left))
-            {
-                using (FileStream rightStream = File.OpenRead(right))
-                {
-                    return Compare(leftStream, rightStream, out message);
-                }
-            }
-        }
-
-        public static bool Compare(Stream left, Stream right, out string message)
-        {
-            using (Package leftPackage = Package.Open(left))
-            {
-                using (Package rightPackage = Package.Open(right))
-                {
-                    return PackageHelper.Compare(leftPackage, rightPackage, false, ExcludeMethod, out message);
-                }
-            }
-        }
-
-        private static bool ExcludeMethod(Uri uri)
-        {
-            //Exclude service data
-            if (uri.OriginalString.EndsWith(".rels") ||
-                uri.OriginalString.EndsWith(".psmdcp"))
-            {
-                return true;
-            }
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/PackageHelper.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/PackageHelper.cs
deleted file mode 100644
index ec92716..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/PackageHelper.cs
+++ /dev/null
@@ -1,504 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Packaging;
-using System.Linq;
-using System.Net.Mime;
-using System.Text;
-using System.Xml.Serialization;
-
-namespace ClosedXML_Tests
-{
-    public static class PackageHelper
-    {
-        public static void WriteXmlPart(Package package, Uri uri, object content, XmlSerializer serializer)
-        {
-            if (package.PartExists(uri))
-            {
-                package.DeletePart(uri);
-            }
-            PackagePart part = package.CreatePart(uri, MediaTypeNames.Text.Xml, CompressionOption.Fast);
-            using (Stream stream = part.GetStream())
-            {
-                serializer.Serialize(stream, content);
-            }
-        }
-
-        public static object ReadXmlPart(Package package, Uri uri, XmlSerializer serializer)
-        {
-            if (!package.PartExists(uri))
-            {
-                throw new ApplicationException(string.Format("Package part '{0}' doesn't exists!", uri.OriginalString));
-            }
-            PackagePart part = package.GetPart(uri);
-            using (Stream stream = part.GetStream())
-            {
-                return serializer.Deserialize(stream);
-            }
-        }
-
-        public static void WriteBinaryPart(Package package, Uri uri, Stream content)
-        {
-            if (package.PartExists(uri))
-            {
-                package.DeletePart(uri);
-            }
-            PackagePart part = package.CreatePart(uri, MediaTypeNames.Application.Octet, CompressionOption.Fast);
-            using (Stream stream = part.GetStream())
-            {
-                StreamHelper.StreamToStreamAppend(content, stream);
-            }
-        }
-
-        /// <summary>
-        ///     Returns part's stream
-        /// </summary>
-        /// <param name="package"></param>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        public static Stream ReadBinaryPart(Package package, Uri uri)
-        {
-            if (!package.PartExists(uri))
-            {
-                throw new ApplicationException("Package part doesn't exists!");
-            }
-            PackagePart part = package.GetPart(uri);
-            return part.GetStream();
-        }
-
-        public static void CopyPart(Uri uri, Package source, Package dest)
-        {
-            CopyPart(uri, source, dest, true);
-        }
-
-        public static void CopyPart(Uri uri, Package source, Package dest, bool overwrite)
-        {
-            #region Check
-
-            if (ReferenceEquals(uri, null))
-            {
-                throw new ArgumentNullException("uri");
-            }
-            if (ReferenceEquals(source, null))
-            {
-                throw new ArgumentNullException("source");
-            }
-            if (ReferenceEquals(dest, null))
-            {
-                throw new ArgumentNullException("dest");
-            }
-
-            #endregion
-
-            if (dest.PartExists(uri))
-            {
-                if (!overwrite)
-                {
-                    throw new ArgumentException("Specified part already exists", "uri");
-                }
-                dest.DeletePart(uri);
-            }
-
-            PackagePart sourcePart = source.GetPart(uri);
-            PackagePart destPart = dest.CreatePart(uri, sourcePart.ContentType, sourcePart.CompressionOption);
-
-            using (Stream sourceStream = sourcePart.GetStream())
-            {
-                using (Stream destStream = destPart.GetStream())
-                {
-                    StreamHelper.StreamToStreamAppend(sourceStream, destStream);
-                }
-            }
-        }
-
-        public static void WritePart<T>(Package package, PackagePartDescriptor descriptor, T content,
-            Action<Stream, T> serializeAction)
-        {
-            #region Check
-
-            if (ReferenceEquals(package, null))
-            {
-                throw new ArgumentNullException("package");
-            }
-            if (ReferenceEquals(descriptor, null))
-            {
-                throw new ArgumentNullException("descriptor");
-            }
-            if (ReferenceEquals(serializeAction, null))
-            {
-                throw new ArgumentNullException("serializeAction");
-            }
-
-            #endregion
-
-            if (package.PartExists(descriptor.Uri))
-            {
-                package.DeletePart(descriptor.Uri);
-            }
-            PackagePart part = package.CreatePart(descriptor.Uri, descriptor.ContentType, descriptor.CompressOption);
-            using (Stream stream = part.GetStream())
-            {
-                serializeAction(stream, content);
-            }
-        }
-
-        public static void WritePart(Package package, PackagePartDescriptor descriptor, Action<Stream> serializeAction)
-        {
-            #region Check
-
-            if (ReferenceEquals(package, null))
-            {
-                throw new ArgumentNullException("package");
-            }
-            if (ReferenceEquals(descriptor, null))
-            {
-                throw new ArgumentNullException("descriptor");
-            }
-            if (ReferenceEquals(serializeAction, null))
-            {
-                throw new ArgumentNullException("serializeAction");
-            }
-
-            #endregion
-
-            if (package.PartExists(descriptor.Uri))
-            {
-                package.DeletePart(descriptor.Uri);
-            }
-            PackagePart part = package.CreatePart(descriptor.Uri, descriptor.ContentType, descriptor.CompressOption);
-            using (Stream stream = part.GetStream())
-            {
-                serializeAction(stream);
-            }
-        }
-
-        public static T ReadPart<T>(Package package, Uri uri, Func<Stream, T> deserializeFunc)
-        {
-            #region Check
-
-            if (ReferenceEquals(package, null))
-            {
-                throw new ArgumentNullException("package");
-            }
-            if (ReferenceEquals(uri, null))
-            {
-                throw new ArgumentNullException("uri");
-            }
-            if (ReferenceEquals(deserializeFunc, null))
-            {
-                throw new ArgumentNullException("deserializeFunc");
-            }
-
-            #endregion
-
-            if (!package.PartExists(uri))
-            {
-                throw new ApplicationException(string.Format("Package part '{0}' doesn't exists!", uri.OriginalString));
-            }
-            PackagePart part = package.GetPart(uri);
-            using (Stream stream = part.GetStream())
-            {
-                return deserializeFunc(stream);
-            }
-        }
-
-        public static void ReadPart(Package package, Uri uri, Action<Stream> deserializeAction)
-        {
-            #region Check
-
-            if (ReferenceEquals(package, null))
-            {
-                throw new ArgumentNullException("package");
-            }
-            if (ReferenceEquals(uri, null))
-            {
-                throw new ArgumentNullException("uri");
-            }
-            if (ReferenceEquals(deserializeAction, null))
-            {
-                throw new ArgumentNullException("deserializeAction");
-            }
-
-            #endregion
-
-            if (!package.PartExists(uri))
-            {
-                throw new ApplicationException(string.Format("Package part '{0}' doesn't exists!", uri.OriginalString));
-            }
-            PackagePart part = package.GetPart(uri);
-            using (Stream stream = part.GetStream())
-            {
-                deserializeAction(stream);
-            }
-        }
-
-        public static bool TryReadPart(Package package, Uri uri, Action<Stream> deserializeAction)
-        {
-            #region Check
-
-            if (ReferenceEquals(package, null))
-            {
-                throw new ArgumentNullException("package");
-            }
-            if (ReferenceEquals(uri, null))
-            {
-                throw new ArgumentNullException("uri");
-            }
-            if (ReferenceEquals(deserializeAction, null))
-            {
-                throw new ArgumentNullException("deserializeAction");
-            }
-
-            #endregion
-
-            if (!package.PartExists(uri))
-            {
-                return false;
-            }
-            PackagePart part = package.GetPart(uri);
-            using (Stream stream = part.GetStream())
-            {
-                deserializeAction(stream);
-            }
-            return true;
-        }
-
-        /// <summary>
-        ///     Compare to packages by parts like streams
-        /// </summary>
-        /// <param name="left"></param>
-        /// <param name="right"></param>
-        /// <param name="compareToFirstDifference"></param>
-        /// <param name="excludeMethod"></param>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        public static bool Compare(Package left, Package right, bool compareToFirstDifference, out string message)
-        {
-            return Compare(left, right, compareToFirstDifference, null, out message);
-        }
-
-        /// <summary>
-        ///     Compare to packages by parts like streams
-        /// </summary>
-        /// <param name="left"></param>
-        /// <param name="right"></param>
-        /// <param name="compareToFirstDifference"></param>
-        /// <param name="excludeMethod"></param>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        public static bool Compare(Package left, Package right, bool compareToFirstDifference,
-            Func<Uri, bool> excludeMethod, out string message)
-        {
-            #region Check
-
-            if (left == null)
-            {
-                throw new ArgumentNullException("left");
-            }
-            if (right == null)
-            {
-                throw new ArgumentNullException("right");
-            }
-
-            #endregion
-
-            excludeMethod = excludeMethod ?? (uri => false);
-            PackagePartCollection leftParts = left.GetParts();
-            PackagePartCollection rightParts = right.GetParts();
-
-            var pairs = new Dictionary<Uri, PartPair>();
-            foreach (PackagePart part in leftParts)
-            {
-                if (excludeMethod(part.Uri))
-                {
-                    continue;
-                }
-                pairs.Add(part.Uri, new PartPair(part.Uri, CompareStatus.OnlyOnLeft));
-            }
-            foreach (PackagePart part in rightParts)
-            {
-                if (excludeMethod(part.Uri))
-                {
-                    continue;
-                }
-                PartPair pair;
-                if (pairs.TryGetValue(part.Uri, out pair))
-                {
-                    pair.Status = CompareStatus.Equal;
-                }
-                else
-                {
-                    pairs.Add(part.Uri, new PartPair(part.Uri, CompareStatus.OnlyOnRight));
-                }
-            }
-
-            if (compareToFirstDifference && pairs.Any(pair => pair.Value.Status != CompareStatus.Equal))
-            {
-                goto EXIT;
-            }
-
-            foreach (PartPair pair in pairs.Values)
-            {
-                if (pair.Status != CompareStatus.Equal)
-                {
-                    continue;
-                }
-                using (Stream oneStream = left.GetPart(pair.Uri).GetStream(FileMode.Open, FileAccess.Read))
-                using (Stream otherStream = right.GetPart(pair.Uri).GetStream(FileMode.Open, FileAccess.Read))
-                {
-                    if (!StreamHelper.Compare(oneStream, otherStream))
-                    {
-                        pair.Status = CompareStatus.NonEqual;
-                        if (compareToFirstDifference)
-                        {
-                            goto EXIT;
-                        }
-                    }
-                }
-            }
-
-            EXIT:
-            List<PartPair> sortedPairs = pairs.Values.ToList();
-            sortedPairs.Sort((one, other) => one.Uri.OriginalString.CompareTo(other.Uri.OriginalString));
-            var sbuilder = new StringBuilder();
-            foreach (PartPair pair in sortedPairs)
-            {
-                if (pair.Status == CompareStatus.Equal)
-                {
-                    continue;
-                }
-                sbuilder.AppendFormat("{0} :{1}", pair.Uri, pair.Status);
-                sbuilder.AppendLine();
-            }
-            message = sbuilder.ToString();
-            return message.Length == 0;
-        }
-
-        #region Nested type: PackagePartDescriptor
-
-        public sealed class PackagePartDescriptor
-        {
-            #region Private fields
-
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly CompressionOption _compressOption;
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly string _contentType;
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly Uri _uri;
-
-            #endregion
-
-            #region Constructor
-
-            /// <summary>
-            ///     Instance constructor
-            /// </summary>
-            /// <param name="uri">Part uri</param>
-            /// <param name="contentType">Content type from <see cref="MediaTypeNames" /></param>
-            /// <param name="compressOption"></param>
-            public PackagePartDescriptor(Uri uri, string contentType, CompressionOption compressOption)
-            {
-                #region Check
-
-                if (ReferenceEquals(uri, null))
-                {
-                    throw new ArgumentNullException("uri");
-                }
-                if (string.IsNullOrEmpty(contentType))
-                {
-                    throw new ArgumentNullException("contentType");
-                }
-
-                #endregion
-
-                _uri = uri;
-                _contentType = contentType;
-                _compressOption = compressOption;
-            }
-
-            #endregion
-
-            #region Public properties
-
-            public Uri Uri
-            {
-                [DebuggerStepThrough] get { return _uri; }
-            }
-
-            public string ContentType
-            {
-                [DebuggerStepThrough] get { return _contentType; }
-            }
-
-            public CompressionOption CompressOption
-            {
-                [DebuggerStepThrough] get { return _compressOption; }
-            }
-
-            #endregion
-
-            #region Public methods
-
-            public override string ToString()
-            {
-                return string.Format("Uri:{0} ContentType: {1}, Compression: {2}", _uri, _contentType, _compressOption);
-            }
-
-            #endregion
-        }
-
-        #endregion
-
-        #region Nested type: CompareStatus
-
-        private enum CompareStatus
-        {
-            OnlyOnLeft,
-            OnlyOnRight,
-            Equal,
-            NonEqual
-        }
-
-        #endregion
-
-        #region Nested type: PartPair
-
-        private sealed class PartPair
-        {
-            #region Private fields
-
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly Uri _uri;
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private CompareStatus _status;
-
-            #endregion
-
-            #region Constructor
-
-            public PartPair(Uri uri, CompareStatus status)
-            {
-                _uri = uri;
-                _status = status;
-            }
-
-            #endregion
-
-            #region Public properties
-
-            public Uri Uri
-            {
-                [DebuggerStepThrough] get { return _uri; }
-            }
-
-            public CompareStatus Status
-            {
-                [DebuggerStepThrough] get { return _status; }
-                [DebuggerStepThrough] set { _status = value; }
-            }
-
-            #endregion
-        }
-
-        #endregion
-
-        //--
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/ResourceFileExtractor.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/ResourceFileExtractor.cs
deleted file mode 100644
index 0083f5a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/ResourceFileExtractor.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-
-namespace ClosedXML_Tests
-{
-    /// <summary>
-    /// Summary description for ResourceFileExtractor.
-    /// </summary>
-    public sealed class ResourceFileExtractor
-    {
-        #region Static
-        #region Private fields
-        private static readonly Dictionary<string, ResourceFileExtractor> ms_defaultExtractors =
-                new Dictionary<string, ResourceFileExtractor>();
-        #endregion
-        #region Public properties
-        /// <summary>Instance of resource extractor for executing assembly </summary>
-        public static ResourceFileExtractor Instance
-        {
-            get
-            {
-                ResourceFileExtractor _return;
-                Assembly _assembly = Assembly.GetCallingAssembly();
-                string _key = _assembly.GetName().FullName;
-                if (!ms_defaultExtractors.TryGetValue(_key, out _return))
-                {
-                    lock (ms_defaultExtractors)
-                    {
-                        if (!ms_defaultExtractors.TryGetValue(_key, out _return))
-                        {
-                            _return = new ResourceFileExtractor(_assembly, true, null);
-                            ms_defaultExtractors.Add(_key, _return);
-                        }
-                    }
-                }
-                return _return;
-            }
-        }
-        #endregion
-        #region Public methods
-        #endregion
-        #endregion
-        #region Private fields
-        private readonly Assembly m_assembly;
-        private readonly ResourceFileExtractor m_baseExtractor;
-        private readonly string m_assemblyName;
-
-        private bool m_isStatic;
-        private string m_resourceFilePath;
-        #endregion
-        #region Constructors
-        /// <summary>
-        /// Create instance
-        /// </summary>
-        /// <param name="resourceFilePath"><c>ResourceFilePath</c> in assembly. Example: .Properties.Scripts.</param>
-        /// <param name="baseExtractor"></param>
-        public ResourceFileExtractor(string resourceFilePath, ResourceFileExtractor baseExtractor)
-                : this(Assembly.GetCallingAssembly(), baseExtractor)
-        {
-            m_resourceFilePath = resourceFilePath;
-        }
-        /// <summary>
-        /// Create instance
-        /// </summary>
-        /// <param name="baseExtractor"></param>
-        public ResourceFileExtractor(ResourceFileExtractor baseExtractor)
-                : this(Assembly.GetCallingAssembly(), baseExtractor)
-        {
-        }
-        /// <summary>
-        /// Create instance
-        /// </summary>
-        /// <param name="resourcePath"><c>ResourceFilePath</c> in assembly. Example: .Properties.Scripts.</param>
-        public ResourceFileExtractor(string resourcePath)
-                : this(Assembly.GetCallingAssembly(), resourcePath)
-        {
-        }
-        /// <summary>
-        /// Instance constructor
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <param name="resourcePath"></param>
-        public ResourceFileExtractor(Assembly assembly, string resourcePath)
-                : this(assembly ?? Assembly.GetCallingAssembly())
-        {
-            m_resourceFilePath = resourcePath;
-        }
-        /// <summary>
-        /// Instance constructor
-        /// </summary>
-        public ResourceFileExtractor()
-                : this(Assembly.GetCallingAssembly())
-        {
-        }
-        /// <summary>
-        /// Instance constructor
-        /// </summary>
-        /// <param name="assembly"></param>
-        public ResourceFileExtractor(Assembly assembly)
-                : this(assembly ?? Assembly.GetCallingAssembly(), (ResourceFileExtractor) null)
-        {
-        }
-        /// <summary>
-        /// Instance constructor
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <param name="baseExtractor"></param>
-        public ResourceFileExtractor(Assembly assembly, ResourceFileExtractor baseExtractor)
-                : this(assembly ?? Assembly.GetCallingAssembly(), false, baseExtractor)
-        {
-        }
-        /// <summary>
-        /// Instance constructor
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <param name="isStatic"></param>
-        /// <param name="baseExtractor"></param>
-        /// <exception cref="ArgumentNullException">Argument is null.</exception>
-        private ResourceFileExtractor(Assembly assembly, bool isStatic, ResourceFileExtractor baseExtractor)
-        {
-            #region Check
-            if (ReferenceEquals(assembly, null))
-            {
-                throw new ArgumentNullException("assembly");
-            }
-            #endregion
-            m_assembly = assembly;
-            m_baseExtractor = baseExtractor;
-            m_assemblyName = Assembly.GetName().Name;
-            IsStatic = isStatic;
-            m_resourceFilePath = ".Resources.";
-        }
-        #endregion
-        #region Public properties
-        /// <summary> Work assembly </summary>
-        public Assembly Assembly
-        {
-            [DebuggerStepThrough]
-            get { return m_assembly; }
-        }
-        /// <summary> Work assembly name </summary>
-        public string AssemblyName
-        {
-            [DebuggerStepThrough]
-            get { return m_assemblyName; }
-        }
-        /// <summary>
-        /// Path to read resource files. Example: .Resources.Upgrades.
-        /// </summary>
-        public string ResourceFilePath
-        {
-            [DebuggerStepThrough]
-            get { return m_resourceFilePath; }
-            [DebuggerStepThrough]
-            set { m_resourceFilePath = value; }
-        }
-        public bool IsStatic
-        {
-            [DebuggerStepThrough]
-            get { return m_isStatic; }
-            [DebuggerStepThrough]
-            set { m_isStatic = value; }
-        }
-        public IEnumerable<string> GetFileNames()
-        {
-            string _path = AssemblyName + m_resourceFilePath;
-            foreach (string _resourceName in Assembly.GetManifestResourceNames())
-            {
-                if (_resourceName.StartsWith(_path))
-                {
-                    yield return _resourceName.Replace(_path, string.Empty);
-                }
-            }
-        }
-        #endregion
-        #region Public methods
-        public string ReadFileFromRes(string fileName)
-        {
-            Stream _stream = ReadFileFromResToStream(fileName);
-            string _result;
-            StreamReader sr = new StreamReader(_stream);
-            try
-            {
-                _result = sr.ReadToEnd();
-            }
-            finally
-            {
-                sr.Close();
-            }
-            return _result;
-        }
-
-        public string ReadFileFromResFormat(string fileName, params object[] formatArgs)
-        {
-            return string.Format(ReadFileFromRes(fileName), formatArgs);
-        }
-
-        /// <summary>
-        /// Read file in current assembly by specific path
-        /// </summary>
-        /// <param name="specificPath">Specific path</param>
-        /// <param name="fileName">Read file name</param>
-        /// <returns></returns>
-        public string ReadSpecificFileFromRes(string specificPath, string fileName)
-        {
-            ResourceFileExtractor _ext = new ResourceFileExtractor(Assembly, specificPath);
-            return _ext.ReadFileFromRes(fileName);
-        }
-        /// <summary>
-        /// Read file in current assembly by specific file name
-        /// </summary>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        /// <exception cref="ApplicationException"><c>ApplicationException</c>.</exception>
-        public Stream ReadFileFromResToStream(string fileName)
-        {
-            string _nameResFile = AssemblyName + m_resourceFilePath + fileName;
-            Stream _stream = Assembly.GetManifestResourceStream(_nameResFile);
-            #region Not found
-            if (ReferenceEquals(_stream, null))
-            {
-                #region Get from base extractor
-                if (!ReferenceEquals(m_baseExtractor, null))
-                {
-                    return m_baseExtractor.ReadFileFromResToStream(fileName);
-                }
-                #endregion
-                throw new ApplicationException("Can't find resource file " + _nameResFile);
-            }
-            #endregion
-            return _stream;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/StreamHelper.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/StreamHelper.cs
deleted file mode 100644
index 30b8d08..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/Utils/StreamHelper.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.IO;
-
-namespace ClosedXML_Tests
-{
-    /// <summary>
-    ///     Help methods for work with streams
-    /// </summary>
-    public static class StreamHelper
-    {
-        /// <summary>
-        ///     Convert stream to byte array
-        /// </summary>
-        /// <param name="pStream">Stream</param>
-        /// <returns>Byte array</returns>
-        public static byte[] StreamToArray(Stream pStream)
-        {
-            long iLength = pStream.Length;
-            var bytes = new byte[iLength];
-            for (int i = 0; i < iLength; i++)
-            {
-                bytes[i] = (byte) pStream.ReadByte();
-            }
-            pStream.Close();
-            return bytes;
-        }
-
-        /// <summary>
-        ///     Convert byte array to stream
-        /// </summary>
-        /// <param name="pBynaryArray">Byte array</param>
-        /// <param name="pStream">Open stream</param>
-        /// <returns></returns>
-        public static Stream ArrayToStreamAppend(byte[] pBynaryArray, Stream pStream)
-        {
-            #region Check params
-
-            if (ReferenceEquals(pBynaryArray, null))
-            {
-                throw new ArgumentNullException("pBynaryArray");
-            }
-            if (ReferenceEquals(pStream, null))
-            {
-                throw new ArgumentNullException("pStream");
-            }
-            if (!pStream.CanWrite)
-            {
-                throw new ArgumentException("Can't write to stream", "pStream");
-            }
-
-            #endregion
-
-            foreach (byte b in pBynaryArray)
-            {
-                pStream.WriteByte(b);
-            }
-            return pStream;
-        }
-
-        public static void StreamToStreamAppend(Stream streamIn, Stream streamToWrite)
-        {
-            StreamToStreamAppend(streamIn, streamToWrite, 0);
-        }
-
-        public static void StreamToStreamAppend(Stream streamIn, Stream streamToWrite, long dataLength)
-        {
-            #region Check params
-
-            if (ReferenceEquals(streamIn, null))
-            {
-                throw new ArgumentNullException("streamIn");
-            }
-            if (ReferenceEquals(streamToWrite, null))
-            {
-                throw new ArgumentNullException("streamToWrite");
-            }
-            if (!streamIn.CanRead)
-            {
-                throw new ArgumentException("Can't read from stream", "streamIn");
-            }
-            if (!streamToWrite.CanWrite)
-            {
-                throw new ArgumentException("Can't write to stream", "streamToWrite");
-            }
-
-            #endregion
-
-            var buf = new byte[512];
-            long length;
-            if (dataLength == 0)
-            {
-                length = streamIn.Length - streamIn.Position;
-            }
-            else
-            {
-                length = dataLength;
-            }
-            long rest = length;
-            while (rest > 0)
-            {
-                int len1 = streamIn.Read(buf, 0, rest >= 512 ? 512 : (int) rest);
-                streamToWrite.Write(buf, 0, len1);
-                rest -= len1;
-            }
-        }
-
-        /// <summary>
-        ///     Compare two streams by converting them to strings and comparing the strings
-        /// </summary>
-        /// <param name="one"></param>
-        /// <param name="other"></param>
-        /// <returns></returns>
-        public static bool Compare(Stream one, Stream other)
-        {
-            #region Check
-
-            if (one == null)
-            {
-                throw new ArgumentNullException("one");
-            }
-            if (other == null)
-            {
-                throw new ArgumentNullException("other");
-            }
-            if (one.Position != 0)
-            {
-                throw new ArgumentException("Must be in position 0", "one");
-            }
-            if (other.Position != 0)
-            {
-                throw new ArgumentException("Must be in position 0", "other");
-            }
-
-            #endregion
-
-            var stringOne = new StreamReader(one).ReadToEnd();
-            var stringOther = new StreamReader(other).ReadToEnd();
-            return stringOne == stringOther;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/XLHelperTests.cs b/ClosedXML/ClosedXML/ClosedXML_Tests/XLHelperTests.cs
deleted file mode 100644
index a73cc75..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/XLHelperTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests
-{
-    /// <summary>
-    ///     This is a test class for XLHelperTests and is intended
-    ///     to contain all XLHelperTests Unit Tests
-    /// </summary>
-    [TestFixture]
-    public class XLHelperTests
-    {
-        /// <summary>
-        ///     Gets or sets the test context which provides
-        ///     information about and functionality for the current test run.
-        /// </summary>
-        public TestContext TestContext { get; set; }
-
-        // 
-        //You can use the following additional attributes as you write your tests:
-        //
-        //Use ClassInitialize to run code before running the first test in the class
-        //[ClassInitialize()]
-        //public static void MyClassInitialize(TestContext testContext)
-        //{
-        //}
-        //
-        //Use ClassCleanup to run code after all tests in a class have run
-        //[ClassCleanup()]
-        //public static void MyClassCleanup()
-        //{
-        //}
-        //
-        //Use TestInitialize to run code before running each test
-        //[TestInitialize()]
-        //public void MyTestInitialize()
-        //{
-        //}
-        //
-        //Use TestCleanup to run code after each test has run
-        //[TestCleanup()]
-        //public void MyTestCleanup()
-        //{
-        //}
-        //
-
-        /// <summary>
-        ///     A test for IsValidColumn
-        /// </summary>
-        [Test]
-        public void IsValidColumnTest()
-        {
-            Assert.AreEqual(false, XLHelper.IsValidColumn(""));
-            Assert.AreEqual(false, XLHelper.IsValidColumn("1"));
-            Assert.AreEqual(false, XLHelper.IsValidColumn("A1"));
-            Assert.AreEqual(false, XLHelper.IsValidColumn("AA1"));
-            Assert.AreEqual(true, XLHelper.IsValidColumn("A"));
-            Assert.AreEqual(true, XLHelper.IsValidColumn("AA"));
-            Assert.AreEqual(true, XLHelper.IsValidColumn("AAA"));
-            Assert.AreEqual(true, XLHelper.IsValidColumn("Z"));
-            Assert.AreEqual(true, XLHelper.IsValidColumn("ZZ"));
-            Assert.AreEqual(true, XLHelper.IsValidColumn("XFD"));
-            Assert.AreEqual(false, XLHelper.IsValidColumn("ZAA"));
-            Assert.AreEqual(false, XLHelper.IsValidColumn("XZA"));
-            Assert.AreEqual(false, XLHelper.IsValidColumn("XFZ"));
-        }
-
-        [Test]
-        public void ReplaceRelative1()
-        {
-            string result = XLHelper.ReplaceRelative("A1", 2, "B");
-            Assert.AreEqual("B2", result);
-        }
-
-        [Test]
-        public void ReplaceRelative2()
-        {
-            string result = XLHelper.ReplaceRelative("$A1", 2, "B");
-            Assert.AreEqual("$A2", result);
-        }
-
-        [Test]
-        public void ReplaceRelative3()
-        {
-            string result = XLHelper.ReplaceRelative("A$1", 2, "B");
-            Assert.AreEqual("B$1", result);
-        }
-
-        [Test]
-        public void ReplaceRelative4()
-        {
-            string result = XLHelper.ReplaceRelative("$A$1", 2, "B");
-            Assert.AreEqual("$A$1", result);
-        }
-
-        [Test]
-        public void ReplaceRelative5()
-        {
-            string result = XLHelper.ReplaceRelative("1:1", 2, "B");
-            Assert.AreEqual("2:2", result);
-        }
-
-        [Test]
-        public void ReplaceRelative6()
-        {
-            string result = XLHelper.ReplaceRelative("$1:1", 2, "B");
-            Assert.AreEqual("$1:2", result);
-        }
-
-        [Test]
-        public void ReplaceRelative7()
-        {
-            string result = XLHelper.ReplaceRelative("1:$1", 2, "B");
-            Assert.AreEqual("2:$1", result);
-        }
-
-        [Test]
-        public void ReplaceRelative8()
-        {
-            string result = XLHelper.ReplaceRelative("$1:$1", 2, "B");
-            Assert.AreEqual("$1:$1", result);
-        }
-
-        [Test]
-        public void ReplaceRelative9()
-        {
-            string result = XLHelper.ReplaceRelative("A:A", 2, "B");
-            Assert.AreEqual("B:B", result);
-        }
-
-        [Test]
-        public void ReplaceRelativeA()
-        {
-            string result = XLHelper.ReplaceRelative("$A:A", 2, "B");
-            Assert.AreEqual("$A:B", result);
-        }
-
-        [Test]
-        public void ReplaceRelativeB()
-        {
-            string result = XLHelper.ReplaceRelative("A:$A", 2, "B");
-            Assert.AreEqual("B:$A", result);
-        }
-
-        [Test]
-        public void ReplaceRelativeC()
-        {
-            string result = XLHelper.ReplaceRelative("$A:$A", 2, "B");
-            Assert.AreEqual("$A:$A", result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Tests/packages.config b/ClosedXML/ClosedXML/ClosedXML_Tests/packages.config
deleted file mode 100644
index d47c16a..0000000
--- a/ClosedXML/ClosedXML/ClosedXML_Tests/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<packages>
-  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/DocumentFormat.OpenXml.dll b/ClosedXML/ClosedXML/DocumentFormat.OpenXml.dll
deleted file mode 100644
index a3249c1..0000000
--- a/ClosedXML/ClosedXML/DocumentFormat.OpenXml.dll
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/ClosedXML/Ionic.Zip.dll b/ClosedXML/ClosedXML/Ionic.Zip.dll
deleted file mode 100644
index 95fa928..0000000
--- a/ClosedXML/ClosedXML/Ionic.Zip.dll
+++ /dev/null
Binary files differ
diff --git a/ClosedXML/Excel/AutoFilters/IXLAutoFilter.cs b/ClosedXML/Excel/AutoFilters/IXLAutoFilter.cs
new file mode 100644
index 0000000..8859848
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/IXLAutoFilter.cs
@@ -0,0 +1,16 @@
+using System;
+namespace ClosedXML.Excel
+{
+    using System.Collections.Generic;
+
+    public interface IXLAutoFilter: IDisposable
+    {
+        IXLFilterColumn Column(String column);
+        IXLFilterColumn Column(Int32 column);
+
+        IXLAutoFilter Sort(Int32 columnToSortBy = 1, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        Boolean Sorted { get; set; }
+        XLSortOrder SortOrder { get; set; }
+        Int32 SortColumn { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/IXLBaseAutoFilter.cs b/ClosedXML/Excel/AutoFilters/IXLBaseAutoFilter.cs
new file mode 100644
index 0000000..b3f8d66
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/IXLBaseAutoFilter.cs
@@ -0,0 +1,25 @@
+using System;
+namespace ClosedXML.Excel
+{
+    using System.Collections.Generic;
+    public enum XLFilterType { Regular, Custom, TopBottom, Dynamic }
+    public enum XLFilterDynamicType { AboveAverage, BelowAverage }
+    public enum XLTopBottomPart { Top, Bottom}
+    public interface IXLBaseAutoFilter
+    {
+        Boolean Enabled { get; set; }
+        IXLRange Range { get; set; }
+        IXLBaseAutoFilter Set(IXLRangeBase range);
+        IXLBaseAutoFilter Clear();
+
+        IXLFilterColumn Column(String column);
+        IXLFilterColumn Column(Int32 column);
+
+        IXLBaseAutoFilter Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        Boolean Sorted { get; set; }
+        XLSortOrder SortOrder { get; set; }
+        Int32 SortColumn { get; set; }
+
+
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/IXLCustomFilteredColumn.cs b/ClosedXML/Excel/AutoFilters/IXLCustomFilteredColumn.cs
new file mode 100644
index 0000000..85cec03
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/IXLCustomFilteredColumn.cs
@@ -0,0 +1,19 @@
+using System;
+namespace ClosedXML.Excel
+{
+    public interface IXLCustomFilteredColumn
+    {
+        void EqualTo<T>(T value) where T : IComparable<T>;
+        void NotEqualTo<T>(T value) where T : IComparable<T>;
+        void GreaterThan<T>(T value) where T : IComparable<T>;
+        void LessThan<T>(T value) where T : IComparable<T>;
+        void EqualOrGreaterThan<T>(T value) where T : IComparable<T>;
+        void EqualOrLessThan<T>(T value) where T : IComparable<T>;
+        void BeginsWith(String value);
+        void NotBeginsWith(String value);
+        void EndsWith(String value);
+        void NotEndsWith(String value);
+        void Contains(String value);
+        void NotContains(String value);
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/IXLFilterColumn.cs b/ClosedXML/Excel/AutoFilters/IXLFilterColumn.cs
new file mode 100644
index 0000000..159faf9
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/IXLFilterColumn.cs
@@ -0,0 +1,46 @@
+using System;
+namespace ClosedXML.Excel
+{
+    public enum XLTopBottomType { Items, Percent }
+    public interface IXLFilterColumn
+    {
+        void Clear();
+
+        IXLFilteredColumn AddFilter<T>(T value) where T : IComparable<T>;
+
+        void Top(Int32 value, XLTopBottomType type = XLTopBottomType.Items);
+        void Bottom(Int32 value, XLTopBottomType type = XLTopBottomType.Items);
+        void AboveAverage();
+        void BelowAverage();
+
+        IXLFilterConnector EqualTo<T>(T value) where T : IComparable<T>;
+        IXLFilterConnector NotEqualTo<T>(T value) where T : IComparable<T>;
+        IXLFilterConnector GreaterThan<T>(T value) where T : IComparable<T>;
+        IXLFilterConnector LessThan<T>(T value) where T : IComparable<T>;
+        IXLFilterConnector EqualOrGreaterThan<T>(T value) where T : IComparable<T>;
+        IXLFilterConnector EqualOrLessThan<T>(T value) where T : IComparable<T>;
+        void Between<T>(T minValue, T maxValue) where T : IComparable<T>;
+        void NotBetween<T>(T minValue, T maxValue) where T : IComparable<T>;
+        IXLFilterConnector BeginsWith(String value);
+        IXLFilterConnector NotBeginsWith(String value);
+        IXLFilterConnector EndsWith(String value);
+        IXLFilterConnector NotEndsWith(String value);
+        IXLFilterConnector Contains(String value);
+        IXLFilterConnector NotContains(String value);
+
+        XLFilterType FilterType { get; set; }
+        Int32 TopBottomValue { get; set; }
+        XLTopBottomType TopBottomType { get; set; }
+        XLTopBottomPart TopBottomPart { get; set; }
+        XLFilterDynamicType DynamicType { get; set; }
+        Double DynamicValue { get; set; }
+
+        IXLFilterColumn SetFilterType(XLFilterType value);
+        IXLFilterColumn SetTopBottomValue(Int32 value);
+        IXLFilterColumn SetTopBottomType(XLTopBottomType value);
+        IXLFilterColumn SetTopBottomPart(XLTopBottomPart value);
+        IXLFilterColumn SetDynamicType(XLFilterDynamicType value);
+        IXLFilterColumn SetDynamicValue(Double value);
+
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/IXLFilterConnector.cs b/ClosedXML/Excel/AutoFilters/IXLFilterConnector.cs
new file mode 100644
index 0000000..7955869
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/IXLFilterConnector.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLFilterConnector
+    {
+        IXLCustomFilteredColumn And { get; }
+        IXLCustomFilteredColumn Or { get; }
+    }
+}
diff --git a/ClosedXML/Excel/AutoFilters/IXLFilteredColumn.cs b/ClosedXML/Excel/AutoFilters/IXLFilteredColumn.cs
new file mode 100644
index 0000000..6491f55
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/IXLFilteredColumn.cs
@@ -0,0 +1,8 @@
+using System;
+namespace ClosedXML.Excel
+{
+    public interface IXLFilteredColumn
+    {
+        IXLFilteredColumn AddFilter<T>(T value) where T : IComparable<T>;
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/XLAutoFilter.cs b/ClosedXML/Excel/AutoFilters/XLAutoFilter.cs
new file mode 100644
index 0000000..79430e6
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/XLAutoFilter.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections.Generic;
+
+    internal class XLAutoFilter : IXLBaseAutoFilter, IXLAutoFilter
+    {
+        private readonly Dictionary<Int32, XLFilterColumn> _columns = new Dictionary<int, XLFilterColumn>();
+
+        public XLAutoFilter()
+        {
+            Filters = new Dictionary<int, List<XLFilter>>();
+        }
+
+        public Dictionary<Int32, List<XLFilter>> Filters { get; private set; }
+
+        #region IXLAutoFilter Members
+
+        IXLAutoFilter IXLAutoFilter.Sort(Int32 columnToSortBy, XLSortOrder sortOrder, Boolean matchCase,
+                                         Boolean ignoreBlanks)
+        {
+            return Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks);
+        }
+
+        public void Dispose()
+        {
+            if (Range != null)
+                Range.Dispose();
+        }
+
+        #endregion
+
+        #region IXLBaseAutoFilter Members
+
+        public Boolean Enabled { get; set; }
+        public IXLRange Range { get; set; }
+
+        IXLBaseAutoFilter IXLBaseAutoFilter.Clear()
+        {
+            return Clear();
+        }
+
+        IXLBaseAutoFilter IXLBaseAutoFilter.Set(IXLRangeBase range)
+        {
+            return Set(range);
+        }
+
+        IXLBaseAutoFilter IXLBaseAutoFilter.Sort(Int32 columnToSortBy, XLSortOrder sortOrder, Boolean matchCase,
+                                                 Boolean ignoreBlanks)
+        {
+            return Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks);
+        }
+
+        public Boolean Sorted { get; set; }
+        public XLSortOrder SortOrder { get; set; }
+        public Int32 SortColumn { get; set; }
+
+        public IXLFilterColumn Column(String column)
+        {
+            return Column(XLHelper.GetColumnNumberFromLetter(column));
+        }
+
+        public IXLFilterColumn Column(Int32 column)
+        {
+            XLFilterColumn filterColumn;
+            if (!_columns.TryGetValue(column, out filterColumn))
+            {
+                filterColumn = new XLFilterColumn(this, column);
+                _columns.Add(column, filterColumn);
+            }
+
+            return filterColumn;
+        }
+
+        #endregion
+
+        public XLAutoFilter Set(IXLRangeBase range)
+        {
+            Range = range.AsRange();
+            Enabled = true;
+            return this;
+        }
+
+        public XLAutoFilter Clear()
+        {
+            Enabled = false;
+            Filters.Clear();
+            foreach (IXLRangeRow row in Range.Rows().Where(r => r.RowNumber() > 1))
+                row.WorksheetRow().Unhide();
+            return this;
+        }
+
+        public XLAutoFilter Sort(Int32 columnToSortBy, XLSortOrder sortOrder, Boolean matchCase, Boolean ignoreBlanks)
+        {
+            var ws = Range.Worksheet as XLWorksheet;
+            ws.SuspendEvents();
+            Range.Range(Range.FirstCell().CellBelow(), Range.LastCell()).Sort(columnToSortBy, sortOrder, matchCase,
+                                                                              ignoreBlanks);
+
+            Sorted = true;
+            SortOrder = sortOrder;
+            SortColumn = columnToSortBy;
+
+            if (Enabled)
+            {
+                using (var rows = Range.Rows(2, Range.RowCount()))
+                {
+                    foreach (IXLRangeRow row in rows)
+                        row.WorksheetRow().Unhide();
+                }
+
+                foreach (KeyValuePair<int, List<XLFilter>> kp in Filters)
+                {
+                    Boolean firstFilter = true;
+                    foreach (XLFilter filter in kp.Value)
+                    {
+                        Boolean isText = filter.Value is String;
+                        using (var rows = Range.Rows(2, Range.RowCount()))
+                        {
+                            foreach (IXLRangeRow row in rows)
+                            {
+                                Boolean match = isText
+                                                    ? filter.Condition(row.Cell(kp.Key).GetString())
+                                                    : row.Cell(kp.Key).DataType == XLCellValues.Number &&
+                                                      filter.Condition(row.Cell(kp.Key).GetDouble());
+                                if (firstFilter)
+                                {
+                                    if (match)
+                                        row.WorksheetRow().Unhide();
+                                    else
+                                        row.WorksheetRow().Hide();
+                                }
+                                else
+                                {
+                                    if (filter.Connector == XLConnector.And)
+                                    {
+                                        if (!row.WorksheetRow().IsHidden)
+                                        {
+                                            if (match)
+                                                row.WorksheetRow().Unhide();
+                                            else
+                                                row.WorksheetRow().Hide();
+                                        }
+                                    }
+                                    else if (match)
+                                        row.WorksheetRow().Unhide();
+                                }
+                            }
+                            firstFilter = false;
+                        }
+                    }
+                }
+            }
+            ws.ResumeEvents();
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/XLCustomFilteredColumn.cs b/ClosedXML/Excel/AutoFilters/XLCustomFilteredColumn.cs
new file mode 100644
index 0000000..26fd585
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/XLCustomFilteredColumn.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCustomFilteredColumn : IXLCustomFilteredColumn
+    {
+        private readonly XLAutoFilter _autoFilter;
+        private readonly Int32 _column;
+        private readonly XLConnector _connector;
+
+        public XLCustomFilteredColumn(XLAutoFilter autoFilter, Int32 column, XLConnector connector)
+        {
+            _autoFilter = autoFilter;
+            _column = column;
+            _connector = connector;
+        }
+
+        #region IXLCustomFilteredColumn Members
+
+        public void EqualTo<T>(T value) where T: IComparable<T>
+        {
+            if (typeof(T) == typeof(String))
+            {
+                ApplyCustomFilter(value, XLFilterOperator.Equal,
+                                  v =>
+                                  v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase));
+            }
+            else
+            {
+                ApplyCustomFilter(value, XLFilterOperator.Equal,
+                                  v => v.CastTo<T>().CompareTo(value) == 0);
+            }
+        }
+
+        public void NotEqualTo<T>(T value) where T: IComparable<T>
+        {
+            if (typeof(T) == typeof(String))
+            {
+                ApplyCustomFilter(value, XLFilterOperator.NotEqual,
+                                  v =>
+                                  !v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase));
+            }
+            else
+            {
+                ApplyCustomFilter(value, XLFilterOperator.NotEqual,
+                                  v => v.CastTo<T>().CompareTo(value) != 0);
+            }
+        }
+
+        public void GreaterThan<T>(T value) where T: IComparable<T>
+        {
+            ApplyCustomFilter(value, XLFilterOperator.GreaterThan,
+                              v => v.CastTo<T>().CompareTo(value) > 0);
+        }
+
+        public void LessThan<T>(T value) where T: IComparable<T>
+        {
+            ApplyCustomFilter(value, XLFilterOperator.LessThan, v => v.CastTo<T>().CompareTo(value) < 0);
+        }
+
+        public void EqualOrGreaterThan<T>(T value) where T: IComparable<T>
+        {
+            ApplyCustomFilter(value, XLFilterOperator.EqualOrGreaterThan,
+                              v => v.CastTo<T>().CompareTo(value) >= 0);
+        }
+
+        public void EqualOrLessThan<T>(T value) where T: IComparable<T>
+        {
+            ApplyCustomFilter(value, XLFilterOperator.EqualOrLessThan,
+                              v => v.CastTo<T>().CompareTo(value) <= 0);
+        }
+
+        public void BeginsWith(String value)
+        {
+            ApplyCustomFilter(value + "*", XLFilterOperator.Equal,
+                              s => ((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public void NotBeginsWith(String value)
+        {
+            ApplyCustomFilter(value + "*", XLFilterOperator.NotEqual,
+                              s =>
+                              !((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public void EndsWith(String value)
+        {
+            ApplyCustomFilter("*" + value, XLFilterOperator.Equal,
+                              s => ((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public void NotEndsWith(String value)
+        {
+            ApplyCustomFilter("*" + value, XLFilterOperator.NotEqual,
+                              s => !((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public void Contains(String value)
+        {
+            ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
+                              s => ((string)s).ToLower().Contains(value.ToLower()));
+        }
+
+        public void NotContains(String value)
+        {
+            ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
+                              s => !((string)s).ToLower().Contains(value.ToLower()));
+        }
+
+        #endregion
+
+        private void ApplyCustomFilter<T>(T value, XLFilterOperator op, Func<Object, Boolean> condition)
+            where T: IComparable<T>
+        {
+            _autoFilter.Filters[_column].Add(new XLFilter
+                                                 {
+                                                     Value = value,
+                                                     Operator = op,
+                                                     Connector = _connector,
+                                                     Condition = condition
+                                                 });
+            using (var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount()))
+            {
+                foreach (IXLRangeRow row in rows)
+                {
+                    if (_connector == XLConnector.And)
+                    {
+                        if (!row.WorksheetRow().IsHidden)
+                        {
+                            if (condition(row.Cell(_column).GetValue<T>()))
+                                row.WorksheetRow().Unhide().Dispose();
+                            else
+                                row.WorksheetRow().Hide().Dispose();
+                        }
+                    }
+                    else if (condition(row.Cell(_column).GetValue<T>()))
+                        row.WorksheetRow().Unhide().Dispose();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/XLFilter.cs b/ClosedXML/Excel/AutoFilters/XLFilter.cs
new file mode 100644
index 0000000..cf3d8b6
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/XLFilter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLConnector { And, Or }
+    public enum XLFilterOperator { Equal, NotEqual, GreaterThan, LessThan, EqualOrGreaterThan, EqualOrLessThan }
+    internal class XLFilter
+    {
+        public XLFilter(XLFilterOperator op = XLFilterOperator.Equal)
+        {
+            Operator = op;
+        }
+
+        public XLFilterOperator Operator { get; set; }
+        public Object Value { get; set; }
+        public XLConnector Connector { get; set; }
+        public Func<Object, Boolean> Condition { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/AutoFilters/XLFilterColumn.cs b/ClosedXML/Excel/AutoFilters/XLFilterColumn.cs
new file mode 100644
index 0000000..11eb172
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/XLFilterColumn.cs
@@ -0,0 +1,393 @@
+using System;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections.Generic;
+
+    internal class XLFilterColumn : IXLFilterColumn
+    {
+        private readonly XLAutoFilter _autoFilter;
+        private readonly Int32 _column;
+
+        public XLFilterColumn(XLAutoFilter autoFilter, Int32 column)
+        {
+            _autoFilter = autoFilter;
+            _column = column;
+        }
+
+        #region IXLFilterColumn Members
+
+        public void Clear()
+        {
+            if (_autoFilter.Filters.ContainsKey(_column))
+                _autoFilter.Filters.Remove(_column);
+        }
+
+        public IXLFilteredColumn AddFilter<T>(T value) where T: IComparable<T>
+        {
+            if (typeof(T) == typeof(String))
+            {
+                ApplyCustomFilter(value, XLFilterOperator.Equal,
+                                  v =>
+                                  v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase),
+                                  XLFilterType.Regular);
+            }
+            else
+            {
+                ApplyCustomFilter(value, XLFilterOperator.Equal,
+                                  v => v.CastTo<T>().CompareTo(value) == 0, XLFilterType.Regular);
+            }
+            return new XLFilteredColumn(_autoFilter, _column);
+        }
+
+        public void Top(Int32 value, XLTopBottomType type = XLTopBottomType.Items)
+        {
+            _autoFilter.Column(_column).TopBottomPart = XLTopBottomPart.Top;
+            SetTopBottom(value, type);
+        }
+
+        public void Bottom(Int32 value, XLTopBottomType type = XLTopBottomType.Items)
+        {
+            _autoFilter.Column(_column).TopBottomPart = XLTopBottomPart.Bottom;
+            SetTopBottom(value, type, false);
+        }
+
+        public void AboveAverage()
+        {
+            ShowAverage(true);
+        }
+
+        public void BelowAverage()
+        {
+            ShowAverage(false);
+        }
+
+        public IXLFilterConnector EqualTo<T>(T value) where T: IComparable<T>
+        {
+            if (typeof(T) == typeof(String))
+            {
+                return ApplyCustomFilter(value, XLFilterOperator.Equal,
+                                         v =>
+                                         v.ToString().Equals(value.ToString(),
+                                                             StringComparison.InvariantCultureIgnoreCase));
+            }
+
+            return ApplyCustomFilter(value, XLFilterOperator.Equal,
+                                     v => v.CastTo<T>().CompareTo(value) == 0);
+        }
+
+        public IXLFilterConnector NotEqualTo<T>(T value) where T: IComparable<T>
+        {
+            if (typeof(T) == typeof(String))
+            {
+                return ApplyCustomFilter(value, XLFilterOperator.NotEqual,
+                                         v =>
+                                         !v.ToString().Equals(value.ToString(),
+                                                              StringComparison.InvariantCultureIgnoreCase));
+            }
+            
+            return ApplyCustomFilter(value, XLFilterOperator.NotEqual,
+                                        v => v.CastTo<T>().CompareTo(value) != 0);
+        }
+
+        public IXLFilterConnector GreaterThan<T>(T value) where T: IComparable<T>
+        {
+            return ApplyCustomFilter(value, XLFilterOperator.GreaterThan,
+                                     v => v.CastTo<T>().CompareTo(value) > 0);
+        }
+
+        public IXLFilterConnector LessThan<T>(T value) where T: IComparable<T>
+        {
+            return ApplyCustomFilter(value, XLFilterOperator.LessThan,
+                                     v => v.CastTo<T>().CompareTo(value) < 0);
+        }
+
+        public IXLFilterConnector EqualOrGreaterThan<T>(T value) where T: IComparable<T>
+        {
+            return ApplyCustomFilter(value, XLFilterOperator.EqualOrGreaterThan,
+                                     v => v.CastTo<T>().CompareTo(value) >= 0);
+        }
+
+        public IXLFilterConnector EqualOrLessThan<T>(T value) where T: IComparable<T>
+        {
+            return ApplyCustomFilter(value, XLFilterOperator.EqualOrLessThan,
+                                     v => v.CastTo<T>().CompareTo(value) <= 0);
+        }
+
+        public void Between<T>(T minValue, T maxValue) where T: IComparable<T>
+        {
+            EqualOrGreaterThan(minValue).And.EqualOrLessThan(maxValue);
+        }
+
+        public void NotBetween<T>(T minValue, T maxValue) where T: IComparable<T>
+        {
+            LessThan(minValue).Or.GreaterThan(maxValue);
+        }
+
+        public IXLFilterConnector BeginsWith(String value)
+        {
+            return ApplyCustomFilter(value + "*", XLFilterOperator.Equal,
+                                     s => ((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public IXLFilterConnector NotBeginsWith(String value)
+        {
+            return ApplyCustomFilter(value + "*", XLFilterOperator.NotEqual,
+                                     s => !((string)s).StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public IXLFilterConnector EndsWith(String value)
+        {
+            return ApplyCustomFilter("*" + value, XLFilterOperator.Equal,
+                                     s => ((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public IXLFilterConnector NotEndsWith(String value)
+        {
+            return ApplyCustomFilter("*" + value, XLFilterOperator.NotEqual,
+                                     s => !((string)s).EndsWith(value, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        public IXLFilterConnector Contains(String value)
+        {
+            return ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
+                                     s => ((string)s).ToLower().Contains(value.ToLower()));
+        }
+
+        public IXLFilterConnector NotContains(String value)
+        {
+            return ApplyCustomFilter("*" + value + "*", XLFilterOperator.Equal,
+                                     s => !((string)s).ToLower().Contains(value.ToLower()));
+        }
+
+        public XLFilterType FilterType { get; set; }
+
+        public Int32 TopBottomValue { get; set; }
+        public XLTopBottomType TopBottomType { get; set; }
+        public XLTopBottomPart TopBottomPart { get; set; }
+
+        public XLFilterDynamicType DynamicType { get; set; }
+        public Double DynamicValue { get; set; }
+
+        #endregion
+
+        private void SetTopBottom(Int32 value, XLTopBottomType type, Boolean takeTop = true)
+        {
+            _autoFilter.Enabled = true;
+            _autoFilter.Column(_column).SetFilterType(XLFilterType.TopBottom)
+                                       .SetTopBottomValue(value)
+                                       .SetTopBottomType(type);
+
+            var values = GetValues(value, type, takeTop);
+
+            Clear();
+            _autoFilter.Filters.Add(_column, new List<XLFilter>());
+
+            Boolean addToList = true;
+            var ws = _autoFilter.Range.Worksheet as XLWorksheet;
+            ws.SuspendEvents();
+            var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount());
+                foreach (IXLRangeRow row in rows)
+                {
+                    Boolean foundOne = false;
+                    foreach (double val in values)
+                    {
+                        Func<Object, Boolean> condition = v => (v as IComparable).CompareTo(val) == 0;
+                        if (addToList)
+                        {
+                            _autoFilter.Filters[_column].Add(new XLFilter
+                                                                 {
+                                                                     Value = val,
+                                                                     Operator = XLFilterOperator.Equal,
+                                                                     Connector = XLConnector.Or,
+                                                                     Condition = condition
+                                                                 });
+                        }
+
+                        var cell = row.Cell(_column);
+                        if (cell.DataType != XLCellValues.Number || !condition(cell.GetDouble())) continue;
+                        row.WorksheetRow().Unhide();
+                        foundOne = true;
+                    }
+                    if (!foundOne)
+                        row.WorksheetRow().Hide();
+
+                    addToList = false;
+                }
+            ws.ResumeEvents();
+        }
+
+        private IEnumerable<double> GetValues(int value, XLTopBottomType type, bool takeTop)
+        {
+            using (var column = _autoFilter.Range.Column(_column))
+            {
+                using (var subColumn = column.Column(2, column.CellCount()))
+                {
+                    var cellsUsed = subColumn.CellsUsed(c => c.DataType == XLCellValues.Number);
+                    if (takeTop)
+                    {
+                        if (type == XLTopBottomType.Items)
+                        {
+                            return cellsUsed.Select(c => c.GetDouble()).OrderByDescending(d => d).Take(value).Distinct();
+                        }
+                        var numerics1 = cellsUsed.Select(c => c.GetDouble());
+                        Int32 valsToTake1 = numerics1.Count() * value / 100;
+                        return numerics1.OrderByDescending(d => d).Take(valsToTake1).Distinct();
+                    }
+
+                    if (type == XLTopBottomType.Items)
+                    {
+                        return cellsUsed.Select(c => c.GetDouble()).OrderBy(d => d).Take(value).Distinct();
+                    }
+
+                    var numerics = cellsUsed.Select(c => c.GetDouble());
+                    Int32 valsToTake = numerics.Count() * value / 100;
+                    return numerics.OrderBy(d => d).Take(valsToTake).Distinct();
+                }
+            }
+        }
+
+        private void ShowAverage(Boolean aboveAverage)
+        {
+            _autoFilter.Enabled = true;
+            _autoFilter.Column(_column).SetFilterType(XLFilterType.Dynamic)
+                .SetDynamicType(aboveAverage
+                                    ? XLFilterDynamicType.AboveAverage
+                                    : XLFilterDynamicType.BelowAverage);
+            var values = GetAverageValues(aboveAverage);
+
+
+            Clear();
+            _autoFilter.Filters.Add(_column, new List<XLFilter>());
+
+            Boolean addToList = true;
+            var ws = _autoFilter.Range.Worksheet as XLWorksheet;
+            ws.SuspendEvents();
+            var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount());
+            
+                foreach (IXLRangeRow row in rows)
+                {
+                    Boolean foundOne = false;
+                    foreach (double val in values)
+                    {
+                        Func<Object, Boolean> condition = v => (v as IComparable).CompareTo(val) == 0;
+                        if (addToList)
+                        {
+                            _autoFilter.Filters[_column].Add(new XLFilter
+                                                                 {
+                                                                     Value = val,
+                                                                     Operator = XLFilterOperator.Equal,
+                                                                     Connector = XLConnector.Or,
+                                                                     Condition = condition
+                                                                 });
+                        }
+
+                        var cell = row.Cell(_column);
+                        if (cell.DataType != XLCellValues.Number || !condition(cell.GetDouble())) continue;
+                        row.WorksheetRow().Unhide();
+                        foundOne = true;
+                    }
+
+                    if (!foundOne)
+                        row.WorksheetRow().Hide();
+
+                    addToList = false;
+                }
+            
+            ws.ResumeEvents();
+        }
+
+        private IEnumerable<double> GetAverageValues(bool aboveAverage)
+        {
+            using (var column = _autoFilter.Range.Column(_column))
+            {
+                using (var subColumn = column.Column(2, column.CellCount()))
+                {
+                    Double average = subColumn.CellsUsed(c => c.DataType == XLCellValues.Number).Select(c => c.GetDouble()).Average();
+
+                    if (aboveAverage)
+                    {
+                        return
+                            subColumn.CellsUsed(c => c.DataType == XLCellValues.Number).
+                                Select(c => c.GetDouble()).Where(c => c > average).Distinct();
+                    }
+
+                    return
+                        subColumn.CellsUsed(c => c.DataType == XLCellValues.Number).
+                            Select(c => c.GetDouble()).Where(c => c < average).Distinct();
+
+                }
+            }
+        }
+
+        private IXLFilterConnector ApplyCustomFilter<T>(T value, XLFilterOperator op, Func<Object, Boolean> condition,
+                                                        XLFilterType filterType = XLFilterType.Custom)
+            where T: IComparable<T>
+        {
+            _autoFilter.Enabled = true;
+            if (filterType == XLFilterType.Custom)
+            {
+                Clear();
+                _autoFilter.Filters.Add(_column,
+                                        new List<XLFilter>
+                                            {
+                                                new XLFilter
+                                                    {
+                                                        Value = value,
+                                                        Operator = op,
+                                                        Connector = XLConnector.Or,
+                                                        Condition = condition
+                                                    }
+                                            });
+            }
+            else
+            {
+                List<XLFilter> filterList;
+                if (_autoFilter.Filters.TryGetValue(_column, out filterList))
+                    filterList.Add(new XLFilter
+                                       {Value = value, Operator = op, Connector = XLConnector.Or, Condition = condition});
+                else
+                {
+                    _autoFilter.Filters.Add(_column,
+                                            new List<XLFilter>
+                                                {
+                                                    new XLFilter
+                                                        {
+                                                            Value = value,
+                                                            Operator = op,
+                                                            Connector = XLConnector.Or,
+                                                            Condition = condition
+                                                        }
+                                                });
+                }
+            }
+            _autoFilter.Column(_column).FilterType = filterType;
+            Boolean isText = typeof(T) == typeof(String);
+            var ws = _autoFilter.Range.Worksheet as XLWorksheet;
+            ws.SuspendEvents();
+            var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount());
+            foreach (IXLRangeRow row in rows)
+            {
+                Boolean match = isText
+                                    ? condition(row.Cell(_column).GetString())
+                                    : row.Cell(_column).DataType == XLCellValues.Number &&
+                                        condition(row.Cell(_column).GetDouble());
+                if (match)
+                    row.WorksheetRow().Unhide();
+                else
+                    row.WorksheetRow().Hide();
+            }
+            ws.ResumeEvents();
+            return new XLFilterConnector(_autoFilter, _column);
+        }
+
+        public IXLFilterColumn SetFilterType(XLFilterType value) { FilterType = value; return this; }
+        public IXLFilterColumn SetTopBottomValue(Int32 value) { TopBottomValue = value; return this; }
+        public IXLFilterColumn SetTopBottomType(XLTopBottomType value) { TopBottomType = value; return this; }
+        public IXLFilterColumn SetTopBottomPart(XLTopBottomPart value) { TopBottomPart = value; return this; }
+        public IXLFilterColumn SetDynamicType(XLFilterDynamicType value) { DynamicType = value; return this; }
+        public IXLFilterColumn SetDynamicValue(Double value) { DynamicValue = value; return this; }
+
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/XLFilterConnector.cs b/ClosedXML/Excel/AutoFilters/XLFilterConnector.cs
new file mode 100644
index 0000000..b563fd5
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/XLFilterConnector.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLFilterConnector : IXLFilterConnector
+    {
+        private readonly XLAutoFilter _autoFilter;
+        private readonly Int32 _column;
+
+        public XLFilterConnector(XLAutoFilter autoFilter, Int32 column)
+        {
+            _autoFilter = autoFilter;
+            _column = column;
+        }
+
+        #region IXLFilterConnector Members
+
+        public IXLCustomFilteredColumn And
+        {
+            get { return new XLCustomFilteredColumn(_autoFilter, _column, XLConnector.And); }
+        }
+
+        public IXLCustomFilteredColumn Or
+        {
+            get { return new XLCustomFilteredColumn(_autoFilter, _column, XLConnector.Or); }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/AutoFilters/XLFilteredColumn.cs b/ClosedXML/Excel/AutoFilters/XLFilteredColumn.cs
new file mode 100644
index 0000000..72479d0
--- /dev/null
+++ b/ClosedXML/Excel/AutoFilters/XLFilteredColumn.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLFilteredColumn : IXLFilteredColumn
+    {
+        private readonly XLAutoFilter _autoFilter;
+        private readonly Int32 _column;
+
+        public XLFilteredColumn(XLAutoFilter autoFilter, Int32 column)
+        {
+            _autoFilter = autoFilter;
+            _column = column;
+        }
+
+        #region IXLFilteredColumn Members
+
+        public IXLFilteredColumn AddFilter<T>(T value) where T: IComparable<T>
+        {
+            Func<Object, Boolean> condition;
+            Boolean isText;
+            if (typeof(T) == typeof(String))
+            {
+                condition = v => v.ToString().Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase);
+                isText = true;
+            }
+            else
+            {
+                condition = v => v.CastTo<T>().CompareTo(value) == 0;
+                isText = false;
+            }
+
+            _autoFilter.Filters[_column].Add(new XLFilter
+                                                 {
+                                                     Value = value,
+                                                     Condition = condition,
+                                                     Operator = XLFilterOperator.Equal,
+                                                     Connector = XLConnector.Or
+                                                 });
+
+            using (var rows = _autoFilter.Range.Rows(2, _autoFilter.Range.RowCount()))
+            {
+                foreach (IXLRangeRow row in rows)
+                {
+                    if ((isText && condition(row.Cell(_column).GetString())) || (
+                                                                                    !isText &&
+                                                                                    row.Cell(_column).DataType ==
+                                                                                    XLCellValues.Number &&
+                                                                                    condition(
+                                                                                        row.Cell(_column).GetValue<T>()))
+                        )
+                        row.WorksheetRow().Unhide().Dispose();
+                }
+            }
+            return this;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/CalcEngine/CalcEngine.cs b/ClosedXML/Excel/CalcEngine/CalcEngine.cs
new file mode 100644
index 0000000..f646ddc
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/CalcEngine.cs
@@ -0,0 +1,783 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Diagnostics;
+using System.Text;
+using System.Text.RegularExpressions;
+using ClosedXML.Excel.CalcEngine;
+using ClosedXML.Excel.CalcEngine.Functions;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    /// <summary>
+	/// CalcEngine parses strings and returns Expression objects that can 
+    /// be evaluated.
+	/// </summary>
+    /// <remarks>
+    /// <para>This class has three extensibility points:</para>
+    /// <para>Use the <b>DataContext</b> property to add an object's properties to the engine scope.</para>
+    /// <para>Use the <b>RegisterFunction</b> method to define custom functions.</para>
+    /// <para>Override the <b>GetExternalObject</b> method to add arbitrary variables to the engine scope.</para>
+    /// </remarks>
+	internal class CalcEngine
+	{
+		//---------------------------------------------------------------------------
+		#region ** fields
+
+		// members
+		string		_expr;				        // expression being parsed
+		int			_len;				        // length of the expression being parsed
+		int			_ptr;				        // current pointer into expression
+        string      _idChars;                   // valid characters in identifiers (besides alpha and digits)
+		Token		_token;				        // current token being parsed
+        Dictionary<object, Token> _tkTbl;       // table with tokens (+, -, etc)
+        Dictionary<string, FunctionDefinition>  _fnTbl;      // table with constants and functions (pi, sin, etc)
+        Dictionary<string, object> _vars;       // table with variables
+        object _dataContext;                    // object with properties
+        bool _optimize;                         // optimize expressions when parsing
+        ExpressionCache _cache;                 // cache with parsed expressions
+        CultureInfo _ci;                        // culture info used to parse numbers/dates
+        char _decimal, _listSep, _percent;                // localized decimal separator, list separator, percent sign
+
+        #endregion
+
+        //---------------------------------------------------------------------------
+        #region ** ctor
+
+        public CalcEngine()
+        {
+            CultureInfo = CultureInfo.InvariantCulture;
+            _tkTbl = GetSymbolTable();
+            _fnTbl = GetFunctionTable();
+            _vars = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            _cache = new ExpressionCache(this);
+            _optimize = true;
+#if DEBUG
+            //this.Test();
+#endif
+        }
+        
+        #endregion
+
+        //---------------------------------------------------------------------------
+		#region ** object model
+
+		/// <summary>
+		/// Parses a string into an <see cref="Expression"/>.
+		/// </summary>
+		/// <param name="expression">String to parse.</param>
+        /// <returns>An <see cref="Expression"/> object that can be evaluated.</returns>
+		public Expression Parse(string expression)
+		{
+			// initialize
+			_expr = expression;
+			_len  = _expr.Length; 
+			_ptr  = 0;
+
+            // skip leading equals sign
+            if (_len > 0 && _expr[0] == '=')
+            {
+                _ptr++;
+            }
+
+			// parse the expression
+			var expr = ParseExpression();
+
+			// check for errors
+			if (_token.ID != TKID.END)
+			{
+                Throw();
+			}
+
+            // optimize expression
+            if (_optimize)
+            {
+                expr = expr.Optimize();
+            }
+
+            // done
+			return expr;
+		}
+        /// <summary>
+        /// Evaluates a string.
+        /// </summary>
+        /// <param name="expression">Expression to evaluate.</param>
+        /// <returns>The value of the expression.</returns>
+        /// <remarks>
+        /// If you are going to evaluate the same expression several times,
+        /// it is more efficient to parse it only once using the <see cref="Parse"/>
+        /// method and then using the Expression.Evaluate method to evaluate
+        /// the parsed expression.
+        /// </remarks>
+		public object Evaluate(string expression)
+		{
+            var x = //Parse(expression);
+                _cache != null
+                ? _cache[expression]
+                : Parse(expression);
+			return x.Evaluate();
+		}
+        /// <summary>
+        /// Gets or sets whether the calc engine should keep a cache with parsed
+        /// expressions.
+        /// </summary>
+        public bool CacheExpressions
+        {
+            get { return _cache != null; }
+            set
+            {
+                if (value != CacheExpressions)
+                {
+                    _cache = value
+                        ? new ExpressionCache(this)
+                        : null;
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether the calc engine should optimize expressions when
+        /// they are parsed.
+        /// </summary>
+        public bool OptimizeExpressions
+        {
+            get { return _optimize; }
+            set { _optimize = value; }
+        }
+        /// <summary>
+        /// Gets or sets a string that specifies special characters that are valid for identifiers.
+        /// </summary>
+        /// <remarks>
+        /// Identifiers must start with a letter or an underscore, which may be followed by
+        /// additional letters, underscores, or digits. This string allows you to specify
+        /// additional valid characters such as ':' or '!' (used in Excel range references
+        /// for example).
+        /// </remarks>
+        public string IdentifierChars
+        {
+            get { return _idChars; }
+            set { _idChars = value; }
+        }
+        /// <summary>
+        /// Registers a function that can be evaluated by this <see cref="CalcEngine"/>.
+        /// </summary>
+        /// <param name="functionName">Function name.</param>
+        /// <param name="parmMin">Minimum parameter count.</param>
+        /// <param name="parmMax">Maximum parameter count.</param>
+        /// <param name="fn">Delegate that evaluates the function.</param>
+        public void RegisterFunction(string functionName, int parmMin, int parmMax, CalcEngineFunction fn)
+        {
+            _fnTbl.Add(functionName, new FunctionDefinition(parmMin, parmMax, fn));
+        }
+        /// <summary>
+        /// Registers a function that can be evaluated by this <see cref="CalcEngine"/>.
+        /// </summary>
+        /// <param name="functionName">Function name.</param>
+        /// <param name="parmCount">Parameter count.</param>
+        /// <param name="fn">Delegate that evaluates the function.</param>
+        public void RegisterFunction(string functionName, int parmCount, CalcEngineFunction fn)
+        {
+            RegisterFunction(functionName, parmCount, parmCount, fn);
+        }
+        /// <summary>
+        /// Gets an external object based on an identifier.
+        /// </summary>
+        /// <remarks>
+        /// This method is useful when the engine needs to create objects dynamically.
+        /// For example, a spreadsheet calc engine would use this method to dynamically create cell
+        /// range objects based on identifiers that cannot be enumerated at design time 
+        /// (such as "AB12", "A1:AB12", etc.)
+        /// </remarks>
+        public virtual object GetExternalObject(string identifier)
+        {
+            return null;
+        }
+        /// <summary>
+        /// Gets or sets the DataContext for this <see cref="CalcEngine"/>.
+        /// </summary>
+        /// <remarks>
+        /// Once a DataContext is set, all public properties of the object become available
+        /// to the CalcEngine, including sub-properties such as "Address.Street". These may
+        /// be used with expressions just like any other constant.
+        /// </remarks>
+        public virtual object DataContext
+        {
+            get { return _dataContext; }
+            set { _dataContext = value; }
+        }
+        /// <summary>
+        /// Gets the dictionary that contains function definitions.
+        /// </summary>
+        public Dictionary<string, FunctionDefinition> Functions
+        {
+            get { return _fnTbl; }
+        }
+        /// <summary>
+        /// Gets the dictionary that contains simple variables (not in the DataContext).
+        /// </summary>
+        public Dictionary<string, object> Variables
+        {
+            get { return _vars; }
+        }
+        /// <summary>
+        /// Gets or sets the <see cref="CultureInfo"/> to use when parsing numbers and dates.
+        /// </summary>
+        public CultureInfo CultureInfo
+        {
+            get { return _ci; }
+            set
+            {
+                _ci = value;
+                var nf = _ci.NumberFormat;
+                _decimal = nf.NumberDecimalSeparator[0];
+                _percent = nf.PercentSymbol[0];
+                _listSep = _ci.TextInfo.ListSeparator[0];
+            }
+        }
+
+		#endregion
+
+        //---------------------------------------------------------------------------
+        #region ** token/keyword tables
+
+        // build/get static token table
+        Dictionary<object, Token> GetSymbolTable()
+        {
+            if (_tkTbl == null)
+            {
+                _tkTbl = new Dictionary<object, Token>();
+                AddToken('&', TKID.CONCAT, TKTYPE.ADDSUB);
+                AddToken('+', TKID.ADD, TKTYPE.ADDSUB);
+                AddToken('-', TKID.SUB, TKTYPE.ADDSUB);
+                AddToken('(', TKID.OPEN, TKTYPE.GROUP);
+                AddToken(')', TKID.CLOSE, TKTYPE.GROUP);
+                AddToken('*', TKID.MUL, TKTYPE.MULDIV);
+                AddToken('.', TKID.PERIOD, TKTYPE.GROUP);
+                AddToken('/', TKID.DIV, TKTYPE.MULDIV);
+                AddToken('\\', TKID.DIVINT, TKTYPE.MULDIV);
+                AddToken('=', TKID.EQ, TKTYPE.COMPARE);
+                AddToken('>', TKID.GT, TKTYPE.COMPARE);
+                AddToken('<', TKID.LT, TKTYPE.COMPARE);
+                AddToken('^', TKID.POWER, TKTYPE.POWER);
+                AddToken("<>", TKID.NE, TKTYPE.COMPARE);
+                AddToken(">=", TKID.GE, TKTYPE.COMPARE);
+                AddToken("<=", TKID.LE, TKTYPE.COMPARE);
+                
+                // list separator is localized, not necessarily a comma
+                // so it can't be on the static table
+                //AddToken(',', TKID.COMMA, TKTYPE.GROUP);
+            }
+            return _tkTbl;
+        }
+        void AddToken(object symbol, TKID id, TKTYPE type)
+        {
+            var token = new Token(symbol, id, type);
+            _tkTbl.Add(symbol, token);
+        }
+
+        // build/get static keyword table
+        Dictionary<string, FunctionDefinition> GetFunctionTable()
+        {
+            if (_fnTbl == null)
+            {
+                // create table
+                _fnTbl = new Dictionary<string, FunctionDefinition>(StringComparer.InvariantCultureIgnoreCase);
+
+                // register built-in functions (and constants)
+                Is.Register(this);
+                Logical.Register(this);
+                MathTrig.Register(this);
+                Text.Register(this);
+                Statistical.Register(this);
+                DateAndTime.Register(this);
+            }
+            return _fnTbl;
+        }
+
+        #endregion
+
+        //---------------------------------------------------------------------------
+		#region ** private stuff
+
+		Expression ParseExpression()
+		{
+			GetToken();
+			return ParseCompare();
+		}
+		Expression ParseCompare()
+		{
+		    var x = ParseAddSub();
+			while (_token.Type == TKTYPE.COMPARE)
+			{
+		        var t = _token;
+				GetToken();
+				var exprArg = ParseAddSub();
+				x = new BinaryExpression(t, x, exprArg);
+			}
+			return x;
+		}
+		Expression ParseAddSub()
+		{
+			var x = ParseMulDiv();
+			while (_token.Type == TKTYPE.ADDSUB)
+			{
+		        var t = _token;
+				GetToken();
+				var exprArg = ParseMulDiv();
+				x = new BinaryExpression(t, x, exprArg);
+			}
+			return x;
+        }
+		Expression ParseMulDiv()
+		{
+			var x = ParsePower();
+			while (_token.Type == TKTYPE.MULDIV)
+			{
+		        var t = _token;
+				GetToken();
+				var a = ParsePower();
+				x = new BinaryExpression(t, x, a);
+			}
+			return x;
+        }
+		Expression ParsePower()
+		{
+			var x = ParseUnary();
+		    while (_token.Type == TKTYPE.POWER)
+			{
+		        var t = _token;
+				GetToken();
+				var a = ParseUnary();
+				x = new BinaryExpression(t, x, a);
+			}
+			return x;
+		}
+ 		Expression ParseUnary()
+		{ 
+			// unary plus and minus
+			if (_token.ID == TKID.ADD || _token.ID == TKID.SUB)
+			{
+				var t = _token;
+		        GetToken();
+                var a = ParseAtom();
+                return new UnaryExpression(t, a);
+			}
+
+			// not unary, return atom
+			return ParseAtom();
+		}
+		Expression ParseAtom()
+		{
+            string id;
+            Expression x = null;
+            FunctionDefinition fnDef = null;
+
+			switch (_token.Type)
+			{
+				// literals
+				case TKTYPE.LITERAL:
+					x = new Expression(_token);
+					break;
+
+                // identifiers
+                case TKTYPE.IDENTIFIER:
+
+                    // get identifier
+                    id = (string)_token.Value;
+
+                    // look for functions
+                    if (_fnTbl.TryGetValue(id, out fnDef))
+                    {
+                        var p = GetParameters();
+                        var pCnt = p == null ? 0 : p.Count;
+                        if (fnDef.ParmMin != -1 && pCnt < fnDef.ParmMin)
+                        {
+                            Throw("Too few parameters.");
+                        }
+                        if (fnDef.ParmMax != -1 && pCnt > fnDef.ParmMax)
+                        {
+                            Throw("Too many parameters.");
+                        }
+                        x = new FunctionExpression(fnDef, p);
+                        break;
+                    }
+
+                    // look for simple variables (much faster than binding!)
+                    if (_vars.ContainsKey(id))
+                    {
+                        x = new VariableExpression(_vars, id);
+                        break;
+                    }
+
+                    // look for external objects
+                    var xObj = GetExternalObject(id);
+                    if (xObj != null)
+                    {
+                        x = new XObjectExpression(xObj);
+                        break;
+                    }
+
+                    // look for bindings
+                    if (DataContext != null)
+                    {
+                        var list = new List<BindingInfo>();
+                        for (var t = _token; t != null; t = GetMember())
+                        {
+                            list.Add(new BindingInfo((string)t.Value, GetParameters()));
+                        }
+                        x = new BindingExpression(this, list, _ci);
+                        break;
+                    }
+                    Throw("Unexpected identifier");
+                    break;
+
+		        // sub-expressions
+		        case TKTYPE.GROUP:
+
+                    // anything other than opening parenthesis is illegal here
+					if (_token.ID != TKID.OPEN)
+					{
+                        Throw("Expression expected.");
+                    }
+
+					// get expression
+					GetToken();
+					x = ParseCompare();
+
+					// check that the parenthesis was closed
+					if (_token.ID != TKID.CLOSE)
+					{
+						Throw("Unbalanced parenthesis.");
+					}
+
+					break;
+		    }
+
+            // make sure we got something...
+            if (x == null)
+            {
+                Throw();
+            }
+
+			// done
+			GetToken();
+			return x;
+		}
+
+		#endregion
+
+		//---------------------------------------------------------------------------
+		#region ** parser
+
+        void GetToken()
+        {
+			// eat white space 
+			while (_ptr < _len && _expr[_ptr] <= ' ')
+			{
+				_ptr++;
+			}
+
+			// are we done?
+			if (_ptr >= _len)
+			{
+                _token = new Token(null, TKID.END, TKTYPE.GROUP);
+				return;
+			}
+
+			// prepare to parse
+            int i;
+			var c = _expr[_ptr];
+
+			// operators
+			// this gets called a lot, so it's pretty optimized.
+			// note that operators must start with non-letter/digit characters.
+            var isLetter = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+            var isDigit = c >= '0' && c <= '9';
+			if (!isLetter && !isDigit)
+			{
+				// if this is a number starting with a decimal, don't parse as operator
+                var nxt = _ptr + 1 < _len ? _expr[_ptr + 1] : 0;
+                bool isNumber = c == _decimal && nxt >= '0' && nxt <= '9';
+				if (!isNumber)
+				{
+                    // look up localized list separator
+                    if (c == _listSep)
+                    {
+                        _token = new Token(c, TKID.COMMA, TKTYPE.GROUP);
+                        _ptr++;
+                        return;
+                    }
+                    
+                    // look up single-char tokens on table
+                    Token tk;
+                    if (_tkTbl.TryGetValue(c, out tk))
+					{
+						// save token we found
+						_token = tk;
+						_ptr++;
+
+						// look for double-char tokens (special case)
+						if (_ptr < _len && (c == '>' || c == '<'))
+						{
+                            if (_tkTbl.TryGetValue(_expr.Substring(_ptr - 1, 2), out tk))
+							{
+								_token = tk;
+								_ptr++;
+							}
+						}
+
+                        // found token on the table
+						return;
+					}
+				}
+			}
+
+			// parse numbers
+            if (isDigit || c == _decimal)
+			{
+				var sci = false;
+                var pct = false;
+                var div = -1.0; // use double, not int (this may get really big)
+                var val = 0.0;
+                for (i = 0; i + _ptr < _len; i++)
+				{
+					c = _expr[_ptr + i];
+
+                    // digits always OK
+                    if (c >= '0' && c <= '9')
+                    {
+                        val = val * 10 + (c - '0');
+                        if (div > -1)
+                        {
+                            div *= 10;
+                        }
+                        continue;
+                    }
+
+					// one decimal is OK
+                    if (c == _decimal && div < 0)
+					{
+						div = 1;
+						continue;
+					}
+                    
+					// scientific notation?
+					if ((c == 'E' || c == 'e') && !sci) 
+					{
+						sci = true;
+						c = _expr[_ptr + i + 1];
+						if (c == '+' || c == '-') i++;
+						continue;
+					}
+
+                    // percentage?
+                    if (c == _percent)
+                    {
+                        pct = true;
+                        i++;
+                        break;
+                    }
+
+					// end of literal
+					break;
+				}
+
+                // end of number, get value
+                if (!sci)
+                {
+                    // much faster than ParseDouble
+                    if (div > 1)
+                    {
+                        val /= div;
+                    }
+                    if (pct)
+                    {
+                        val /= 100.0;
+                    }
+                }
+                else
+                {
+                    var lit = _expr.Substring(_ptr, i);
+                    val = ParseDouble(lit, _ci);
+                }
+
+                // build token
+                _token = new Token(val, TKID.ATOM, TKTYPE.LITERAL);
+
+                // advance pointer and return
+                _ptr += i;
+                return;
+			}
+
+			// parse strings
+			if (c == '\"')
+			{
+				// look for end quote, skip double quotes
+				for (i = 1; i + _ptr < _len; i++)
+				{
+					c = _expr[_ptr + i];
+					if (c != '\"') continue;
+					char cNext = i + _ptr < _len - 1 ? _expr[_ptr + i + 1]: ' ';
+					if (cNext != '\"') break;
+					i++;
+				}
+
+				// check that we got the end of the string
+				if (c != '\"')
+				{
+					Throw("Can't find final quote.");
+				}
+
+				// end of string
+				var lit = _expr.Substring(_ptr + 1, i - 1);
+				_ptr += i + 1;
+                _token = new Token(lit.Replace("\"\"", "\""), TKID.ATOM, TKTYPE.LITERAL);
+				return;
+			}
+
+			// parse dates (review)
+			if (c == '#')
+			{
+				// look for end #
+				for (i = 1; i + _ptr < _len; i++)
+				{
+					c = _expr[_ptr + i];
+					if (c == '#') break;
+				}
+
+				// check that we got the end of the date
+				if (c != '#') 
+				{
+					Throw("Can't find final date delimiter ('#').");
+				}
+
+				// end of date
+				var lit = _expr.Substring(_ptr + 1, i - 1);
+				_ptr += i + 1;
+                _token = new Token(DateTime.Parse(lit, _ci), TKID.ATOM, TKTYPE.LITERAL);
+				return;
+			}
+
+            // identifiers (functions, objects) must start with alpha or underscore
+            if (!isLetter && c != '_' && (_idChars == null || _idChars.IndexOf(c) < 0))
+            {
+                Throw("Identifier expected.");
+            }
+
+            // and must contain only letters/digits/_idChars
+            for (i = 1; i + _ptr < _len; i++)
+            {
+                c = _expr[_ptr + i];
+                isLetter = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+                isDigit = c >= '0' && c <= '9';
+                if (!isLetter && !isDigit && c != '_' && (_idChars == null || _idChars.IndexOf(c) < 0))
+                {
+                    break;
+                }
+            }
+
+            // got identifier
+            var id = _expr.Substring(_ptr, i);
+            _ptr += i;
+            _token = new Token(id, TKID.ATOM, TKTYPE.IDENTIFIER);
+		}
+        static double ParseDouble(string str, CultureInfo ci)
+        {
+            if (str.Length > 0 && str[str.Length - 1] == ci.NumberFormat.PercentSymbol[0])
+            {
+                str = str.Substring(0, str.Length - 1);
+                return double.Parse(str, NumberStyles.Any, ci) / 100.0;
+            }
+            return double.Parse(str, NumberStyles.Any, ci);
+        }
+        List<Expression> GetParameters() // e.g. myfun(a, b, c+2)
+		{
+			// check whether next token is a (, 
+			// restore state and bail if it's not
+			var pos  = _ptr;
+			var tk = _token;
+			GetToken();
+			if (_token.ID != TKID.OPEN)
+			{
+                _ptr = pos;
+                _token = tk;
+				return null;
+			}
+
+			// check for empty Parameter list
+			pos = _ptr;
+			GetToken();
+            if (_token.ID == TKID.CLOSE)
+            {
+                return null;
+            }
+			_ptr = pos;
+
+			// get Parameters until we reach the end of the list
+            var parms = new List<Expression>();
+			var expr = ParseExpression();
+			parms.Add(expr);
+			while (_token.ID == TKID.COMMA)
+			{
+				expr = ParseExpression();
+				parms.Add(expr);
+			}
+
+			// make sure the list was closed correctly
+			if (_token.ID != TKID.CLOSE)
+			{
+                Throw();
+			}
+
+			// done
+			return parms;
+    	}
+        Token GetMember()
+        {
+            // check whether next token is a MEMBER token ('.'), 
+            // restore state and bail if it's not
+            var pos = _ptr;
+            var tk = _token;
+            GetToken();
+            if (_token.ID != TKID.PERIOD)
+            {
+                _ptr = pos;
+                _token = tk;
+                return null;
+            }
+
+            // skip member token
+            GetToken();
+            if (_token.Type != TKTYPE.IDENTIFIER)
+            {
+                Throw("Identifier expected");
+            }
+            return _token;
+        }
+
+		#endregion
+
+		//---------------------------------------------------------------------------
+		#region ** static helpers
+
+        static void Throw()
+        {
+            Throw("Syntax error.");
+        }
+        static void Throw(string msg)
+        {
+            throw new Exception(msg);
+        }
+
+        #endregion
+	}
+
+    /// <summary>
+    /// Delegate that represents CalcEngine functions.
+    /// </summary>
+    /// <param name="parms">List of <see cref="Expression"/> objects that represent the
+    /// parameters to be used in the function call.</param>
+    /// <returns>The function result.</returns>
+    internal delegate object CalcEngineFunction(List<Expression> parms);
+}
diff --git a/ClosedXML/Excel/CalcEngine/Expression.cs b/ClosedXML/Excel/CalcEngine/Expression.cs
new file mode 100644
index 0000000..6f078c2
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Expression.cs
@@ -0,0 +1,505 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Reflection;
+using ClosedXML.Excel.CalcEngine;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+	/// <summary>
+	/// Base class that represents parsed expressions.
+	/// </summary>
+	/// <remarks>
+	/// For example:
+	/// <code>
+	/// Expression expr = scriptEngine.Parse(strExpression);
+	/// object val = expr.Evaluate();
+	/// </code>
+	/// </remarks>
+	internal class Expression : IComparable<Expression>
+	{
+		//---------------------------------------------------------------------------
+		#region ** fields
+
+		internal Token _token;
+		static CultureInfo _ci = CultureInfo.InvariantCulture;
+
+		#endregion
+
+		//---------------------------------------------------------------------------
+		#region ** ctors
+
+		internal Expression()
+		{
+			_token = new Token(null, TKID.ATOM, TKTYPE.IDENTIFIER);
+		}
+		internal Expression(object value)
+		{
+			_token = new Token(value, TKID.ATOM, TKTYPE.LITERAL);
+		}
+		internal Expression(Token tk)
+		{
+			_token = tk;
+		}
+
+		#endregion
+
+		//---------------------------------------------------------------------------
+		#region ** object model
+
+		public virtual object Evaluate()
+		{
+			if (_token.Type != TKTYPE.LITERAL)
+			{
+				throw new ArgumentException("Bad expression.");
+			}
+			return _token.Value;
+		}
+		public virtual Expression Optimize()
+		{
+			return this;
+		}
+
+		#endregion
+
+		//---------------------------------------------------------------------------
+		#region ** implicit converters
+
+		public static implicit operator string(Expression x)
+		{
+			var v = x.Evaluate();
+			return v == null ? string.Empty : v.ToString();
+		}
+		public static implicit operator double(Expression x)
+		{
+			// evaluate
+			var v = x.Evaluate();
+
+			// handle doubles
+			if (v is double)
+			{
+				return (double)v;
+			}
+
+			// handle booleans
+			if (v is bool)
+			{
+				return (bool)v ? 1 : 0;
+			}
+
+			// handle dates
+			if (v is DateTime)
+			{
+				return ((DateTime)v).ToOADate();
+			}
+
+			// handle nulls
+			if (v == null || v is String)
+			{
+				return 0;
+			}
+
+			// handle everything else
+			return (double)Convert.ChangeType(v, typeof(double), _ci);
+		}
+		public static implicit operator bool(Expression x)
+		{
+			// evaluate
+			var v = x.Evaluate();
+
+			// handle booleans
+			if (v is bool)
+			{
+				return (bool)v;
+			}
+
+			// handle nulls
+			if (v == null)
+			{
+				return false;
+			}
+
+			// handle doubles
+			if (v is double)
+			{
+				return (double)v == 0 ? false : true;
+			}
+
+			// handle everything else
+			return (double)x == 0 ? false : true;
+		}
+		public static implicit operator DateTime(Expression x)
+		{
+			// evaluate
+			var v = x.Evaluate();
+
+			// handle dates
+			if (v is DateTime)
+			{
+				return (DateTime)v;
+			}
+
+			// handle doubles
+			if (v is double)
+			{
+				return DateTime.FromOADate((double)x);
+			}
+
+			// handle everything else
+			return (DateTime)Convert.ChangeType(v, typeof(DateTime), _ci);
+		}
+
+		#endregion
+
+		//---------------------------------------------------------------------------
+		#region ** IComparable<Expression>
+
+		public int CompareTo(Expression other)
+		{
+			// get both values
+			var c1 = this.Evaluate() as IComparable;
+			var c2 = other.Evaluate() as IComparable;
+
+			// handle nulls
+			if (c1 == null && c2 == null)
+			{
+				return 0;
+			}
+			if (c2 == null)
+			{
+				return -1;
+			}
+			if (c1 == null)
+			{
+				return +1;
+			}
+
+			// make sure types are the same
+			if (c1.GetType() != c2.GetType())
+			{
+				c2 = Convert.ChangeType(c2, c1.GetType()) as IComparable;
+			}
+
+			// compare
+			return c1.CompareTo(c2);
+		}
+
+		#endregion
+	}
+	/// <summary>
+	/// Unary expression, e.g. +123
+	/// </summary>
+	class UnaryExpression : Expression
+	{
+		// ** fields
+		Expression	_expr;
+
+		// ** ctor
+		public UnaryExpression(Token tk, Expression expr) : base(tk)
+		{
+			_expr = expr;
+		}
+
+		// ** object model
+		override public object Evaluate()
+		{
+			switch (_token.ID)
+			{
+				case TKID.ADD:
+					return +(double)_expr;
+				case TKID.SUB:
+					return -(double)_expr;
+			}
+			throw new ArgumentException("Bad expression.");
+		}
+		public override Expression Optimize()
+		{
+			_expr = _expr.Optimize();
+			return _expr._token.Type == TKTYPE.LITERAL
+				? new Expression(this.Evaluate())
+				: this;
+		}
+	}
+	/// <summary>
+	/// Binary expression, e.g. 1+2
+	/// </summary>
+	class BinaryExpression : Expression
+	{
+		// ** fields
+		Expression	_lft;
+		Expression	_rgt;
+
+		// ** ctor
+		public BinaryExpression(Token tk, Expression exprLeft, Expression exprRight) : base(tk)
+		{
+			_lft  = exprLeft;
+			_rgt = exprRight;
+		}
+
+		// ** object model
+		override public object Evaluate()
+		{
+			// handle comparisons
+			if (_token.Type == TKTYPE.COMPARE)
+			{
+				var cmp = _lft.CompareTo(_rgt);
+				switch (_token.ID)
+				{
+					case TKID.GT: return cmp > 0;
+					case TKID.LT: return cmp < 0;
+					case TKID.GE: return cmp >= 0;
+					case TKID.LE: return cmp <= 0;
+					case TKID.EQ: return cmp == 0;
+					case TKID.NE: return cmp != 0;
+				}
+			}
+
+			// handle everything else
+			switch (_token.ID)
+			{
+				case TKID.CONCAT:
+					return (string)_lft + (string)_rgt;
+				case TKID.ADD: 
+					return (double)_lft + (double)_rgt;
+				case TKID.SUB: 
+					return (double)_lft - (double)_rgt;
+				case TKID.MUL: 
+					return (double)_lft * (double)_rgt;
+				case TKID.DIV: 
+					return (double)_lft / (double)_rgt;
+				case TKID.DIVINT: 
+					return (double)(int)((double)_lft / (double)_rgt);
+				case TKID.MOD: 
+					return (double)(int)((double)_lft % (double)_rgt);
+				case TKID.POWER:
+					var a = (double)_lft;
+					var b = (double)_rgt;
+					if (b == 0.0) return 1.0;
+					if (b == 0.5) return Math.Sqrt(a);
+					if (b == 1.0) return a;
+					if (b == 2.0) return a * a;
+					if (b == 3.0) return a * a * a;
+					if (b == 4.0) return a * a * a * a;
+					return Math.Pow((double)_lft, (double)_rgt);
+			}
+			throw new ArgumentException("Bad expression.");
+		}
+		public override Expression Optimize()
+		{
+			_lft = _lft.Optimize();
+			_rgt = _rgt.Optimize();
+			return _lft._token.Type == TKTYPE.LITERAL && _rgt._token.Type == TKTYPE.LITERAL
+				? new Expression(this.Evaluate())
+				: this;
+		}
+	}
+	/// <summary>
+	/// Function call expression, e.g. sin(0.5)
+	/// </summary>
+	class FunctionExpression : Expression
+	{
+		// ** fields
+		FunctionDefinition _fn;
+		List<Expression> _parms;
+
+		// ** ctor
+		internal FunctionExpression()
+		{
+		}
+		public FunctionExpression(FunctionDefinition function, List<Expression> parms)
+		{
+			_fn = function;
+			_parms = parms;
+		}
+
+		// ** object model
+		override public object Evaluate()
+		{
+			return _fn.Function(_parms);
+		}
+		public override Expression Optimize()
+		{
+			bool allLits = true;
+			if (_parms != null)
+			{
+				for (int i = 0; i < _parms.Count; i++)
+				{
+					var p = _parms[i].Optimize();
+					_parms[i] = p;
+					if (p._token.Type != TKTYPE.LITERAL)
+					{
+						allLits = false;
+					}
+				}
+			}
+			return allLits
+				? new Expression(this.Evaluate())
+				: this;
+		}
+	}
+	/// <summary>
+	/// Simple variable reference.
+	/// </summary>
+	class VariableExpression : Expression
+	{
+		Dictionary<string, object> _dct;
+		string _name;
+
+		public VariableExpression(Dictionary<string, object> dct, string name)
+		{
+			_dct = dct;
+			_name = name;
+		}
+		public override object Evaluate()
+		{
+			return _dct[_name];
+		}
+	}
+	/// <summary>
+	/// Expression based on an object's properties.
+	/// </summary>
+	class BindingExpression : Expression
+	{
+		CalcEngine _ce;
+		CultureInfo _ci;
+		List<BindingInfo> _bindingPath;
+
+		// ** ctor
+		internal BindingExpression(CalcEngine engine, List<BindingInfo> bindingPath, CultureInfo ci)
+		{
+			_ce = engine;
+			_bindingPath = bindingPath;
+			_ci = ci;
+		}
+
+		// ** object model
+		override public object Evaluate()
+		{
+			return GetValue(_ce.DataContext);
+		}
+
+		// ** implementation
+		object GetValue(object obj)
+		{
+			const BindingFlags bf =
+				BindingFlags.IgnoreCase |
+				BindingFlags.Instance |
+				BindingFlags.Public |
+				BindingFlags.Static;
+
+			if (obj != null)
+			{
+				foreach (var bi in _bindingPath)
+				{
+					// get property
+					if (bi.PropertyInfo == null)
+					{
+						bi.PropertyInfo = obj.GetType().GetProperty(bi.Name, bf);
+					}
+
+					// get object
+					try
+					{
+						obj = bi.PropertyInfo.GetValue(obj, null);
+					}
+					catch
+					{
+						// REVIEW: is this needed?
+						System.Diagnostics.Debug.Assert(false, "shouldn't happen!");
+						bi.PropertyInfo = obj.GetType().GetProperty(bi.Name, bf);
+						bi.PropertyInfoItem = null;
+						obj = bi.PropertyInfo.GetValue(obj, null);
+					}
+
+					// handle indexers (lists and dictionaries)
+					if (bi.Parms != null && bi.Parms.Count > 0)
+					{
+						// get indexer property (always called "Item")
+						if (bi.PropertyInfoItem == null)
+						{
+							bi.PropertyInfoItem = obj.GetType().GetProperty("Item", bf);
+						}
+
+						// get indexer parameters
+						var pip = bi.PropertyInfoItem.GetIndexParameters();
+						var list = new List<object>();
+						for (int i = 0; i < pip.Length; i++)
+						{
+							var pv = bi.Parms[i].Evaluate();
+							pv = Convert.ChangeType(pv, pip[i].ParameterType, _ci);
+							list.Add(pv);
+						}
+
+						// get value
+						obj = bi.PropertyInfoItem.GetValue(obj, list.ToArray());
+					}
+				}
+			}
+
+			// all done
+			return obj;
+		}
+	}
+	/// <summary>
+	/// Helper used for building BindingExpression objects.
+	/// </summary>
+	class BindingInfo
+	{
+		public BindingInfo(string member, List<Expression> parms)
+		{
+			Name = member;
+			Parms = parms;
+		}
+		public string Name { get; set; }
+		public PropertyInfo PropertyInfo { get; set; }
+		public PropertyInfo PropertyInfoItem { get; set; }
+		public List<Expression> Parms { get; set; }
+	}
+	/// <summary>
+	/// Expression that represents an external object.
+	/// </summary>
+	class XObjectExpression : 
+		Expression, 
+		IEnumerable
+	{
+		object _value;
+
+		// ** ctor
+		internal XObjectExpression(object value)
+		{
+			_value = value;
+		}
+
+		public object Value { get { return _value; } }
+
+		// ** object model
+		public override object Evaluate()
+		{
+			// use IValueObject if available
+			var iv = _value as IValueObject;
+			if (iv != null)
+			{
+				return iv.GetValue();
+			}
+
+			// return raw object
+			return _value;
+		}
+		public IEnumerator GetEnumerator()
+		{
+		    return (_value as IEnumerable).GetEnumerator();
+		}
+	}
+	/// <summary>
+	/// Interface supported by external objects that have to return a value
+	/// other than themselves (e.g. a cell range object should return the 
+	/// cell content instead of the range itself).
+	/// </summary>
+	public interface IValueObject
+	{
+		object GetValue();
+	}
+}
diff --git a/ClosedXML/Excel/CalcEngine/ExpressionCache.cs b/ClosedXML/Excel/CalcEngine/ExpressionCache.cs
new file mode 100644
index 0000000..3c7fd00
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/ExpressionCache.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    /// <summary>
+    /// Caches expressions based on their string representation.
+    /// This saves parsing time.
+    /// </summary>
+    /// <remarks>
+    /// Uses weak references to avoid accumulating unused expressions.
+    /// </remarks>
+    class ExpressionCache
+    {
+        Dictionary<string, WeakReference> _dct;
+        CalcEngine _ce;
+        int _hitCount;
+
+        public ExpressionCache(CalcEngine ce)
+        {
+            _ce = ce;
+            _dct = new Dictionary<string, WeakReference>();
+        }
+
+        // gets the parsed version of a string expression
+        public Expression this[string expression]
+        {
+            get
+            {
+                Expression x;
+                WeakReference wr;
+                if (_dct.TryGetValue(expression, out wr) && wr.IsAlive)
+                {
+                    x = wr.Target as Expression;
+                }
+                else
+                {
+                    // remove all dead references from dictionary
+                    if (wr != null && _dct.Count > 100 && _hitCount++ > 100)
+                    {
+                        RemoveDeadReferences();
+                        _hitCount = 0;
+                    }
+
+                    // store this expression
+                    x = _ce.Parse(expression);
+                    _dct[expression] = new WeakReference(x);
+                }
+                return x;
+            }
+        }
+
+        // remove all dead references from the cache
+        void RemoveDeadReferences()
+        {
+            for (bool done = false; !done; )
+            {
+                done = true;
+                foreach (var k in _dct.Keys)
+                {
+                    if (!_dct[k].IsAlive)
+                    {
+                        _dct.Remove(k);
+                        done = false;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/FunctionDefinition.cs b/ClosedXML/Excel/CalcEngine/FunctionDefinition.cs
new file mode 100644
index 0000000..fc02182
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/FunctionDefinition.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    /// <summary>
+    /// Function definition class (keeps function name, parameter counts, and delegate).
+    /// </summary>
+    internal class FunctionDefinition
+    {
+        // ** fields
+        public int ParmMin, ParmMax;
+        public CalcEngineFunction Function;
+
+        // ** ctor
+        public FunctionDefinition(int parmMin, int parmMax, CalcEngineFunction function)
+        {
+            ParmMin = parmMin;
+            ParmMax = parmMax;
+            Function = function;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/Database.cs b/ClosedXML/Excel/CalcEngine/Functions/Database.cs
new file mode 100644
index 0000000..c7aed5f
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/Database.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine.Functions
+{
+    internal static class Database
+    {
+        public static void Register(CalcEngine ce)
+        {
+            //ce.RegisterFunction("DAVERAGE", 3, Daverage); // Returns the average of selected database entries
+            //ce.RegisterFunction("DCOUNT", 1, Dcount); // Counts the cells that contain numbers in a database
+            //ce.RegisterFunction("DCOUNTA", 1, Dcounta); // Counts nonblank cells in a database
+            //ce.RegisterFunction("DGET", 1, Dget); // Extracts from a database a single record that matches the specified criteria
+            //ce.RegisterFunction("DMAX", 1, Dmax); // Returns the maximum value from selected database entries
+            //ce.RegisterFunction("DMIN", 1, Dmin); // Returns the minimum value from selected database entries
+            //ce.RegisterFunction("DPRODUCT", 1, Dproduct); // Multiplies the values in a particular field of records that match the criteria in a database
+            //ce.RegisterFunction("DSTDEV", 1, Dstdev); // Estimates the standard deviation based on a sample of selected database entries
+            //ce.RegisterFunction("DSTDEVP", 1, Dstdevp); // Calculates the standard deviation based on the entire population of selected database entries
+            //ce.RegisterFunction("DSUM", 1, Dsum); // Adds the numbers in the field column of records in the database that match the criteria
+            //ce.RegisterFunction("DVAR", 1, Dvar); // Estimates variance based on a sample from selected database entries
+            //ce.RegisterFunction("DVARP", 1, Dvarp); // Calculates variance based on the entire population of selected database entries
+        }
+
+        static object Daverage(List<Expression> p)
+        {
+            var b = true;
+            foreach (var v in p)
+            {
+                b = b && (bool)v;
+            }
+            return b;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/DateAndTime.cs b/ClosedXML/Excel/CalcEngine/Functions/DateAndTime.cs
new file mode 100644
index 0000000..d1fe392
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/DateAndTime.cs
@@ -0,0 +1,320 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine.Functions
+{
+    internal static class DateAndTime
+    {
+        public static void Register(CalcEngine ce)
+        {
+            ce.RegisterFunction("DATE", 3, Date); // Returns the serial number of a particular date
+            ce.RegisterFunction("DATEVALUE", 1, Datevalue); // Converts a date in the form of text to a serial number
+            ce.RegisterFunction("DAY", 1, Day); // Converts a serial number to a day of the month
+            ce.RegisterFunction("DAYS360", 2, 3, Days360); // Calculates the number of days between two dates based on a 360-day year
+            ce.RegisterFunction("EDATE", 2, Edate); // Returns the serial number of the date that is the indicated number of months before or after the start date
+            ce.RegisterFunction("EOMONTH", 2, Eomonth); // Returns the serial number of the last day of the month before or after a specified number of months
+            ce.RegisterFunction("HOUR", 1, Hour); // Converts a serial number to an hour
+            ce.RegisterFunction("MINUTE", 1, Minute); // Converts a serial number to a minute
+            ce.RegisterFunction("MONTH", 1, Month); // Converts a serial number to a month
+            ce.RegisterFunction("NETWORKDAYS", 2, 3, Networkdays); // Returns the number of whole workdays between two dates
+            ce.RegisterFunction("NOW", 0, Now); // Returns the serial number of the current date and time
+            ce.RegisterFunction("SECOND", 1, Second); // Converts a serial number to a second
+            ce.RegisterFunction("TIME", 3, Time); // Returns the serial number of a particular time
+            ce.RegisterFunction("TIMEVALUE", 1, Timevalue); // Converts a time in the form of text to a serial number
+            ce.RegisterFunction("TODAY", 0, Today); // Returns the serial number of today's date
+            ce.RegisterFunction("WEEKDAY", 1, 2, Weekday); // Converts a serial number to a day of the week
+            ce.RegisterFunction("WEEKNUM", 1, 2, Weeknum); // Converts a serial number to a number representing where the week falls numerically with a year
+            ce.RegisterFunction("WORKDAY", 2, 3, Workday); // Returns the serial number of the date before or after a specified number of workdays
+            ce.RegisterFunction("YEAR", 1, Year); // Converts a serial number to a year
+            ce.RegisterFunction("YEARFRAC", 2, 3, Yearfrac); // Returns the year fraction representing the number of whole days between start_date and end_date
+
+        }
+
+        private static object Date(List<Expression> p)
+        {
+            var year = (int) p[0];
+            var month = (int) p[1];
+            var day = (int) p[2];
+
+            return (int) Math.Floor(new DateTime(year, month, day).ToOADate());
+        }
+
+        private static object Datevalue(List<Expression> p)
+        {
+            var date = (string) p[0];
+
+            return (int) Math.Floor(DateTime.Parse(date).ToOADate());
+        }
+
+        private static object Day(List<Expression> p)
+        {
+            var date = (DateTime) p[0];
+
+            return date.Day;
+        }
+
+        private static object Month(List<Expression> p)
+        {
+            var date = (DateTime) p[0];
+
+            return date.Month;
+        }
+
+        private static object Year(List<Expression> p)
+        {
+            var date = (DateTime) p[0];
+
+            return date.Year;
+        }
+
+        private static object Minute(List<Expression> p)
+        {
+            var date = (DateTime) p[0];
+
+            return date.Minute;
+        }
+
+        private static object Hour(List<Expression> p)
+        {
+            var date = (DateTime) p[0];
+
+            return date.Hour;
+        }
+
+        private static object Second(List<Expression> p)
+        {
+            var date = (DateTime) p[0];
+
+            return date.Second;
+        }
+
+        private static object Now(List<Expression> p)
+        {
+            return DateTime.Now;
+        }
+
+        private static object Time(List<Expression> p)
+        {
+            var hour = (int) p[0];
+            var minute = (int) p[1];
+            var second = (int) p[2];
+
+            return new TimeSpan(0, hour, minute, second);
+        }
+
+        private static object Timevalue(List<Expression> p)
+        {
+            var date = (DateTime) p[0];
+
+            return (DateTime.MinValue + date.TimeOfDay).ToOADate();
+        }
+
+        private static object Today(List<Expression> p)
+        {
+            return DateTime.Now.Date;
+        }
+
+        private static object Days360(List<Expression> p)
+        {
+            var date1 = (DateTime) p[0];
+            var date2 = (DateTime) p[1];
+            var isEuropean = p.Count == 3 ? p[2] : false;
+
+            return Days360(date1, date2, isEuropean);
+        }
+
+        private static Int32 Days360(DateTime date1, DateTime date2, Boolean isEuropean)
+        {
+            var d1 = date1.Day;
+            var m1 = date1.Month;
+            var y1 = date1.Year;
+            var d2 = date2.Day;
+            var m2 = date2.Month;
+            var y2 = date2.Year;
+
+            if (isEuropean)
+            {
+                if (d1 == 31) d1 = 30;
+                if (d2 == 31) d2 = 30;
+            }
+            else
+            {
+                if (d1 == 31) d1 = 30;
+                if (d2 == 31 && d1 == 30) d2 = 30;
+            }
+
+            return 360 * (y2 - y1) + 30 * (m2 - m1) + (d2 - d1);
+
+        }
+
+        private static object Edate(List<Expression> p)
+        {
+            var date = (DateTime)p[0];
+            var mod = (int)p[1];
+
+            var retDate = date.AddMonths(mod);
+            return retDate;
+        }
+
+        private static object Eomonth(List<Expression> p)
+        {
+            var date = (DateTime)p[0];
+            var mod = (int)p[1];
+
+            var retDate = date.AddMonths(mod);
+            return new DateTime(retDate.Year, retDate.Month, 1).AddMonths(1).AddDays(-1);
+        }
+
+        private static object Networkdays(List<Expression> p)
+        {
+            var date1 = (DateTime)p[0];
+            var date2 = (DateTime)p[1];
+            var bankHolidays = new List<DateTime>();
+            if (p.Count == 3)
+            {
+                var t = new Tally {p[2]};
+
+                bankHolidays.AddRange(t.Select(XLHelper.GetDate));
+            }
+
+            return BusinessDaysUntil(date1, date2, bankHolidays);
+        }
+
+        /// <summary>
+        /// Calculates number of business days, taking into account:
+        ///  - weekends (Saturdays and Sundays)
+        ///  - bank holidays in the middle of the week
+        /// </summary>
+        /// <param name="firstDay">First day in the time interval</param>
+        /// <param name="lastDay">Last day in the time interval</param>
+        /// <param name="bankHolidays">List of bank holidays excluding weekends</param>
+        /// <returns>Number of business days during the 'span'</returns>
+        private static int BusinessDaysUntil(DateTime firstDay, DateTime lastDay, IEnumerable<DateTime> bankHolidays)
+        {
+            firstDay = firstDay.Date;
+            lastDay = lastDay.Date;
+            if (firstDay > lastDay)
+                throw new ArgumentException("Incorrect last day " + lastDay);
+
+            TimeSpan span = lastDay - firstDay;
+            int businessDays = span.Days + 1;
+            int fullWeekCount = businessDays / 7;
+            // find out if there are weekends during the time exceedng the full weeks
+            if (businessDays > fullWeekCount * 7)
+            {
+                // we are here to find out if there is a 1-day or 2-days weekend
+                // in the time interval remaining after subtracting the complete weeks
+                var firstDayOfWeek = (int)firstDay.DayOfWeek;
+                var lastDayOfWeek = (int)lastDay.DayOfWeek;
+                if (lastDayOfWeek < firstDayOfWeek)
+                    lastDayOfWeek += 7;
+                if (firstDayOfWeek <= 6)
+                {
+                    if (lastDayOfWeek >= 7)// Both Saturday and Sunday are in the remaining time interval
+                        businessDays -= 2;
+                    else if (lastDayOfWeek >= 6)// Only Saturday is in the remaining time interval
+                        businessDays -= 1;
+                }
+                else if (firstDayOfWeek <= 7 && lastDayOfWeek >= 7)// Only Sunday is in the remaining time interval
+                    businessDays -= 1;
+            }
+
+            // subtract the weekends during the full weeks in the interval
+            businessDays -= fullWeekCount + fullWeekCount;
+
+            // subtract the number of bank holidays during the time interval
+            foreach (var bh in bankHolidays)
+            {
+                if (firstDay <= bh && bh <= lastDay)
+                    --businessDays;
+            }
+
+            return businessDays;
+        }
+
+        private static object Weekday(List<Expression> p)
+        {
+            var dayOfWeek = (int)((DateTime)p[0]).DayOfWeek;
+            var retType = p.Count == 2 ? (int)p[1] : 1;
+
+            if (retType == 2) return dayOfWeek;
+            if (retType == 1) return dayOfWeek + 1;
+
+            return dayOfWeek - 1;
+        }
+
+        private static object Weeknum(List<Expression> p)
+        {
+            var date = (DateTime)p[0];
+            var retType = p.Count == 2 ? (int)p[1] : 1;
+
+            DayOfWeek dayOfWeek = retType == 1 ? DayOfWeek.Sunday : DayOfWeek.Monday;
+            var cal = new GregorianCalendar(GregorianCalendarTypes.Localized);
+            var val = cal.GetWeekOfYear(date, CalendarWeekRule.FirstDay, dayOfWeek);
+
+            return val;
+        }
+
+        private static object Workday(List<Expression> p)
+        {
+            var startDate = (DateTime)p[0];
+            var daysRequired = (int)p[1];
+
+            if (daysRequired == 0) return startDate;
+            if (daysRequired <  0) throw new ArgumentOutOfRangeException("DaysRequired must be >= 0.");
+
+            var bankHolidays = new List<DateTime>();
+            if (p.Count == 3)
+            {
+                var t = new Tally { p[2] };
+
+                bankHolidays.AddRange(t.Select(XLHelper.GetDate));
+            }
+            var testDate = startDate.AddDays(((daysRequired / 7) + 2) * 7);
+            return Workday(startDate, testDate, daysRequired, bankHolidays).NextWorkday(bankHolidays);
+        }
+
+        private static DateTime Workday(DateTime startDate, DateTime testDate, int daysRequired, IEnumerable<DateTime> bankHolidays)
+        {
+            
+            var businessDays = BusinessDaysUntil(startDate, testDate, bankHolidays);
+            if (businessDays == daysRequired)
+                return testDate;
+
+            int days = businessDays > daysRequired ? -1 : 1;
+
+            return Workday(startDate, testDate.AddDays(days), daysRequired, bankHolidays);
+        }
+
+        private static object Yearfrac(List<Expression> p)
+        {
+            var date1 = (DateTime) p[0];
+            var date2 = (DateTime) p[1];
+            var option = p.Count == 3 ? (int)p[2] : 0;
+
+            if (option == 0)
+                return Days360(date1, date2, false) / 360.0;
+            if (option == 1)
+                return Math.Floor((date2 - date1).TotalDays) / GetYearAverage(date1, date2);
+            if (option == 2)
+                return Math.Floor((date2 - date1).TotalDays) / 360.0;
+            if (option == 3)
+                return Math.Floor((date2 - date1).TotalDays) / 365.0;
+
+            return Days360(date1, date2, true) / 360.0;
+        }
+
+        private static Double GetYearAverage(DateTime date1, DateTime date2)
+        {
+            var daysInYears = new List<Int32>();
+            for (int year = date1.Year; year <= date2.Year; year++)
+                daysInYears.Add(DateTime.IsLeapYear(year) ? 366 : 365);
+            return daysInYears.Average();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/CalcEngine/Functions/Is.cs b/ClosedXML/Excel/CalcEngine/Functions/Is.cs
new file mode 100644
index 0000000..544f92e
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/Is.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    internal static class Is
+    {
+        public static void Register(CalcEngine ce)
+        {
+            ce.RegisterFunction("ISBLANK", 1, IsBlank);
+        }
+
+        static object IsBlank(List<Expression> p)
+        {
+            var v = (string)p[0];
+            return String.IsNullOrEmpty(v);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/Logical.cs b/ClosedXML/Excel/CalcEngine/Functions/Logical.cs
new file mode 100644
index 0000000..1b6695e
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/Logical.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    internal static class Logical
+    {
+        public static void Register(CalcEngine ce)
+        {
+            ce.RegisterFunction("AND", 1, int.MaxValue, And);
+            ce.RegisterFunction("OR", 1, int.MaxValue, Or);
+            ce.RegisterFunction("NOT", 1, Not);
+            ce.RegisterFunction("IF", 2, 3, If);
+            ce.RegisterFunction("TRUE", 0, True);
+            ce.RegisterFunction("FALSE", 0, False);
+        }
+
+        static object And(List<Expression> p)
+        {
+            var b = true;
+            foreach (var v in p)
+            {
+                b = b && (bool)v;
+            }
+            return b;
+        }
+        static object Or(List<Expression> p)
+        {
+            var b = false;
+            foreach (var v in p)
+            {
+                b = b || (bool)v;
+            }
+            return b;
+        }
+        static object Not(List<Expression> p)
+        {
+            return !(bool)p[0];
+        }
+        static object If(List<Expression> p)
+        {
+            if ((bool)p[0] )
+            {
+                return p[1].Evaluate();
+            }
+            else
+            {
+                return p.Count > 2 ? p[2].Evaluate() : false;
+            }
+        }
+        static object True(List<Expression> p)
+        {
+            return true;
+        }
+        static object False(List<Expression> p)
+        {
+            return false;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs b/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs
new file mode 100644
index 0000000..4c33e64
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs
@@ -0,0 +1,703 @@
+using System;
+using System.Diagnostics;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using System.Text.RegularExpressions;
+using ClosedXML.Excel.CalcEngine.Functions;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    internal static class MathTrig
+    {
+        private static readonly Random _rnd = new Random();
+
+        public static void Register(CalcEngine ce)
+        {
+            ce.RegisterFunction("ABS", 1, Abs);
+            ce.RegisterFunction("ACOS", 1, Acos);
+            ce.RegisterFunction("ACOSH", 1, Acosh);
+            ce.RegisterFunction("ASIN", 1, Asin);
+            ce.RegisterFunction("ASINH", 1, Asinh);
+            ce.RegisterFunction("ATAN", 1, Atan);
+            ce.RegisterFunction("ATAN2", 2, Atan2);
+            ce.RegisterFunction("ATANH", 1, Atanh);
+            ce.RegisterFunction("CEILING", 1, Ceiling);
+            ce.RegisterFunction("COMBIN", 2, Combin);
+            ce.RegisterFunction("COS", 1, Cos);
+            ce.RegisterFunction("COSH", 1, Cosh);
+            ce.RegisterFunction("DEGREES", 1, Degrees);
+            ce.RegisterFunction("EVEN", 1, Even);
+            ce.RegisterFunction("EXP", 1, Exp);
+            ce.RegisterFunction("FACT", 1, Fact);
+            ce.RegisterFunction("FACTDOUBLE", 1, FactDouble);
+            ce.RegisterFunction("FLOOR", 1, Floor);
+            ce.RegisterFunction("GCD", 1, 255, Gcd);
+            ce.RegisterFunction("INT", 1, Int);
+            ce.RegisterFunction("LCM", 1, 255, Lcm);
+            ce.RegisterFunction("LN", 1, Ln);
+            ce.RegisterFunction("LOG", 1, 2, Log);
+            ce.RegisterFunction("LOG10", 1, Log10);
+            ce.RegisterFunction("MDETERM", 1, MDeterm);
+            ce.RegisterFunction("MINVERSE", 1, MInverse);
+            ce.RegisterFunction("MMULT", 2, MMult);
+            ce.RegisterFunction("MOD", 2, Mod);
+            ce.RegisterFunction("MROUND", 2, MRound);
+            ce.RegisterFunction("MULTINOMIAL", 1, 255, Multinomial);
+            ce.RegisterFunction("ODD", 1, Odd);
+            ce.RegisterFunction("PI", 0, Pi);
+            ce.RegisterFunction("POWER", 2, Power);
+            ce.RegisterFunction("PRODUCT", 1, 255, Product);
+            ce.RegisterFunction("QUOTIENT", 2, Quotient);
+            ce.RegisterFunction("RADIANS", 1, Radians);
+            ce.RegisterFunction("RAND", 0, Rand);
+            ce.RegisterFunction("RANDBETWEEN", 2, RandBetween);
+            ce.RegisterFunction("ROMAN", 1, 2, Roman);
+            ce.RegisterFunction("ROUND", 2, Round);
+            ce.RegisterFunction("ROUNDDOWN", 2, RoundDown);
+            ce.RegisterFunction("ROUNDUP", 1, 2, RoundUp);
+            ce.RegisterFunction("SERIESSUM", 4, SeriesSum);
+            ce.RegisterFunction("SIGN", 1, Sign);
+            ce.RegisterFunction("SIN", 1, Sin);
+            ce.RegisterFunction("SINH", 1, Sinh);
+            ce.RegisterFunction("SQRT", 1, Sqrt);
+            ce.RegisterFunction("SQRTPI", 1, SqrtPi);
+            ce.RegisterFunction("SUBTOTAL", 2, 255, Subtotal);
+            ce.RegisterFunction("SUM", 1, int.MaxValue, Sum);
+            ce.RegisterFunction("SUMIF", 2, 3, SumIf);
+            //ce.RegisterFunction("SUMPRODUCT", 1, SumProduct);
+            ce.RegisterFunction("SUMSQ", 1, 255, SumSq);
+            //ce.RegisterFunction("SUMX2MY2", SumX2MY2, 1);
+            //ce.RegisterFunction("SUMX2PY2", SumX2PY2, 1);
+            //ce.RegisterFunction("SUMXMY2", SumXMY2, 1);
+            ce.RegisterFunction("TAN", 1, Tan);
+            ce.RegisterFunction("TANH", 1, Tanh);
+            ce.RegisterFunction("TRUNC", 1, Trunc);
+        }
+
+        private static object Abs(List<Expression> p)
+        {
+            return Math.Abs(p[0]);
+        }
+
+        private static object Acos(List<Expression> p)
+        {
+            return Math.Acos(p[0]);
+        }
+
+        private static object Asin(List<Expression> p)
+        {
+            return Math.Asin(p[0]);
+        }
+
+        private static object Atan(List<Expression> p)
+        {
+            return Math.Atan(p[0]);
+        }
+
+        private static object Atan2(List<Expression> p)
+        {
+            return Math.Atan2(p[0], p[1]);
+        }
+
+        private static object Ceiling(List<Expression> p)
+        {
+            return Math.Ceiling(p[0]);
+        }
+
+        private static object Cos(List<Expression> p)
+        {
+            return Math.Cos(p[0]);
+        }
+
+        private static object Cosh(List<Expression> p)
+        {
+            return Math.Cosh(p[0]);
+        }
+
+        private static object Exp(List<Expression> p)
+        {
+            return Math.Exp(p[0]);
+        }
+
+        private static object Floor(List<Expression> p)
+        {
+            return Math.Floor(p[0]);
+        }
+
+        private static object Int(List<Expression> p)
+        {
+            return (int) ((double) p[0]);
+        }
+
+        private static object Ln(List<Expression> p)
+        {
+            return Math.Log(p[0]);
+        }
+
+        private static object Log(List<Expression> p)
+        {
+            var lbase = p.Count > 1 ? (double) p[1] : 10;
+            return Math.Log(p[0], lbase);
+        }
+
+        private static object Log10(List<Expression> p)
+        {
+            return Math.Log10(p[0]);
+        }
+
+        private static object Pi(List<Expression> p)
+        {
+            return Math.PI;
+        }
+
+        private static object Power(List<Expression> p)
+        {
+            return Math.Pow(p[0], p[1]);
+        }
+
+        private static object Rand(List<Expression> p)
+        {
+            return _rnd.NextDouble();
+        }
+
+        private static object RandBetween(List<Expression> p)
+        {
+            return _rnd.Next((int) (double) p[0], (int) (double) p[1]);
+        }
+
+        private static object Sign(List<Expression> p)
+        {
+            return Math.Sign(p[0]);
+        }
+
+        private static object Sin(List<Expression> p)
+        {
+            return Math.Sin(p[0]);
+        }
+
+        private static object Sinh(List<Expression> p)
+        {
+            return Math.Sinh(p[0]);
+        }
+
+        private static object Sqrt(List<Expression> p)
+        {
+            return Math.Sqrt(p[0]);
+        }
+
+        private static object Sum(List<Expression> p)
+        {
+            var tally = new Tally();
+            foreach (var e in p)
+            {
+                tally.Add(e);
+            }
+            return tally.Sum();
+        }
+
+        private static object SumIf(List<Expression> p)
+        {
+            // get parameters
+            var range = p[0] as IEnumerable;
+            var sumRange = p.Count < 3 ? range : p[2] as IEnumerable;
+            var criteria = p[1].Evaluate();
+
+            // build list of values in range and sumRange
+            var rangeValues = new List<object>();
+            foreach (var value in range)
+            {
+                rangeValues.Add(value);
+            }
+            var sumRangeValues = new List<object>();
+            foreach (var value in sumRange)
+            {
+                sumRangeValues.Add(value);
+            }
+
+            // compute total
+            var ce = new CalcEngine();
+            var tally = new Tally();
+            for (var i = 0; i < Math.Min(rangeValues.Count, sumRangeValues.Count); i++)
+            {
+                if (ValueSatisfiesCriteria(rangeValues[i], criteria, ce))
+                {
+                    tally.AddValue(sumRangeValues[i]);
+                }
+            }
+
+            // done
+            return tally.Sum();
+        }
+
+        private static bool ValueSatisfiesCriteria(object value, object criteria, CalcEngine ce)
+        {
+            // safety...
+            if (value == null)
+            {
+                return false;
+            }
+
+            // if criteria is a number, straight comparison
+            if (criteria is double)
+            {
+                if (value is Double)
+                    return (double) value == (double) criteria;
+                Double dValue;
+                return Double.TryParse(value.ToString(), out dValue) && dValue == (double) criteria;
+            }
+
+            // convert criteria to string
+            var cs = criteria as string;
+            if (!string.IsNullOrEmpty(cs))
+            {
+                // if criteria is an expression (e.g. ">20"), use calc engine
+                if (cs[0] == '=' || cs[0] == '<' || cs[0] == '>')
+                {
+                    // build expression
+                    var expression = string.Format("{0}{1}", value, cs);
+
+                    // add quotes if necessary
+                    var pattern = @"(\w+)(\W+)(\w+)";
+                    var m = Regex.Match(expression, pattern);
+                    if (m.Groups.Count == 4)
+                    {
+                        double d;
+                        if (!double.TryParse(m.Groups[1].Value, out d) ||
+                            !double.TryParse(m.Groups[3].Value, out d))
+                        {
+                            expression = string.Format("\"{0}\"{1}\"{2}\"",
+                                                       m.Groups[1].Value,
+                                                       m.Groups[2].Value,
+                                                       m.Groups[3].Value);
+                        }
+                    }
+
+                    // evaluate
+                    return (bool) ce.Evaluate(expression);
+                }
+
+                // if criteria is a regular expression, use regex
+                if (cs.IndexOf('*') > -1)
+                {
+                    var pattern = cs.Replace(@"\", @"\\");
+                    pattern = pattern.Replace(".", @"\");
+                    pattern = pattern.Replace("*", ".*");
+                    return Regex.IsMatch(value.ToString(), pattern, RegexOptions.IgnoreCase);
+                }
+
+                // straight string comparison 
+                return string.Equals(value.ToString(), cs, StringComparison.OrdinalIgnoreCase);
+            }
+
+            // should never get here?
+            Debug.Assert(false, "failed to evaluate criteria in SumIf");
+            return false;
+        }
+
+        private static object Tan(List<Expression> p)
+        {
+            return Math.Tan(p[0]);
+        }
+
+        private static object Tanh(List<Expression> p)
+        {
+            return Math.Tanh(p[0]);
+        }
+
+        private static object Trunc(List<Expression> p)
+        {
+            return (double) (int) ((double) p[0]);
+        }
+
+        public static double DegreesToRadians(double degrees)
+        {
+            return (Math.PI/180.0)*degrees;
+        }
+
+        public static double RadiansToDegrees(double radians)
+        {
+            return (180.0/Math.PI)*radians;
+        }
+
+        public static double GradsToRadians(double grads)
+        {
+            return (grads/200.0)*Math.PI;
+        }
+
+        public static double RadiansToGrads(double radians)
+        {
+            return (radians/Math.PI)*200.0;
+        }
+
+        public static double DegreesToGrads(double degrees)
+        {
+            return (degrees/9.0)*10.0;
+        }
+
+        public static double GradsToDegrees(double grads)
+        {
+            return (grads/10.0)*9.0;
+        }
+
+        public static double ASinh(double x)
+        {
+            return (Math.Log(x + Math.Sqrt(x*x + 1.0)));
+        }
+
+        private static object Acosh(List<Expression> p)
+        {
+            return XLMath.ACosh(p[0]);
+        }
+
+        private static object Asinh(List<Expression> p)
+        {
+            return XLMath.ASinh(p[0]);
+        }
+
+        private static object Atanh(List<Expression> p)
+        {
+            return XLMath.ATanh(p[0]);
+        }
+
+        private static object Combin(List<Expression> p)
+        {
+            Int32 n = (int) p[0];
+            Int32 k = (int) p[1];
+            return XLMath.Combin(n, k);
+        }
+
+        private static object Degrees(List<Expression> p)
+        {
+            return p[0] * (180.0 / Math.PI);
+        }
+
+
+
+        private static object Fact(List<Expression> p)
+        {
+            var num = Math.Floor(p[0]);
+            double fact = 1.0;
+            if (num > 1)
+                for (int i = 2; i <= num; i++)
+                    fact *= i;
+            return fact;
+        }
+
+        private static object FactDouble(List<Expression> p)
+        {
+            var num = Math.Floor(p[0]);
+            double fact = 1.0;
+            if (num > 1)
+            {
+                var start = Math.Abs(num % 2) < XLHelper.Epsilon ? 2 : 1;
+                for (int i = start; i <= num; i = i + 2)
+                    fact *= i;
+            }
+            return fact;
+        }
+
+        private static object Gcd(List<Expression> p)
+        {
+            return p.Select(v => (int)v).Aggregate(Gcd);
+        }
+
+        private static int Gcd(int a, int b)
+        {
+            return b == 0 ? a : Gcd(b, a % b);
+        }
+
+        private static object Lcm(List<Expression> p)
+        {
+            return p.Select(v => (int)v).Aggregate(Lcm);
+        }
+
+        private static int Lcm(int a, int b)
+        {
+            if (a == 0 || b == 0) return 0;
+            return a * ( b / Gcd(a, b));
+        }
+
+        private static object Mod(List<Expression> p)
+        {
+            Int32 n = (int)Math.Abs(p[0]);
+            Int32 d = (int)p[1];
+            var ret = n % d;
+            return d < 0 ? ret * -1 : ret;
+        }
+
+        private static object MRound(List<Expression> p)
+        {
+            var n = (Decimal)(Double)p[0];
+            var k = (Decimal)(Double)p[1];
+
+            var mod = n % k;
+            var mult = Math.Floor(n / k);
+            var div = k / 2;
+
+            if (Math.Abs(mod - div) <= (Decimal)XLHelper.Epsilon) return (k * mult) + k;
+
+            return k * mult;
+        }
+
+        private static object Multinomial(List<Expression> p)
+        {
+            return Multinomial(p.Select(v => (double)v).ToList());
+        }
+
+        private static double Multinomial(List<double> numbers)
+        {
+            double numbersSum = 0;
+            foreach (var number in numbers)
+                numbersSum += number;
+
+            double maxNumber = numbers.Max();
+            var denomFactorPowers = new double[(uint)numbers.Max() + 1];
+            foreach (var number in numbers)
+                for (int i = 2; i <= number; i++)
+                    denomFactorPowers[i]++;
+            for (int i = 2; i < denomFactorPowers.Length; i++)
+                denomFactorPowers[i]--; // reduce with nominator;
+
+            int currentFactor = 2;
+            double currentPower = 1;
+            double result = 1;
+            for (double i = maxNumber + 1; i <= numbersSum; i++)
+            {
+                double tempDenom = 1;
+                while (tempDenom < result && currentFactor < denomFactorPowers.Length)
+                {
+                    if (currentPower > denomFactorPowers[currentFactor])
+                    {
+                        currentFactor++;
+                        currentPower = 1;
+                    }
+                    else
+                    {
+                        tempDenom *= currentFactor;
+                        currentPower++;
+                    }
+                }
+                result = result / tempDenom * i;
+            }
+
+            return result;
+        }
+
+        private static object Odd(List<Expression> p)
+        {
+            var num = (int)Math.Ceiling(p[0]);
+            var addValue = num >= 0 ? 1 : -1;
+            return XLMath.IsOdd(num) ? num : num + addValue;
+        }
+
+        private static object Even(List<Expression> p)
+        {
+            var num = (int)Math.Ceiling(p[0]);
+            var addValue = num >= 0 ? 1 : -1;
+            return XLMath.IsEven(num) ? num : num + addValue;
+        }
+
+        private static object Product(List<Expression> p)
+        {
+            if (p.Count == 0) return 0;
+            Double total = 1;
+            p.ForEach(v => total *= v);
+            return total;
+        }
+
+        private static object Quotient(List<Expression> p)
+        {
+            Double n = p[0];
+            Double k = p[1];
+
+            return (int)(n / k);
+        }
+
+        private static object Radians(List<Expression> p)
+        {
+            return p[0] * Math.PI / 180.0;
+        }
+
+        private static object Roman(List<Expression> p)
+        {
+            Int32 intTemp;
+            Boolean boolTemp;
+            if (p.Count == 1
+                || (Boolean.TryParse(p[1]._token.Value.ToString(), out boolTemp) && boolTemp)
+                || (Int32.TryParse(p[1]._token.Value.ToString(), out intTemp) && intTemp == 1))
+                return XLMath.ToRoman((int)p[0]);
+
+            throw new ArgumentException("Can only support classic roman types.");
+        }
+
+        private static object Round(List<Expression> p)
+        {
+            var value = (Double)p[0];
+            var digits = (Int32)(Double)p[1];
+            if (digits >= 0)
+            {
+                return Math.Round(value, digits);
+            }
+            else
+            {
+                digits = Math.Abs(digits);
+                double temp = value / Math.Pow(10, digits);
+                temp = Math.Round(temp, 0);
+                return temp * Math.Pow(10, digits);
+            }
+
+        }
+
+        private static object RoundDown(List<Expression> p)
+        {
+            var value = (Double)p[0];
+            var digits = (Int32)(Double)p[1];
+
+            if (value >= 0)
+                return Math.Floor(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
+
+            return Math.Ceiling(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
+        }
+
+        private static object RoundUp(List<Expression> p)
+        {
+            var value = (Double)p[0];
+            var digits = (Int32)(Double)p[1];
+
+            if (value >= 0)
+                return Math.Ceiling(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
+
+            return Math.Floor(value * Math.Pow(10, digits)) / Math.Pow(10, digits);
+        }
+
+        private static object SeriesSum(List<Expression> p)
+        {
+            var x = (Double)p[0];
+            var n = (Double)p[1];
+            var m = (Double)p[2];
+            var obj = p[3] as XObjectExpression;
+
+            if (obj == null)
+                return p[3] * Math.Pow(x , n);
+
+            Double total = 0;
+            Int32 i = 0;
+            foreach (var e in obj)
+            {
+                total += (double)e * Math.Pow(x, n + i * m);
+                i++;
+            }
+
+            return total;
+        }
+
+        private static object SqrtPi(List<Expression> p)
+        {
+            var num = (Double)p[0];
+            return Math.Sqrt(Math.PI * num);
+        }
+
+        private static object Subtotal(List<Expression> p)
+        {
+            var fId = (int)(Double)p[0];
+            var tally = new Tally(p.Skip(1));
+
+            switch (fId)
+            {
+                case 1:
+                    return tally.Average();
+                case 2:
+                    return tally.Count();
+                case 3:
+                    return tally.CountA();
+                case 4:
+                    return tally.Max();
+                case 5:
+                    return tally.Min();
+                case 6:
+                    return tally.Product();
+                case 7:
+                    return tally.Std();
+                case 8:
+                    return tally.StdP();
+                case 9:
+                    return tally.Sum();
+                case 10:
+                    return tally.Var();
+                case 11:
+                    return tally.VarP();
+                default:
+                    throw new ArgumentException("Function not supported.");
+            }
+        }
+
+        private static object SumSq(List<Expression> p)
+        {
+            var t = new Tally(p);
+            return t.Numerics().Sum(v => Math.Pow(v, 2));
+        }
+
+        private static object MMult(List<Expression> p)
+        {
+            Double[,] A = GetArray(p[0]);
+            Double[,] B = GetArray(p[1]);
+
+            if (A.GetLength(0) != B.GetLength(0) || A.GetLength(1) != B.GetLength(1))
+                throw new ArgumentException("Ranges must have the same number of rows and columns.");
+
+            var C = new double[A.GetLength(0), A.GetLength(1)];
+            for (int i = 0; i < A.GetLength(0); i++)
+            {
+                for (int j = 0; j < B.GetLength(1); j++)
+                {
+                    for (int k = 0; k < A.GetLength(1); k++)
+                    {
+                        C[i, j] += A[i, k] * B[k, j];
+                    }
+                }
+            }
+
+
+            return C;
+        }
+
+        private static double[,] GetArray(Expression expression)
+        {
+            var oExp1 = expression as XObjectExpression;
+            if (oExp1 == null) return new [,]{{(Double)expression}};
+
+            var range = (oExp1.Value as CellRangeReference).Range;
+            var rowCount = range.RowCount();
+            var columnCount = range.ColumnCount();
+            var arr = new double[rowCount,columnCount];
+
+            for (int row = 0; row < rowCount; row++)
+            {
+                for (int column = 0; column < columnCount; column++)
+                {
+                    arr[row, column] = range.Cell(row + 1, column + 1).GetDouble();
+                }
+            }
+
+            return arr;
+        }
+
+        private static object MDeterm(List<Expression> p)
+        {
+            var arr = GetArray(p[0]);
+            var m = new XLMatrix(arr);
+
+            return m.Determinant();
+        }
+
+        private static object MInverse(List<Expression> p)
+        {
+            var arr = GetArray(p[0]);
+            var m = new XLMatrix(arr);
+
+            return m.Invert().mat;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/CalcEngine/Functions/Statistical.cs b/ClosedXML/Excel/CalcEngine/Functions/Statistical.cs
new file mode 100644
index 0000000..973bb90
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/Statistical.cs
@@ -0,0 +1,215 @@
+using System;
+using System.Net;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    internal static class Statistical
+    {
+        public static void Register(CalcEngine ce)
+        {
+            //ce.RegisterFunction("AVEDEV", AveDev, 1, int.MaxValue);
+            ce.RegisterFunction("AVERAGE", 1, int.MaxValue, Average);
+            ce.RegisterFunction("AVERAGEA", 1, int.MaxValue, AverageA);
+            //BETADIST	Returns the beta cumulative distribution function
+            //BETAINV	Returns the inverse of the cumulative distribution function for a specified beta distribution
+            //BINOMDIST	Returns the individual term binomial distribution probability
+            //CHIDIST	Returns the one-tailed probability of the chi-squared distribution
+            //CHIINV	Returns the inverse of the one-tailed probability of the chi-squared distribution
+            //CHITEST	Returns the test for independence
+            //CONFIDENCE	Returns the confidence interval for a population mean
+            //CORREL	Returns the correlation coefficient between two data sets
+            ce.RegisterFunction("COUNT", 1, int.MaxValue, Count);
+            ce.RegisterFunction("COUNTA", 1, int.MaxValue, CountA);
+            ce.RegisterFunction("COUNTBLANK", 1, int.MaxValue, CountBlank);
+            ce.RegisterFunction("COUNTIF", 2, CountIf);
+            //COVAR	Returns covariance, the average of the products of paired deviations
+            //CRITBINOM	Returns the smallest value for which the cumulative binomial distribution is less than or equal to a criterion value
+            //DEVSQ	Returns the sum of squares of deviations
+            //EXPONDIST	Returns the exponential distribution
+            //FDIST	Returns the F probability distribution
+            //FINV	Returns the inverse of the F probability distribution
+            //FISHER	Returns the Fisher transformation
+            //FISHERINV	Returns the inverse of the Fisher transformation
+            //FORECAST	Returns a value along a linear trend
+            //FREQUENCY	Returns a frequency distribution as a vertical array
+            //FTEST	Returns the result of an F-test
+            //GAMMADIST	Returns the gamma distribution
+            //GAMMAINV	Returns the inverse of the gamma cumulative distribution
+            //GAMMALN	Returns the natural logarithm of the gamma function, Γ(x)
+            //GEOMEAN	Returns the geometric mean
+            //GROWTH	Returns values along an exponential trend
+            //HARMEAN	Returns the harmonic mean
+            //HYPGEOMDIST	Returns the hypergeometric distribution
+            //INTERCEPT	Returns the intercept of the linear regression line
+            //KURT	Returns the kurtosis of a data set
+            //LARGE	Returns the k-th largest value in a data set
+            //LINEST	Returns the parameters of a linear trend
+            //LOGEST	Returns the parameters of an exponential trend
+            //LOGINV	Returns the inverse of the lognormal distribution
+            //LOGNORMDIST	Returns the cumulative lognormal distribution
+            ce.RegisterFunction("MAX", 1, int.MaxValue, Max);
+            ce.RegisterFunction("MAXA", 1, int.MaxValue, MaxA);
+            //MEDIAN	Returns the median of the given numbers
+            ce.RegisterFunction("MIN", 1, int.MaxValue, Min);
+            ce.RegisterFunction("MINA", 1, int.MaxValue, MinA);
+            //MODE	Returns the most common value in a data set
+            //NEGBINOMDIST	Returns the negative binomial distribution
+            //NORMDIST	Returns the normal cumulative distribution
+            //NORMINV	Returns the inverse of the normal cumulative distribution
+            //NORMSDIST	Returns the standard normal cumulative distribution
+            //NORMSINV	Returns the inverse of the standard normal cumulative distribution
+            //PEARSON	Returns the Pearson product moment correlation coefficient
+            //PERCENTILE	Returns the k-th percentile of values in a range
+            //PERCENTRANK	Returns the percentage rank of a value in a data set
+            //PERMUT	Returns the number of permutations for a given number of objects
+            //POISSON	Returns the Poisson distribution
+            //PROB	Returns the probability that values in a range are between two limits
+            //QUARTILE	Returns the quartile of a data set
+            //RANK	Returns the rank of a number in a list of numbers
+            //RSQ	Returns the square of the Pearson product moment correlation coefficient
+            //SKEW	Returns the skewness of a distribution
+            //SLOPE	Returns the slope of the linear regression line
+            //SMALL	Returns the k-th smallest value in a data set
+            //STANDARDIZE	Returns a normalized value
+            ce.RegisterFunction("STDEV", 1, int.MaxValue, StDev);
+            ce.RegisterFunction("STDEVA", 1, int.MaxValue, StDevA);
+            ce.RegisterFunction("STDEVP", 1, int.MaxValue, StDevP);
+            ce.RegisterFunction("STDEVPA", 1, int.MaxValue, StDevPA);
+            //STEYX	Returns the standard error of the predicted y-value for each x in the regression
+            //TDIST	Returns the Student's t-distribution
+            //TINV	Returns the inverse of the Student's t-distribution
+            //TREND	Returns values along a linear trend
+            //TRIMMEAN	Returns the mean of the interior of a data set
+            //TTEST	Returns the probability associated with a Student's t-test
+            ce.RegisterFunction("VAR", 1, int.MaxValue, Var);
+            ce.RegisterFunction("VARA", 1, int.MaxValue, VarA);
+            ce.RegisterFunction("VARP", 1, int.MaxValue, VarP);
+            ce.RegisterFunction("VARPA", 1, int.MaxValue, VarPA);
+            //WEIBULL	Returns the Weibull distribution
+            //ZTEST	Returns the one-tailed probability-value of a z-test
+        }
+
+
+
+        static object Average(List<Expression> p)
+        {
+            return GetTally(p, true).Average();
+        }
+        static object AverageA(List<Expression> p)
+        {
+            return GetTally(p, false).Average();
+        }
+        static object Count(List<Expression> p)
+        {
+            return GetTally(p, true).Count();
+        }
+        static object CountA(List<Expression> p)
+        {
+            return GetTally(p, false).Count();
+        }
+        static object CountBlank(List<Expression> p)
+        {
+            var cnt = 0.0;
+            foreach (Expression e in p)
+            {
+                var ienum = e as IEnumerable;
+                if (ienum != null)
+                {
+                    foreach (var value in ienum)
+                    {
+                        if (IsBlank(value))
+                            cnt++;
+                    }
+                }
+                else
+                {
+                    if (IsBlank(e.Evaluate()))
+                        cnt++;
+                }
+            }
+            return cnt;
+        }
+        static bool IsBlank(object value)
+        {
+            return 
+                value == null || 
+                value is string && ((string)value).Length == 0;
+        }
+        static object CountIf(List<Expression> p)
+        {
+            CalcEngine ce = new CalcEngine();
+            var cnt = 0.0;
+            var ienum = p[0] as IEnumerable;
+            if (ienum != null)
+            {
+                var crit = (string)p[1].Evaluate();
+                foreach (var value in ienum)
+                {
+                    if (!IsBlank(value))
+                    {
+                        var exp = string.Format("{0}{1}", value, crit);
+                        if ((bool)ce.Evaluate(exp))
+                            cnt++;
+                    }
+                }
+            }
+            return cnt;
+        }
+        static object Max(List<Expression> p)
+        {
+            return GetTally(p, true).Max();
+        }
+        static object MaxA(List<Expression> p)
+        {
+            return GetTally(p, false).Max();
+        }
+        static object Min(List<Expression> p)
+        {
+            return GetTally(p, true).Min();
+        }
+        static object MinA(List<Expression> p)
+        {
+            return GetTally(p, false).Min();
+        }
+        static object StDev(List<Expression> p)
+        {
+            return GetTally(p, true).Std();
+        }
+        static object StDevA(List<Expression> p)
+        {
+            return GetTally(p, false).Std();
+        }
+        static object StDevP(List<Expression> p)
+        {
+            return GetTally(p, true).StdP();
+        }
+        static object StDevPA(List<Expression> p)
+        {
+            return GetTally(p, false).StdP();
+        }
+        static object Var(List<Expression> p)
+        {
+            return GetTally(p, true).Var();
+        }
+        static object VarA(List<Expression> p)
+        {
+            return GetTally(p, false).Var();
+        }
+        static object VarP(List<Expression> p)
+        {
+            return GetTally(p, true).VarP();
+        }
+        static object VarPA(List<Expression> p)
+        {
+            return GetTally(p, false).VarP();
+        }
+
+        // utility for tallying statistics
+        static Tally GetTally(List<Expression> p, bool numbersOnly)
+        {
+            return new Tally(p);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/Tally.cs b/ClosedXML/Excel/CalcEngine/Functions/Tally.cs
new file mode 100644
index 0000000..f7d76fc
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/Tally.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Net;
+using System.Collections;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    internal class Tally: IEnumerable<Object>
+    {
+        private readonly List<object> _list = new List<object>();
+
+        public Tally(){}
+        public Tally(IEnumerable<Expression> p)
+        {
+            foreach (var e in p)
+            {
+                Add(e);
+            }
+        }
+
+        public void Add(Expression e)
+        {
+            // handle enumerables
+            var ienum = e as IEnumerable;
+            if (ienum != null)
+            {
+                foreach (var value in ienum)
+                {
+                    _list.Add(value);
+                }
+                return;
+            }
+
+            // handle expressions
+            var val = e.Evaluate();
+            var valEnumerable = val as IEnumerable;
+            if (valEnumerable == null || val is string)
+                _list.Add(val);
+            else
+                foreach (var v in valEnumerable)
+                    _list.Add(v);
+        }
+
+        public void AddValue(Object v)
+        {
+            _list.Add(v);
+        }
+
+        public double Count() { return _list.Count; }
+        public double CountA()
+        {
+            Double cntA = 0;
+            foreach (var value in _list)
+            {
+                var vEnumerable = value as IEnumerable;
+                if (vEnumerable == null)
+                    cntA += AddCount(value);
+                else
+                {
+                    foreach (var v in vEnumerable)
+                    {
+                        cntA += AddCount(v);
+                        break;
+                    }
+                }
+            }
+            return cntA;
+        }
+
+        private static double AddCount(object value)
+        {
+            var strVal = value as String;
+            if (value != null && (strVal == null || !XLHelper.IsNullOrWhiteSpace(strVal)))
+                return 1;
+            return 0;
+        }
+
+        public List<Double> Numerics()
+        {
+            List<Double> retVal = new List<double>();
+            foreach (var value in _list)
+            {
+                var vEnumerable = value as IEnumerable;
+                if (vEnumerable == null)
+                    AddNumericValue(value, retVal);
+                else
+                {
+                    foreach (var v in vEnumerable)
+                    {
+                        AddNumericValue(v, retVal);
+                        break;
+                    }
+                }
+            }
+            return retVal;
+        }
+
+        private static void AddNumericValue(object value, List<double> retVal)
+        {
+            Double tmp;
+            if (Double.TryParse(value.ToString(), out tmp))
+            {
+                retVal.Add(tmp);
+            }
+        }
+
+        public double Product()
+        {
+            var nums = Numerics();
+            if (nums.Count == 0) return 0;
+
+            Double retVal = 1;
+            nums.ForEach(n => retVal *= n);
+
+            return retVal;
+        }
+        public double Sum() { return Numerics().Sum(); }
+        public double Average()
+        {
+            return Numerics().Count == 0 ? 0 : Numerics().Average();
+        }
+
+        public double Min()
+        {
+            return Numerics().Count == 0 ? 0 : Numerics().Min();
+        }
+
+        public double Max()
+        {
+            return Numerics().Count == 0 ? 0 : Numerics().Max();
+        }
+
+        public double Range()
+        {
+            var nums = Numerics();
+            return nums.Max() - nums.Min();
+        }
+
+        private double Sum2(List<Double> nums)
+        {
+            return nums.Sum(d => d * d);
+        }
+
+        public double VarP()
+        {
+            var nums = Numerics();
+            var avg = nums.Average();
+            var sum2 = nums.Sum(d => d * d);
+            return nums.Count <= 1 ? 0 : sum2 / nums.Count - avg * avg;
+        }
+        public double StdP()
+        {
+            var nums = Numerics();
+            var avg = nums.Average();
+            var sum2 = nums.Sum(d => d * d);
+            return nums.Count <= 1 ? 0 : Math.Sqrt(sum2 / nums.Count - avg * avg);
+        }
+        public double Var()
+        {
+            var nums = Numerics();
+            var avg = nums.Average();
+            var sum2 = nums.Sum(d => d * d);
+            return nums.Count <= 1 ? 0 : (sum2 / nums.Count - avg * avg) * nums.Count / (nums.Count - 1);
+        }
+        public double Std()
+        {
+            var values = Numerics();
+            double ret = 0;
+            if (values.Count > 0)
+            {
+                //Compute the Average      
+                double avg = values.Average();
+                //Perform the Sum of (value-avg)_2_2      
+                double sum = values.Sum(d => Math.Pow(d - avg, 2));
+                //Put it all together      
+                ret = Math.Sqrt((sum) / (values.Count() - 1));
+            }
+            return ret;
+
+        }
+
+        public IEnumerator<object> GetEnumerator()
+        {
+            return _list.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/Text.cs b/ClosedXML/Excel/CalcEngine/Functions/Text.cs
new file mode 100644
index 0000000..0da3a1a
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/Text.cs
@@ -0,0 +1,261 @@
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    internal static class Text
+    {
+        public static void Register(CalcEngine ce)
+        {
+            ce.RegisterFunction("ASC", 1, Asc); // Changes full-width (double-byte) English letters or katakana within a character string to half-width (single-byte) characters
+            //ce.RegisterFunction("BAHTTEXT	Converts a number to text, using the ß (baht) currency format
+            ce.RegisterFunction("CHAR", 1, _Char); // Returns the character specified by the code number
+            ce.RegisterFunction("CLEAN", 1, Clean); //	Removes all nonprintable characters from text
+            ce.RegisterFunction("CODE", 1, Code); // Returns a numeric code for the first character in a text string
+            ce.RegisterFunction("CONCATENATE", 1, int.MaxValue, Concat); //	Joins several text items into one text item
+            ce.RegisterFunction("DOLLAR", 1, 2, Dollar); // Converts a number to text, using the $ (dollar) currency format
+            ce.RegisterFunction("EXACT", 2, Exact); // Checks to see if two text values are identical
+            ce.RegisterFunction("FIND", 2, 3, Find); //Finds one text value within another (case-sensitive)
+            ce.RegisterFunction("FIXED", 1, 3, Fixed); // Formats a number as text with a fixed number of decimals
+            //ce.RegisterFunction("JIS	Changes half-width (single-byte) English letters or katakana within a character string to full-width (double-byte) characters
+            ce.RegisterFunction("LEFT", 1, 2, Left); // LEFTB	Returns the leftmost characters from a text value
+            ce.RegisterFunction("LEN", 1, Len); //, Returns the number of characters in a text string
+            ce.RegisterFunction("LOWER", 1, Lower); //	Converts text to lowercase
+            ce.RegisterFunction("MID", 3, Mid); // Returns a specific number of characters from a text string starting at the position you specify
+            //ce.RegisterFunction("PHONETIC	Extracts the phonetic (furigana) characters from a text string
+            ce.RegisterFunction("PROPER", 1, Proper); // Capitalizes the first letter in each word of a text value
+            ce.RegisterFunction("REPLACE", 4, Replace); // Replaces characters within text
+            ce.RegisterFunction("REPT", 2, Rept); // Repeats text a given number of times
+            ce.RegisterFunction("RIGHT", 1, 2, Right); // Returns the rightmost characters from a text value
+            ce.RegisterFunction("SEARCH", 2, Search); // Finds one text value within another (not case-sensitive)
+            ce.RegisterFunction("SUBSTITUTE", 3, 4, Substitute); // Substitutes new text for old text in a text string
+            ce.RegisterFunction("T", 1, T); // Converts its arguments to text
+            ce.RegisterFunction("TEXT", 2, _Text); // Formats a number and converts it to text
+            ce.RegisterFunction("TRIM", 1, Trim); // Removes spaces from text
+            ce.RegisterFunction("UPPER", 1, Upper); // Converts text to uppercase
+            ce.RegisterFunction("VALUE", 1, Value); // Converts a text argument to a number
+            ce.RegisterFunction("HYPERLINK", 1, Hyperlink);
+        }
+
+        static object _Char(List<Expression> p)
+        {
+            var c = (char)(int)p[0];
+            return c.ToString();
+        }
+        static object Code(List<Expression> p)
+        {
+            var s = (string)p[0];
+            return (int)s[0];
+        }
+        static object Concat(List<Expression> p)
+        {
+            var sb = new StringBuilder();
+            foreach (var x in p)
+            {
+                sb.Append((string)x);
+            }
+            return sb.ToString();
+        }
+        static object Find(List<Expression> p)
+        {
+            return IndexOf(p, StringComparison.Ordinal);
+        }
+        static int IndexOf(List<Expression> p, StringComparison cmp)
+        {
+            var srch = (string)p[0];
+            var text = (string)p[1];
+            var start = 0;
+            if (p.Count > 2)
+            {
+                start = (int)p[2] - 1;
+            }
+            var index = text.IndexOf(srch, start, cmp);
+            return index > -1 ? index + 1 : index;
+        }
+        static object Left(List<Expression> p)
+        {
+            var str = (string)p[0];
+            var n = 1;
+            if (p.Count > 1)
+            {
+                n = (int)p[1];
+            }
+            if (n >= str.Length) return str;
+
+            return str.Substring(0, n);
+        }
+        static object Len(List<Expression> p)
+        {
+            return ((string)p[0]).Length;
+        }
+        static object Lower(List<Expression> p)
+        {
+            return ((string)p[0]).ToLower();
+        }
+        static object Mid(List<Expression> p)
+        {
+            var str = (string)p[0];
+            var start = (int)p[1] - 1;
+            var length = (int)p[2];
+            if (start > str.Length - 1)
+                return String.Empty;
+            if (start + length > str.Length - 1)
+                return str.Substring(start);
+            return str.Substring(start, length);
+        }
+        static object Proper(List<Expression> p)
+        {
+            var s = (string)p[0];
+            return s.Substring(0, 1).ToUpper() + s.Substring(1).ToLower();
+        }
+        static object Replace(List<Expression> p)
+        {
+            // old start len new
+            var s = (string)p[0];
+            var start = (int)p[1] - 1;
+            var len = (int)p[2];
+            var rep = (string)p[3];
+
+            var sb = new StringBuilder();
+            sb.Append(s.Substring(0, start));
+            sb.Append(rep);
+            sb.Append(s.Substring(start + len));
+
+            return sb.ToString();
+        }
+        static object Rept(List<Expression> p)
+        {
+            var sb = new StringBuilder();
+            var s = (string)p[0];
+            for (int i = 0; i < (int)p[1]; i++)
+            {
+                sb.Append(s);
+            }
+            return sb.ToString();
+        }
+        static object Right(List<Expression> p)
+        {
+            var str = (string)p[0];
+            var n = 1;
+            if (p.Count > 1)
+            {
+                n = (int)p[1];
+            }
+            
+            if (n >= str.Length) return str;
+
+            return str.Substring(str.Length - n);
+        }
+        static object Search(List<Expression> p)
+        {
+            return IndexOf(p, StringComparison.OrdinalIgnoreCase);
+        }
+        static object Substitute(List<Expression> p)
+        {
+            // get parameters
+            var text = (string)p[0];
+            var oldText = (string)p[1];
+            var newText = (string)p[2];
+
+            // if index not supplied, replace all
+            if (p.Count == 3)
+            {
+                return text.Replace(oldText, newText);
+            }
+
+            // replace specific instance
+            int index = (int)p[3];
+            if (index < 1)
+            {
+                throw new Exception("Invalid index in Substitute.");
+            }
+            int pos = text.IndexOf(oldText);
+            while (pos > -1 && index > 1)
+            {
+                pos = text.IndexOf(oldText, pos + 1);
+                index--;
+            }
+            return pos > -1
+                ? text.Substring(0, pos) + newText + text.Substring(pos + oldText.Length)
+                : text;
+        }
+        static object T(List<Expression> p)
+        {
+            return (string)p[0];
+        }
+        static object _Text(List<Expression> p)
+        {
+            return ((double)p[0]).ToString((string)p[1], CultureInfo.CurrentCulture);
+        }
+        static object Trim(List<Expression> p)
+        {
+            //Should not trim non breaking space
+            //See http://office.microsoft.com/en-us/excel-help/trim-function-HP010062581.aspx
+            return ((string)p[0]).Trim(' ');
+        }
+        static object Upper(List<Expression> p)
+        {
+            return ((string)p[0]).ToUpper();
+        }
+        static object Value(List<Expression> p)
+        {
+            return double.Parse((string)p[0], NumberStyles.Any, CultureInfo.InvariantCulture);
+        }
+
+        static object Asc(List<Expression> p)
+        {
+            return (string)p[0];
+        }
+
+        static object Hyperlink(List<Expression> p)
+        {
+            String address = p[0];
+            String toolTip = p.Count == 2 ? p[1] : String.Empty;
+            return new XLHyperlink(address, toolTip);
+        }
+
+        static object Clean(List<Expression> p)
+        {
+            var s = (string)p[0];
+
+            var result = new StringBuilder();
+            foreach (var c in from c in s let b = (byte)c where b >= 32 select c)
+            {
+                result.Append(c);
+            }
+            return result.ToString();
+        }
+        static object Dollar(List<Expression> p)
+        {
+            Double value = p[0];
+            int dec = p.Count == 2 ? (int)p[1] : 2;
+
+            return value.ToString("C" + dec);
+        }
+
+        static object Exact(List<Expression> p)
+        {
+            var t1 = (string)p[0];
+            var t2 = (string)p[1];
+
+            return t1 == t2;
+        }
+
+        static object Fixed(List<Expression> p)
+        {
+            Double value = p[0];
+            int dec = p.Count >= 2 ? (int)p[1] : 2;
+            Boolean com = p.Count != 3 || p[2];
+
+            var retVal = value.ToString("N" + dec);
+            if (com)
+                return retVal;
+
+            return retVal.Replace(",", String.Empty);
+        }
+    }    
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs b/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs
new file mode 100644
index 0000000..63c052c
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine.Functions
+{
+    public static class XLMath
+    {
+        public static double DegreesToRadians(double degrees)
+        {
+            return (Math.PI / 180.0) * degrees;
+        }
+
+        public static double RadiansToDegrees(double radians)
+        {
+            return (180.0 / Math.PI) * radians;
+        }
+
+        public static double GradsToRadians(double grads)
+        {
+            return (grads / 200.0) * Math.PI;
+        }
+
+        public static double RadiansToGrads(double radians)
+        {
+            return (radians / Math.PI) * 200.0;
+        }
+
+        public static double DegreesToGrads(double degrees)
+        {
+            return (degrees / 9.0) * 10.0;
+        }
+
+        public static double GradsToDegrees(double grads)
+        {
+            return (grads / 10.0) * 9.0;
+        }
+
+        public static double ASinh(double x)
+        {
+            return (Math.Log(x + Math.Sqrt(x * x + 1.0)));
+        }
+
+        public static double ACosh(double x)
+        {
+            return (Math.Log(x + Math.Sqrt((x * x) - 1.0)));
+        }
+
+        public static double ATanh(double x)
+        {
+            return (Math.Log((1.0 + x) / (1.0 - x)) / 2.0);
+        }
+
+        public static double ACoth(double x)
+        {
+            //return (Math.Log((x + 1.0) / (x - 1.0)) / 2.0);
+            return (ATanh(1.0 / x));
+        }
+
+        public static double ASech(double x)
+        {
+            return (ACosh(1.0 / x));
+        }
+
+        public static double ACsch(double x)
+        {
+            return (ASinh(1.0 / x));
+        }
+
+        public static double Sech(double x)
+        {
+            return (1.0 / Math.Cosh(x));
+        }
+
+        public static double Csch(double x)
+        {
+            return (1.0 / Math.Sinh(x));
+        }
+
+        public static double Coth(double x)
+        {
+            return (Math.Cosh(x) / Math.Sinh(x));
+        }
+
+        public static double Combin(Int32 n, Int32 k)
+        {
+            if (k == 0) return 1;
+            return n * Combin(n - 1, k - 1) / k;
+        }
+
+        public static Boolean IsEven(Int32 value)
+        {
+            return Math.Abs(value % 2) < XLHelper.Epsilon;
+        }
+        public static Boolean IsOdd(Int32 value)
+        {
+            return Math.Abs(value % 2) > XLHelper.Epsilon;
+        }
+
+        public static string ToRoman(int number)
+        {
+            if ((number < 0) || (number > 3999)) throw new ArgumentOutOfRangeException("insert value betwheen 1 and 3999");
+            if (number < 1) return string.Empty;
+            if (number >= 1000) return "M" + ToRoman(number - 1000);
+            if (number >= 900) return "CM" + ToRoman(number - 900); 
+            if (number >= 500) return "D" + ToRoman(number - 500);
+            if (number >= 400) return "CD" + ToRoman(number - 400);
+            if (number >= 100) return "C" + ToRoman(number - 100);
+            if (number >= 90) return "XC" + ToRoman(number - 90);
+            if (number >= 50) return "L" + ToRoman(number - 50);
+            if (number >= 40) return "XL" + ToRoman(number - 40);
+            if (number >= 10) return "X" + ToRoman(number - 10);
+            if (number >= 9) return "IX" + ToRoman(number - 9);
+            if (number >= 5) return "V" + ToRoman(number - 5);
+            if (number >= 4) return "IV" + ToRoman(number - 4);
+            if (number >= 1) return "I" + ToRoman(number - 1);
+            throw new ArgumentOutOfRangeException("something bad happened");
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/Functions/XLMatrix.cs b/ClosedXML/Excel/CalcEngine/Functions/XLMatrix.cs
new file mode 100644
index 0000000..000f20c
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Functions/XLMatrix.cs
@@ -0,0 +1,594 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace ClosedXML.Excel.CalcEngine.Functions
+{
+    internal class XLMatrix
+    {
+        public XLMatrix L;
+        public XLMatrix U;
+        public int cols;
+        private double detOfP = 1;
+        public double[,] mat;
+        private int[] pi;
+        public int rows;
+
+        public XLMatrix(int iRows, int iCols) // XLMatrix Class constructor
+        {
+            rows = iRows;
+            cols = iCols;
+            mat = new double[rows,cols];
+        }
+        public XLMatrix(Double[,] arr)
+            :this(arr.GetLength(0), arr.GetLength(1))
+        {
+            var roCount = arr.GetLength(0);
+            var coCount = arr.GetLength(1);
+            for (int ro = 0; ro < roCount; ro++)
+            {
+                for (int co = 0; co < coCount; co++)
+                {
+                    mat[ro, co] = arr[ro, co];
+                }
+            }
+        }
+
+        public double this[int iRow, int iCol] // Access this matrix as a 2D array
+        {
+            get { return mat[iRow, iCol]; }
+            set { mat[iRow, iCol] = value; }
+        }
+
+        public Boolean IsSquare()
+        {
+            return (rows == cols);
+        }
+
+        public XLMatrix GetCol(int k)
+        {
+            var m = new XLMatrix(rows, 1);
+            for (var i = 0; i < rows; i++) m[i, 0] = mat[i, k];
+            return m;
+        }
+
+        public void SetCol(XLMatrix v, int k)
+        {
+            for (var i = 0; i < rows; i++) mat[i, k] = v[i, 0];
+        }
+
+        public void MakeLU() // Function for LU decomposition
+        {
+            if (!IsSquare()) throw new Exception("The matrix is not square!");
+            L = IdentityMatrix(rows, cols);
+            U = Duplicate();
+
+            pi = new int[rows];
+            for (var i = 0; i < rows; i++) pi[i] = i;
+
+            var k0 = 0;
+
+            for (var k = 0; k < cols - 1; k++)
+            {
+                double p = 0;
+                for (var i = k; i < rows; i++) // find the row with the biggest pivot
+                {
+                    if (Math.Abs(U[i, k]) > p)
+                    {
+                        p = Math.Abs(U[i, k]);
+                        k0 = i;
+                    }
+                }
+                if (p == 0) 
+                    throw new Exception("The matrix is singular!");
+
+                var pom1 = pi[k];
+                pi[k] = pi[k0];
+                pi[k0] = pom1; // switch two rows in permutation matrix
+
+                double pom2;
+                for (var i = 0; i < k; i++)
+                {
+                    pom2 = L[k, i];
+                    L[k, i] = L[k0, i];
+                    L[k0, i] = pom2;
+                }
+
+                if (k != k0) detOfP *= -1;
+
+                for (var i = 0; i < cols; i++) // Switch rows in U
+                {
+                    pom2 = U[k, i];
+                    U[k, i] = U[k0, i];
+                    U[k0, i] = pom2;
+                }
+
+                for (var i = k + 1; i < rows; i++)
+                {
+                    L[i, k] = U[i, k]/U[k, k];
+                    for (var j = k; j < cols; j++)
+                        U[i, j] = U[i, j] - L[i, k]*U[k, j];
+                }
+            }
+        }
+
+
+        public XLMatrix SolveWith(XLMatrix v) // Function solves Ax = v in confirmity with solution vector "v"
+        {
+            if (rows != cols) throw new Exception("The matrix is not square!");
+            if (rows != v.rows) throw new Exception("Wrong number of results in solution vector!");
+            if (L == null) MakeLU();
+
+            var b = new XLMatrix(rows, 1);
+            for (var i = 0; i < rows; i++) b[i, 0] = v[pi[i], 0]; // switch two items in "v" due to permutation matrix
+
+            var z = SubsForth(L, b);
+            var x = SubsBack(U, z);
+
+            return x;
+        }
+
+        public XLMatrix Invert() // Function returns the inverted matrix
+        {
+            if (L == null) MakeLU();
+
+            var inv = new XLMatrix(rows, cols);
+
+            for (var i = 0; i < rows; i++)
+            {
+                var Ei = ZeroMatrix(rows, 1);
+                Ei[i, 0] = 1;
+                var col = SolveWith(Ei);
+                inv.SetCol(col, i);
+            }
+            return inv;
+        }
+
+
+        public double Determinant() // Function for determinant
+        {
+            if (L == null) MakeLU();
+            var det = detOfP;
+            for (var i = 0; i < rows; i++) det *= U[i, i];
+            return det;
+        }
+
+        public XLMatrix GetP() // Function returns permutation matrix "P" due to permutation vector "pi"
+        {
+            if (L == null) MakeLU();
+
+            var matrix = ZeroMatrix(rows, cols);
+            for (var i = 0; i < rows; i++) matrix[pi[i], i] = 1;
+            return matrix;
+        }
+
+        public XLMatrix Duplicate() // Function returns the copy of this matrix
+        {
+            var matrix = new XLMatrix(rows, cols);
+            for (var i = 0; i < rows; i++)
+                for (var j = 0; j < cols; j++)
+                    matrix[i, j] = mat[i, j];
+            return matrix;
+        }
+
+        public static XLMatrix SubsForth(XLMatrix A, XLMatrix b) // Function solves Ax = b for A as a lower triangular matrix
+        {
+            if (A.L == null) A.MakeLU();
+            var n = A.rows;
+            var x = new XLMatrix(n, 1);
+
+            for (var i = 0; i < n; i++)
+            {
+                x[i, 0] = b[i, 0];
+                for (var j = 0; j < i; j++) x[i, 0] -= A[i, j]*x[j, 0];
+                x[i, 0] = x[i, 0]/A[i, i];
+            }
+            return x;
+        }
+
+        public static XLMatrix SubsBack(XLMatrix A, XLMatrix b) // Function solves Ax = b for A as an upper triangular matrix
+        {
+            if (A.L == null) A.MakeLU();
+            var n = A.rows;
+            var x = new XLMatrix(n, 1);
+
+            for (var i = n - 1; i > -1; i--)
+            {
+                x[i, 0] = b[i, 0];
+                for (var j = n - 1; j > i; j--) x[i, 0] -= A[i, j]*x[j, 0];
+                x[i, 0] = x[i, 0]/A[i, i];
+            }
+            return x;
+        }
+
+        public static XLMatrix ZeroMatrix(int iRows, int iCols) // Function generates the zero matrix
+        {
+            var matrix = new XLMatrix(iRows, iCols);
+            for (var i = 0; i < iRows; i++)
+                for (var j = 0; j < iCols; j++)
+                    matrix[i, j] = 0;
+            return matrix;
+        }
+
+        public static XLMatrix IdentityMatrix(int iRows, int iCols) // Function generates the identity matrix
+        {
+            var matrix = ZeroMatrix(iRows, iCols);
+            for (var i = 0; i < Math.Min(iRows, iCols); i++)
+                matrix[i, i] = 1;
+            return matrix;
+        }
+
+        public static XLMatrix RandomMatrix(int iRows, int iCols, int dispersion) // Function generates the zero matrix
+        {
+            var random = new Random();
+            var matrix = new XLMatrix(iRows, iCols);
+            for (var i = 0; i < iRows; i++)
+                for (var j = 0; j < iCols; j++)
+                    matrix[i, j] = random.Next(-dispersion, dispersion);
+            return matrix;
+        }
+
+        public static XLMatrix Parse(string ps) // Function parses the matrix from string
+        {
+            var s = NormalizeMatrixString(ps);
+            var rows = Regex.Split(s, "\r\n");
+            var nums = rows[0].Split(' ');
+            var matrix = new XLMatrix(rows.Length, nums.Length);
+            try
+            {
+                for (var i = 0; i < rows.Length; i++)
+                {
+                    nums = rows[i].Split(' ');
+                    for (var j = 0; j < nums.Length; j++) matrix[i, j] = double.Parse(nums[j]);
+                }
+            }
+            catch (FormatException)
+            {
+                throw new Exception("Wrong input format!");
+            }
+            return matrix;
+        }
+
+        public override string ToString() // Function returns matrix as a string
+        {
+            var s = "";
+            for (var i = 0; i < rows; i++)
+            {
+                for (var j = 0; j < cols; j++) s += String.Format("{0,5:0.00}", mat[i, j]) + " ";
+                s += "\r\n";
+            }
+            return s;
+        }
+
+        public static XLMatrix Transpose(XLMatrix m) // XLMatrix transpose, for any rectangular matrix
+        {
+            var t = new XLMatrix(m.cols, m.rows);
+            for (var i = 0; i < m.rows; i++)
+                for (var j = 0; j < m.cols; j++)
+                    t[j, i] = m[i, j];
+            return t;
+        }
+
+        public static XLMatrix Power(XLMatrix m, int pow) // Power matrix to exponent
+        {
+            if (pow == 0) return IdentityMatrix(m.rows, m.cols);
+            if (pow == 1) return m.Duplicate();
+            if (pow == -1) return m.Invert();
+
+            XLMatrix x;
+            if (pow < 0)
+            {
+                x = m.Invert();
+                pow *= -1;
+            }
+            else x = m.Duplicate();
+
+            var ret = IdentityMatrix(m.rows, m.cols);
+            while (pow != 0)
+            {
+                if ((pow & 1) == 1) ret *= x;
+                x *= x;
+                pow >>= 1;
+            }
+            return ret;
+        }
+
+        private static void SafeAplusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
+        {
+            for (var i = 0; i < size; i++) // rows
+                for (var j = 0; j < size; j++) // cols
+                {
+                    C[i, j] = 0;
+                    if (xa + j < A.cols && ya + i < A.rows) C[i, j] += A[ya + i, xa + j];
+                    if (xb + j < B.cols && yb + i < B.rows) C[i, j] += B[yb + i, xb + j];
+                }
+        }
+
+        private static void SafeAminusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
+        {
+            for (var i = 0; i < size; i++) // rows
+                for (var j = 0; j < size; j++) // cols
+                {
+                    C[i, j] = 0;
+                    if (xa + j < A.cols && ya + i < A.rows) C[i, j] += A[ya + i, xa + j];
+                    if (xb + j < B.cols && yb + i < B.rows) C[i, j] -= B[yb + i, xb + j];
+                }
+        }
+
+        private static void SafeACopytoC(XLMatrix A, int xa, int ya, XLMatrix C, int size)
+        {
+            for (var i = 0; i < size; i++) // rows
+                for (var j = 0; j < size; j++) // cols
+                {
+                    C[i, j] = 0;
+                    if (xa + j < A.cols && ya + i < A.rows) C[i, j] += A[ya + i, xa + j];
+                }
+        }
+
+        private static void AplusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
+        {
+            for (var i = 0; i < size; i++) // rows
+                for (var j = 0; j < size; j++) C[i, j] = A[ya + i, xa + j] + B[yb + i, xb + j];
+        }
+
+        private static void AminusBintoC(XLMatrix A, int xa, int ya, XLMatrix B, int xb, int yb, XLMatrix C, int size)
+        {
+            for (var i = 0; i < size; i++) // rows
+                for (var j = 0; j < size; j++) C[i, j] = A[ya + i, xa + j] - B[yb + i, xb + j];
+        }
+
+        private static void ACopytoC(XLMatrix A, int xa, int ya, XLMatrix C, int size)
+        {
+            for (var i = 0; i < size; i++) // rows
+                for (var j = 0; j < size; j++) C[i, j] = A[ya + i, xa + j];
+        }
+
+        private static XLMatrix StrassenMultiply(XLMatrix A, XLMatrix B) // Smart matrix multiplication
+        {
+            if (A.cols != B.rows) throw new Exception("Wrong dimension of matrix!");
+
+            XLMatrix R;
+
+            var msize = Math.Max(Math.Max(A.rows, A.cols), Math.Max(B.rows, B.cols));
+
+            if (msize < 32)
+            {
+                R = ZeroMatrix(A.rows, B.cols);
+                for (var i = 0; i < R.rows; i++)
+                    for (var j = 0; j < R.cols; j++)
+                        for (var k = 0; k < A.cols; k++)
+                            R[i, j] += A[i, k]*B[k, j];
+                return R;
+            }
+
+            var size = 1;
+            var n = 0;
+            while (msize > size)
+            {
+                size *= 2;
+                n++;
+            }
+            
+            var h = size/2;
+
+
+            var mField = new XLMatrix[n,9];
+
+            /*
+             *  8x8, 8x8, 8x8, ...
+             *  4x4, 4x4, 4x4, ...
+             *  2x2, 2x2, 2x2, ...
+             *  . . .
+             */
+
+            for (var i = 0; i < n - 4; i++) // rows
+            {
+                var z = (int) Math.Pow(2, n - i - 1);
+                for (var j = 0; j < 9; j++) mField[i, j] = new XLMatrix(z, z);
+            }
+
+            SafeAplusBintoC(A, 0, 0, A, h, h, mField[0, 0], h);
+            SafeAplusBintoC(B, 0, 0, B, h, h, mField[0, 1], h);
+            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 1], 1, mField); // (A11 + A22) * (B11 + B22);
+
+            SafeAplusBintoC(A, 0, h, A, h, h, mField[0, 0], h);
+            SafeACopytoC(B, 0, 0, mField[0, 1], h);
+            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 2], 1, mField); // (A21 + A22) * B11;
+
+            SafeACopytoC(A, 0, 0, mField[0, 0], h);
+            SafeAminusBintoC(B, h, 0, B, h, h, mField[0, 1], h);
+            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 3], 1, mField); //A11 * (B12 - B22);
+
+            SafeACopytoC(A, h, h, mField[0, 0], h);
+            SafeAminusBintoC(B, 0, h, B, 0, 0, mField[0, 1], h);
+            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 4], 1, mField); //A22 * (B21 - B11);
+
+            SafeAplusBintoC(A, 0, 0, A, h, 0, mField[0, 0], h);
+            SafeACopytoC(B, h, h, mField[0, 1], h);
+            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 5], 1, mField); //(A11 + A12) * B22;
+
+            SafeAminusBintoC(A, 0, h, A, 0, 0, mField[0, 0], h);
+            SafeAplusBintoC(B, 0, 0, B, h, 0, mField[0, 1], h);
+            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 6], 1, mField); //(A21 - A11) * (B11 + B12);
+
+            SafeAminusBintoC(A, h, 0, A, h, h, mField[0, 0], h);
+            SafeAplusBintoC(B, 0, h, B, h, h, mField[0, 1], h);
+            StrassenMultiplyRun(mField[0, 0], mField[0, 1], mField[0, 1 + 7], 1, mField); // (A12 - A22) * (B21 + B22);
+
+            R = new XLMatrix(A.rows, B.cols); // result
+
+            // C11
+            for (var i = 0; i < Math.Min(h, R.rows); i++) // rows
+                for (var j = 0; j < Math.Min(h, R.cols); j++) // cols
+                    R[i, j] = mField[0, 1 + 1][i, j] + mField[0, 1 + 4][i, j] - mField[0, 1 + 5][i, j] +
+                              mField[0, 1 + 7][i, j];
+
+            // C12
+            for (var i = 0; i < Math.Min(h, R.rows); i++) // rows
+                for (var j = h; j < Math.Min(2*h, R.cols); j++) // cols
+                    R[i, j] = mField[0, 1 + 3][i, j - h] + mField[0, 1 + 5][i, j - h];
+
+            // C21
+            for (var i = h; i < Math.Min(2*h, R.rows); i++) // rows
+                for (var j = 0; j < Math.Min(h, R.cols); j++) // cols
+                    R[i, j] = mField[0, 1 + 2][i - h, j] + mField[0, 1 + 4][i - h, j];
+
+            // C22
+            for (var i = h; i < Math.Min(2*h, R.rows); i++) // rows
+                for (var j = h; j < Math.Min(2*h, R.cols); j++) // cols
+                    R[i, j] = mField[0, 1 + 1][i - h, j - h] - mField[0, 1 + 2][i - h, j - h] +
+                              mField[0, 1 + 3][i - h, j - h] + mField[0, 1 + 6][i - h, j - h];
+
+            return R;
+        }
+
+        // function for square matrix 2^N x 2^N
+
+        private static void StrassenMultiplyRun(XLMatrix A, XLMatrix B, XLMatrix C, int l, XLMatrix[,] f)
+            // A * B into C, level of recursion, matrix field
+        {
+            var size = A.rows;
+            var h = size/2;
+
+            if (size < 32)
+            {
+                for (var i = 0; i < C.rows; i++)
+                    for (var j = 0; j < C.cols; j++)
+                    {
+                        C[i, j] = 0;
+                        for (var k = 0; k < A.cols; k++) C[i, j] += A[i, k]*B[k, j];
+                    }
+                return;
+            }
+
+            AplusBintoC(A, 0, 0, A, h, h, f[l, 0], h);
+            AplusBintoC(B, 0, 0, B, h, h, f[l, 1], h);
+            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 1], l + 1, f); // (A11 + A22) * (B11 + B22);
+
+            AplusBintoC(A, 0, h, A, h, h, f[l, 0], h);
+            ACopytoC(B, 0, 0, f[l, 1], h);
+            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 2], l + 1, f); // (A21 + A22) * B11;
+
+            ACopytoC(A, 0, 0, f[l, 0], h);
+            AminusBintoC(B, h, 0, B, h, h, f[l, 1], h);
+            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 3], l + 1, f); //A11 * (B12 - B22);
+
+            ACopytoC(A, h, h, f[l, 0], h);
+            AminusBintoC(B, 0, h, B, 0, 0, f[l, 1], h);
+            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 4], l + 1, f); //A22 * (B21 - B11);
+
+            AplusBintoC(A, 0, 0, A, h, 0, f[l, 0], h);
+            ACopytoC(B, h, h, f[l, 1], h);
+            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 5], l + 1, f); //(A11 + A12) * B22;
+
+            AminusBintoC(A, 0, h, A, 0, 0, f[l, 0], h);
+            AplusBintoC(B, 0, 0, B, h, 0, f[l, 1], h);
+            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 6], l + 1, f); //(A21 - A11) * (B11 + B12);
+
+            AminusBintoC(A, h, 0, A, h, h, f[l, 0], h);
+            AplusBintoC(B, 0, h, B, h, h, f[l, 1], h);
+            StrassenMultiplyRun(f[l, 0], f[l, 1], f[l, 1 + 7], l + 1, f); // (A12 - A22) * (B21 + B22);
+
+            // C11
+            for (var i = 0; i < h; i++) // rows
+                for (var j = 0; j < h; j++) // cols
+                    C[i, j] = f[l, 1 + 1][i, j] + f[l, 1 + 4][i, j] - f[l, 1 + 5][i, j] + f[l, 1 + 7][i, j];
+
+            // C12
+            for (var i = 0; i < h; i++) // rows
+                for (var j = h; j < size; j++) // cols
+                    C[i, j] = f[l, 1 + 3][i, j - h] + f[l, 1 + 5][i, j - h];
+
+            // C21
+            for (var i = h; i < size; i++) // rows
+                for (var j = 0; j < h; j++) // cols
+                    C[i, j] = f[l, 1 + 2][i - h, j] + f[l, 1 + 4][i - h, j];
+
+            // C22
+            for (var i = h; i < size; i++) // rows
+                for (var j = h; j < size; j++) // cols
+                    C[i, j] = f[l, 1 + 1][i - h, j - h] - f[l, 1 + 2][i - h, j - h] + f[l, 1 + 3][i - h, j - h] +
+                              f[l, 1 + 6][i - h, j - h];
+        }
+
+        public static XLMatrix StupidMultiply(XLMatrix m1, XLMatrix m2) // Stupid matrix multiplication
+        {
+            if (m1.cols != m2.rows) throw new Exception("Wrong dimensions of matrix!");
+
+            var result = ZeroMatrix(m1.rows, m2.cols);
+            for (var i = 0; i < result.rows; i++)
+                for (var j = 0; j < result.cols; j++)
+                    for (var k = 0; k < m1.cols; k++)
+                        result[i, j] += m1[i, k]*m2[k, j];
+            return result;
+        }
+
+        private static XLMatrix Multiply(double n, XLMatrix m) // Multiplication by constant n
+        {
+            var r = new XLMatrix(m.rows, m.cols);
+            for (var i = 0; i < m.rows; i++)
+                for (var j = 0; j < m.cols; j++)
+                    r[i, j] = m[i, j]*n;
+            return r;
+        }
+
+        private static XLMatrix Add(XLMatrix m1, XLMatrix m2) 
+        {
+            if (m1.rows != m2.rows || m1.cols != m2.cols)
+                throw new Exception("Matrices must have the same dimensions!");
+            var r = new XLMatrix(m1.rows, m1.cols);
+            for (var i = 0; i < r.rows; i++)
+                for (var j = 0; j < r.cols; j++)
+                    r[i, j] = m1[i, j] + m2[i, j];
+            return r;
+        }
+
+        public static string NormalizeMatrixString(string matStr) // From Andy - thank you! :)
+        {
+            // Remove any multiple spaces
+            while (matStr.IndexOf("  ") != -1)
+                matStr = matStr.Replace("  ", " ");
+
+            // Remove any spaces before or after newlines
+            matStr = matStr.Replace(" \r\n", "\r\n");
+            matStr = matStr.Replace("\r\n ", "\r\n");
+
+            // If the data ends in a newline, remove the trailing newline.
+            // Make it easier by first replacing \r\n’s with |’s then
+            // restore the |’s with \r\n’s
+            matStr = matStr.Replace("\r\n", "|");
+            while (matStr.LastIndexOf("|") == (matStr.Length - 1))
+                matStr = matStr.Substring(0, matStr.Length - 1);
+
+            matStr = matStr.Replace("|", "\r\n");
+            return matStr;
+        }
+
+        //   O P E R A T O R S
+
+        public static XLMatrix operator -(XLMatrix m)
+        {
+            return Multiply(-1, m);
+        }
+
+        public static XLMatrix operator +(XLMatrix m1, XLMatrix m2)
+        {
+            return Add(m1, m2);
+        }
+
+        public static XLMatrix operator -(XLMatrix m1, XLMatrix m2)
+        {
+            return Add(m1, -m2);
+        }
+
+        public static XLMatrix operator *(XLMatrix m1, XLMatrix m2)
+        {
+            return StrassenMultiply(m1, m2);
+        }
+
+        public static XLMatrix operator *(double n, XLMatrix m)
+        {
+            return Multiply(n, m);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/CalcEngine/Token.cs b/ClosedXML/Excel/CalcEngine/Token.cs
new file mode 100644
index 0000000..2095806
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/Token.cs
@@ -0,0 +1,47 @@
+namespace ClosedXML.Excel.CalcEngine
+{
+    /// <summary>
+	/// Represents a node in the expression tree.
+    /// </summary>
+    internal class Token
+	{
+        // ** fields
+		public TKID ID;
+        public TKTYPE Type;
+        public object Value;
+
+        // ** ctor
+        public Token(object value, TKID id, TKTYPE type)
+        {
+            Value = value;
+            ID = id;
+			Type = type;
+		}
+    }
+    /// <summary>
+    /// Token types (used when building expressions, sequence defines operator priority)
+    /// </summary>
+    internal enum TKTYPE
+    {
+        COMPARE,	// < > = <= >=
+        ADDSUB,		// + -
+        MULDIV,		// * /
+        POWER,		// ^
+        GROUP,		// ( ) , .
+        LITERAL,	// 123.32, "Hello", etc.
+        IDENTIFIER  // functions, external objects, bindings
+    }
+    /// <summary>
+    /// Token ID (used when evaluating expressions)
+    /// </summary>
+    internal enum TKID
+    {
+        GT, LT, GE, LE, EQ, NE, // COMPARE
+        ADD, SUB, // ADDSUB
+        MUL, DIV, DIVINT, MOD, // MULDIV
+        POWER, // POWER
+        OPEN, CLOSE, END, COMMA, PERIOD, // GROUP
+        ATOM, // LITERAL, IDENTIFIER
+        CONCAT
+    }
+}
diff --git a/ClosedXML/Excel/CalcEngine/XLCalcEngine.cs b/ClosedXML/Excel/CalcEngine/XLCalcEngine.cs
new file mode 100644
index 0000000..eb359ac
--- /dev/null
+++ b/ClosedXML/Excel/CalcEngine/XLCalcEngine.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel.CalcEngine
+{
+    internal class XLCalcEngine : CalcEngine
+    {
+        private readonly IXLWorksheet _ws;
+        private readonly XLWorkbook _wb;
+        public XLCalcEngine()
+        {}
+        public XLCalcEngine(XLWorkbook wb)
+        {
+            _wb = wb;
+            IdentifierChars = "$:!";
+        }
+        public XLCalcEngine(IXLWorksheet ws): this(ws.Workbook)
+        {
+            _ws = ws;
+        }
+
+        public override object GetExternalObject(string identifier)
+        {
+            if (identifier.Contains("!") && _wb != null)
+            {
+                var wsName = identifier.Substring(0, identifier.IndexOf("!"));
+                return new CellRangeReference(_wb.Worksheet(wsName).Range(identifier.Substring(identifier.IndexOf("!") + 1)), this);
+            }
+
+            if (_ws != null)
+                return new CellRangeReference(_ws.Range(identifier), this);
+
+            return identifier;
+        }
+
+
+    }
+
+    internal class CellRangeReference : IValueObject, IEnumerable
+    {
+        private IXLRange _range;
+        private XLCalcEngine _ce;
+        public CellRangeReference(IXLRange range, XLCalcEngine ce)
+        {
+            _range = range;
+            _ce = ce;
+        }
+
+        public IXLRange Range { get { return _range; } }
+
+        // ** IValueObject
+        public object GetValue()
+        {
+            return GetValue(_range.FirstCell());
+        }
+
+        // ** IEnumerable
+        public IEnumerator GetEnumerator()
+        {
+            return _range.Cells().Select(GetValue).GetEnumerator();
+        }
+
+        private Boolean _evaluating;
+
+        // ** implementation
+        object GetValue(IXLCell cell)
+        {
+            if (_evaluating)
+            {
+                throw new Exception("Circular Reference");
+            }
+            try
+            {
+                _evaluating = true;
+                var f = cell.FormulaA1;
+                if (XLHelper.IsNullOrWhiteSpace(f))
+                    return cell.Value;
+                else
+                    return new XLCalcEngine(cell.Worksheet).Evaluate(f);
+
+            }
+            finally
+            {
+                _evaluating = false;
+            }
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Cells/IXLCell.cs b/ClosedXML/Excel/Cells/IXLCell.cs
new file mode 100644
index 0000000..157017f
--- /dev/null
+++ b/ClosedXML/Excel/Cells/IXLCell.cs
@@ -0,0 +1,328 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+
+namespace ClosedXML.Excel
+{
+    public enum XLCellValues { Text, Number, Boolean, DateTime, TimeSpan }
+
+    public enum XLClearOptions
+    {
+        ContentsAndFormats,
+        Contents,
+        Formats
+    }
+
+    public interface IXLCell
+    {
+        /// <summary>
+        /// Gets or sets the cell's value. To get a strongly typed object use the method GetValue&lt;T&gt;.
+        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from this cell.</para>
+        /// <para>If the object is a range ClosedXML will copy the range starting from this cell.</para>
+        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
+        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
+        /// </summary>
+        /// <value>
+        /// The object containing the value(s) to set.
+        /// </value>
+        Object Value { get; set; }
+
+        /// <summary>Gets this cell's address, relative to the worksheet.</summary>
+        /// <value>The cell's address.</value>
+        IXLAddress Address { get;  }
+
+        /// <summary>
+        /// Gets or sets the type of this cell's data.
+        /// <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
+        /// </summary>
+        /// <value>
+        /// The type of the cell's data.
+        /// </value>
+        /// <exception cref="ArgumentException"></exception>
+        XLCellValues DataType { get; set; }
+
+        /// <summary>
+        /// Sets the type of this cell's data.
+        /// <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
+        /// </summary>
+        /// <param name="dataType">Type of the data.</param>
+        /// <returns></returns>
+        IXLCell SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Sets the cell's value.
+        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from this cell.</para>
+        /// <para>If the object is a range ClosedXML will copy the range starting from this cell.</para>
+        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
+        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
+        /// </summary>
+        /// <value>
+        /// The object containing the value(s) to set.
+        /// </value>
+        IXLCell SetValue<T>(T value);
+
+        /// <summary>
+        /// Gets the cell's value converted to the T type.
+        /// <para>ClosedXML will try to covert the current value to the T type.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to the T type.</para>
+        /// </summary>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <exception cref="ArgumentException"></exception>
+        T GetValue<T>();
+
+        /// <summary>
+        /// Gets the cell's value converted to a String.
+        /// </summary>
+        String GetString();
+
+        /// <summary>
+        /// Gets the cell's value formatted depending on the cell's data type and style.
+        /// </summary>
+        String GetFormattedString();
+
+        /// <summary>
+        /// Gets the cell's value converted to Double.
+        /// <para>ClosedXML will try to covert the current value to Double.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to Double.</para>
+        /// </summary>
+        Double GetDouble();
+
+        /// <summary>
+        /// Gets the cell's value converted to Boolean.
+        /// <para>ClosedXML will try to covert the current value to Boolean.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to Boolean.</para>
+        /// </summary>
+        Boolean GetBoolean();
+
+        /// <summary>
+        /// Gets the cell's value converted to DateTime.
+        /// <para>ClosedXML will try to covert the current value to DateTime.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to DateTime.</para>
+        /// </summary>
+        DateTime GetDateTime();
+
+        /// <summary>
+        /// Gets the cell's value converted to TimeSpan.
+        /// <para>ClosedXML will try to covert the current value to TimeSpan.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to TimeSpan.</para>
+        /// </summary>
+        TimeSpan GetTimeSpan();
+
+        XLHyperlink GetHyperlink();
+
+        Boolean TryGetValue<T>(out T value);
+
+
+
+        Boolean HasHyperlink { get; }
+
+        /// <summary>
+        /// Clears the contents of this cell.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLCell Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        /// <summary>
+        /// Deletes the current cell and shifts the surrounding cells according to the shiftDeleteCells parameter.
+        /// </summary>
+        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
+        void Delete(XLShiftDeletedCells shiftDeleteCells);
+
+        /// <summary>
+        /// Gets or sets the cell's formula with A1 references.
+        /// </summary>
+        /// <value>The formula with A1 references.</value>
+        String FormulaA1 { get; set; }
+
+        IXLCell SetFormulaA1(String formula);
+
+        /// <summary>
+        /// Gets or sets the cell's formula with R1C1 references.
+        /// </summary>
+        /// <value>The formula with R1C1 references.</value>
+        String FormulaR1C1 { get; set; }
+
+        IXLCell SetFormulaR1C1(String formula);
+
+        /// <summary>
+        /// Returns this cell as an IXLRange.
+        /// </summary>
+        IXLRange AsRange();
+
+
+        /// <summary>
+        /// Gets or sets the cell's style.
+        /// </summary>
+        IXLStyle Style { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this cell's text should be shared or not.
+        /// </summary>
+        /// <value>
+        ///   If false the cell's text will not be shared and stored as an inline value.
+        /// </value>
+        Boolean ShareString { get; set; }
+
+        /// <summary>
+        /// Inserts the IEnumerable data elements and returns the range it occupies.
+        /// </summary>
+        /// <param name="data">The IEnumerable data.</param>
+        IXLRange InsertData(IEnumerable data);
+
+        /// <summary>
+        /// Inserts the IEnumerable data elements as a table and returns it.
+        /// <para>The new table will receive a generic name: Table#</para>
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        IXLTable InsertTable<T>(IEnumerable<T> data);
+
+        /// <summary>
+        /// Inserts the IEnumerable data elements as a table and returns it.
+        /// <para>The new table will receive a generic name: Table#</para>
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        /// <param name="createTable">
+        /// if set to <c>true</c> it will create an Excel table.
+        /// <para>if set to <c>false</c> the table will be created in memory.</para>
+        /// </param>
+        IXLTable InsertTable<T>(IEnumerable<T> data, Boolean createTable);
+
+        /// <summary>
+        /// Creates an Excel table from the given IEnumerable data elements.
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        /// <param name="tableName">Name of the table.</param>
+        IXLTable InsertTable<T>(IEnumerable<T> data, String tableName);
+
+        /// <summary>
+        /// Inserts the IEnumerable data elements as a table and returns it.
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        /// <param name="tableName">Name of the table.</param>
+        /// <param name="createTable">
+        /// if set to <c>true</c> it will create an Excel table.
+        /// <para>if set to <c>false</c> the table will be created in memory.</para>
+        /// </param>
+        IXLTable InsertTable<T>(IEnumerable<T> data, String tableName, Boolean createTable);
+
+
+        /// <summary>
+        /// Inserts the DataTable data elements as a table and returns it.
+        /// <para>The new table will receive a generic name: Table#</para>
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        IXLTable InsertTable(DataTable data);
+
+        /// <summary>
+        /// Inserts the DataTable data elements as a table and returns it.
+        /// <para>The new table will receive a generic name: Table#</para>
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        /// <param name="createTable">
+        /// if set to <c>true</c> it will create an Excel table.
+        /// <para>if set to <c>false</c> the table will be created in memory.</para>
+        /// </param>
+        IXLTable InsertTable(DataTable data, Boolean createTable);
+
+        /// <summary>
+        /// Creates an Excel table from the given DataTable data elements.
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        /// <param name="tableName">Name of the table.</param>
+        IXLTable InsertTable(DataTable data, String tableName);
+
+        /// <summary>
+        /// Inserts the DataTable data elements as a table and returns it.
+        /// </summary>
+        /// <param name="data">The table data.</param>
+        /// <param name="tableName">Name of the table.</param>
+        /// <param name="createTable">
+        /// if set to <c>true</c> it will create an Excel table.
+        /// <para>if set to <c>false</c> the table will be created in memory.</para>
+        /// </param>
+        IXLTable InsertTable(DataTable data, String tableName, Boolean createTable);
+
+
+        XLHyperlink Hyperlink { get; set; }
+        IXLWorksheet Worksheet { get; }
+
+        IXLDataValidation DataValidation { get; }
+        IXLDataValidation NewDataValidation { get; }
+        IXLDataValidation SetDataValidation();
+
+
+        IXLCells InsertCellsAbove(int numberOfRows);
+        IXLCells InsertCellsBelow(int numberOfRows);
+        IXLCells InsertCellsAfter(int numberOfColumns);
+        IXLCells InsertCellsBefore(int numberOfColumns);
+
+        /// <summary>
+        /// Creates a named range out of this cell. 
+        /// <para>If the named range exists, it will add this range to that named range.</para>
+        /// <para>The default scope for the named range is Workbook.</para>
+        /// </summary>
+        /// <param name="rangeName">Name of the range.</param>
+        IXLCell AddToNamed(String rangeName);
+
+        /// <summary>
+        /// Creates a named range out of this cell. 
+        /// <para>If the named range exists, it will add this range to that named range.</para>
+        /// <param name="rangeName">Name of the range.</param>
+        /// <param name="scope">The scope for the named range.</param>
+        /// </summary>
+        IXLCell AddToNamed(String rangeName, XLScope scope);
+
+        /// <summary>
+        /// Creates a named range out of this cell. 
+        /// <para>If the named range exists, it will add this range to that named range.</para>
+        /// <param name="rangeName">Name of the range.</param>
+        /// <param name="scope">The scope for the named range.</param>
+        /// <param name="comment">The comments for the named range.</param>
+        /// </summary>
+        IXLCell AddToNamed(String rangeName, XLScope scope, String comment);
+
+        IXLCell CopyFrom(IXLCell otherCell);
+        IXLCell CopyFrom(String otherCell);
+        IXLCell CopyTo(IXLCell target);
+        IXLCell CopyTo(String target);
+
+        String ValueCached { get; }
+
+        IXLRichText RichText { get; }
+        Boolean HasRichText { get; }
+        IXLComment Comment { get; }
+        Boolean HasComment { get; }
+
+        Boolean IsMerged();
+        Boolean IsEmpty();
+        Boolean IsEmpty(Boolean includeFormats);
+
+        IXLCell CellAbove();
+        IXLCell CellAbove(Int32 step);
+        IXLCell CellBelow();
+        IXLCell CellBelow(Int32 step);
+        IXLCell CellLeft();
+        IXLCell CellLeft(Int32 step);
+        IXLCell CellRight();
+        IXLCell CellRight(Int32 step);
+
+        IXLColumn WorksheetColumn();
+        IXLRow WorksheetRow();
+
+        Boolean HasDataValidation { get; }
+
+        IXLConditionalFormat AddConditionalFormat();
+
+        void Select();
+
+        Boolean Active { get; set; }
+        IXLCell SetActive(Boolean value = true);
+
+        Boolean HasFormula { get; }
+
+        IXLRangeAddress FormulaReference { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Cells/IXLCells.cs b/ClosedXML/Excel/Cells/IXLCells.cs
new file mode 100644
index 0000000..d2eefe9
--- /dev/null
+++ b/ClosedXML/Excel/Cells/IXLCells.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLCells : IEnumerable<IXLCell>
+    {
+        /// <summary>
+        /// Sets the cells' value.
+        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
+        /// <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
+        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
+        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
+        /// </summary>
+        /// <value>
+        /// The object containing the value(s) to set.
+        /// </value>
+        Object Value { set; }
+
+        /// <summary>
+        /// Sets the type of the cells' data.
+        /// <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
+        /// <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
+        /// </summary>
+        /// <value>
+        /// The type of the cell's data.
+        /// </value>
+        /// <exception cref="ArgumentException"></exception>
+        XLCellValues DataType { set; }
+
+        IXLCells SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of these cells.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLCells Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        /// <summary>
+        /// Delete the comments of these cells.
+        /// </summary>
+        void DeleteComments();
+
+        /// <summary>
+        /// Sets the cells' formula with A1 references.
+        /// </summary>
+        /// <value>The formula with A1 references.</value>
+        String FormulaA1 { set; }
+
+        /// <summary>
+        /// Sets the cells' formula with R1C1 references.
+        /// </summary>
+        /// <value>The formula with R1C1 references.</value>
+        String FormulaR1C1 { set; }
+
+        IXLStyle Style { get; set; }
+
+        void Select();
+    }
+}
diff --git a/ClosedXML/Excel/Cells/XLCell.cs b/ClosedXML/Excel/Cells/XLCell.cs
new file mode 100644
index 0000000..f9312ee
--- /dev/null
+++ b/ClosedXML/Excel/Cells/XLCell.cs
@@ -0,0 +1,2597 @@
+namespace ClosedXML.Excel
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Data;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.RegularExpressions;
+#if NET4
+    using System.ComponentModel.DataAnnotations;
+
+#endif
+
+    internal class XLCell : IXLCell, IXLStylized
+    {
+        public static readonly DateTime BaseDate = new DateTime(1899, 12, 30);
+        private static Dictionary<int, string> _formatCodes;
+
+        private static readonly Regex A1Regex = new Regex(
+            @"(?<=\W)(\$?[a-zA-Z]{1,3}\$?\d{1,7})(?=\W)" // A1
+            + @"|(?<=\W)(\$?\d{1,7}:\$?\d{1,7})(?=\W)" // 1:1
+            + @"|(?<=\W)(\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})(?=\W)", RegexOptions.Compiled); // A:A
+
+        public static readonly Regex A1SimpleRegex = new Regex(
+            //  @"(?<=\W)" // Start with non word
+            @"(?<Reference>" // Start Group to pick
+            + @"(?<Sheet>" // Start Sheet Name, optional
+            + @"("
+            + @"\'([^\[\]\*/\\\?:\']+|\'\')\'"
+            // Sheet name with special characters, surrounding apostrophes are required
+            + @"|"
+            + @"\'?\w+\'?" // Sheet name with letters and numbers, surrounding apostrophes are optional
+            + @")"
+            + @"!)?" // End Sheet Name, optional
+            + @"(?<Range>" // Start range
+            + @"\$?[a-zA-Z]{1,3}\$?\d{1,7}" // A1 Address 1
+            + @"(?<RangeEnd>:\$?[a-zA-Z]{1,3}\$?\d{1,7})?" // A1 Address 2, optional
+            + @"|"
+            + @"(?<ColumnNumbers>\$?\d{1,7}:\$?\d{1,7})" // 1:1
+            + @"|"
+            + @"(?<ColumnLetters>\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})" // A:A
+            + @")" // End Range
+            + @")" // End Group to pick
+            //+ @"(?=\W)" // End with non word
+            , RegexOptions.Compiled);
+
+        private static readonly Regex A1RowRegex = new Regex(
+            @"(\$?\d{1,7}:\$?\d{1,7})" // 1:1
+            , RegexOptions.Compiled);
+
+        private static readonly Regex A1ColumnRegex = new Regex(
+            @"(\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})" // A:A
+            , RegexOptions.Compiled);
+
+        private static readonly Regex R1C1Regex = new Regex(
+            @"(?<=\W)([Rr]\[?-?\d{0,7}\]?[Cc]\[?-?\d{0,7}\]?)(?=\W)" // R1C1
+            + @"|(?<=\W)([Rr]\[?-?\d{0,7}\]?:[Rr]\[?-?\d{0,7}\]?)(?=\W)" // R:R
+            + @"|(?<=\W)([Cc]\[?-?\d{0,5}\]?:[Cc]\[?-?\d{0,5}\]?)(?=\W)", RegexOptions.Compiled); // C:C
+
+        private static readonly Regex utfPattern = new Regex(@"(?<!_x005F)_x(?!005F)([0-9A-F]{4})_", RegexOptions.Compiled);
+
+        #region Fields
+
+        private readonly XLWorksheet _worksheet;
+
+        internal string _cellValue = String.Empty;
+
+        private XLComment _comment;
+        internal XLCellValues _dataType;
+        private XLHyperlink _hyperlink;
+        private XLRichText _richText;
+
+        #endregion
+
+        #region Constructor
+
+        private Int32 _styleCacheId;
+
+        public XLCell(XLWorksheet worksheet, XLAddress address, Int32 styleId)
+        {
+            Address = address;
+            ShareString = true;
+            _worksheet = worksheet;
+            SetStyle(styleId);
+        }
+
+        private IXLStyle GetStyleForRead()
+        {
+            return Worksheet.Workbook.GetStyleById(GetStyleId());
+        }
+
+        public Int32 GetStyleId()
+        {
+            if (StyleChanged)
+                SetStyle(Style);
+
+            return _styleCacheId;
+        }
+
+        private void SetStyle(IXLStyle styleToUse)
+        {
+            _styleCacheId = Worksheet.Workbook.GetStyleId(styleToUse);
+            _style = null;
+            StyleChanged = false;
+        }
+
+        private void SetStyle(Int32 styleId)
+        {
+            _styleCacheId = styleId;
+            _style = null;
+            StyleChanged = false;
+        }
+
+        #endregion
+
+        public bool SettingHyperlink;
+        public int SharedStringId;
+        private string _formulaA1;
+        private string _formulaR1C1;
+        private IXLStyle _style;
+
+        public XLWorksheet Worksheet
+        {
+            get { return _worksheet; }
+        }
+
+        public XLAddress Address { get; internal set; }
+
+        public string InnerText
+        {
+            get
+            {
+                if (HasRichText)
+                    return _richText.ToString();
+
+                return XLHelper.IsNullOrWhiteSpace(_cellValue) ? FormulaA1 : _cellValue;
+            }
+        }
+
+        public IXLDataValidation NewDataValidation
+        {
+            get
+            {
+                using (var asRange = AsRange())
+                {
+                    return asRange.NewDataValidation; // Call the data validation without breaking it into pieces
+                }
+            }
+        }
+
+        public XLDataValidation DataValidation
+        {
+            get
+            {
+                using (var asRange = AsRange())
+                {
+                    var dv = asRange.DataValidation; // Call the data validation to break it into pieces
+                    foreach (var d in Worksheet.DataValidations)
+                    {
+                        var rs = d.Ranges;
+                        if (rs.Count == 1)
+                        {
+                            var r = rs.Single();
+                            var ra1 = r.RangeAddress.ToStringRelative();
+                            var ra2 = asRange.RangeAddress.ToStringRelative();
+                            if (ra1.Equals(ra2))
+                                return d as XLDataValidation;
+                        }
+                    }
+                }
+                return null;
+            }
+        }
+
+        internal XLComment Comment
+        {
+            get
+            {
+                if (_comment == null)
+                {
+                    // MS Excel uses Tahoma 8 Swiss no matter what current style font
+                    // var style = GetStyleForRead();
+                    var defaultFont = new XLFont
+                        {
+                            FontName = "Tahoma",
+                            FontSize = 8,
+                            FontFamilyNumbering = XLFontFamilyNumberingValues.Swiss
+                        };
+                    _comment = new XLComment(this, defaultFont);
+                }
+
+                return _comment;
+            }
+        }
+
+        #region IXLCell Members
+
+        IXLDataValidation IXLCell.DataValidation
+        {
+            get { return DataValidation; }
+        }
+
+        IXLWorksheet IXLCell.Worksheet
+        {
+            get { return Worksheet; }
+        }
+
+        IXLAddress IXLCell.Address
+        {
+            get { return Address; }
+        }
+
+        IXLRange IXLCell.AsRange()
+        {
+            return AsRange();
+        }
+
+        public IXLCell SetValue<T>(T value)
+        {
+            FormulaA1 = String.Empty;
+            _richText = null;
+            if (value is String || value is char)
+            {
+                _cellValue = value.ToString();
+                _dataType = XLCellValues.Text;
+                if (_cellValue.Contains(Environment.NewLine) && !GetStyleForRead().Alignment.WrapText)
+                    Style.Alignment.WrapText = true;
+            }
+            else if (value is TimeSpan)
+            {
+                _cellValue = value.ToString();
+                _dataType = XLCellValues.TimeSpan;
+                Style.NumberFormat.NumberFormatId = 46;
+            }
+            else if (value is DateTime)
+            {
+                _dataType = XLCellValues.DateTime;
+                var dtTest = (DateTime)Convert.ChangeType(value, typeof (DateTime));
+                Style.NumberFormat.NumberFormatId = dtTest.Date == dtTest ? 14 : 22;
+
+                _cellValue = dtTest.ToOADate().ToString();
+            }
+            else if (
+                value is sbyte
+                || value is byte
+                || value is short
+                || value is ushort
+                || value is int
+                || value is uint
+                || value is long
+                || value is ulong
+                || value is float
+                || value is double
+                || value is decimal
+                )
+            {
+                if ((value is double || value is float) && (Double.IsNaN((Double)Convert.ChangeType(value, typeof (Double)))
+                    || Double.IsInfinity((Double)Convert.ChangeType(value, typeof (Double)))))
+                {
+                    _cellValue = value.ToString();
+                    _dataType = XLCellValues.Text;
+                }
+                else
+                {
+                    _dataType = XLCellValues.Number;
+                    _cellValue = value.ToString();
+                }
+            }
+            else if (value is Boolean)
+            {
+                _dataType = XLCellValues.Boolean;
+                _cellValue = (Boolean)Convert.ChangeType(value, typeof(Boolean)) ? "1" : "0";
+            }
+            else
+            {
+                _cellValue = Convert.ToString(value);
+                _dataType = XLCellValues.Text;
+            }
+
+            return this;
+        }
+
+        public T GetValue<T>()
+        {
+            T retVal;
+            if(TryGetValue(out retVal))
+                return retVal;
+
+            throw new Exception("Cannot convert cell value to " + typeof(T));
+        }
+
+        public string GetString()
+        {
+            return GetValue<string>();
+        }
+
+        public double GetDouble()
+        {
+            return GetValue<double>();
+        }
+
+        public bool GetBoolean()
+        {
+            return GetValue<bool>();
+        }
+
+        public DateTime GetDateTime()
+        {
+            return GetValue<DateTime>();
+        }
+
+        public TimeSpan GetTimeSpan()
+        {
+            return GetValue<TimeSpan>();
+        }
+
+        public string GetFormattedString()
+        {
+            String cValue;
+            if (FormulaA1.Length > 0)
+            {
+                try
+                {
+                    cValue = GetString();
+                }
+                catch 
+                {
+                    cValue = String.Empty;
+                }
+            }
+            else
+            {
+                cValue = _cellValue;
+            }
+
+            if (_dataType == XLCellValues.Boolean)
+                return (cValue != "0").ToString();
+            if (_dataType == XLCellValues.TimeSpan)
+                return cValue;
+            if (_dataType == XLCellValues.DateTime || IsDateFormat())
+            {
+                double dTest;
+                if (Double.TryParse(cValue, out dTest))
+                {
+                    var format = GetFormat();
+                    return DateTime.FromOADate(dTest).ToString(format);
+                }
+
+                return cValue;
+            }
+
+            if (_dataType == XLCellValues.Number)
+            {
+                double dTest;
+                if (Double.TryParse(cValue, out dTest))
+                {
+                    var format = GetFormat();
+                    return dTest.ToString(format);
+                }
+
+                return cValue;
+            }
+
+            return cValue;
+        }
+
+
+        public object Value
+        {
+            get
+            {
+                var fA1 = FormulaA1;
+                if (!XLHelper.IsNullOrWhiteSpace(fA1))
+                {
+                    if (fA1[0] == '{')
+                        fA1 = fA1.Substring(1, fA1.Length - 2);
+
+                    string sName;
+                    string cAddress;
+                    if (fA1.Contains('!'))
+                    {
+                        sName = fA1.Substring(0, fA1.IndexOf('!'));
+                        if (sName[0] == '\'')
+                            sName = sName.Substring(1, sName.Length - 2);
+
+                        cAddress = fA1.Substring(fA1.IndexOf('!') + 1);
+                    }
+                    else
+                    {
+                        sName = Worksheet.Name;
+                        cAddress = fA1;
+                    }
+
+                    if (_worksheet.Workbook.WorksheetsInternal.Any<XLWorksheet>(
+                        w => String.Compare(w.Name, sName, true) == 0)
+                        && XLHelper.IsValidA1Address(cAddress)
+                        )
+                        return _worksheet.Workbook.Worksheet(sName).Cell(cAddress).Value;
+
+                    var retVal = Worksheet.Evaluate(fA1);
+                    var retValEnumerable = retVal as IEnumerable;
+
+                    if (retValEnumerable != null && !(retVal is String))
+                        foreach (var v in retValEnumerable)
+                            return v;
+
+
+                    return retVal;
+                }
+
+                var cellValue = HasRichText ? _richText.ToString() : _cellValue;
+
+
+                if (_dataType == XLCellValues.Boolean)
+                    return cellValue != "0";
+
+                if (_dataType == XLCellValues.DateTime)
+                    return DateTime.FromOADate(Double.Parse(cellValue));
+
+                if (_dataType == XLCellValues.Number)
+                    return Double.Parse(cellValue);
+
+                if (_dataType == XLCellValues.TimeSpan)
+                {
+                    // return (DateTime.FromOADate(Double.Parse(cellValue)) - baseDate);
+                    return TimeSpan.Parse(cellValue);
+                }
+
+                return cellValue;
+            }
+
+            set
+            {
+                FormulaA1 = String.Empty;
+
+                if (value as XLCells != null) throw new ArgumentException("Cannot assign IXLCells object to the cell value.");
+
+                if (SetRangeRows(value)) return;
+
+                if (SetRangeColumns(value)) return;
+
+                if (SetEnumerable(value)) return;
+
+                if (SetRange(value)) return;
+
+                if (!SetRichText(value))
+                    SetValue(value);
+
+                if (_cellValue.Length > 32767) throw new ArgumentException("Cells can only hold 32,767 characters.");
+            }
+        }
+
+        public IXLTable InsertTable<T>(IEnumerable<T> data)
+        {
+            return InsertTable(data, null, true);
+        }
+
+        public IXLTable InsertTable<T>(IEnumerable<T> data, bool createTable)
+        {
+            return InsertTable(data, null, createTable);
+        }
+
+        public IXLTable InsertTable<T>(IEnumerable<T> data, string tableName)
+        {
+            return InsertTable(data, tableName, true);
+        }
+
+        public IXLTable InsertTable<T>(IEnumerable<T> data, string tableName, bool createTable)
+        {
+            if (data != null && data.GetType() != typeof (String))
+            {
+                var ro = Address.RowNumber + 1;
+                var fRo = Address.RowNumber;
+                var hasTitles = false;
+                var maxCo = 0;
+                var isDataTable = false;
+                var isDataReader = false;
+                if (!data.Any())
+                {
+                    var t = data.GetItemType();
+                    if (t.IsPrimitive || t == typeof (string) || t == typeof (DateTime) || t == typeof (Decimal))
+                        maxCo = Address.ColumnNumber + 1;
+                    else
+                        maxCo = Address.ColumnNumber + t.GetFields().Length + t.GetProperties().Length;
+                }
+                else
+                {
+                    foreach (object m in data)
+                    {
+                        var co = Address.ColumnNumber;
+
+                        if (m.GetType().IsPrimitive || m is string || m is DateTime || m is Decimal)
+                        {
+                            if (!hasTitles)
+                            {
+                                var fieldName = GetFieldName(m.GetType().GetCustomAttributes(true));
+                                if (XLHelper.IsNullOrWhiteSpace(fieldName))
+                                    fieldName = m.GetType().Name;
+
+                                SetValue(fieldName, fRo, co);
+                                hasTitles = true;
+                                co = Address.ColumnNumber;
+                            }
+
+                            SetValue(m, ro, co);
+                            co++;
+                        }
+                        else if (m.GetType().IsArray)
+                        {
+                            foreach (var item in (Array)m)
+                            {
+                                SetValue(item, ro, co);
+                                co++;
+                            }
+                        }
+                        else if (isDataTable || m is DataRow)
+                        {
+                            if (!isDataTable)
+                                isDataTable = true;
+
+                            if (!hasTitles)
+                            {
+                                foreach (var fieldName in from DataColumn column in ((DataRow)m).Table.Columns
+                                                          select XLHelper.IsNullOrWhiteSpace(column.Caption)
+                                                                     ? column.ColumnName
+                                                                     : column.Caption)
+                                {
+                                    SetValue(fieldName, fRo, co);
+                                    co++;
+                                }
+
+                                co = Address.ColumnNumber;
+                                hasTitles = true;
+                            }
+
+                            foreach (var item in ((DataRow)m).ItemArray)
+                            {
+                                SetValue(item, ro, co);
+                                co++;
+                            }
+                        }
+                        else if (isDataReader || m is IDataRecord)
+                        {
+                            if (!isDataReader)
+                                isDataReader = true;
+
+                            var record = m as IDataRecord;
+
+                            var fieldCount = record.FieldCount;
+                            if (!hasTitles)
+                            {
+                                for (var i = 0; i < fieldCount; i++)
+                                {
+                                    SetValue(record.GetName(i), fRo, co);
+                                    co++;
+                                }
+
+                                co = Address.ColumnNumber;
+                                hasTitles = true;
+                            }
+
+                            for (var i = 0; i < fieldCount; i++)
+                            {
+                                SetValue(record[i], ro, co);
+                                co++;
+                            }
+                        }
+                        else
+                        {
+                            var fieldInfo = m.GetType().GetFields();
+                            var propertyInfo = m.GetType().GetProperties();
+                            if (!hasTitles)
+                            {
+                                foreach (var info in fieldInfo)
+                                {
+                                    if ((info as IEnumerable) == null)
+                                    {
+                                        var fieldName = GetFieldName(info.GetCustomAttributes(true));
+                                        if (XLHelper.IsNullOrWhiteSpace(fieldName))
+                                            fieldName = info.Name;
+
+                                        SetValue(fieldName, fRo, co);
+                                    }
+
+                                    co++;
+                                }
+
+                                foreach (var info in propertyInfo)
+                                {
+                                    if ((info as IEnumerable) == null)
+                                    {
+                                        var fieldName = GetFieldName(info.GetCustomAttributes(true));
+                                        if (XLHelper.IsNullOrWhiteSpace(fieldName))
+                                            fieldName = info.Name;
+
+                                        SetValue(fieldName, fRo, co);
+                                    }
+
+                                    co++;
+                                }
+
+                                co = Address.ColumnNumber;
+                                hasTitles = true;
+                            }
+
+                            foreach (var info in fieldInfo)
+                            {
+                                SetValue(info.GetValue(m), ro, co);
+                                co++;
+                            }
+
+                            foreach (var info in propertyInfo)
+                            {
+                                if ((info as IEnumerable) == null)
+                                    SetValue(info.GetValue(m, null), ro, co);
+                                co++;
+                            }
+                        }
+
+                        if (co > maxCo)
+                            maxCo = co;
+
+                        ro++;
+                    }
+                }
+
+                ClearMerged();
+                var range = _worksheet.Range(
+                    Address.RowNumber,
+                    Address.ColumnNumber,
+                    ro - 1,
+                    maxCo - 1);
+
+                if (createTable)
+                    return tableName == null ? range.CreateTable() : range.CreateTable(tableName);
+                return tableName == null ? range.AsTable() : range.AsTable(tableName);
+            }
+
+            return null;
+        }
+
+
+        public IXLTable InsertTable(DataTable data)
+        {
+            return InsertTable(data, null, true);
+        }
+
+        public IXLTable InsertTable(DataTable data, bool createTable)
+        {
+            return InsertTable(data, null, createTable);
+        }
+
+        public IXLTable InsertTable(DataTable data, string tableName)
+        {
+            return InsertTable(data, tableName, true);
+        }
+
+        public IXLTable InsertTable(DataTable data, string tableName, bool createTable)
+        {
+            if (data == null) return null;
+
+            if (data.Rows.Count > 0) return InsertTable(data.AsEnumerable(), tableName, createTable);
+
+            var ro = Address.RowNumber;
+            var co = Address.ColumnNumber;
+
+            foreach (DataColumn col in data.Columns)
+            {
+                SetValue(col.ColumnName, ro, co);
+                co++;
+            }
+
+            ClearMerged();
+            var range = _worksheet.Range(
+                Address.RowNumber,
+                Address.ColumnNumber,
+                ro,
+                co - 1);
+
+            if (createTable) return tableName == null ? range.CreateTable() : range.CreateTable(tableName);
+
+            return tableName == null ? range.AsTable() : range.AsTable(tableName);
+        }
+
+        public IXLRange InsertData(IEnumerable data)
+        {
+            if (data != null && data.GetType() != typeof (String))
+            {
+                var ro = Address.RowNumber;
+                var maxCo = 0;
+                var isDataTable = false;
+                var isDataReader = false;
+                foreach (var m in data)
+                {
+                    var co = Address.ColumnNumber;
+
+                    if (m.GetType().IsPrimitive || m is string || m is DateTime || m is Decimal)
+                    {
+                        SetValue(m, ro, co);
+                        co++;
+                    }
+                    else if (m.GetType().IsArray)
+                    {
+                        // dynamic arr = m;
+                        foreach (var item in (Array)m)
+                        {
+                            SetValue(item, ro, co);
+                            co++;
+                        }
+                    }
+                    else if (isDataTable || m is DataRow)
+                    {
+                        if (!isDataTable)
+                            isDataTable = true;
+
+                        foreach (var item in (m as DataRow).ItemArray)
+                        {
+                            SetValue(item, ro, co);
+                            co++;
+                        }
+                    }
+                    else if (isDataReader || m is IDataRecord)
+                    {
+                        if (!isDataReader)
+                            isDataReader = true;
+
+                        var record = m as IDataRecord;
+
+                        var fieldCount = record.FieldCount;
+                        for (var i = 0; i < fieldCount; i++)
+                        {
+                            SetValue(record[i], ro, co);
+                            co++;
+                        }
+                    }
+                    else
+                    {
+                        var fieldInfo = m.GetType().GetFields();
+                        foreach (var info in fieldInfo)
+                        {
+                            SetValue(info.GetValue(m), ro, co);
+                            co++;
+                        }
+
+                        var propertyInfo = m.GetType().GetProperties();
+                        foreach (var info in propertyInfo)
+                        {
+                            if ((info as IEnumerable) == null)
+                                SetValue(info.GetValue(m, null), ro, co);
+                            co++;
+                        }
+                    }
+
+                    if (co > maxCo)
+                        maxCo = co;
+
+                    ro++;
+                }
+
+                ClearMerged();
+                return _worksheet.Range(
+                    Address.RowNumber,
+                    Address.ColumnNumber,
+                    ro - 1,
+                    maxCo - 1);
+            }
+
+            return null;
+        }
+
+        public IXLStyle Style
+        {
+            get { return GetStyle(); }
+
+            set { SetStyle(value); }
+        }
+
+        public IXLCell SetDataType(XLCellValues dataType)
+        {
+            DataType = dataType;
+            return this;
+        }
+
+
+        public XLCellValues DataType
+        {
+            get { return _dataType; }
+            set
+            {
+                if (_dataType == value) return;
+
+                if (_richText != null)
+                {
+                    _cellValue = _richText.ToString();
+                    _richText = null;
+                }
+
+                if (_cellValue.Length > 0)
+                {
+                    if (value == XLCellValues.Boolean)
+                    {
+                        bool bTest;
+                        if (Boolean.TryParse(_cellValue, out bTest))
+                            _cellValue = bTest ? "1" : "0";
+                        else
+                            _cellValue = _cellValue == "0" || String.IsNullOrEmpty(_cellValue) ? "0" : "1";
+                    }
+                    else if (value == XLCellValues.DateTime)
+                    {
+                        DateTime dtTest;
+                        double dblTest;
+                        if (DateTime.TryParse(_cellValue, out dtTest))
+                            _cellValue = dtTest.ToOADate().ToString();
+                        else if (Double.TryParse(_cellValue, out dblTest))
+                            _cellValue = dblTest.ToString();
+                        else
+                        {
+                            throw new ArgumentException(
+                                string.Format(
+                                    "Cannot set data type to DateTime because '{0}' is not recognized as a date.",
+                                    _cellValue));
+                        }
+                        var style = GetStyleForRead();
+                        if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+                            Style.NumberFormat.NumberFormatId = _cellValue.Contains('.') ? 22 : 14;
+                    }
+                    else if (value == XLCellValues.TimeSpan)
+                    {
+                        TimeSpan tsTest;
+                        if (TimeSpan.TryParse(_cellValue, out tsTest))
+                        {
+                            _cellValue = tsTest.ToString();
+                            var style = GetStyleForRead();
+                            if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+                                Style.NumberFormat.NumberFormatId = 46;
+                        }
+                        else
+                        {
+                            try
+                            {
+                                _cellValue = (DateTime.FromOADate(Double.Parse(_cellValue)) - BaseDate).ToString();
+                            }
+                            catch
+                            {
+                                throw new ArgumentException(
+                                    string.Format(
+                                        "Cannot set data type to TimeSpan because '{0}' is not recognized as a TimeSpan.",
+                                        _cellValue));
+                            }
+                        }
+                    }
+                    else if (value == XLCellValues.Number)
+                    {
+                        double dTest;
+                        if (Double.TryParse(_cellValue, out dTest))
+                            _cellValue = Double.Parse(_cellValue).ToString();
+                        else
+                        {
+                            throw new ArgumentException(
+                                string.Format(
+                                    "Cannot set data type to Number because '{0}' is not recognized as a number.",
+                                    _cellValue));
+                        }
+                    }
+                    else
+                    {
+                        if (_dataType == XLCellValues.Boolean)
+                            _cellValue = (_cellValue != "0").ToString();
+                        else if (_dataType == XLCellValues.TimeSpan)
+                            _cellValue = BaseDate.Add(GetTimeSpan()).ToOADate().ToString(CultureInfo.InvariantCulture);
+                    }
+                }
+
+                _dataType = value;
+            }
+        }
+
+        public IXLCell Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            return Clear(clearOptions, false);
+        }
+
+        internal IXLCell Clear(XLClearOptions clearOptions, bool calledFromRange)
+        {
+            //Note: We have to check if the cell is part of a merged range. If so we have to clear the whole range
+            //Checking if called from range to avoid stack overflow
+            if (IsMerged() && !calledFromRange)
+            {
+                using (var asRange = AsRange())
+                {
+                    var firstOrDefault = Worksheet.Internals.MergedRanges.FirstOrDefault(asRange.Intersects);
+                    if (firstOrDefault != null)
+                        firstOrDefault.Clear(clearOptions);
+                }
+            }
+            else
+            {
+                if (clearOptions == XLClearOptions.Contents || clearOptions == XLClearOptions.ContentsAndFormats)
+                {
+                    Hyperlink = null;
+                    _richText = null;
+                    //_comment = null;
+                    _cellValue = String.Empty;
+                    FormulaA1 = String.Empty;
+                }
+
+                if (clearOptions == XLClearOptions.Formats || clearOptions == XLClearOptions.ContentsAndFormats)
+                {
+                    if (HasDataValidation)
+                        DataValidation.Clear();
+
+
+                    SetStyle(Worksheet.Style);
+                }
+            }
+
+            return this;
+        }
+
+
+        public void Delete(XLShiftDeletedCells shiftDeleteCells)
+        {
+            _worksheet.Range(Address, Address).Delete(shiftDeleteCells);
+        }
+
+        public string FormulaA1
+        {
+            get
+            {
+                if (XLHelper.IsNullOrWhiteSpace(_formulaA1))
+                {
+                    if (!XLHelper.IsNullOrWhiteSpace(_formulaR1C1))
+                    {
+                        _formulaA1 = GetFormulaA1(_formulaR1C1);
+                        return FormulaA1;
+                    }
+
+                    return String.Empty;
+                }
+
+                if (_formulaA1.Trim()[0] == '=')
+                    return _formulaA1.Substring(1);
+
+                if (_formulaA1.Trim().StartsWith("{="))
+                    return "{" + _formulaA1.Substring(2);
+
+                return _formulaA1;
+            }
+
+            set
+            {
+                _formulaA1 = XLHelper.IsNullOrWhiteSpace(value) ? null : value;
+
+                _formulaR1C1 = null;
+            }
+        }
+
+        public string FormulaR1C1
+        {
+            get
+            {
+                if (XLHelper.IsNullOrWhiteSpace(_formulaR1C1))
+                    _formulaR1C1 = GetFormulaR1C1(FormulaA1);
+
+                return _formulaR1C1;
+            }
+
+            set
+            {
+                _formulaR1C1 = XLHelper.IsNullOrWhiteSpace(value) ? null : value;
+
+// FormulaA1 = GetFormulaA1(value);
+            }
+        }
+
+        public bool ShareString { get; set; }
+
+        public XLHyperlink Hyperlink
+        {
+            get
+            {
+                if (_hyperlink == null)
+                    Hyperlink = new XLHyperlink();
+
+                return _hyperlink;
+            }
+
+            set
+            {
+                if (_worksheet.Hyperlinks.Any(hl => Address.Equals(hl.Cell.Address)))
+                    _worksheet.Hyperlinks.Delete(Address);
+
+                _hyperlink = value;
+
+                if (_hyperlink == null) return;
+
+                _hyperlink.Worksheet = _worksheet;
+                _hyperlink.Cell = this;
+
+                _worksheet.Hyperlinks.Add(_hyperlink);
+
+                if (SettingHyperlink) return;
+
+                if (GetStyleForRead().Font.FontColor.Equals(_worksheet.Style.Font.FontColor))
+                    Style.Font.FontColor = XLColor.FromTheme(XLThemeColor.Hyperlink);
+
+                if (GetStyleForRead().Font.Underline == _worksheet.Style.Font.Underline)
+                    Style.Font.Underline = XLFontUnderlineValues.Single;
+            }
+        }
+
+
+        public IXLCells InsertCellsAbove(int numberOfRows)
+        {
+            return AsRange().InsertRowsAbove(numberOfRows).Cells();
+        }
+
+        public IXLCells InsertCellsBelow(int numberOfRows)
+        {
+            return AsRange().InsertRowsBelow(numberOfRows).Cells();
+        }
+
+        public IXLCells InsertCellsAfter(int numberOfColumns)
+        {
+            return AsRange().InsertColumnsAfter(numberOfColumns).Cells();
+        }
+
+        public IXLCells InsertCellsBefore(int numberOfColumns)
+        {
+            return AsRange().InsertColumnsBefore(numberOfColumns).Cells();
+        }
+
+        public IXLCell AddToNamed(string rangeName)
+        {
+            AsRange().AddToNamed(rangeName);
+            return this;
+        }
+
+        public IXLCell AddToNamed(string rangeName, XLScope scope)
+        {
+            AsRange().AddToNamed(rangeName, scope);
+            return this;
+        }
+
+        public IXLCell AddToNamed(string rangeName, XLScope scope, string comment)
+        {
+            AsRange().AddToNamed(rangeName, scope, comment);
+            return this;
+        }
+
+        public string ValueCached { get; internal set; }
+
+        public IXLRichText RichText
+        {
+            get
+            {
+                if (_richText == null)
+                {
+                    var style = GetStyleForRead();
+                    _richText = _cellValue.Length == 0
+                                    ? new XLRichText(style.Font)
+                                    : new XLRichText(GetFormattedString(), style.Font);
+                }
+
+                return _richText;
+            }
+        }
+
+        public bool HasRichText
+        {
+            get { return _richText != null; }
+        }
+
+        IXLComment IXLCell.Comment
+        {
+            get { return Comment; }
+        }
+
+        public bool HasComment
+        {
+            get { return _comment != null; }
+        }
+
+        public Boolean IsMerged()
+        {
+            return Worksheet.Internals.MergedRanges.Any(r => r.Contains(this));
+        }
+
+        public Boolean IsEmpty()
+        {
+            return IsEmpty(false);
+        }
+
+        public Boolean IsEmpty(Boolean includeFormats)
+        {
+            if (InnerText.Length > 0)
+                return false;
+
+            if (includeFormats)
+            {
+                if (!Style.Equals(Worksheet.Style) || IsMerged() || HasComment || HasDataValidation)
+                    return false;
+
+                if (_style == null)
+                {
+                    XLRow row;
+                    if (Worksheet.Internals.RowsCollection.TryGetValue(Address.RowNumber, out row) && !row.Style.Equals(Worksheet.Style))
+                        return false;
+
+                    XLColumn column;
+                    if (Worksheet.Internals.ColumnsCollection.TryGetValue(Address.ColumnNumber, out column) && !column.Style.Equals(Worksheet.Style))
+                        return false;
+                }
+
+                if (Worksheet.ConditionalFormats.Any(cf => cf.Range.Contains(this)))
+                    return false;
+            }
+            return true;
+        }
+
+        public IXLColumn WorksheetColumn()
+        {
+            return Worksheet.Column(Address.ColumnNumber);
+        }
+
+        public IXLRow WorksheetRow()
+        {
+            return Worksheet.Row(Address.RowNumber);
+        }
+
+        public IXLCell CopyTo(IXLCell target)
+        {
+            (target as XLCell).CopyFrom(this, true);
+            return target;
+        }
+
+        public IXLCell CopyTo(String target)
+        {
+            return CopyTo(GetTargetCell(target, Worksheet));
+        }
+
+
+        public IXLCell CopyFrom(IXLCell otherCell)
+        {
+            return CopyFrom(otherCell as XLCell, true);
+        }
+
+        public IXLCell CopyFrom(String otherCell)
+        {
+            return CopyFrom(GetTargetCell(otherCell, Worksheet));
+        }
+
+        public IXLCell SetFormulaA1(String formula)
+        {
+            FormulaA1 = formula;
+            return this;
+        }
+
+        public IXLCell SetFormulaR1C1(String formula)
+        {
+            FormulaR1C1 = formula;
+            return this;
+        }
+
+        public Boolean HasDataValidation
+        {
+            get
+            {
+                using (var asRange = AsRange())
+                    return Worksheet.DataValidations.Any(dv => dv.Ranges.Contains(asRange) && dv.IsDirty());
+            }
+        }
+
+        public IXLDataValidation SetDataValidation()
+        {
+            return DataValidation;
+        }
+
+        public void Select()
+        {
+            AsRange().Select();
+        }
+
+        public IXLConditionalFormat AddConditionalFormat()
+        {
+            using (var r = AsRange())
+                return r.AddConditionalFormat();
+        }
+
+        public Boolean Active
+        {
+            get { return Worksheet.ActiveCell == this; }
+            set
+            {
+                if (value)
+                    Worksheet.ActiveCell = this;
+                else if (Active)
+                    Worksheet.ActiveCell = null;
+            }
+        }
+
+        public IXLCell SetActive(Boolean value = true)
+        {
+            Active = value;
+            return this;
+        }
+
+        public Boolean HasHyperlink
+        {
+            get { return _hyperlink != null; }
+        }
+
+        public XLHyperlink GetHyperlink()
+        {
+            if (HasHyperlink)
+                return Hyperlink;
+
+            return Value as XLHyperlink;
+        }
+
+        public Boolean TryGetValue<T>(out T value)
+        {
+            var currValue = Value;
+
+            if (currValue == null)
+            {
+                value = default(T);
+                return true;
+            }
+
+            bool b;
+            if (TryGetTimeSpanValue(out value, currValue, out b)) return b;
+
+            if (TryGetRichStringValue(out value)) return true;
+
+            if (TryGetStringValue(out value, currValue)) return true;
+
+            var strValue = currValue.ToString();
+            if (typeof(T) == typeof(bool)) return TryGetBasicValue<T, bool>(out value, strValue, bool.TryParse);
+            if (typeof(T) == typeof(sbyte)) return TryGetBasicValue<T, sbyte>(out value, strValue, sbyte.TryParse);
+            if (typeof(T) == typeof(byte)) return TryGetBasicValue<T, byte>(out value, strValue, byte.TryParse);
+            if (typeof(T) == typeof(short)) return TryGetBasicValue<T, short>(out value, strValue, short.TryParse);
+            if (typeof(T) == typeof(ushort)) return TryGetBasicValue<T, ushort>(out value, strValue, ushort.TryParse);
+            if (typeof(T) == typeof(int)) return TryGetBasicValue<T, int>(out value, strValue, int.TryParse);
+            if (typeof(T) == typeof(uint)) return TryGetBasicValue<T, uint>(out value, strValue, uint.TryParse);
+            if (typeof(T) == typeof(long)) return TryGetBasicValue<T, long>(out value, strValue, long.TryParse);
+            if (typeof(T) == typeof(ulong)) return TryGetBasicValue<T, ulong>(out value, strValue, ulong.TryParse);
+            if (typeof(T) == typeof(float)) return TryGetBasicValue<T, float>(out value, strValue, float.TryParse);
+            if (typeof(T) == typeof(double)) return TryGetBasicValue<T, double>(out value, strValue, double.TryParse);
+            if (typeof(T) == typeof(decimal)) return TryGetBasicValue<T, decimal>(out value, strValue, decimal.TryParse);
+
+            if (typeof(T) == typeof(XLHyperlink))
+            {
+                XLHyperlink tmp = GetHyperlink();
+                if (tmp != null)
+                {
+                    value = (T)Convert.ChangeType(tmp, typeof(T));
+                    return true;
+                }
+
+                value = default(T);
+                return false;
+            }
+
+            try
+            {
+                value = (T)Convert.ChangeType(currValue, typeof(T));
+                return true;
+            }
+            catch
+            {
+                value = default(T);
+                return false;
+            }
+        }
+
+        private static bool TryGetTimeSpanValue<T>(out T value, object currValue, out bool b)
+        {
+            if (typeof (T) == typeof (TimeSpan))
+            {
+                TimeSpan tmp;
+                Boolean retVal = true;
+
+                if (currValue is TimeSpan)
+                {
+                    tmp = (TimeSpan) currValue;
+                }
+                else if (!TimeSpan.TryParse(currValue.ToString(), out tmp))
+                {
+                    retVal = false;
+                }
+
+                value = (T) Convert.ChangeType(tmp, typeof (T));
+                {
+                    b = retVal;
+                    return true;
+                }
+            }
+            value = default(T);
+            b = false;
+            return false;
+        }
+
+        private bool TryGetRichStringValue<T>(out T value)
+        {
+            if (typeof (T) == typeof (IXLRichText))
+            {
+                value = (T) RichText;
+                return true;
+            }
+            value = default(T);
+            return false;
+        }
+
+        private static bool TryGetStringValue<T>(out T value, object currValue)
+        {
+            if (typeof (T) == typeof (String))
+            {
+                var valToUse = currValue.ToString();
+                if (!utfPattern.Match(valToUse).Success)
+                {
+                    value = (T) Convert.ChangeType(valToUse, typeof (T));
+                    return true;
+                }
+
+                var sb = new StringBuilder();
+                var lastIndex = 0;
+                foreach (Match match in utfPattern.Matches(valToUse))
+                {
+                    var matchString = match.Value;
+                    var matchIndex = match.Index;
+                    sb.Append(valToUse.Substring(lastIndex, matchIndex - lastIndex));
+
+                    sb.Append((char) int.Parse(match.Groups[1].Value, NumberStyles.AllowHexSpecifier));
+
+                    lastIndex = matchIndex + matchString.Length;
+                }
+                if (lastIndex < valToUse.Length)
+                    sb.Append(valToUse.Substring(lastIndex));
+
+                value = (T) Convert.ChangeType(sb.ToString(), typeof (T));
+                return true;
+            }
+            value = default(T);
+            return false;
+        }
+
+        private static Boolean TryGetBooleanValue<T>(out T value, object currValue)
+        {
+            if (typeof (T) == typeof (Boolean))
+            {
+                Boolean tmp;
+                if (Boolean.TryParse(currValue.ToString(), out tmp))
+                {
+                    value = (T) Convert.ChangeType(tmp, typeof (T));
+                    {
+                        return true;
+                    }
+                }
+            }
+            value = default(T);
+            return false;
+        }
+
+        delegate Boolean Func<T>(String input, out T output);
+
+        private static Boolean TryGetBasicValue<T, U>(out T value, String currValue, Func<U> func )
+        {
+                U tmp;
+                if (func(currValue, out tmp))
+                {
+                    value = (T)Convert.ChangeType(tmp, typeof(T));
+                    {
+                        return true;
+                    }
+                }
+            value = default(T);
+            return false;
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public Boolean StyleChanged { get; set; }
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return Style;
+                UpdatingStyle = false;
+            }
+        }
+
+        public bool UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return Style; }
+            set { Style = value; }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges {AsRange()};
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        private bool SetRangeColumns(object value)
+        {
+            var columns = value as XLRangeColumns;
+            if (columns == null)
+                return SetColumns(value);
+
+            var cell = this;
+            foreach (var column in columns)
+            {
+                cell.SetRange(column);
+                cell = cell.CellRight();
+            }
+            return true;
+        }
+
+        private bool SetColumns(object value)
+        {
+            var columns = value as XLColumns;
+            if (columns == null)
+                return false;
+
+            var cell = this;
+            foreach (var column in columns)
+            {
+                cell.SetRange(column);
+                cell = cell.CellRight();
+            }
+            return true;
+        }
+
+        private bool SetRangeRows(object value)
+        {
+            var rows = value as XLRangeRows;
+            if (rows == null)
+                return SetRows(value);
+
+            var cell = this;
+            foreach (var row in rows)
+            {
+                cell.SetRange(row);
+                cell = cell.CellBelow();
+            }
+            return true;
+        }
+
+        private bool SetRows(object value)
+        {
+            var rows = value as XLRows;
+            if (rows == null)
+                return false;
+
+            var cell = this;
+            foreach (var row in rows)
+            {
+                cell.SetRange(row);
+                cell = cell.CellBelow();
+            }
+            return true;
+        }
+
+        public XLRange AsRange()
+        {
+            return _worksheet.Range(Address, Address);
+        }
+
+        private IXLStyle GetStyle()
+        {
+            //return _style ?? (_style = new XLStyle(this, Worksheet.Workbook.GetStyleById(_styleCacheId)));
+            if (_style != null)
+                return _style;
+
+            return _style = new XLStyle(this, Worksheet.Workbook.GetStyleById(_styleCacheId));
+        }
+
+        public void DeleteComment()
+        {
+            _comment = null;
+        }
+
+        private bool IsDateFormat()
+        {
+            var style = GetStyleForRead();
+            return _dataType == XLCellValues.Number
+                   && XLHelper.IsNullOrWhiteSpace(style.NumberFormat.Format)
+                   && ((style.NumberFormat.NumberFormatId >= 14
+                        && style.NumberFormat.NumberFormatId <= 22)
+                       || (style.NumberFormat.NumberFormatId >= 45
+                           && style.NumberFormat.NumberFormatId <= 47));
+        }
+
+        private string GetFormat()
+        {
+            var format = String.Empty;
+            var style = GetStyleForRead();
+            if (XLHelper.IsNullOrWhiteSpace(style.NumberFormat.Format))
+            {
+                var formatCodes = GetFormatCodes();
+                if (formatCodes.ContainsKey(style.NumberFormat.NumberFormatId))
+                    format = formatCodes[style.NumberFormat.NumberFormatId];
+            }
+            else
+                format = style.NumberFormat.Format;
+            return format;
+        }
+
+        private bool SetRichText(object value)
+        {
+            var asRichString = value as XLRichText;
+
+            if (asRichString == null)
+                return false;
+
+            _richText = asRichString;
+            _dataType = XLCellValues.Text;
+            return true;
+        }
+
+        private Boolean SetRange(Object rangeObject)
+        {
+            var asRange = rangeObject as XLRangeBase;
+            if (asRange == null)
+            {
+                var tmp = rangeObject as XLCell;
+                if (tmp != null)
+                    asRange = tmp.AsRange();
+            }
+
+            if (asRange != null)
+            {
+                if (!(asRange is XLRow || asRange is XLColumn))
+                {
+                    var maxRows = asRange.RowCount();
+                    var maxColumns = asRange.ColumnCount();
+                    Worksheet.Range(Address.RowNumber, Address.ColumnNumber, maxRows, maxColumns).Clear();
+                }
+
+                var minRow = asRange.RangeAddress.FirstAddress.RowNumber;
+                var minColumn = asRange.RangeAddress.FirstAddress.ColumnNumber;
+                foreach (var sourceCell in asRange.CellsUsed(true))
+                {
+                    Worksheet.Cell(
+                        Address.RowNumber + sourceCell.Address.RowNumber - minRow,
+                        Address.ColumnNumber + sourceCell.Address.ColumnNumber - minColumn
+                        ).CopyFrom(sourceCell, true);
+                }
+
+                var rangesToMerge = (from mergedRange in (asRange.Worksheet).Internals.MergedRanges
+                                     where asRange.Contains(mergedRange)
+                                     let initialRo =
+                                         Address.RowNumber +
+                                         (mergedRange.RangeAddress.FirstAddress.RowNumber -
+                                          asRange.RangeAddress.FirstAddress.RowNumber)
+                                     let initialCo =
+                                         Address.ColumnNumber +
+                                         (mergedRange.RangeAddress.FirstAddress.ColumnNumber -
+                                          asRange.RangeAddress.FirstAddress.ColumnNumber)
+                                     select
+                                         Worksheet.Range(initialRo, initialCo, initialRo + mergedRange.RowCount() - 1,
+                                                         initialCo + mergedRange.ColumnCount() - 1)).Cast<IXLRange>().
+                    ToList();
+                rangesToMerge.ForEach(r => r.Merge());
+
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool SetEnumerable(object collectionObject)
+        {
+            var asEnumerable = collectionObject as IEnumerable;
+            return InsertData(asEnumerable) != null;
+        }
+
+        private void ClearMerged()
+        {
+            List<IXLRange> mergeToDelete;
+            using (var asRange = AsRange())
+                mergeToDelete = Worksheet.Internals.MergedRanges.Where(merge => merge.Intersects(asRange)).ToList();
+
+            mergeToDelete.ForEach(m => Worksheet.Internals.MergedRanges.Remove(m));
+        }
+
+        private void SetValue<T>(T value, int ro, int co) where T : class
+        {
+            if (value == null)
+                _worksheet.Cell(ro, co).SetValue(String.Empty);
+            else
+            {
+                if (value is IConvertible)
+                    _worksheet.Cell(ro, co).SetValue((T)Convert.ChangeType(value, typeof (T)));
+                else
+                    _worksheet.Cell(ro, co).SetValue(value);
+            }
+        }
+
+        private void SetValue(object value)
+        {
+            FormulaA1 = String.Empty;
+            var val = value == null ? String.Empty : value.ToString();
+            _richText = null;
+            if (val.Length == 0)
+                _dataType = XLCellValues.Text;
+            else
+            {
+                double dTest;
+                DateTime dtTest;
+                bool bTest;
+                TimeSpan tsTest;
+                var style = GetStyleForRead();
+                if (style.NumberFormat.Format == "@")
+                {
+                    _dataType = XLCellValues.Text;
+                    if (val.Contains(Environment.NewLine) && !style.Alignment.WrapText)
+                        Style.Alignment.WrapText = true;
+                }
+                else if (val[0] == '\'')
+                {
+                    val = val.Substring(1, val.Length - 1);
+                    _dataType = XLCellValues.Text;
+                    if (val.Contains(Environment.NewLine) && !style.Alignment.WrapText)
+                        Style.Alignment.WrapText = true;
+                }
+                else if (value is TimeSpan || (!Double.TryParse(val, out dTest) && TimeSpan.TryParse(val, out tsTest)))
+                {
+                    if (!(value is TimeSpan) && TimeSpan.TryParse(val, out tsTest))
+                        val = tsTest.ToString();
+
+                    _dataType = XLCellValues.TimeSpan;
+                    if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+                        Style.NumberFormat.NumberFormatId = 46;
+                }
+                else if (val.Trim() != "NaN" &&  Double.TryParse(val, out dTest))
+                    _dataType = XLCellValues.Number;
+                else if (DateTime.TryParse(val, out dtTest) && dtTest >= BaseDate)
+                {
+
+                    _dataType = XLCellValues.DateTime;
+
+                    if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+                        Style.NumberFormat.NumberFormatId = dtTest.Date == dtTest ? 14 : 22;
+                    {
+                        DateTime forMillis;
+                        if (value is DateTime && (forMillis = (DateTime)value).Millisecond > 0)
+                        {
+                            val = forMillis.ToOADate().ToString();
+                        }
+                        else
+                        {
+                            val = dtTest.ToOADate().ToString();
+                        }
+                    }
+                    
+                }
+                else if (Boolean.TryParse(val, out bTest))
+                {
+                    _dataType = XLCellValues.Boolean;
+                    val = bTest ? "1" : "0";
+                }
+                else
+                {
+                    _dataType = XLCellValues.Text;
+                    if (val.Contains(Environment.NewLine) && !style.Alignment.WrapText)
+                        Style.Alignment.WrapText = true;
+                }
+            }
+            if (val.Length > 32767) throw new ArgumentException("Cells can only hold 32,767 characters.");
+            _cellValue = val;
+        }
+
+        private static Dictionary<int, string> GetFormatCodes()
+        {
+            if (_formatCodes == null)
+            {
+                var fCodes = new Dictionary<int, string>
+                    {
+                        {0, string.Empty},
+                        {1, "0"},
+                        {2, "0.00"},
+                        {3, "#,##0"},
+                        {4, "#,##0.00"},
+                        {7, "$#,##0.00_);($#,##0.00)"},
+                        {9, "0%"},
+                        {10, "0.00%"},
+                        {11, "0.00E+00"},
+                        {12, "# ?/?"},
+                        {13, "# ??/??"},
+                        {14, "M/d/yyyy"},
+                        {15, "d-MMM-yy"},
+                        {16, "d-MMM"},
+                        {17, "MMM-yy"},
+                        {18, "h:mm tt"},
+                        {19, "h:mm:ss tt"},
+                        {20, "H:mm"},
+                        {21, "H:mm:ss"},
+                        {22, "M/d/yyyy H:mm"},
+                        {37, "#,##0 ;(#,##0)"},
+                        {38, "#,##0 ;[Red](#,##0)"},
+                        {39, "#,##0.00;(#,##0.00)"},
+                        {40, "#,##0.00;[Red](#,##0.00)"},
+                        {45, "mm:ss"},
+                        {46, "[h]:mm:ss"},
+                        {47, "mmss.0"},
+                        {48, "##0.0E+0"},
+                        {49, "@"}
+                    };
+                _formatCodes = fCodes;
+            }
+
+            return _formatCodes;
+        }
+
+        private string GetFormulaR1C1(string value)
+        {
+            return GetFormula(value, FormulaConversionType.A1ToR1C1, 0, 0);
+        }
+
+        private string GetFormulaA1(string value)
+        {
+            return GetFormula(value, FormulaConversionType.R1C1ToA1, 0, 0);
+        }
+
+        private string GetFormula(string strValue, FormulaConversionType conversionType, int rowsToShift,
+                                  int columnsToShift)
+        {
+            if (XLHelper.IsNullOrWhiteSpace(strValue))
+                return String.Empty;
+
+            var value = ">" + strValue + "<";
+
+            var regex = conversionType == FormulaConversionType.A1ToR1C1 ? A1Regex : R1C1Regex;
+
+            var sb = new StringBuilder();
+            var lastIndex = 0;
+
+            foreach (var match in regex.Matches(value).Cast<Match>())
+            {
+                var matchString = match.Value;
+                var matchIndex = match.Index;
+                if (value.Substring(0, matchIndex).CharCount('"') % 2 == 0)
+                {
+// Check if the match is in between quotes
+                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex));
+                    sb.Append(conversionType == FormulaConversionType.A1ToR1C1
+                                  ? GetR1C1Address(matchString, rowsToShift, columnsToShift)
+                                  : GetA1Address(matchString, rowsToShift, columnsToShift));
+                }
+                else
+                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex + matchString.Length));
+                lastIndex = matchIndex + matchString.Length;
+            }
+
+            if (lastIndex < value.Length)
+                sb.Append(value.Substring(lastIndex));
+
+            var retVal = sb.ToString();
+            return retVal.Substring(1, retVal.Length - 2);
+        }
+
+        private string GetA1Address(string r1C1Address, int rowsToShift, int columnsToShift)
+        {
+            var addressToUse = r1C1Address.ToUpper();
+
+            if (addressToUse.Contains(':'))
+            {
+                var parts = addressToUse.Split(':');
+                var p1 = parts[0];
+                var p2 = parts[1];
+                string leftPart;
+                string rightPart;
+                if (p1.StartsWith("R"))
+                {
+                    leftPart = GetA1Row(p1, rowsToShift);
+                    rightPart = GetA1Row(p2, rowsToShift);
+                }
+                else
+                {
+                    leftPart = GetA1Column(p1, columnsToShift);
+                    rightPart = GetA1Column(p2, columnsToShift);
+                }
+
+                return leftPart + ":" + rightPart;
+            }
+
+            var rowPart = addressToUse.Substring(0, addressToUse.IndexOf("C"));
+            var rowToReturn = GetA1Row(rowPart, rowsToShift);
+
+            var columnPart = addressToUse.Substring(addressToUse.IndexOf("C"));
+            var columnToReturn = GetA1Column(columnPart, columnsToShift);
+
+            var retAddress = columnToReturn + rowToReturn;
+            return retAddress;
+        }
+
+        private string GetA1Column(string columnPart, int columnsToShift)
+        {
+            string columnToReturn;
+            if (columnPart == "C")
+                columnToReturn = XLHelper.GetColumnLetterFromNumber(Address.ColumnNumber + columnsToShift);
+            else
+            {
+                var bIndex = columnPart.IndexOf("[");
+                var mIndex = columnPart.IndexOf("-");
+                if (bIndex >= 0)
+                {
+                    columnToReturn = XLHelper.GetColumnLetterFromNumber(
+                        Address.ColumnNumber +
+                        Int32.Parse(columnPart.Substring(bIndex + 1, columnPart.Length - bIndex - 2)) + columnsToShift
+                        );
+                }
+                else if (mIndex >= 0)
+                {
+                    columnToReturn = XLHelper.GetColumnLetterFromNumber(
+                        Address.ColumnNumber + Int32.Parse(columnPart.Substring(mIndex)) + columnsToShift
+                        );
+                }
+                else
+                {
+                    columnToReturn = "$" +
+                                     XLHelper.GetColumnLetterFromNumber(Int32.Parse(columnPart.Substring(1)) +
+                                                                        columnsToShift);
+                }
+            }
+
+            return columnToReturn;
+        }
+
+        private string GetA1Row(string rowPart, int rowsToShift)
+        {
+            string rowToReturn;
+            if (rowPart == "R")
+                rowToReturn = (Address.RowNumber + rowsToShift).ToString();
+            else
+            {
+                var bIndex = rowPart.IndexOf("[");
+                if (bIndex >= 0)
+                {
+                    rowToReturn =
+                        (Address.RowNumber + Int32.Parse(rowPart.Substring(bIndex + 1, rowPart.Length - bIndex - 2)) +
+                         rowsToShift).ToString();
+                }
+                else
+                    rowToReturn = "$" + (Int32.Parse(rowPart.Substring(1)) + rowsToShift);
+            }
+
+            return rowToReturn;
+        }
+
+        private string GetR1C1Address(string a1Address, int rowsToShift, int columnsToShift)
+        {
+            if (a1Address.Contains(':'))
+            {
+                var parts = a1Address.Split(':');
+                var p1 = parts[0];
+                var p2 = parts[1];
+                int row1;
+                if (Int32.TryParse(p1.Replace("$", string.Empty), out row1))
+                {
+                    var row2 = Int32.Parse(p2.Replace("$", string.Empty));
+                    var leftPart = GetR1C1Row(row1, p1.Contains('$'), rowsToShift);
+                    var rightPart = GetR1C1Row(row2, p2.Contains('$'), rowsToShift);
+                    return leftPart + ":" + rightPart;
+                }
+                else
+                {
+                    var column1 = XLHelper.GetColumnNumberFromLetter(p1.Replace("$", string.Empty));
+                    var column2 = XLHelper.GetColumnNumberFromLetter(p2.Replace("$", string.Empty));
+                    var leftPart = GetR1C1Column(column1, p1.Contains('$'), columnsToShift);
+                    var rightPart = GetR1C1Column(column2, p2.Contains('$'), columnsToShift);
+                    return leftPart + ":" + rightPart;
+                }
+            }
+
+            var address = XLAddress.Create(_worksheet, a1Address);
+
+            var rowPart = GetR1C1Row(address.RowNumber, address.FixedRow, rowsToShift);
+            var columnPart = GetR1C1Column(address.ColumnNumber, address.FixedColumn, columnsToShift);
+
+            return rowPart + columnPart;
+        }
+
+        private string GetR1C1Row(int rowNumber, bool fixedRow, int rowsToShift)
+        {
+            string rowPart;
+            rowNumber += rowsToShift;
+            var rowDiff = rowNumber - Address.RowNumber;
+            if (rowDiff != 0 || fixedRow)
+                rowPart = fixedRow ? String.Format("R{0}", rowNumber) : String.Format("R[{0}]", rowDiff);
+            else
+                rowPart = "R";
+
+            return rowPart;
+        }
+
+        private string GetR1C1Column(int columnNumber, bool fixedColumn, int columnsToShift)
+        {
+            string columnPart;
+            columnNumber += columnsToShift;
+            var columnDiff = columnNumber - Address.ColumnNumber;
+            if (columnDiff != 0 || fixedColumn)
+                columnPart = fixedColumn ? String.Format("C{0}", columnNumber) : String.Format("C[{0}]", columnDiff);
+            else
+                columnPart = "C";
+
+            return columnPart;
+        }
+
+        internal void CopyValues(XLCell source)
+        {
+            _cellValue = source._cellValue;
+            _dataType = source._dataType;
+            FormulaR1C1 = source.FormulaR1C1;
+            _richText = source._richText == null ? null : new XLRichText(source._richText, source.Style.Font);
+            _comment = source._comment == null ? null : new XLComment(this, source._comment, source.Style.Font);
+
+            if (source._hyperlink != null)
+            {
+                SettingHyperlink = true;
+                Hyperlink = new XLHyperlink(source.Hyperlink);
+                SettingHyperlink = false;
+            }
+        }
+
+        private IXLCell GetTargetCell(String target, XLWorksheet defaultWorksheet)
+        {
+            var pair = target.Split('!');
+            if (pair.Length == 1)
+                return defaultWorksheet.Cell(target);
+
+            var wsName = pair[0];
+            if (wsName.StartsWith("'"))
+                wsName = wsName.Substring(1, wsName.Length - 2);
+            return defaultWorksheet.Workbook.Worksheet(wsName).Cell(pair[1]);
+        }
+
+
+        public IXLCell CopyFrom(XLCell otherCell, Boolean copyDataValidations)
+        {
+            var source = otherCell;
+            CopyValues(otherCell);
+
+            SetStyle(source._style ?? source.Worksheet.Workbook.GetStyleById(source._styleCacheId));
+
+            var conditionalFormats = otherCell.Worksheet.ConditionalFormats.Where(c => c.Range.Contains(otherCell)).ToList();
+            foreach (var cf in conditionalFormats)
+            {
+                var c = new XLConditionalFormat(cf as XLConditionalFormat) {Range = AsRange()};
+                var oldValues = c.Values.Values.ToList();
+                c.Values.Clear();
+                foreach (var v in oldValues)
+                {
+                    var f = v.Value;
+                    if (v.IsFormula)
+                    {
+                        var r1c1 = otherCell.GetFormulaR1C1(f);
+                        f = GetFormulaA1(r1c1);
+                    }
+
+
+                    c.Values.Add(new XLFormula {_value = f, IsFormula = v.IsFormula});
+                }
+
+                _worksheet.ConditionalFormats.Add(c);
+            }
+
+            if (copyDataValidations)
+            {
+                var eventTracking = Worksheet.EventTrackingEnabled;
+                Worksheet.EventTrackingEnabled = false;
+                if (otherCell.HasDataValidation)
+                    CopyDataValidation(otherCell, otherCell.DataValidation);
+                else if (HasDataValidation)
+                {
+                    using (var asRange = AsRange())
+                        Worksheet.DataValidations.Delete(asRange);
+                }
+                Worksheet.EventTrackingEnabled = eventTracking;
+            }
+
+            return this;
+        }
+
+        internal void CopyDataValidation(XLCell otherCell, XLDataValidation otherDv)
+        {
+            var thisDv = DataValidation;
+            thisDv.CopyFrom(otherDv);
+            thisDv.Value = GetFormulaA1(otherCell.GetFormulaR1C1(otherDv.Value));
+            thisDv.MinValue = GetFormulaA1(otherCell.GetFormulaR1C1(otherDv.MinValue));
+            thisDv.MaxValue = GetFormulaA1(otherCell.GetFormulaR1C1(otherDv.MaxValue));
+        }
+
+        internal void ShiftFormulaRows(XLRange shiftedRange, int rowsShifted)
+        {
+            _formulaA1 = ShiftFormulaRows(FormulaA1, Worksheet, shiftedRange, rowsShifted);
+        }
+
+        internal static String ShiftFormulaRows(String formulaA1, XLWorksheet worksheetInAction, XLRange shiftedRange,
+                                                int rowsShifted)
+        {
+            if (XLHelper.IsNullOrWhiteSpace(formulaA1)) return String.Empty;
+
+            var value = formulaA1; // ">" + formulaA1 + "<";
+
+            var regex = A1SimpleRegex;
+
+            var sb = new StringBuilder();
+            var lastIndex = 0;
+
+            var shiftedWsName = shiftedRange.Worksheet.Name;
+            foreach (var match in regex.Matches(value).Cast<Match>())
+            {
+                var matchString = match.Value;
+                var matchIndex = match.Index;
+                if (value.Substring(0, matchIndex).CharCount('"') % 2 == 0)
+                {
+                    // Check that the match is not between quotes
+                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex));
+                    string sheetName;
+                    var useSheetName = false;
+                    if (matchString.Contains('!'))
+                    {
+                        sheetName = matchString.Substring(0, matchString.IndexOf('!'));
+                        if (sheetName[0] == '\'')
+                            sheetName = sheetName.Substring(1, sheetName.Length - 2);
+                        useSheetName = true;
+                    }
+                    else
+                        sheetName = worksheetInAction.Name;
+
+                    if (String.Compare(sheetName, shiftedWsName, true) == 0)
+                    {
+                        var rangeAddress = matchString.Substring(matchString.IndexOf('!') + 1);
+                        if (!A1ColumnRegex.IsMatch(rangeAddress))
+                        {
+                            var matchRange = worksheetInAction.Workbook.Worksheet(sheetName).Range(rangeAddress);
+                            if (shiftedRange.RangeAddress.FirstAddress.RowNumber <= matchRange.RangeAddress.LastAddress.RowNumber
+                                && shiftedRange.RangeAddress.FirstAddress.ColumnNumber <= matchRange.RangeAddress.FirstAddress.ColumnNumber
+                                && shiftedRange.RangeAddress.LastAddress.ColumnNumber >= matchRange.RangeAddress.LastAddress.ColumnNumber)
+                            {
+                                if (A1RowRegex.IsMatch(rangeAddress))
+                                {
+                                    var rows = rangeAddress.Split(':');
+                                    var row1String = rows[0];
+                                    var row2String = rows[1];
+                                    string row1;
+                                    if (row1String[0] == '$')
+                                    {
+                                        row1 = "$" +
+                                               (Int32.Parse(row1String.Substring(1)) + rowsShifted).ToInvariantString();
+                                    }
+                                    else
+                                        row1 = (Int32.Parse(row1String) + rowsShifted).ToInvariantString();
+
+                                    string row2;
+                                    if (row2String[0] == '$')
+                                    {
+                                        row2 = "$" +
+                                               (Int32.Parse(row2String.Substring(1)) + rowsShifted).ToInvariantString();
+                                    }
+                                    else
+                                        row2 = (Int32.Parse(row2String) + rowsShifted).ToInvariantString();
+
+                                    sb.Append(useSheetName
+                                                  ? String.Format("'{0}'!{1}:{2}", sheetName, row1, row2)
+                                                  : String.Format("{0}:{1}", row1, row2));
+                                }
+                                else if (shiftedRange.RangeAddress.FirstAddress.RowNumber <=
+                                         matchRange.RangeAddress.FirstAddress.RowNumber)
+                                {
+                                    if (rangeAddress.Contains(':'))
+                                    {
+                                        if (useSheetName)
+                                        {
+                                            sb.Append(String.Format("'{0}'!{1}:{2}",
+                                                                    sheetName,
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber +
+                                                                                  rowsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnLetter,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn),
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.RowNumber +
+                                                                                  rowsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.ColumnLetter,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedColumn)));
+                                        }
+                                        else
+                                        {
+                                            sb.Append(String.Format("{0}:{1}",
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber +
+                                                                                  rowsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnLetter,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn),
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.RowNumber +
+                                                                                  rowsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.ColumnLetter,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedColumn)));
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if (useSheetName)
+                                        {
+                                            sb.Append(String.Format("'{0}'!{1}",
+                                                                    sheetName,
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber +
+                                                                                  rowsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnLetter,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn)));
+                                        }
+                                        else
+                                        {
+                                            sb.Append(String.Format("{0}",
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber +
+                                                                                  rowsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnLetter,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn)));
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    if (useSheetName)
+                                    {
+                                        sb.Append(String.Format("'{0}'!{1}:{2}",
+                                                                sheetName,
+                                                                matchRange.RangeAddress.FirstAddress,
+                                                                new XLAddress(worksheetInAction,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.RowNumber +
+                                                                              rowsShifted,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.ColumnLetter,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedRow,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedColumn)));
+                                    }
+                                    else
+                                    {
+                                        sb.Append(String.Format("{0}:{1}",
+                                                                matchRange.RangeAddress.FirstAddress,
+                                                                new XLAddress(worksheetInAction,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.RowNumber +
+                                                                              rowsShifted,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.ColumnLetter,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedRow,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedColumn)));
+                                    }
+                                }
+                            }
+                            else
+                                sb.Append(matchString);
+                        }
+                        else
+                            sb.Append(matchString);
+                    }
+                    else
+                        sb.Append(matchString);
+                }
+                else
+                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex + matchString.Length));
+                lastIndex = matchIndex + matchString.Length;
+            }
+
+            if (lastIndex < value.Length)
+                sb.Append(value.Substring(lastIndex));
+
+            return sb.ToString();
+
+            //string retVal = sb.ToString();
+            //return retVal.Substring(1, retVal.Length - 2);
+        }
+
+        internal void ShiftFormulaColumns(XLRange shiftedRange, int columnsShifted)
+        {
+            _formulaA1 = ShiftFormulaColumns(FormulaA1, Worksheet, shiftedRange, columnsShifted);
+        }
+
+        internal static String ShiftFormulaColumns(String formulaA1, XLWorksheet worksheetInAction, XLRange shiftedRange,
+                                                   int columnsShifted)
+        {
+            if (XLHelper.IsNullOrWhiteSpace(formulaA1)) return String.Empty;
+
+            var value = formulaA1; // ">" + formulaA1 + "<";
+
+            var regex = A1SimpleRegex;
+
+            var sb = new StringBuilder();
+            var lastIndex = 0;
+
+            foreach (var match in regex.Matches(value).Cast<Match>())
+            {
+                var matchString = match.Value;
+                var matchIndex = match.Index;
+                if (value.Substring(0, matchIndex).CharCount('"') % 2 == 0)
+                {
+// Check that the match is not between quotes
+                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex));
+                    string sheetName;
+                    var useSheetName = false;
+                    if (matchString.Contains('!'))
+                    {
+                        sheetName = matchString.Substring(0, matchString.IndexOf('!'));
+                        if (sheetName[0] == '\'')
+                            sheetName = sheetName.Substring(1, sheetName.Length - 2);
+                        useSheetName = true;
+                    }
+                    else
+                        sheetName = worksheetInAction.Name;
+
+                    if (String.Compare(sheetName, shiftedRange.Worksheet.Name, true) == 0)
+                    {
+                        var rangeAddress = matchString.Substring(matchString.IndexOf('!') + 1);
+                        if (!A1RowRegex.IsMatch(rangeAddress))
+                        {
+                            var matchRange = worksheetInAction.Workbook.Worksheet(sheetName).Range(rangeAddress);
+                            if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
+                                matchRange.RangeAddress.LastAddress.ColumnNumber
+                                &&
+                                shiftedRange.RangeAddress.FirstAddress.RowNumber <=
+                                matchRange.RangeAddress.FirstAddress.RowNumber
+                                &&
+                                shiftedRange.RangeAddress.LastAddress.RowNumber >=
+                                matchRange.RangeAddress.LastAddress.RowNumber)
+                            {
+                                if (A1ColumnRegex.IsMatch(rangeAddress))
+                                {
+                                    var columns = rangeAddress.Split(':');
+                                    var column1String = columns[0];
+                                    var column2String = columns[1];
+                                    string column1;
+                                    if (column1String[0] == '$')
+                                    {
+                                        column1 = "$" +
+                                                  XLHelper.GetColumnLetterFromNumber(
+                                                      XLHelper.GetColumnNumberFromLetter(
+                                                          column1String.Substring(1)) + columnsShifted);
+                                    }
+                                    else
+                                    {
+                                        column1 =
+                                            XLHelper.GetColumnLetterFromNumber(
+                                                XLHelper.GetColumnNumberFromLetter(column1String) +
+                                                columnsShifted);
+                                    }
+
+                                    string column2;
+                                    if (column2String[0] == '$')
+                                    {
+                                        column2 = "$" +
+                                                  XLHelper.GetColumnLetterFromNumber(
+                                                      XLHelper.GetColumnNumberFromLetter(
+                                                          column2String.Substring(1)) + columnsShifted);
+                                    }
+                                    else
+                                    {
+                                        column2 =
+                                            XLHelper.GetColumnLetterFromNumber(
+                                                XLHelper.GetColumnNumberFromLetter(column2String) +
+                                                columnsShifted);
+                                    }
+
+                                    sb.Append(useSheetName
+                                                  ? String.Format("'{0}'!{1}:{2}", sheetName, column1, column2)
+                                                  : String.Format("{0}:{1}", column1, column2));
+                                }
+                                else if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
+                                         matchRange.RangeAddress.FirstAddress.ColumnNumber)
+                                {
+                                    if (rangeAddress.Contains(':'))
+                                    {
+                                        if (useSheetName)
+                                        {
+                                            sb.Append(String.Format("'{0}'!{1}:{2}",
+                                                                    sheetName,
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnNumber +
+                                                                                  columnsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn),
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.RowNumber,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.ColumnNumber +
+                                                                                  columnsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedColumn)));
+                                        }
+                                        else
+                                        {
+                                            sb.Append(String.Format("{0}:{1}",
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnNumber +
+                                                                                  columnsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn),
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.RowNumber,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.ColumnNumber +
+                                                                                  columnsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      LastAddress.FixedColumn)));
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if (useSheetName)
+                                        {
+                                            sb.Append(String.Format("'{0}'!{1}",
+                                                                    sheetName,
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnNumber +
+                                                                                  columnsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn)));
+                                        }
+                                        else
+                                        {
+                                            sb.Append(String.Format("{0}",
+                                                                    new XLAddress(worksheetInAction,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.RowNumber,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.ColumnNumber +
+                                                                                  columnsShifted,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedRow,
+                                                                                  matchRange.RangeAddress.
+                                                                                      FirstAddress.FixedColumn)));
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    if (useSheetName)
+                                    {
+                                        sb.Append(String.Format("'{0}'!{1}:{2}",
+                                                                sheetName,
+                                                                matchRange.RangeAddress.FirstAddress,
+                                                                new XLAddress(worksheetInAction,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.RowNumber,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.ColumnNumber +
+                                                                              columnsShifted,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedRow,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedColumn)));
+                                    }
+                                    else
+                                    {
+                                        sb.Append(String.Format("{0}:{1}",
+                                                                matchRange.RangeAddress.FirstAddress,
+                                                                new XLAddress(worksheetInAction,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.RowNumber,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.ColumnNumber +
+                                                                              columnsShifted,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedRow,
+                                                                              matchRange.RangeAddress.
+                                                                                  LastAddress.FixedColumn)));
+                                    }
+                                }
+                            }
+                            else
+                                sb.Append(matchString);
+                        }
+                        else
+                            sb.Append(matchString);
+                    }
+                    else
+                        sb.Append(matchString);
+                }
+                else
+                    sb.Append(value.Substring(lastIndex, matchIndex - lastIndex + matchString.Length));
+                lastIndex = matchIndex + matchString.Length;
+            }
+
+            if (lastIndex < value.Length)
+                sb.Append(value.Substring(lastIndex));
+
+            return sb.ToString();
+
+            //string retVal = sb.ToString();
+            //return retVal.Substring(1, retVal.Length - 2);
+        }
+
+        // --
+
+        private XLCell CellShift(Int32 rowsToShift, Int32 columnsToShift)
+        {
+            return Worksheet.Cell(Address.RowNumber + rowsToShift, Address.ColumnNumber + columnsToShift);
+        }
+
+        private static String GetFieldName(Object[] customAttributes)
+        {
+#if NET4
+            var attribute = customAttributes.FirstOrDefault(a => a is DisplayAttribute);
+            return attribute != null ? (attribute as DisplayAttribute).Name : null;
+#else
+            return null;
+#endif
+        }
+
+        #region Nested type: FormulaConversionType
+
+        private enum FormulaConversionType
+        {
+            A1ToR1C1,
+            R1C1ToA1
+        };
+
+        #endregion
+
+        #region XLCell Above
+
+        IXLCell IXLCell.CellAbove()
+        {
+            return CellAbove();
+        }
+
+        IXLCell IXLCell.CellAbove(Int32 step)
+        {
+            return CellAbove(step);
+        }
+
+        public XLCell CellAbove()
+        {
+            return CellAbove(1);
+        }
+
+        public XLCell CellAbove(Int32 step)
+        {
+            return CellShift(step * -1, 0);
+        }
+
+        #endregion
+
+        #region XLCell Below
+
+        IXLCell IXLCell.CellBelow()
+        {
+            return CellBelow();
+        }
+
+        IXLCell IXLCell.CellBelow(Int32 step)
+        {
+            return CellBelow(step);
+        }
+
+        public XLCell CellBelow()
+        {
+            return CellBelow(1);
+        }
+
+        public XLCell CellBelow(Int32 step)
+        {
+            return CellShift(step, 0);
+        }
+
+        #endregion
+
+        #region XLCell Left
+
+        IXLCell IXLCell.CellLeft()
+        {
+            return CellLeft();
+        }
+
+        IXLCell IXLCell.CellLeft(Int32 step)
+        {
+            return CellLeft(step);
+        }
+
+        public XLCell CellLeft()
+        {
+            return CellLeft(1);
+        }
+
+        public XLCell CellLeft(Int32 step)
+        {
+            return CellShift(0, step * -1);
+        }
+
+        #endregion
+
+        #region XLCell Right
+
+        IXLCell IXLCell.CellRight()
+        {
+            return CellRight();
+        }
+
+        IXLCell IXLCell.CellRight(Int32 step)
+        {
+            return CellRight(step);
+        }
+
+        public XLCell CellRight()
+        {
+            return CellRight(1);
+        }
+
+        public XLCell CellRight(Int32 step)
+        {
+            return CellShift(0, step);
+        }
+
+        #endregion
+
+        public Boolean HasFormula { get { return !XLHelper.IsNullOrWhiteSpace(FormulaA1); } }
+
+        public IXLRangeAddress FormulaReference { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Cells/XLCells.cs b/ClosedXML/Excel/Cells/XLCells.cs
new file mode 100644
index 0000000..7b7eb6e
--- /dev/null
+++ b/ClosedXML/Excel/Cells/XLCells.cs
@@ -0,0 +1,280 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Linq;
+
+    internal class XLCells : IXLCells, IXLStylized, IEnumerable<XLCell>
+    {
+        public Boolean StyleChanged { get; set; }
+        #region Fields
+
+        private readonly bool _includeFormats;
+        private readonly List<XLRangeAddress> _rangeAddresses = new List<XLRangeAddress>();
+        private readonly bool _usedCellsOnly;
+        private IXLStyle _style;
+        private readonly Func<IXLCell, Boolean> _predicate;
+        #endregion
+
+        #region Constructor
+
+        public XLCells(bool usedCellsOnly, bool includeFormats, Func<IXLCell, Boolean> predicate = null)
+        {
+            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
+            _usedCellsOnly = usedCellsOnly;
+            _includeFormats = includeFormats;
+            _predicate = predicate;
+        }
+
+        #endregion
+
+        #region IEnumerable<XLCell> Members
+
+        public IEnumerator<XLCell> GetEnumerator()
+        {
+            var cellsInRanges = new Dictionary<XLWorksheet, HashSet<XLSheetPoint>>();
+            Boolean oneRange = _rangeAddresses.Count == 1;
+            foreach (XLRangeAddress range in _rangeAddresses)
+            {
+                HashSet<XLSheetPoint> hash;
+                if (cellsInRanges.ContainsKey(range.Worksheet))
+                    hash = cellsInRanges[range.Worksheet];
+                else
+                {
+                    hash = new HashSet<XLSheetPoint>();
+                    cellsInRanges.Add(range.Worksheet, hash);
+                }
+
+                if (_usedCellsOnly)
+                {
+                    if (oneRange)
+                    {
+                        var cellRange = range.Worksheet.Internals.CellsCollection
+                                                .GetCells(
+                                                range.FirstAddress.RowNumber,
+                                                range.FirstAddress.ColumnNumber,
+                                                range.LastAddress.RowNumber,
+                                                range.LastAddress.ColumnNumber)
+                                                .Where(c => 
+                                                            !c.IsEmpty(_includeFormats) 
+                                                            && (_predicate == null || _predicate(c))
+                                                            );
+
+                        foreach(var cell in cellRange)
+                        {
+                            yield return cell;
+                        }
+                    }
+                    else
+                    {
+                        var tmpRange = range;
+                        var addressList = range.Worksheet.Internals.CellsCollection
+                            .GetSheetPoints(
+                            tmpRange.FirstAddress.RowNumber,
+                            tmpRange.FirstAddress.ColumnNumber,
+                            tmpRange.LastAddress.RowNumber,
+                            tmpRange.LastAddress.ColumnNumber);
+
+                        foreach (XLSheetPoint a in addressList.Where(a => !hash.Contains(a)))
+                        {
+                            hash.Add(a);
+                        }
+                    }
+                }
+                else
+                {
+                    var mm = new MinMax
+                                 {
+                                     MinRow = range.FirstAddress.RowNumber,
+                                     MaxRow = range.LastAddress.RowNumber,
+                                     MinColumn = range.FirstAddress.ColumnNumber,
+                                     MaxColumn = range.LastAddress.ColumnNumber
+                                 };
+                    if (mm.MaxRow > 0 && mm.MaxColumn > 0)
+                    {
+                        for (Int32 ro = mm.MinRow; ro <= mm.MaxRow; ro++)
+                        {
+                            for (Int32 co = mm.MinColumn; co <= mm.MaxColumn; co++)
+                            {
+                                if (oneRange)
+                                {
+                                    var c = range.Worksheet.Cell(ro, co);
+                                    if (_predicate == null || _predicate(c))
+                                        yield return c;
+                                }
+                                else
+                                {
+                                    var address = new XLSheetPoint(ro, co);
+                                    if (!hash.Contains(address))
+                                        hash.Add(address);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (!oneRange)
+            {
+                if (_usedCellsOnly)
+                {
+                    var cellRange = cellsInRanges.SelectMany(
+                                cir =>
+                                cir.Value.Select(a => cir.Key.Internals.CellsCollection.GetCell(a)).Where(
+                                    cell => cell != null && (
+                                                                !cell.IsEmpty(_includeFormats) 
+                                                                && (_predicate == null || _predicate(cell))
+                                                                )));
+
+                    foreach (var cell in cellRange)
+                    {
+                        yield return cell;
+                    }
+                }
+                else
+                {
+                    foreach (var cir in cellsInRanges)
+                    {
+                        foreach (XLSheetPoint a in cir.Value)
+                        {
+                            var c = cir.Key.Cell(a.Row, a.Column);
+                            if (_predicate == null || _predicate(c))
+                                yield return c;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region IXLCells Members
+
+        IEnumerator<IXLCell> IEnumerable<IXLCell>.GetEnumerator()
+        {
+            foreach (XLCell cell in this)
+                yield return cell;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLStyle Style
+        {
+            get { return _style; }
+            set
+            {
+                _style = new XLStyle(this, value);
+                this.ForEach<XLCell>(c => c.Style = _style);
+            }
+        }
+
+        public Object Value
+        {
+            set { this.ForEach<XLCell>(c => c.Value = value); }
+        }
+
+        public IXLCells SetDataType(XLCellValues dataType)
+        {
+            this.ForEach<XLCell>(c => c.DataType = dataType);
+            return this;
+        }
+
+        public XLCellValues DataType
+        {
+            set { this.ForEach<XLCell>(c => c.DataType = value); }
+        }
+
+
+        public IXLCells Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            this.ForEach<XLCell>(c => c.Clear(clearOptions));
+            return this;
+        }
+
+        public void DeleteComments() {
+            this.ForEach<XLCell>(c => c.DeleteComment());
+        }
+
+        public String FormulaA1
+        {
+            set { this.ForEach<XLCell>(c => c.FormulaA1 = value); }
+        }
+
+        public String FormulaR1C1
+        {
+            set { this.ForEach<XLCell>(c => c.FormulaR1C1 = value); }
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return _style;
+                foreach (XLCell c in this)
+                    yield return c.Style;
+                UpdatingStyle = false;
+            }
+        }
+
+        public Boolean UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return _style; }
+            set { _style = new XLStyle(this, value); }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges();
+                this.ForEach<XLCell>(c => retVal.Add(c.AsRange()));
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        public void Add(XLRangeAddress rangeAddress)
+        {
+            _rangeAddresses.Add(rangeAddress);
+        }
+
+        public void Add(XLCell cell)
+        {
+            _rangeAddresses.Add(new XLRangeAddress(cell.Address, cell.Address));
+        }
+
+        //--
+
+        #region Nested type: MinMax
+
+        private struct MinMax
+        {
+            public Int32 MaxColumn;
+            public Int32 MaxRow;
+            public Int32 MinColumn;
+            public Int32 MinRow;
+        }
+
+        #endregion
+
+        public void Select()
+        {
+            foreach (var cell in this)
+                cell.Select();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Cells/XLCellsCollection.cs b/ClosedXML/Excel/Cells/XLCellsCollection.cs
new file mode 100644
index 0000000..6d91072
--- /dev/null
+++ b/ClosedXML/Excel/Cells/XLCellsCollection.cs
@@ -0,0 +1,497 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCellsCollection
+    {
+
+        private readonly Dictionary<int, Dictionary<int, XLCell>> rowsCollection = new Dictionary<int, Dictionary<int, XLCell>>();
+        public readonly Dictionary<Int32, Int32> ColumnsUsed = new Dictionary<int, int>();
+        public readonly Dictionary<Int32, HashSet<Int32>> deleted = new Dictionary<int, HashSet<int>>();
+
+        internal Dictionary<int, Dictionary<int, XLCell>> RowsCollection
+        {
+            get { return rowsCollection; }
+        }
+
+        public Int32 MaxColumnUsed;
+        public Int32 MaxRowUsed;
+        public Dictionary<Int32, Int32> RowsUsed = new Dictionary<int, int>();
+
+        public XLCellsCollection()
+        {
+            Clear();
+        }
+
+        public Int32 Count { get; private set; }
+
+
+        public void Add(XLSheetPoint sheetPoint, XLCell cell)
+        {
+            Add(sheetPoint.Row, sheetPoint.Column, cell);
+        }
+
+        public void Add(Int32 row, Int32 column, XLCell cell)
+        {
+            Count++;
+
+            IncrementUsage(RowsUsed, row);
+            IncrementUsage(ColumnsUsed, column);
+
+            Dictionary<int, XLCell> columnsCollection;
+            if (!rowsCollection.TryGetValue(row, out columnsCollection))
+            {
+                columnsCollection = new Dictionary<int, XLCell>();
+                rowsCollection.Add(row, columnsCollection);
+            }
+            columnsCollection.Add(column, cell);
+            if (row > MaxRowUsed) MaxRowUsed = row;
+            if (column > MaxColumnUsed) MaxColumnUsed = column;
+
+            HashSet<Int32> delHash;
+            if (deleted.TryGetValue(row, out delHash))
+                delHash.Remove(column);
+        }
+
+        private static void IncrementUsage(Dictionary<int, int> dictionary, Int32 key)
+        {
+            if (dictionary.ContainsKey(key))
+                dictionary[key]++;
+            else
+                dictionary.Add(key, 1);
+        }
+
+        private static void DecrementUsage(Dictionary<int, int> dictionary, Int32 key)
+        {
+            Int32 count;
+            if (!dictionary.TryGetValue(key, out count)) return;
+
+            if (count > 0)
+                dictionary[key]--;
+            else
+                dictionary.Remove(key);
+        }
+
+        public void Clear()
+        {
+            Count = 0;
+            RowsUsed.Clear();
+            ColumnsUsed.Clear();
+
+            rowsCollection.Clear();
+            MaxRowUsed = 0;
+            MaxColumnUsed = 0;
+        }
+
+        public void Remove(XLSheetPoint sheetPoint)
+        {
+            Remove(sheetPoint.Row, sheetPoint.Column);
+        }
+
+        public void Remove(Int32 row, Int32 column)
+        {
+            Count--;
+            DecrementUsage(RowsUsed, row);
+            DecrementUsage(ColumnsUsed, row);
+            
+            HashSet<Int32> delHash;
+            if (deleted.TryGetValue(row, out delHash))
+            {
+                if (!delHash.Contains(column))
+                    delHash.Add(column);
+            }
+            else
+            {
+                delHash = new HashSet<int>();
+                delHash.Add(column);
+                deleted.Add(row, delHash);
+            }
+
+            Dictionary<int, XLCell> columnsCollection;
+            if (rowsCollection.TryGetValue(row, out columnsCollection))
+            {
+                columnsCollection.Remove(column);
+                if (columnsCollection.Count == 0)
+                {
+                    rowsCollection.Remove(row);
+                }
+            }
+
+            
+        }
+
+        internal IEnumerable<XLCell> GetCells(Int32 rowStart, Int32 columnStart,
+                                            Int32 rowEnd, Int32 columnEnd,
+                                            Func<IXLCell, Boolean> predicate = null)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = rowStart; ro <= finalRow; ro++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = columnStart; co <= finalColumn; co++)
+                    {
+                        XLCell cell;
+                        if (columnsCollection.TryGetValue(co, out cell)
+                            && (predicate == null || predicate(cell)))
+                            yield return cell;
+                    }
+                }
+            }
+        }
+
+        internal HashSet<Int32> GetStyleIds(Int32 initial)
+        {
+            HashSet<Int32> ids = new HashSet<int>();
+            ids.Add(initial);
+            foreach (var row in rowsCollection)
+            {
+                foreach (var column in row.Value)
+                {
+                    var id = column.Value.GetStyleId();
+                    if (!ids.Contains(id))
+                    {
+                        ids.Add(id);
+                    }
+                }
+            }
+            return ids;
+        }
+
+
+        internal IEnumerable<XLCell> GetCellsUsed(Int32 rowStart, Int32 columnStart,
+                                    Int32 rowEnd, Int32 columnEnd,
+                                    Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = rowStart; ro <= finalRow; ro++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = columnStart; co <= finalColumn; co++)
+                    {
+                        XLCell cell;
+                        if (columnsCollection.TryGetValue(co, out cell)
+                        && !cell.IsEmpty(includeFormats)
+                        && (predicate == null || predicate(cell)))
+                            yield return cell;
+                    }
+                }
+            }
+
+        }
+
+        public XLSheetPoint FirstPointUsed(Int32 rowStart, Int32 columnStart,
+                                    Int32 rowEnd, Int32 columnEnd, Boolean includeFormats = false, Func<IXLCell, Boolean> predicate = null)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+
+            var firstRow = FirstRowUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
+            if (firstRow == 0) return new XLSheetPoint(0, 0);
+
+            var firstColumn = FirstColumnUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
+            if (firstColumn == 0) return new XLSheetPoint(0, 0);
+
+            return new XLSheetPoint(firstRow, firstColumn);
+        }
+
+        public XLSheetPoint LastPointUsed(Int32 rowStart, Int32 columnStart,
+                            Int32 rowEnd, Int32 columnEnd, Boolean includeFormats = false, Func<IXLCell, Boolean> predicate = null)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+
+            var firstRow = LastRowUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
+            if (firstRow == 0) return new XLSheetPoint(0, 0);
+
+            var firstColumn = LastColumnUsed(rowStart, columnStart, finalRow, finalColumn, includeFormats, predicate);
+            if (firstColumn == 0) return new XLSheetPoint(0, 0);
+
+            return new XLSheetPoint(firstRow, firstColumn);
+        }
+
+        public int FirstRowUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats,
+            Func<IXLCell, Boolean> predicate = null)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = rowStart; ro <= finalRow; ro++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = columnStart; co <= finalColumn; co++)
+                    {
+                        XLCell cell;
+                        if (columnsCollection.TryGetValue(co, out cell)
+                        && !cell.IsEmpty(includeFormats)
+                        && (predicate == null || predicate(cell)))
+                            return ro;
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+        public int FirstColumnUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = rowStart; ro <= finalRow; ro++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = columnStart; co <= finalColumn; co++)
+                    {
+                        XLCell cell;
+                        if (columnsCollection.TryGetValue(co, out cell)
+                        && !cell.IsEmpty(includeFormats)
+                        && (predicate == null || predicate(cell)))
+                            return co;
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+
+        public int LastRowUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = finalRow; ro >= rowStart; ro--)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = finalColumn; co >= columnStart; co--)
+                    {
+                        XLCell cell;
+                        if (columnsCollection.TryGetValue(co, out cell)
+                         && !cell.IsEmpty(includeFormats)
+                        && (predicate == null || predicate(cell)))
+                            return ro;
+                    }
+                }
+            }
+            return 0;
+        }
+
+        public int LastColumnUsed(int rowStart, int columnStart, int rowEnd, int columnEnd, Boolean includeFormats, Func<IXLCell, Boolean> predicate = null)
+        {
+            int maxCo = 0;
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = finalRow; ro >= rowStart; ro--)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = finalColumn; co >= columnStart && co > maxCo; co--)
+                    {
+                        XLCell cell;
+                        if (columnsCollection.TryGetValue(co, out cell)
+                         && !cell.IsEmpty(includeFormats)
+                        && (predicate == null || predicate(cell)))
+                            maxCo = co;
+                    }
+                }
+            }
+            return maxCo;
+        }
+
+        public void RemoveAll(Int32 rowStart, Int32 columnStart,
+                              Int32 rowEnd, Int32 columnEnd)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = rowStart; ro <= finalRow; ro++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = columnStart; co <= finalColumn; co++)
+                    {
+                        if (columnsCollection.ContainsKey(co))
+                            Remove(ro, co);
+                    }
+                }
+            }
+        }
+
+        public IEnumerable<XLSheetPoint> GetSheetPoints(Int32 rowStart, Int32 columnStart,
+                                                        Int32 rowEnd, Int32 columnEnd)
+        {
+            int finalRow = rowEnd > MaxRowUsed ? MaxRowUsed : rowEnd;
+            int finalColumn = columnEnd > MaxColumnUsed ? MaxColumnUsed : columnEnd;
+            for (int ro = rowStart; ro <= finalRow; ro++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = columnStart; co <= finalColumn; co++)
+                    {
+                        if (columnsCollection.ContainsKey(co))
+                            yield return new XLSheetPoint(ro, co);
+                    }
+                }
+            }
+        }
+
+        public XLCell GetCell(Int32 row, Int32 column)
+        {
+            if (row > MaxRowUsed || column > MaxColumnUsed)
+                return null;
+            Dictionary<int, XLCell> columnsCollection;
+            if (rowsCollection.TryGetValue(row, out columnsCollection))
+            {
+                XLCell cell;
+                return columnsCollection.TryGetValue(column, out cell) ? cell : null;
+            }
+            return null;
+        }
+
+        public XLCell GetCell(XLSheetPoint sp)
+        {
+            return GetCell(sp.Row, sp.Column);
+        }
+
+        internal void SwapRanges(XLSheetRange sheetRange1, XLSheetRange sheetRange2, XLWorksheet worksheet)
+        {
+            Int32 rowCount = sheetRange1.LastPoint.Row - sheetRange1.FirstPoint.Row + 1;
+            Int32 columnCount = sheetRange1.LastPoint.Column - sheetRange1.FirstPoint.Column + 1;
+            for (int row = 0; row < rowCount; row++)
+            {
+                for (int column = 0; column < columnCount; column++)
+                {
+                    var sp1 = new XLSheetPoint(sheetRange1.FirstPoint.Row + row, sheetRange1.FirstPoint.Column + column);
+                    var sp2 = new XLSheetPoint(sheetRange2.FirstPoint.Row + row, sheetRange2.FirstPoint.Column + column);
+                    var cell1 = GetCell(sp1);
+                    var cell2 = GetCell(sp2);
+
+                    if (cell1 == null) cell1 = worksheet.Cell(sp1.Row, sp1.Column);
+                    if (cell2 == null) cell2 = worksheet.Cell(sp2.Row, sp2.Column);
+
+                    //if (cell1 != null)
+                    //{
+                    cell1.Address = new XLAddress(cell1.Worksheet, sp2.Row, sp2.Column, false, false);
+                    Remove(sp1);
+                    //if (cell2 != null)
+                    Add(sp1, cell2);
+                    //}
+
+                    //if (cell2 == null) continue;
+
+                    cell2.Address = new XLAddress(cell2.Worksheet, sp1.Row, sp1.Column, false, false);
+                    Remove(sp2);
+                    //if (cell1 != null)
+                    Add(sp2, cell1);
+                }
+            }
+        }
+
+        internal IEnumerable<XLCell> GetCells()
+        {
+            return GetCells(1, 1, MaxRowUsed, MaxColumnUsed);
+        }
+
+        internal IEnumerable<XLCell> GetCells(Func<IXLCell, Boolean> predicate)
+        {
+            for (int ro = 1; ro <= MaxRowUsed; ro++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(ro, out columnsCollection))
+                {
+                    for (int co = 1; co <= MaxColumnUsed; co++)
+                    {
+                        XLCell cell;
+                        if (columnsCollection.TryGetValue(co, out cell)
+                            && (predicate == null || predicate(cell)))
+                            yield return cell;
+                    }
+                }
+            }
+
+        }
+
+        public Boolean Contains(Int32 row, Int32 column)
+        {
+            Dictionary<int, XLCell> columnsCollection;
+            return rowsCollection.TryGetValue(row, out columnsCollection) && columnsCollection.ContainsKey(column);
+        }
+
+        public Int32 MinRowInColumn(Int32 column)
+        {
+            for (int row = 1; row <= MaxRowUsed; row++)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(row, out columnsCollection))
+                {
+                    if (columnsCollection.ContainsKey(column))
+                        return row;
+                }
+            }
+
+            return 0;
+        }
+
+        public Int32 MaxRowInColumn(Int32 column)
+        {
+            for (int row = MaxRowUsed; row >= 1; row--)
+            {
+                Dictionary<int, XLCell> columnsCollection;
+                if (rowsCollection.TryGetValue(row, out columnsCollection))
+                {
+                    if (columnsCollection.ContainsKey(column))
+                        return row;
+                }
+            }
+
+            return 0;
+        }
+
+        public Int32 MinColumnInRow(Int32 row)
+        {
+            Dictionary<int, XLCell> columnsCollection;
+            if (rowsCollection.TryGetValue(row, out columnsCollection))
+            {
+                if (columnsCollection.Count > 0)
+                    return columnsCollection.Keys.Min();
+            }
+
+            return 0;
+        }
+
+        public Int32 MaxColumnInRow(Int32 row)
+        {
+            Dictionary<int, XLCell> columnsCollection;
+            if (rowsCollection.TryGetValue(row, out columnsCollection))
+            {
+                if (columnsCollection.Count > 0)
+                    return columnsCollection.Keys.Max();
+            }
+
+            return 0;
+        }
+
+        public IEnumerable<XLCell> GetCellsInColumn(Int32 column)
+        {
+            return GetCells(1, column, MaxRowUsed, column);
+        }
+
+        public IEnumerable<XLCell> GetCellsInRow(Int32 row)
+        {
+            return GetCells(row, 1, row, MaxColumnUsed);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Charts/IXLChart.cs b/ClosedXML/Excel/Charts/IXLChart.cs
new file mode 100644
index 0000000..63af704
--- /dev/null
+++ b/ClosedXML/Excel/Charts/IXLChart.cs
@@ -0,0 +1,90 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLChartType {
+        Area,
+        Area3D,
+        AreaStacked,
+        AreaStacked100Percent,
+        AreaStacked100Percent3D,
+        AreaStacked3D,
+        BarClustered,
+        BarClustered3D,
+        BarStacked,
+        BarStacked100Percent,
+        BarStacked100Percent3D,
+        BarStacked3D,
+        Bubble,
+        Bubble3D,
+        Column3D,
+        ColumnClustered,
+        ColumnClustered3D,
+        ColumnStacked,
+        ColumnStacked100Percent,
+        ColumnStacked100Percent3D,
+        ColumnStacked3D,
+        Cone,
+        ConeClustered,
+        ConeHorizontalClustered,
+        ConeHorizontalStacked,
+        ConeHorizontalStacked100Percent,
+        ConeStacked,
+        ConeStacked100Percent,
+        Cylinder,
+        CylinderClustered,
+        CylinderHorizontalClustered,
+        CylinderHorizontalStacked,
+        CylinderHorizontalStacked100Percent,
+        CylinderStacked,
+        CylinderStacked100Percent,
+        Doughnut,
+        DoughnutExploded,
+        Line,
+        Line3D,
+        LineStacked,
+        LineStacked100Percent,
+        LineWithMarkers,
+        LineWithMarkersStacked,
+        LineWithMarkersStacked100Percent,
+        Pie,
+        Pie3D,
+        PieExploded,
+        PieExploded3D,
+        PieToBar,
+        PieToPie,
+        Pyramid,
+        PyramidClustered,
+        PyramidHorizontalClustered,
+        PyramidHorizontalStacked,
+        PyramidHorizontalStacked100Percent,
+        PyramidStacked,
+        PyramidStacked100Percent,
+        Radar,
+        RadarFilled,
+        RadarWithMarkers,
+        StockHighLowClose,
+        StockOpenHighLowClose,
+        StockVolumeHighLowClose,
+        StockVolumeOpenHighLowClose,
+        Surface,
+        SurfaceContour,
+        SurfaceContourWireframe,
+        SurfaceWireframe,
+        XYScatterMarkers,
+        XYScatterSmoothLinesNoMarkers,
+        XYScatterSmoothLinesWithMarkers,
+        XYScatterStraightLinesNoMarkers,
+        XYScatterStraightLinesWithMarkers
+    }
+    public interface IXLChart: IXLDrawing<IXLChart>
+    {
+        Boolean RightAngleAxes { get; set; }
+        IXLChart SetRightAngleAxes();
+        IXLChart SetRightAngleAxes(Boolean rightAngleAxes);
+
+        XLChartType ChartType { get; set; }
+        IXLChart SetChartType(XLChartType chartType);
+
+    }
+}
diff --git a/ClosedXML/Excel/Charts/IXLCharts.cs b/ClosedXML/Excel/Charts/IXLCharts.cs
new file mode 100644
index 0000000..2e21d09
--- /dev/null
+++ b/ClosedXML/Excel/Charts/IXLCharts.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLCharts: IEnumerable<IXLChart>
+    {
+        void Add(IXLChart chart);
+    }
+}
diff --git a/ClosedXML/Excel/Charts/XLChart.cs b/ClosedXML/Excel/Charts/XLChart.cs
new file mode 100644
index 0000000..75de711
--- /dev/null
+++ b/ClosedXML/Excel/Charts/XLChart.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal enum XLChartTypeCategory { Bar3D }
+    internal enum XLBarOrientation { Vertical, Horizontal }
+    internal enum XLBarGrouping { Clustered, Percent, Stacked, Standard }
+    internal class XLChart: XLDrawing<IXLChart>, IXLChart
+    {
+        internal IXLWorksheet worksheet;
+        public XLChart(XLWorksheet worksheet)
+        {
+            Container = this;
+            this.worksheet = worksheet;
+            Int32 zOrder;
+            if (worksheet.Charts.Any())
+                zOrder = worksheet.Charts.Max(c => c.ZOrder) + 1;
+            else
+                zOrder = 1;
+            ZOrder = zOrder;
+            ShapeId = worksheet.Workbook.ShapeIdManager.GetNext();
+            RightAngleAxes = true;
+        }
+
+        public Boolean RightAngleAxes { get; set; }
+        public IXLChart SetRightAngleAxes()
+        {
+            RightAngleAxes = true;
+            return this;
+        }
+        public IXLChart SetRightAngleAxes(Boolean rightAngleAxes)
+        {
+            RightAngleAxes = rightAngleAxes;
+            return this;
+        }
+
+        public XLChartType ChartType { get; set; }
+        public IXLChart SetChartType(XLChartType chartType)
+        {
+            ChartType = chartType;
+            return this;
+        }
+
+        public XLChartTypeCategory ChartTypeCategory
+        {
+            get
+            {
+                if (Bar3DCharts.Contains(ChartType))
+                    return XLChartTypeCategory.Bar3D;
+                else
+                    throw new NotImplementedException();
+
+            }
+        }
+
+        private HashSet<XLChartType> Bar3DCharts = new HashSet<XLChartType> { 
+            XLChartType.BarClustered3D, 
+            XLChartType.BarStacked100Percent3D, 
+            XLChartType.BarStacked3D, 
+            XLChartType.Column3D, 
+            XLChartType.ColumnClustered3D, 
+            XLChartType.ColumnStacked100Percent3D, 
+            XLChartType.ColumnStacked3D
+        };
+
+        public XLBarOrientation BarOrientation
+        {
+            get
+            {
+                if (HorizontalCharts.Contains(ChartType))
+                    return XLBarOrientation.Horizontal;
+                else
+                    return XLBarOrientation.Vertical;
+            }
+        }
+
+        private HashSet<XLChartType> HorizontalCharts = new HashSet<XLChartType>{
+            XLChartType.BarClustered, 
+            XLChartType.BarClustered3D, 
+            XLChartType.BarStacked, 
+            XLChartType.BarStacked100Percent, 
+            XLChartType.BarStacked100Percent3D, 
+            XLChartType.BarStacked3D, 
+            XLChartType.ConeHorizontalClustered, 
+            XLChartType.ConeHorizontalStacked, 
+            XLChartType.ConeHorizontalStacked100Percent, 
+            XLChartType.CylinderHorizontalClustered, 
+            XLChartType.CylinderHorizontalStacked, 
+            XLChartType.CylinderHorizontalStacked100Percent, 
+            XLChartType.PyramidHorizontalClustered, 
+            XLChartType.PyramidHorizontalStacked, 
+            XLChartType.PyramidHorizontalStacked100Percent
+        };
+
+        public XLBarGrouping BarGrouping
+        {
+            get
+            {
+                if (ClusteredCharts.Contains(ChartType))
+                    return XLBarGrouping.Clustered;
+                else if (PercentCharts.Contains(ChartType))
+                    return XLBarGrouping.Percent;
+                else if (StackedCharts.Contains(ChartType))
+                    return XLBarGrouping.Stacked;
+                else
+                    return XLBarGrouping.Standard;
+            }
+        }
+
+        public HashSet<XLChartType> ClusteredCharts = new HashSet<XLChartType>()
+        {
+            XLChartType.BarClustered,
+            XLChartType.BarClustered3D,
+            XLChartType.ColumnClustered,
+            XLChartType.ColumnClustered3D,
+            XLChartType.ConeClustered,
+            XLChartType.ConeHorizontalClustered,
+            XLChartType.CylinderClustered,
+            XLChartType.CylinderHorizontalClustered,
+            XLChartType.PyramidClustered,
+            XLChartType.PyramidHorizontalClustered
+        };
+
+        public HashSet<XLChartType> PercentCharts = new HashSet<XLChartType>() { 
+            XLChartType.AreaStacked100Percent,
+            XLChartType.AreaStacked100Percent3D,
+            XLChartType.BarStacked100Percent,
+            XLChartType.BarStacked100Percent3D,
+            XLChartType.ColumnStacked100Percent,
+            XLChartType.ColumnStacked100Percent3D,
+            XLChartType.ConeHorizontalStacked100Percent,
+            XLChartType.ConeStacked100Percent,
+            XLChartType.CylinderHorizontalStacked100Percent,
+            XLChartType.CylinderStacked100Percent,
+            XLChartType.LineStacked100Percent,
+            XLChartType.LineWithMarkersStacked100Percent,
+            XLChartType.PyramidHorizontalStacked100Percent,
+            XLChartType.PyramidStacked100Percent
+        };
+
+        public HashSet<XLChartType> StackedCharts = new HashSet<XLChartType>()
+        {
+            XLChartType.AreaStacked,
+            XLChartType.AreaStacked3D,
+            XLChartType.BarStacked,
+            XLChartType.BarStacked3D,
+            XLChartType.ColumnStacked,
+            XLChartType.ColumnStacked3D,
+            XLChartType.ConeHorizontalStacked,
+            XLChartType.ConeStacked,
+            XLChartType.CylinderHorizontalStacked,
+            XLChartType.CylinderStacked,
+            XLChartType.LineStacked,
+            XLChartType.LineWithMarkersStacked,
+            XLChartType.PyramidHorizontalStacked,
+            XLChartType.PyramidStacked
+        };
+    }
+}
diff --git a/ClosedXML/Excel/Charts/XLCharts.cs b/ClosedXML/Excel/Charts/XLCharts.cs
new file mode 100644
index 0000000..46ff4e0
--- /dev/null
+++ b/ClosedXML/Excel/Charts/XLCharts.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCharts: IXLCharts
+    {
+        private List<IXLChart> charts = new List<IXLChart>();
+        public IEnumerator<IXLChart> GetEnumerator()
+        {
+            return charts.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public void Add(IXLChart chart)
+        {
+            charts.Add(chart);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Columns/IXLColumn.cs b/ClosedXML/Excel/Columns/IXLColumn.cs
new file mode 100644
index 0000000..990ed2d
--- /dev/null
+++ b/ClosedXML/Excel/Columns/IXLColumn.cs
@@ -0,0 +1,185 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLColumn : IXLRangeBase
+    {
+
+        /// <summary>
+        /// Gets or sets the width of this column.
+        /// </summary>
+        /// <value>
+        /// The width of this column.
+        /// </value>
+        Double Width { get; set; }
+
+        /// <summary>
+        /// Deletes this column and shifts the columns at the right of this one accordingly.
+        /// </summary>
+        void Delete();
+
+        /// <summary>
+        /// Gets this column's number
+        /// </summary>
+        Int32 ColumnNumber();
+
+        /// <summary>
+        /// Gets this column's letter
+        /// </summary>
+        String ColumnLetter();
+
+        /// <summary>
+        /// Inserts X number of columns at the right of this one.
+        /// <para>All columns at the right will be shifted accordingly.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">The number of columns to insert.</param>
+        IXLColumns InsertColumnsAfter(Int32 numberOfColumns);
+
+        /// <summary>
+        /// Inserts X number of columns at the left of this one.
+        /// <para>This column and all at the right will be shifted accordingly.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">The number of columns to insert.</param>
+        IXLColumns InsertColumnsBefore(Int32 numberOfColumns);
+
+        /// <summary>
+        /// Gets the cell in the specified row.
+        /// </summary>
+        /// <param name="rowNumber">The cell's row.</param>
+        IXLCell Cell(Int32 rowNumber);
+
+        /// <summary>
+        /// Returns the specified group of cells, separated by commas.
+        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1,3:5")</para>
+        /// </summary>
+        /// <param name="cellsInColumn">The column cells to return.</param>
+        new IXLCells Cells(String cellsInColumn);
+
+        /// <summary>
+        /// Returns the specified group of cells.
+        /// </summary>
+        /// <param name="firstRow">The first row in the group of cells to return.</param>
+        /// <param name="lastRow">The last row in the group of cells to return.</param>
+        IXLCells Cells(Int32 firstRow, Int32 lastRow);
+
+        /// <summary>
+        /// Adjusts the width of the column based on its contents.
+        /// </summary>
+        IXLColumn AdjustToContents();
+        /// <summary>
+        /// Adjusts the width of the column based on its contents, starting from the startRow.
+        /// </summary>
+        /// <param name="startRow">The row to start calculating the column width.</param>
+        IXLColumn AdjustToContents(Int32 startRow);
+        /// <summary>
+        /// Adjusts the width of the column based on its contents, starting from the startRow and ending at endRow.
+        /// </summary>
+        /// <param name="startRow">The row to start calculating the column width.</param>
+        /// <param name="endRow">The row to end calculating the column width.</param>
+        IXLColumn AdjustToContents(Int32 startRow, Int32 endRow);
+
+        IXLColumn AdjustToContents(Double minWidth, Double maxWidth);
+        IXLColumn AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth);
+        IXLColumn AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth);
+
+        /// <summary>
+        /// Hides this column.
+        /// </summary>
+        IXLColumn Hide();
+
+        /// <summary>Unhides this column.</summary>
+        IXLColumn Unhide();
+
+        /// <summary>
+        /// Gets a value indicating whether this column is hidden or not.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this column is hidden; otherwise, <c>false</c>.
+        /// </value>
+        Boolean IsHidden { get; }
+
+        /// <summary>
+        /// Gets or sets the outline level of this column.
+        /// </summary>
+        /// <value>
+        /// The outline level of this column.
+        /// </value>
+        Int32 OutlineLevel { get; set; }
+
+        /// <summary>
+        /// Adds this column to the next outline level (Increments the outline level for this column by 1).
+        /// </summary>
+        IXLColumn Group();
+
+        /// <summary>
+        /// Adds this column to the next outline level (Increments the outline level for this column by 1).
+        /// </summary>
+        /// <param name="collapse">If set to <c>true</c> the column will be shown collapsed.</param>
+        IXLColumn Group(Boolean collapse);
+
+        /// <summary>
+        /// Sets outline level for this column.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        IXLColumn Group(Int32 outlineLevel);
+
+        /// <summary>
+        /// Sets outline level for this column.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        /// <param name="collapse">If set to <c>true</c> the column will be shown collapsed.</param>
+        IXLColumn Group(Int32 outlineLevel, Boolean collapse);
+
+        /// <summary>
+        /// Adds this column to the previous outline level (decrements the outline level for this column by 1).
+        /// </summary>
+        IXLColumn Ungroup();
+
+        /// <summary>
+        /// Adds this column to the previous outline level (decrements the outline level for this column by 1).
+        /// </summary>
+        /// <param name="fromAll">If set to <c>true</c> it will remove this column from all outline levels.</param>
+        IXLColumn Ungroup(Boolean fromAll);
+
+        /// <summary>
+        /// Show this column as collapsed.
+        /// </summary>
+        IXLColumn Collapse();
+
+        /// <summary>Expands this column (if it's collapsed).</summary>
+        IXLColumn Expand();
+
+        Int32 CellCount();
+
+        IXLRangeColumn CopyTo(IXLCell cell);
+        IXLRangeColumn CopyTo(IXLRangeBase range);
+        IXLColumn CopyTo(IXLColumn column);
+
+        IXLColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+
+        IXLRangeColumn Column(Int32 start, Int32 end);
+        IXLRangeColumn Column(IXLCell start, IXLCell end);
+        IXLRangeColumns Columns(String columns);
+
+        /// <summary>
+        /// Adds a vertical page break after this column.
+        /// </summary>
+        IXLColumn AddVerticalPageBreak();
+
+        IXLColumn SetDataType(XLCellValues dataType);
+
+        IXLColumn ColumnLeft();
+        IXLColumn ColumnLeft(Int32 step);
+        IXLColumn ColumnRight();
+        IXLColumn ColumnRight(Int32 step);
+
+        /// <summary>
+        /// Clears the contents of this column.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        new IXLColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        IXLRangeColumn ColumnUsed(Boolean includeFormats = false);
+
+    }
+}
diff --git a/ClosedXML/Excel/Columns/IXLColumns.cs b/ClosedXML/Excel/Columns/IXLColumns.cs
new file mode 100644
index 0000000..bb23287
--- /dev/null
+++ b/ClosedXML/Excel/Columns/IXLColumns.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLColumns: IEnumerable<IXLColumn>, IDisposable
+    {
+        /// <summary>
+        /// Sets the width of all columns.
+        /// </summary>
+        /// <value>
+        /// The width of all columns.
+        /// </value>
+        Double Width { set; }
+
+        /// <summary>
+        /// Deletes all columns and shifts the columns at the right of them accordingly.
+        /// </summary>
+        void Delete();
+
+        /// <summary>
+        /// Adjusts the width of all columns based on its contents.
+        /// </summary>
+        IXLColumns AdjustToContents();
+        /// <summary>
+        /// Adjusts the width of all columns based on its contents, starting from the startRow.
+        /// </summary>
+        /// <param name="startRow">The row to start calculating the column width.</param>
+        IXLColumns AdjustToContents(Int32 startRow);
+        /// <summary>
+        /// Adjusts the width of all columns based on its contents, starting from the startRow and ending at endRow.
+        /// </summary>
+        /// <param name="startRow">The row to start calculating the column width.</param>
+        /// <param name="endRow">The row to end calculating the column width.</param>
+        IXLColumns AdjustToContents(Int32 startRow, Int32 endRow);
+
+        IXLColumns AdjustToContents(Double minWidth, Double maxWidth);
+        IXLColumns AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth);
+        IXLColumns AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth);
+
+        /// <summary>
+        /// Hides all columns.
+        /// </summary>
+        void Hide();
+
+        /// <summary>Unhides all columns.</summary>
+        void Unhide();
+
+        /// <summary>
+        /// Increments the outline level of all columns by 1.
+        /// </summary>
+        void Group();
+
+        /// <summary>
+        /// Increments the outline level of all columns by 1.
+        /// </summary>
+        /// <param name="collapse">If set to <c>true</c> the columns will be shown collapsed.</param>
+        void Group(Boolean collapse);
+
+        /// <summary>
+        /// Sets outline level for all columns.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        void Group(Int32 outlineLevel);
+
+        /// <summary>
+        /// Sets outline level for all columns.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        /// <param name="collapse">If set to <c>true</c> the columns will be shown collapsed.</param>
+        void Group(Int32 outlineLevel, Boolean collapse);
+
+        /// <summary>
+        /// Decrements the outline level of all columns by 1.
+        /// </summary>
+        void Ungroup();
+
+        /// <summary>
+        /// Decrements the outline level of all columns by 1.
+        /// </summary>
+        /// <param name="fromAll">If set to <c>true</c> it will remove the columns from all outline levels.</param>
+        void Ungroup(Boolean fromAll);
+
+        /// <summary>
+        /// Show all columns as collapsed.
+        /// </summary>
+        void Collapse();
+
+        /// <summary>Expands all columns (if they're collapsed).</summary>
+        void Expand();
+
+        /// <summary>
+        /// Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+        
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        IXLStyle Style { get; set; }
+
+        /// <summary>
+        /// Adds a vertical page break after these columns.
+        /// </summary>
+        IXLColumns AddVerticalPageBreaks();
+
+        IXLColumns SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of these columns.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        void Select();
+    }
+}
diff --git a/ClosedXML/Excel/Columns/XLColumn.cs b/ClosedXML/Excel/Columns/XLColumn.cs
new file mode 100644
index 0000000..c713895
--- /dev/null
+++ b/ClosedXML/Excel/Columns/XLColumn.cs
@@ -0,0 +1,766 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Drawing;
+
+
+namespace ClosedXML.Excel
+{
+    internal class XLColumn : XLRangeBase, IXLColumn
+    {
+        #region Private fields
+
+        private bool _collapsed;
+        private bool _isHidden;
+        private int _outlineLevel;
+
+        private Double _width;
+
+        #endregion
+
+        #region Constructor
+
+        public XLColumn(Int32 column, XLColumnParameters xlColumnParameters)
+            : base(
+                new XLRangeAddress(new XLAddress(xlColumnParameters.Worksheet, 1, column, false, false),
+                                   new XLAddress(xlColumnParameters.Worksheet, XLHelper.MaxRowNumber, column, false,
+                                                 false)))
+        {
+            SetColumnNumber(column);
+
+            IsReference = xlColumnParameters.IsReference;
+            if (IsReference)
+                SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
+            else
+            {
+                SetStyle(xlColumnParameters.DefaultStyleId);
+                _width = xlColumnParameters.Worksheet.ColumnWidth;
+            }
+        }
+
+        public XLColumn(XLColumn column)
+            : base(
+                new XLRangeAddress(new XLAddress(column.Worksheet, 1, column.ColumnNumber(), false, false),
+                                   new XLAddress(column.Worksheet, XLHelper.MaxRowNumber, column.ColumnNumber(),
+                                                 false, false)))
+        {
+            _width = column._width;
+            IsReference = column.IsReference;
+            if (IsReference)
+				SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
+			_collapsed = column._collapsed;
+            _isHidden = column._isHidden;
+            _outlineLevel = column._outlineLevel;
+            SetStyle(column.GetStyleId());
+        }
+
+        #endregion
+
+        public Boolean IsReference { get; private set; }
+
+        public override IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+
+                yield return Style;
+
+                int column = ColumnNumber();
+
+                foreach (XLCell cell in Worksheet.Internals.CellsCollection.GetCellsInColumn(column))
+                    yield return cell.Style;
+
+                UpdatingStyle = false;
+            }
+        }
+
+        public override Boolean UpdatingStyle { get; set; }
+
+        public override IXLStyle InnerStyle
+        {
+            get
+            {
+                return IsReference
+                           ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].InnerStyle
+                           : GetStyle();
+            }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].InnerStyle = value;
+                else
+                    SetStyle(value);
+            }
+        }
+
+        public Boolean Collapsed
+        {
+            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].Collapsed : _collapsed; }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].Collapsed = value;
+                else
+                    _collapsed = value;
+            }
+        }
+
+        #region IXLColumn Members
+
+        public Double Width
+        {
+            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].Width : _width; }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].Width = value;
+                else
+                    _width = value;
+            }
+        }
+
+        public void Delete()
+        {
+            int columnNumber = ColumnNumber();
+            using (var asRange = AsRange())
+            {
+                asRange.Delete(XLShiftDeletedCells.ShiftCellsLeft);
+            }
+            
+            Worksheet.Internals.ColumnsCollection.Remove(columnNumber);
+            var columnsToMove = new List<Int32>();
+            columnsToMove.AddRange(
+                Worksheet.Internals.ColumnsCollection.Where(c => c.Key > columnNumber).Select(c => c.Key));
+            foreach (int column in columnsToMove.OrderBy(c => c))
+            {
+                Worksheet.Internals.ColumnsCollection.Add(column - 1, Worksheet.Internals.ColumnsCollection[column]);
+                Worksheet.Internals.ColumnsCollection.Remove(column);
+            }
+        }
+
+        public new IXLColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            base.Clear(clearOptions);
+            return this;
+        }
+
+        public IXLCell Cell(Int32 rowNumber)
+        {
+            return Cell(rowNumber, 1);
+        }
+
+        public new IXLCells Cells(String cellsInColumn)
+        {
+            var retVal = new XLCells(false, false);
+            var rangePairs = cellsInColumn.Split(',');
+            foreach (string pair in rangePairs)
+                retVal.Add(Range(pair.Trim()).RangeAddress);
+            return retVal;
+        }
+
+        public new IXLCells Cells()
+        {
+            return CellsUsed(true);
+        }
+
+        public IXLCells Cells(Int32 firstRow, Int32 lastRow)
+        {
+            return Cells(firstRow + ":" + lastRow);
+        }
+
+        public override IXLStyle Style
+        {
+            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].Style : GetStyle(); }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].Style = value;
+                else
+                {
+                    SetStyle(value);
+
+                    Int32 minRow = 1;
+                    Int32 maxRow = 0;
+                    int column = ColumnNumber();
+                    if (Worksheet.Internals.CellsCollection.ColumnsUsed.ContainsKey(column))
+                    {
+                        minRow = Worksheet.Internals.CellsCollection.MinRowInColumn(column);
+                        maxRow = Worksheet.Internals.CellsCollection.MaxRowInColumn(column);
+                    }
+
+                    if (Worksheet.Internals.RowsCollection.Count > 0)
+                    {
+                        Int32 minInCollection = Worksheet.Internals.RowsCollection.Keys.Min();
+                        Int32 maxInCollection = Worksheet.Internals.RowsCollection.Keys.Max();
+                        if (minInCollection < minRow)
+                            minRow = minInCollection;
+                        if (maxInCollection > maxRow)
+                            maxRow = maxInCollection;
+                    }
+
+                    if (minRow > 0 && maxRow > 0)
+                    {
+                        for (Int32 ro = minRow; ro <= maxRow; ro++)
+                            Worksheet.Cell(ro, column).Style = value;
+                    }
+                }
+            }
+        }
+
+        public new IXLColumns InsertColumnsAfter(Int32 numberOfColumns)
+        {
+            int columnNum = ColumnNumber();
+            Worksheet.Internals.ColumnsCollection.ShiftColumnsRight(columnNum + 1, numberOfColumns);
+            using (var column = Worksheet.Column(columnNum))
+            {
+                using (var asRange = column.AsRange())
+                {
+                    asRange.InsertColumnsAfterVoid(true, numberOfColumns);
+                }
+            }
+
+            var newColumns = Worksheet.Columns(columnNum + 1, columnNum + numberOfColumns);
+            CopyColumns(newColumns);
+            return newColumns;
+        }
+
+        public new IXLColumns InsertColumnsBefore(Int32 numberOfColumns)
+        {
+            int columnNum = ColumnNumber();
+            if (columnNum > 1)
+            {
+                using (var column = Worksheet.Column(columnNum - 1))
+                {
+                    return column.InsertColumnsAfter(numberOfColumns);
+                }
+            }
+
+            Worksheet.Internals.ColumnsCollection.ShiftColumnsRight(columnNum, numberOfColumns);
+
+            using (var column = Worksheet.Column(columnNum))
+            {
+                using (var asRange = column.AsRange())
+                {
+                    asRange.InsertColumnsBeforeVoid(true, numberOfColumns);
+                }
+            }
+
+            return Worksheet.Columns(columnNum, columnNum + numberOfColumns - 1);
+        }
+
+        private void CopyColumns(IXLColumns newColumns)
+        {
+            foreach (var newColumn in newColumns)
+            {
+                var internalColumn = Worksheet.Internals.ColumnsCollection[newColumn.ColumnNumber()];
+                internalColumn._width = Width;
+                internalColumn.SetStyle(Style);
+                internalColumn._collapsed = Collapsed;
+                internalColumn._isHidden = IsHidden;
+                internalColumn._outlineLevel = OutlineLevel;
+            }
+        }
+
+        public IXLColumn AdjustToContents()
+        {
+            return AdjustToContents(1);
+        }
+
+        public IXLColumn AdjustToContents(Int32 startRow)
+        {
+            return AdjustToContents(startRow, XLHelper.MaxRowNumber);
+        }
+
+        public IXLColumn AdjustToContents(Int32 startRow, Int32 endRow)
+        {
+            return AdjustToContents(startRow, endRow, 0, Double.MaxValue);
+        }
+
+        public IXLColumn AdjustToContents(Double minWidth, Double maxWidth)
+        {
+            return AdjustToContents(1, XLHelper.MaxRowNumber, minWidth, maxWidth);
+        }
+
+        public IXLColumn AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth)
+        {
+            return AdjustToContents(startRow, XLHelper.MaxRowNumber, minWidth, maxWidth);
+        }
+
+        public IXLColumn AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth)
+        {
+            var fontCache = new Dictionary<IXLFontBase, Font>();
+            Double colMaxWidth = minWidth;
+            foreach (XLCell c in Column(startRow, endRow).CellsUsed())
+            {
+                if (c.IsMerged()) continue;
+
+                Double thisWidthMax = 0;
+                Int32 textRotation = c.Style.Alignment.TextRotation;
+                if (c.HasRichText || textRotation != 0 || c.InnerText.Contains(Environment.NewLine))
+                {
+                    var kpList = new List<KeyValuePair<IXLFontBase, string>>();
+
+                    #region if (c.HasRichText)
+
+                    if (c.HasRichText)
+                    {
+                        foreach (IXLRichString rt in c.RichText)
+                        {
+                            String formattedString = rt.Text;
+                            var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
+                            Int32 arrCount = arr.Count();
+                            for (Int32 i = 0; i < arrCount; i++)
+                            {
+                                String s = arr[i];
+                                if (i < arrCount - 1)
+                                    s += Environment.NewLine;
+                                kpList.Add(new KeyValuePair<IXLFontBase, String>(rt, s));
+                            }
+                        }
+                    }
+                    else
+                    {
+                        String formattedString = c.GetFormattedString();
+                        var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
+                        Int32 arrCount = arr.Count();
+                        for (Int32 i = 0; i < arrCount; i++)
+                        {
+                            String s = arr[i];
+                            if (i < arrCount - 1)
+                                s += Environment.NewLine;
+                            kpList.Add(new KeyValuePair<IXLFontBase, String>(c.Style.Font, s));
+                        }
+                    }
+
+                    #endregion
+
+                    #region foreach (var kp in kpList)
+
+                    Double runningWidth = 0;
+                    Boolean rotated = false;
+                    Double maxLineWidth = 0;
+                    Int32 lineCount = 1;
+                    foreach (KeyValuePair<IXLFontBase, string> kp in kpList)
+                    {
+                        var f = kp.Key;
+                        String formattedString = kp.Value;
+
+                        Int32 newLinePosition = formattedString.IndexOf(Environment.NewLine);
+                        if (textRotation == 0)
+                        {
+                            #region if (newLinePosition >= 0)
+
+                            if (newLinePosition >= 0)
+                            {
+                                if (newLinePosition > 0)
+                                    runningWidth += f.GetWidth(formattedString.Substring(0, newLinePosition), fontCache);
+
+                                if (runningWidth > thisWidthMax)
+                                    thisWidthMax = runningWidth;
+
+                                runningWidth = newLinePosition < formattedString.Length - 2
+                                                   ? f.GetWidth(formattedString.Substring(newLinePosition + 2), fontCache)
+                                                   : 0;
+                            }
+                            else
+                                runningWidth += f.GetWidth(formattedString, fontCache);
+
+                            #endregion
+                        }
+                        else
+                        {
+                            #region if (textRotation == 255)
+
+                            if (textRotation == 255)
+                            {
+                                if (runningWidth <= 0)
+                                    runningWidth = f.GetWidth("X", fontCache);
+
+                                if (newLinePosition >= 0)
+                                    runningWidth += f.GetWidth("X", fontCache);
+                            }
+                            else
+                            {
+                                rotated = true;
+                                Double vWidth = f.GetWidth("X", fontCache);
+                                if (vWidth > maxLineWidth)
+                                    maxLineWidth = vWidth;
+
+                                if (newLinePosition >= 0)
+                                {
+                                    lineCount++;
+
+                                    if (newLinePosition > 0)
+                                        runningWidth += f.GetWidth(formattedString.Substring(0, newLinePosition), fontCache);
+
+                                    if (runningWidth > thisWidthMax)
+                                        thisWidthMax = runningWidth;
+
+                                    runningWidth = newLinePosition < formattedString.Length - 2
+                                                       ? f.GetWidth(formattedString.Substring(newLinePosition + 2), fontCache)
+                                                       : 0;
+                                }
+                                else
+                                    runningWidth += f.GetWidth(formattedString, fontCache);
+                            }
+
+                            #endregion
+                        }
+                    }
+
+                    #endregion
+
+                    if (runningWidth > thisWidthMax)
+                        thisWidthMax = runningWidth;
+
+                    #region if (rotated)
+
+                    if (rotated)
+                    {
+                        Int32 rotation;
+                        if (textRotation == 90 || textRotation == 180 || textRotation == 255)
+                            rotation = 90;
+                        else
+                            rotation = textRotation % 90;
+
+                        Double r = DegreeToRadian(rotation);
+
+                        thisWidthMax = (thisWidthMax * Math.Cos(r)) + (maxLineWidth * lineCount);
+                    }
+
+                    #endregion
+                }
+                else
+                    thisWidthMax = c.Style.Font.GetWidth(c.GetFormattedString(), fontCache);
+                if (thisWidthMax >= maxWidth)
+                {
+                    colMaxWidth = maxWidth;
+                    break;
+                }
+
+                if (thisWidthMax > colMaxWidth)
+                    colMaxWidth = thisWidthMax + 1;
+            }
+
+            if (colMaxWidth <= 0)
+                colMaxWidth = Worksheet.ColumnWidth;
+
+            Width = colMaxWidth;
+
+            foreach (IDisposable font in fontCache.Values)
+            {
+                font.Dispose();
+            }
+            return this;
+        }
+
+
+        public IXLColumn Hide()
+        {
+            IsHidden = true;
+            return this;
+        }
+
+        public IXLColumn Unhide()
+        {
+            IsHidden = false;
+            return this;
+        }
+
+        public Boolean IsHidden
+        {
+            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].IsHidden : _isHidden; }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].IsHidden = value;
+                else
+                    _isHidden = value;
+            }
+        }
+
+        public Int32 OutlineLevel
+        {
+            get { return IsReference ? Worksheet.Internals.ColumnsCollection[ColumnNumber()].OutlineLevel : _outlineLevel; }
+            set
+            {
+                if (value < 0 || value > 8)
+                    throw new ArgumentOutOfRangeException("value", "Outline level must be between 0 and 8.");
+
+                if (IsReference)
+                    Worksheet.Internals.ColumnsCollection[ColumnNumber()].OutlineLevel = value;
+                else
+                {
+                    Worksheet.IncrementColumnOutline(value);
+                    Worksheet.DecrementColumnOutline(_outlineLevel);
+                    _outlineLevel = value;
+                }
+            }
+        }
+
+        public IXLColumn Group()
+        {
+            return Group(false);
+        }
+
+        public IXLColumn Group(Boolean collapse)
+        {
+            if (OutlineLevel < 8)
+                OutlineLevel += 1;
+
+            Collapsed = collapse;
+            return this;
+        }
+
+        public IXLColumn Group(Int32 outlineLevel)
+        {
+            return Group(outlineLevel, false);
+        }
+
+        public IXLColumn Group(Int32 outlineLevel, Boolean collapse)
+        {
+            OutlineLevel = outlineLevel;
+            Collapsed = collapse;
+            return this;
+        }
+
+        public IXLColumn Ungroup()
+        {
+            return Ungroup(false);
+        }
+
+        public IXLColumn Ungroup(Boolean ungroupFromAll)
+        {
+            if (ungroupFromAll)
+                OutlineLevel = 0;
+            else
+            {
+                if (OutlineLevel > 0)
+                    OutlineLevel -= 1;
+            }
+            return this;
+        }
+
+        public IXLColumn Collapse()
+        {
+            Collapsed = true;
+            return Hide();
+        }
+
+        public IXLColumn Expand()
+        {
+            Collapsed = false;
+            return Unhide();
+        }
+
+        public Int32 CellCount()
+        {
+            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
+        }
+
+        public IXLColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false,
+                              Boolean ignoreBlanks = true)
+        {
+            Sort(1, sortOrder, matchCase, ignoreBlanks);
+            return this;
+        }
+
+
+        IXLRangeColumn IXLColumn.CopyTo(IXLCell target)
+        {
+            using (var asRange = AsRange())
+                using (var copy = asRange.CopyTo(target))
+                    return copy.Column(1);
+        }
+
+        IXLRangeColumn IXLColumn.CopyTo(IXLRangeBase target)
+        {
+            using (var asRange = AsRange())
+                using (var copy = asRange.CopyTo(target))
+                    return copy.Column(1);
+        }
+
+        public IXLColumn CopyTo(IXLColumn column)
+        {
+            column.Clear();
+            var newColumn = (XLColumn)column;
+            newColumn._width = _width;
+            newColumn.Style = GetStyle();
+
+            using (var asRange = AsRange())
+                asRange.CopyTo(column).Dispose();
+
+            return newColumn;
+        }
+
+        public IXLRangeColumn Column(Int32 start, Int32 end)
+        {
+            return Range(start, 1, end, 1).Column(1);
+        }
+
+        public IXLRangeColumn Column(IXLCell start, IXLCell end)
+        {
+            return Column(start.Address.RowNumber, end.Address.RowNumber);
+        }
+
+        public IXLRangeColumns Columns(String columns)
+        {
+            var retVal = new XLRangeColumns();
+            var columnPairs = columns.Split(',');
+            foreach (string pair in columnPairs)
+                using (var asRange = AsRange())
+                    asRange.Columns(pair.Trim()).ForEach(retVal.Add);
+            return retVal;
+        }
+
+        /// <summary>
+        ///   Adds a vertical page break after this column.
+        /// </summary>
+        public IXLColumn AddVerticalPageBreak()
+        {
+            Worksheet.PageSetup.AddVerticalPageBreak(ColumnNumber());
+            return this;
+        }
+
+        public IXLColumn SetDataType(XLCellValues dataType)
+        {
+            DataType = dataType;
+            return this;
+        }
+
+        public IXLRangeColumn ColumnUsed(Boolean includeFormats = false)
+        {
+            return Column(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
+        }
+
+        #endregion
+
+        public override XLRange AsRange()
+        {
+            return Range(1, 1, XLHelper.MaxRowNumber, 1);
+        }
+
+        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
+        {
+            if (range.RangeAddress.FirstAddress.ColumnNumber <= ColumnNumber())
+                SetColumnNumber(ColumnNumber() + columnsShifted);
+        }
+
+        private void SetColumnNumber(int column)
+        {
+            if (column <= 0)
+                RangeAddress.IsInvalid = false;
+            else
+            {
+                RangeAddress.FirstAddress = new XLAddress(Worksheet,
+                                                          1,
+                                                          column,
+                                                          RangeAddress.FirstAddress.FixedRow,
+                                                          RangeAddress.FirstAddress.FixedColumn);
+                RangeAddress.LastAddress = new XLAddress(Worksheet,
+                                                         XLHelper.MaxRowNumber,
+                                                         column,
+                                                         RangeAddress.LastAddress.FixedRow,
+                                                         RangeAddress.LastAddress.FixedColumn);
+            }
+        }
+
+        public override XLRange Range(String rangeAddressStr)
+        {
+            String rangeAddressToUse;
+            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
+            {
+                if (rangeAddressStr.Contains('-'))
+                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
+
+                var arrRange = rangeAddressStr.Split(':');
+                string firstPart = arrRange[0];
+                string secondPart = arrRange[1];
+                rangeAddressToUse = FixColumnAddress(firstPart) + ":" + FixColumnAddress(secondPart);
+            }
+            else
+                rangeAddressToUse = FixColumnAddress(rangeAddressStr);
+
+            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
+            return Range(rangeAddress);
+        }
+
+        public IXLRangeColumn Range(int firstRow, int lastRow)
+        {
+            return Range(firstRow, 1, lastRow, 1).Column(1);
+        }
+
+        private static double DegreeToRadian(double angle)
+        {
+            return Math.PI * angle / 180.0;
+        }
+
+
+        private XLColumn ColumnShift(Int32 columnsToShift)
+        {
+            return Worksheet.Column(ColumnNumber() + columnsToShift);
+        }
+
+        #region XLColumn Left
+
+        IXLColumn IXLColumn.ColumnLeft()
+        {
+            return ColumnLeft();
+        }
+
+        IXLColumn IXLColumn.ColumnLeft(Int32 step)
+        {
+            return ColumnLeft(step);
+        }
+
+        public XLColumn ColumnLeft()
+        {
+            return ColumnLeft(1);
+        }
+
+        public XLColumn ColumnLeft(Int32 step)
+        {
+            return ColumnShift(step * -1);
+        }
+
+        #endregion
+
+        #region XLColumn Right
+
+        IXLColumn IXLColumn.ColumnRight()
+        {
+            return ColumnRight();
+        }
+
+        IXLColumn IXLColumn.ColumnRight(Int32 step)
+        {
+            return ColumnRight(step);
+        }
+
+        public XLColumn ColumnRight()
+        {
+            return ColumnRight(1);
+        }
+
+        public XLColumn ColumnRight(Int32 step)
+        {
+            return ColumnShift(step);
+        }
+
+        #endregion
+
+        public new Boolean IsEmpty()
+        {
+            return IsEmpty(false);
+        }
+
+        public new Boolean IsEmpty(Boolean includeFormats)
+        {
+            if (includeFormats && !Style.Equals(Worksheet.Style))
+                return false;
+
+            return base.IsEmpty(includeFormats);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Columns/XLColumnCollection.cs b/ClosedXML/Excel/Columns/XLColumnCollection.cs
new file mode 100644
index 0000000..9d5f440
--- /dev/null
+++ b/ClosedXML/Excel/Columns/XLColumnCollection.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLColumnsCollection : IDictionary<Int32, XLColumn>, IDisposable
+    {
+        public void ShiftColumnsRight(Int32 startingColumn, Int32 columnsToShift)
+        {
+            foreach (var ro in _dictionary.Keys.Where(k => k >= startingColumn).OrderByDescending(k => k))
+            {
+                var columnToMove = _dictionary[ro];
+                Int32 newColumnNum = ro + columnsToShift;
+                if (newColumnNum <= XLHelper.MaxColumnNumber)
+                {
+                    var newColumn = new XLColumn(columnToMove)
+                                        {
+                                            RangeAddress =
+                                            {
+                                                FirstAddress = new XLAddress(1, newColumnNum, false, false),
+                                                LastAddress =
+                                                    new XLAddress(XLHelper.MaxRowNumber, newColumnNum, false, false)
+                                            }
+                                        };
+                                        
+                    _dictionary.Add(newColumnNum, newColumn);
+                }
+                _dictionary.Remove(ro);
+            }
+
+        }
+
+        private readonly Dictionary<Int32, XLColumn> _dictionary = new Dictionary<Int32, XLColumn>();
+
+        public void Add(int key, XLColumn value)
+        {
+            _dictionary.Add(key, value);
+        }
+
+        public bool ContainsKey(int key)
+        {
+            return _dictionary.ContainsKey(key);
+        }
+
+        public ICollection<int> Keys
+        {
+            get { return _dictionary.Keys; }
+        }
+
+        public bool Remove(int key)
+        {
+            return _dictionary.Remove(key);
+        }
+
+        public bool TryGetValue(int key, out XLColumn value)
+        {
+            return _dictionary.TryGetValue(key, out value);
+        }
+
+        public ICollection<XLColumn> Values
+        {
+            get { return _dictionary.Values; }
+        }
+
+        public XLColumn this[int key]
+        {
+            get
+            {
+                return _dictionary[key];
+            }
+            set
+            {
+                _dictionary[key] = value;
+            }
+        }
+
+        public void Add(KeyValuePair<int, XLColumn> item)
+        {
+            _dictionary.Add(item.Key, item.Value);
+        }
+
+        public void Clear()
+        {
+            _dictionary.Clear();
+        }
+
+        public bool Contains(KeyValuePair<int, XLColumn> item)
+        {
+            return _dictionary.Contains(item);
+        }
+
+        public void CopyTo(KeyValuePair<int, XLColumn>[] array, int arrayIndex)
+        {
+            throw new NotImplementedException();
+        }
+
+        public int Count
+        {
+            get { return _dictionary.Count; }
+        }
+
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        public bool Remove(KeyValuePair<int, XLColumn> item)
+        {
+            return _dictionary.Remove(item.Key);
+        }
+
+        public IEnumerator<KeyValuePair<int, XLColumn>> GetEnumerator()
+        {
+            return _dictionary.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return _dictionary.GetEnumerator();
+        }
+
+        public void RemoveAll(Func<XLColumn, Boolean> predicate)
+        {
+            _dictionary.RemoveAll(predicate);
+        }
+
+        public void Dispose()
+        {
+            _dictionary.Values.ForEach(c=>c.Dispose());
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Columns/XLColumnParameters.cs b/ClosedXML/Excel/Columns/XLColumnParameters.cs
new file mode 100644
index 0000000..4353f20
--- /dev/null
+++ b/ClosedXML/Excel/Columns/XLColumnParameters.cs
@@ -0,0 +1,18 @@
+using System;
+
+
+namespace ClosedXML.Excel
+{
+    internal class XLColumnParameters
+    {
+        public XLColumnParameters(XLWorksheet worksheet, Int32 defaultStyleId, Boolean isReference)
+        {
+            Worksheet = worksheet;
+            DefaultStyleId = defaultStyleId;
+            IsReference = isReference;
+        }
+        public Int32 DefaultStyleId { get; set; }
+        public XLWorksheet Worksheet { get; private set; }
+        public Boolean IsReference { get; private set; }
+    }
+}
diff --git a/ClosedXML/Excel/Columns/XLColumns.cs b/ClosedXML/Excel/Columns/XLColumns.cs
new file mode 100644
index 0000000..f62761c
--- /dev/null
+++ b/ClosedXML/Excel/Columns/XLColumns.cs
@@ -0,0 +1,287 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    internal class XLColumns : IXLColumns, IXLStylized
+    {
+        public Boolean StyleChanged { get; set; }
+        private readonly List<XLColumn> _columns = new List<XLColumn>();
+        private readonly XLWorksheet _worksheet;
+        internal IXLStyle style;
+
+        public XLColumns(XLWorksheet worksheet)
+        {
+            _worksheet = worksheet;
+            style = new XLStyle(this, XLWorkbook.DefaultStyle);
+        }
+
+        #region IXLColumns Members
+
+        public IEnumerator<IXLColumn> GetEnumerator()
+        {
+            return _columns.Cast<IXLColumn>().OrderBy(r => r.ColumnNumber()).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLStyle Style
+        {
+            get { return style; }
+            set
+            {
+                style = new XLStyle(this, value);
+
+                if (_worksheet != null)
+                    _worksheet.Style = value;
+                else
+                {
+                    foreach (XLColumn column in _columns)
+                        column.Style = value;
+                }
+            }
+        }
+
+        public Double Width
+        {
+            set
+            {
+                _columns.ForEach(c => c.Width = value);
+
+                if (_worksheet == null) return;
+
+                _worksheet.ColumnWidth = value;
+                _worksheet.Internals.ColumnsCollection.ForEach(c => c.Value.Width = value);
+            }
+        }
+
+        public void Delete()
+        {
+            if (_worksheet != null)
+            {
+                _worksheet.Internals.ColumnsCollection.Clear();
+                _worksheet.Internals.CellsCollection.Clear();
+            }
+            else
+            {
+                var toDelete = new Dictionary<IXLWorksheet, List<Int32>>();
+                foreach (XLColumn c in _columns)
+                {
+                    if (!toDelete.ContainsKey(c.Worksheet))
+                        toDelete.Add(c.Worksheet, new List<Int32>());
+
+                    toDelete[c.Worksheet].Add(c.ColumnNumber());
+                }
+
+                foreach (KeyValuePair<IXLWorksheet, List<int>> kp in toDelete)
+                {
+                    foreach (int c in kp.Value.OrderByDescending(c => c))
+                        kp.Key.Column(c).Delete();
+                }
+            }
+        }
+
+        public IXLColumns AdjustToContents()
+        {
+            _columns.ForEach(c => c.AdjustToContents());
+            return this;
+        }
+
+        public IXLColumns AdjustToContents(Int32 startRow)
+        {
+            _columns.ForEach(c => c.AdjustToContents(startRow));
+            return this;
+        }
+
+        public IXLColumns AdjustToContents(Int32 startRow, Int32 endRow)
+        {
+            _columns.ForEach(c => c.AdjustToContents(startRow, endRow));
+            return this;
+        }
+
+        public IXLColumns AdjustToContents(Double minWidth, Double maxWidth)
+        {
+            _columns.ForEach(c => c.AdjustToContents(minWidth, maxWidth));
+            return this;
+        }
+
+        public IXLColumns AdjustToContents(Int32 startRow, Double minWidth, Double maxWidth)
+        {
+            _columns.ForEach(c => c.AdjustToContents(startRow, minWidth, maxWidth));
+            return this;
+        }
+
+        public IXLColumns AdjustToContents(Int32 startRow, Int32 endRow, Double minWidth, Double maxWidth)
+        {
+            _columns.ForEach(c => c.AdjustToContents(startRow, endRow, minWidth, maxWidth));
+            return this;
+        }
+
+        public void Hide()
+        {
+            _columns.ForEach(c => c.Hide());
+        }
+
+        public void Unhide()
+        {
+            _columns.ForEach(c => c.Unhide());
+        }
+
+        public void Group()
+        {
+            Group(false);
+        }
+
+        public void Group(Int32 outlineLevel)
+        {
+            Group(outlineLevel, false);
+        }
+
+        public void Ungroup()
+        {
+            Ungroup(false);
+        }
+
+        public void Group(Boolean collapse)
+        {
+            _columns.ForEach(c => c.Group(collapse));
+        }
+
+        public void Group(Int32 outlineLevel, Boolean collapse)
+        {
+            _columns.ForEach(c => c.Group(outlineLevel, collapse));
+        }
+
+        public void Ungroup(Boolean ungroupFromAll)
+        {
+            _columns.ForEach(c => c.Ungroup(ungroupFromAll));
+        }
+
+        public void Collapse()
+        {
+            _columns.ForEach(c => c.Collapse());
+        }
+
+        public void Expand()
+        {
+            _columns.ForEach(c => c.Expand());
+        }
+
+        public IXLCells Cells()
+        {
+            var cells = new XLCells(false, false);
+            foreach (XLColumn container in _columns)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed()
+        {
+            var cells = new XLCells(true, false);
+            foreach (XLColumn container in _columns)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Boolean includeFormats)
+        {
+            var cells = new XLCells(true, includeFormats);
+            foreach (XLColumn container in _columns)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        /// <summary>
+        ///   Adds a vertical page break after this column.
+        /// </summary>
+        public IXLColumns AddVerticalPageBreaks()
+        {
+            foreach (XLColumn col in _columns)
+                col.Worksheet.PageSetup.AddVerticalPageBreak(col.ColumnNumber());
+            return this;
+        }
+
+        public IXLColumns SetDataType(XLCellValues dataType)
+        {
+            _columns.ForEach(c => c.DataType = dataType);
+            return this;
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return style;
+                if (_worksheet != null)
+                    yield return _worksheet.Style;
+                else
+                {
+                    foreach (IXLStyle s in _columns.SelectMany(col => col.Styles))
+                    {
+                        yield return s;
+                    }
+                }
+                UpdatingStyle = false;
+            }
+        }
+
+        public Boolean UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return style; }
+            set { style = new XLStyle(this, value); }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges();
+                this.ForEach(c => retVal.Add(c.AsRange()));
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        public void Add(XLColumn column)
+        {
+            _columns.Add(column);
+        }
+
+        public void CollapseOnly()
+        {
+            _columns.ForEach(c => c.Collapsed = true);
+        }
+
+        public IXLColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            _columns.ForEach(c=>c.Clear(clearOptions));
+            return this;
+        }
+
+        public void Dispose()
+        {
+            if (_columns != null)
+                _columns.ForEach(c => c.Dispose());
+        }
+
+        public void Select()
+        {
+            foreach (var range in this)
+                range.Select();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Comments/IXLComment.cs b/ClosedXML/Excel/Comments/IXLComment.cs
new file mode 100644
index 0000000..cddc435
--- /dev/null
+++ b/ClosedXML/Excel/Comments/IXLComment.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLComment : IXLFormattedText<IXLComment>, IXLDrawing<IXLComment>
+    {
+        /// <summary>
+        /// Gets or sets this comment's author's name
+        /// </summary>
+        String Author { get; set; }
+        /// <summary>
+        /// Sets the name of the comment's author
+        /// </summary>
+        /// <param name="value">Author's name</param>
+        IXLComment SetAuthor(String value);
+
+        /// <summary>
+        /// Adds a bolded line with the author's name
+        /// </summary>
+        IXLRichString AddSignature();
+
+        void Delete();
+    }
+
+}
diff --git a/ClosedXML/Excel/Comments/XLComment.cs b/ClosedXML/Excel/Comments/XLComment.cs
new file mode 100644
index 0000000..83f5846
--- /dev/null
+++ b/ClosedXML/Excel/Comments/XLComment.cs
@@ -0,0 +1,207 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLComment : XLFormattedText<IXLComment>, IXLComment
+    {
+        private XLCell _cell;
+
+        public XLComment(XLCell cell, IXLFontBase defaultFont)
+            : base(defaultFont)
+        {
+            Initialize(cell);
+        }
+
+        public XLComment(XLCell cell, XLFormattedText<IXLComment> defaultComment, IXLFontBase defaultFont)
+            : base(defaultComment, defaultFont)
+        {
+            Initialize(cell);
+        }
+
+        public XLComment(XLCell cell, String text, IXLFontBase defaultFont)
+            : base(text, defaultFont)
+        {
+            Initialize(cell);
+        }
+
+        #region IXLComment Members
+
+        public String Author { get; set; }
+
+        public IXLComment SetAuthor(String value)
+        {
+            Author = value;
+            return this;
+        }
+
+        public IXLRichString AddSignature()
+        {
+            AddText(Author + ":").SetBold();
+            return AddText(Environment.NewLine);
+        }
+
+        public void Delete()
+        {
+            _cell.DeleteComment();
+        }
+
+        #endregion
+
+        #region IXLDrawing
+
+        public String Name { get; set; }
+        public String Description { get; set; }
+        public XLDrawingAnchor Anchor { get; set; }
+        public Boolean HorizontalFlip { get; set; }
+        public Boolean VerticalFlip { get; set; }
+        public Int32 Rotation { get; set; }
+        public Int32 ExtentLength { get; set; }
+        public Int32 ExtentWidth { get; set; }
+        public Int32 ShapeId { get; internal set; }
+
+        private Boolean _visible;
+
+        public Boolean Visible
+        {
+            get
+            {
+                return _visible;
+            }
+            set
+            {
+                _visible = value;
+            }
+        }
+
+        public IXLComment SetVisible()
+        {
+            Visible = true;
+            return Container;
+        }
+
+        public IXLComment SetVisible(Boolean hidden)
+        {
+            Visible = hidden;
+            return Container;
+        }
+
+        public IXLDrawingPosition Position { get; private set; }
+
+        public Int32 ZOrder { get; set; }
+
+        public IXLComment SetZOrder(Int32 zOrder)
+        {
+            ZOrder = zOrder;
+            return Container;
+        }
+
+        public IXLDrawingStyle Style { get; private set; }
+
+        public IXLComment SetName(String name)
+        {
+            Name = name;
+            return Container;
+        }
+
+        public IXLComment SetDescription(String description)
+        {
+            Description = description;
+            return Container;
+        }
+
+        public IXLComment SetHorizontalFlip()
+        {
+            HorizontalFlip = true;
+            return Container;
+        }
+
+        public IXLComment SetHorizontalFlip(Boolean horizontalFlip)
+        {
+            HorizontalFlip = horizontalFlip;
+            return Container;
+        }
+
+        public IXLComment SetVerticalFlip()
+        {
+            VerticalFlip = true;
+            return Container;
+        }
+
+        public IXLComment SetVerticalFlip(Boolean verticalFlip)
+        {
+            VerticalFlip = verticalFlip;
+            return Container;
+        }
+
+        public IXLComment SetRotation(Int32 rotation)
+        {
+            Rotation = rotation;
+            return Container;
+        }
+
+        public IXLComment SetExtentLength(Int32 extentLength)
+        {
+            ExtentLength = extentLength;
+            return Container;
+        }
+
+        public IXLComment SetExtentWidth(Int32 extentWidth)
+        {
+            ExtentWidth = extentWidth;
+            return Container;
+        }
+
+        #endregion
+
+        private void Initialize(XLCell cell)
+        {
+            Author = cell.Worksheet.Author;
+            Container = this;
+            Anchor = XLDrawingAnchor.MoveAndSizeWithCells;
+            Style = new XLDrawingStyle();
+            Int32 pRow = cell.Address.RowNumber;
+            Double pRowOffset = 0;
+            if (pRow > 1)
+            {
+                pRow--;
+                double prevHeight = cell.CellAbove().WorksheetRow().Height;
+                if (prevHeight > 7)
+                    pRowOffset = prevHeight - 7;
+            }
+            Position = new XLDrawingPosition
+                           {
+                               Column = cell.Address.ColumnNumber + 1,
+                               ColumnOffset = 2,
+                               Row = pRow,
+                               RowOffset = pRowOffset
+                           };
+
+            ZOrder = cell.Worksheet.ZOrder++;
+            Style
+                .Margins.SetLeft(0.1)
+                .Margins.SetRight(0.1)
+                .Margins.SetTop(0.05)
+                .Margins.SetBottom(0.05)
+                .Margins.SetAutomatic()
+                .Size.SetHeight(59.25)
+                .Size.SetWidth(19.2)
+                .ColorsAndLines.SetLineColor(XLColor.Black)
+                .ColorsAndLines.SetFillColor(XLColor.FromArgb(255, 255, 225))
+                .ColorsAndLines.SetLineDash(XLDashStyle.Solid)
+                .ColorsAndLines.SetLineStyle(XLLineStyle.Single)
+                .ColorsAndLines.SetLineWeight(0.75)
+                .ColorsAndLines.SetFillTransparency(1)
+                .ColorsAndLines.SetLineTransparency(1)
+                .Alignment.SetHorizontal(XLDrawingHorizontalAlignment.Left)
+                .Alignment.SetVertical(XLDrawingVerticalAlignment.Top)
+                .Alignment.SetDirection(XLDrawingTextDirection.Context)
+                .Alignment.SetOrientation(XLDrawingTextOrientation.LeftToRight)
+                .Properties.SetPositioning(XLDrawingAnchor.Absolute)
+                .Protection.SetLocked()
+                .Protection.SetLockText();
+
+            _cell = cell;
+            ShapeId = cell.Worksheet.Workbook.ShapeIdManager.GetNext();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMax.cs b/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMax.cs
new file mode 100644
index 0000000..c147515
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMax.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLCFColorScaleMax
+    {
+        void Maximum(XLCFContentType type, String value, XLColor color);
+        void Maximum(XLCFContentType type, Double value, XLColor color);
+        void HighestValue(XLColor color);
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMid.cs b/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMid.cs
new file mode 100644
index 0000000..f36fdae
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMid.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLCFColorScaleMid
+    {
+        IXLCFColorScaleMax Midpoint(XLCFContentType type, String value, XLColor color);
+        IXLCFColorScaleMax Midpoint(XLCFContentType type, Double value, XLColor color);
+        void Maximum(XLCFContentType type, String value, XLColor color);
+        void Maximum(XLCFContentType type, Double value, XLColor color);
+        void HighestValue(XLColor color);
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMin.cs b/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMin.cs
new file mode 100644
index 0000000..6e942a3
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLCFColorScaleMin.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLCFContentType { Number, Percent, Formula, Percentile, Minimum, Maximum }
+    public interface IXLCFColorScaleMin
+    {
+        IXLCFColorScaleMid Minimum(XLCFContentType type, String value, XLColor color);
+        IXLCFColorScaleMid Minimum(XLCFContentType type, Double value, XLColor color);
+        IXLCFColorScaleMid LowestValue(XLColor color);
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMax.cs b/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMax.cs
new file mode 100644
index 0000000..16341e3
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMax.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLCFDataBarMax
+    {
+        void Maximum(XLCFContentType type, String value);
+        void Maximum(XLCFContentType type, Double value);
+        void HighestValue();
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMin.cs b/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMin.cs
new file mode 100644
index 0000000..a3d5e73
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLCFDataBarMin.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLCFDataBarMin
+    {
+        IXLCFDataBarMax Minimum(XLCFContentType type, String value);
+        IXLCFDataBarMax Minimum(XLCFContentType type, Double value);
+        IXLCFDataBarMax LowestValue();
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLCFIconSet.cs b/ClosedXML/Excel/ConditionalFormats/IXLCFIconSet.cs
new file mode 100644
index 0000000..a5a361f
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLCFIconSet.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLCFIconSetOperator {GreaterThan, EqualOrGreaterThan}
+    public interface IXLCFIconSet
+    {
+        IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, String value, XLCFContentType type);
+        IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, Double value, XLCFContentType type);
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormat.cs b/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormat.cs
new file mode 100644
index 0000000..c211f7a
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormat.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLTimePeriod
+    {
+        Yesterday,
+        Today,
+        Tomorrow,
+        InTheLast7Days,
+        LastWeek,
+        ThisWeek,
+        NextWeek,
+        LastMonth,
+        ThisMonth,
+        NextMonth
+    }
+    public enum XLIconSetStyle
+    {
+        ThreeArrows,
+        ThreeArrowsGray,
+        ThreeFlags,
+        ThreeTrafficLights1,
+        ThreeTrafficLights2,
+        ThreeSigns,
+        ThreeSymbols,
+        ThreeSymbols2,
+        FourArrows,
+        FourArrowsGray,
+        FourRedToBlack,
+        FourRating,
+        FourTrafficLights,
+        FiveArrows,
+        FiveArrowsGray,
+        FiveRating,
+        FiveQuarters
+    }
+    public enum XLConditionalFormatType
+    {
+        Expression,
+        CellIs,
+        ColorScale,
+        DataBar,
+        IconSet,
+        Top10,
+        IsUnique,
+        IsDuplicate,
+        ContainsText,
+        NotContainsText,
+        StartsWith,
+        EndsWith,
+        IsBlank,
+        NotBlank,
+        IsError,
+        NotError,
+        TimePeriod,
+        AboveAverage
+    }
+    public enum XLCFOperator { Equal, NotEqual, GreaterThan, LessThan, EqualOrGreaterThan, EqualOrLessThan, Between, NotBetween, Contains, NotContains, StartsWith, EndsWith }
+    public interface IXLConditionalFormat
+    {
+        IXLStyle Style { get; set; }
+
+        IXLStyle WhenIsBlank();
+        IXLStyle WhenNotBlank();
+        IXLStyle WhenIsError();
+        IXLStyle WhenNotError();
+        IXLStyle WhenDateIs(XLTimePeriod timePeriod );
+        IXLStyle WhenContains(String value);
+        IXLStyle WhenNotContains(String value);
+        IXLStyle WhenStartsWith(String value);
+        IXLStyle WhenEndsWith(String value);
+        IXLStyle WhenEquals(String value);
+        IXLStyle WhenNotEquals(String value);
+        IXLStyle WhenGreaterThan(String value);
+        IXLStyle WhenLessThan(String value);
+        IXLStyle WhenEqualOrGreaterThan(String value);
+        IXLStyle WhenEqualOrLessThan(String value);
+        IXLStyle WhenBetween(String minValue, String maxValue);
+        IXLStyle WhenNotBetween(String minValue, String maxValue);
+
+        IXLStyle WhenEquals(Double value);
+        IXLStyle WhenNotEquals(Double value);
+        IXLStyle WhenGreaterThan(Double value);
+        IXLStyle WhenLessThan(Double value);
+        IXLStyle WhenEqualOrGreaterThan(Double value);
+        IXLStyle WhenEqualOrLessThan(Double value);
+        IXLStyle WhenBetween(Double minValue, Double maxValue);
+        IXLStyle WhenNotBetween(Double minValue, Double maxValue);
+
+        IXLStyle WhenIsDuplicate();
+        IXLStyle WhenIsUnique();
+        IXLStyle WhenIsTrue(String formula);
+        IXLStyle WhenIsTop(Int32 value, XLTopBottomType topBottomType = XLTopBottomType.Items);
+        IXLStyle WhenIsBottom(Int32 value, XLTopBottomType topBottomType);
+
+        IXLCFColorScaleMin ColorScale();
+        IXLCFDataBarMin DataBar(XLColor color, Boolean showBarOnly = false);
+        IXLCFIconSet IconSet(XLIconSetStyle iconSetStyle, Boolean reverseIconOrder = false, Boolean showIconOnly = false);
+
+        XLConditionalFormatType ConditionalFormatType { get; }
+        XLIconSetStyle IconSetStyle { get; }
+        XLTimePeriod TimePeriod { get; }
+        Boolean ReverseIconOrder { get; }
+        Boolean ShowIconOnly { get; }
+        Boolean ShowBarOnly { get; }
+        IXLRange Range { get; set; }
+
+        XLDictionary<XLFormula> Values { get; }
+        XLDictionary<XLColor> Colors { get; }
+        XLDictionary<XLCFContentType> ContentTypes { get; }
+        XLDictionary<XLCFIconSetOperator> IconSetOperators { get; }
+        
+        XLCFOperator Operator { get; }
+        Boolean Bottom { get;  }
+        Boolean Percent { get; }
+        
+        
+    }
+}
+    
\ No newline at end of file
diff --git a/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormats.cs b/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormats.cs
new file mode 100644
index 0000000..94fe02a
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/IXLConditionalFormats.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLConditionalFormats: IEnumerable<IXLConditionalFormat>
+    {
+        void Add(IXLConditionalFormat conditionalFormat);
+        void RemoveAll();
+        void Remove(Predicate<IXLConditionalFormat> predicate);
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/IXLCFConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/IXLCFConverter.cs
new file mode 100644
index 0000000..d885fea
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/IXLCFConverter.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal interface IXLCFConverter
+    {
+        ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context);
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFCellIsConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFCellIsConverter.cs
new file mode 100644
index 0000000..a39690d
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFCellIsConverter.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFCellIsConverter : IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            String val = GetQuoted(cf.Values[1]);
+
+
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula();
+            if (cf.Operator == XLCFOperator.Equal || cf.Operator == XLCFOperator.NotEqual)
+                formula.Text = val;
+            else
+                formula.Text = val;
+            conditionalFormattingRule.Append(formula);
+
+            if(cf.Operator == XLCFOperator.Between || cf.Operator == XLCFOperator.NotBetween)
+            {
+                var formula2 = new Formula { Text = GetQuoted(cf.Values[2]) };
+                conditionalFormattingRule.Append(formula2);    
+            }
+
+            return conditionalFormattingRule;
+        }
+
+        private String GetQuoted(XLFormula formula)
+        {
+            String value = formula.Value;
+            Double num;
+            if ((!Double.TryParse(value, out num) && !formula.IsFormula) && value[0] != '\"' && !value.EndsWith("\""))
+                return String.Format("\"{0}\"", value.Replace("\"", "\"\""));
+
+            return value;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFColorScaleConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFColorScaleConverter.cs
new file mode 100644
index 0000000..5d970d5
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFColorScaleConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFColorScaleConverter:IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+            
+            var colorScale = new ColorScale();
+            for(Int32 i = 1; i <= cf.Values.Count; i++)
+            {
+                var conditionalFormatValueObject = new ConditionalFormatValueObject { Type = cf.ContentTypes[i].ToOpenXml(), Val = cf.Values[i].Value };
+                colorScale.Append(conditionalFormatValueObject);
+            }
+
+            for (Int32 i = 1; i <= cf.Values.Count; i++)
+            {
+                Color color = new Color { Rgb = cf.Colors[i].Color.ToHex() };
+                colorScale.Append(color);
+            }
+
+            conditionalFormattingRule.Append(colorScale);
+
+            return conditionalFormattingRule;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFContainsConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFContainsConverter.cs
new file mode 100644
index 0000000..3abf4c3
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFContainsConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFContainsConverter : IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            String val = cf.Values[1].Value;
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "NOT(ISERROR(SEARCH(\"" + val + "\"," + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + ")))" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFConverters.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFConverters.cs
new file mode 100644
index 0000000..e4ed8bb
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFConverters.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFConverters
+    {
+        private static readonly Dictionary<XLConditionalFormatType, IXLCFConverter> Converters;
+        static XLCFConverters()
+        {
+            Converters = new Dictionary<XLConditionalFormatType, IXLCFConverter>();
+            Converters.Add(XLConditionalFormatType.ColorScale, new XLCFColorScaleConverter());
+            Converters.Add(XLConditionalFormatType.StartsWith, new XLCFStartsWithConverter());
+            Converters.Add(XLConditionalFormatType.EndsWith, new XLCFEndsWithConverter());
+            Converters.Add(XLConditionalFormatType.IsBlank, new XLCFIsBlankConverter());
+            Converters.Add(XLConditionalFormatType.NotBlank, new XLCFNotBlankConverter());
+            Converters.Add(XLConditionalFormatType.IsError, new XLCFIsErrorConverter());
+            Converters.Add(XLConditionalFormatType.NotError, new XLCFNotErrorConverter());
+            Converters.Add(XLConditionalFormatType.ContainsText, new XLCFContainsConverter());
+            Converters.Add(XLConditionalFormatType.NotContainsText, new XLCFNotContainsConverter());
+            Converters.Add(XLConditionalFormatType.CellIs, new XLCFCellIsConverter());
+            Converters.Add(XLConditionalFormatType.IsUnique, new XLCFUniqueConverter());
+            Converters.Add(XLConditionalFormatType.IsDuplicate, new XLCFUniqueConverter());
+            Converters.Add(XLConditionalFormatType.Expression, new XLCFCellIsConverter());
+            Converters.Add(XLConditionalFormatType.Top10, new XLCFTopConverter());
+            Converters.Add(XLConditionalFormatType.DataBar, new XLCFDataBarConverter());
+            Converters.Add(XLConditionalFormatType.IconSet, new XLCFIconSetConverter());
+        }
+        public static ConditionalFormattingRule Convert(IXLConditionalFormat conditionalFormat, Int32 priority, XLWorkbook.SaveContext context)
+        {
+            return Converters[conditionalFormat.ConditionalFormatType].Convert(conditionalFormat, priority, context);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFDataBarConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFDataBarConverter.cs
new file mode 100644
index 0000000..1b2f0be
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFDataBarConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFDataBarConverter:IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var dataBar = new DataBar {ShowValue = !cf.ShowBarOnly};
+            var conditionalFormatValueObject1 = new ConditionalFormatValueObject { Type = cf.ContentTypes[1].ToOpenXml()};
+            if (cf.Values.Count >= 1) conditionalFormatValueObject1.Val = cf.Values[1].Value;
+
+            var conditionalFormatValueObject2 = new ConditionalFormatValueObject { Type = cf.ContentTypes[2].ToOpenXml()};
+            if (cf.Values.Count >= 2) conditionalFormatValueObject2.Val = cf.Values[2].Value;
+
+            var color = new Color { Rgb = cf.Colors[1].Color.ToHex() };
+
+            dataBar.Append(conditionalFormatValueObject1);
+            dataBar.Append(conditionalFormatValueObject2);
+            dataBar.Append(color);
+
+            conditionalFormattingRule.Append(dataBar);
+
+            return conditionalFormattingRule;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFEndsWithConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFEndsWithConverter.cs
new file mode 100644
index 0000000..1fa1532
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFEndsWithConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFEndsWithConverter : IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            String val = cf.Values[1].Value;
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "RIGHT(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "," + val.Length.ToString() + ")=\"" + val + "\"" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFIconSetConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFIconSetConverter.cs
new file mode 100644
index 0000000..b5922ec
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFIconSetConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFIconSetConverter:IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, Int32 priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var iconSet = new IconSet {ShowValue = !cf.ShowIconOnly, Reverse = cf.ReverseIconOrder, IconSetValue = cf.IconSetStyle.ToOpenXml()};
+            Int32 count = cf.Values.Count;
+            for(Int32 i=1;i<= count; i++ )
+            {
+                var conditionalFormatValueObject = new ConditionalFormatValueObject { Type = cf.ContentTypes[i].ToOpenXml(), Val = cf.Values[i].Value, GreaterThanOrEqual = cf.IconSetOperators[i] == XLCFIconSetOperator.EqualOrGreaterThan};    
+                iconSet.Append(conditionalFormatValueObject);
+                
+            }
+            conditionalFormattingRule.Append(iconSet);
+            return conditionalFormattingRule;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsBlankConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsBlankConverter.cs
new file mode 100644
index 0000000..21e5e65
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsBlankConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFIsBlankConverter : IXLCFConverter
+    {
+
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "LEN(TRIM(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))=0" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsErrorConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsErrorConverter.cs
new file mode 100644
index 0000000..7fc1d7a
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFIsErrorConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFIsErrorConverter : IXLCFConverter
+    {
+
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "ISERROR(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + ")" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotBlankConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotBlankConverter.cs
new file mode 100644
index 0000000..aaeef02
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotBlankConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFNotBlankConverter : IXLCFConverter
+    {
+
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "LEN(TRIM(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))>0" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotContainsConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotContainsConverter.cs
new file mode 100644
index 0000000..86dcee8
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotContainsConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFNotContainsConverter : IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            String val = cf.Values[1].Value;
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "ISERROR(SEARCH(\"" + val + "\"," + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotErrorConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotErrorConverter.cs
new file mode 100644
index 0000000..2510a0a
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFNotErrorConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFNotErrorConverter : IXLCFConverter
+    {
+
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "NOT(ISERROR(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "))" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFStartsWithConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFStartsWithConverter.cs
new file mode 100644
index 0000000..82cfb88
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFStartsWithConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFStartsWithConverter : IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            String val = cf.Values[1].Value;
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Operator = cf.Operator.ToOpenXml(), Text = val, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+
+            var formula = new Formula { Text = "LEFT(" + cf.Range.RangeAddress.FirstAddress.ToStringRelative(false) + "," + val.Length.ToString() + ")=\"" + val + "\"" };
+
+            conditionalFormattingRule.Append(formula);
+
+            return conditionalFormattingRule;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFTopConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFTopConverter.cs
new file mode 100644
index 0000000..57b90f3
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFTopConverter.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFTopConverter : IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            UInt32 val = UInt32.Parse(cf.Values[1].Value);
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Percent = cf.Percent, Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority, Rank = val, Bottom = cf.Bottom};
+            return conditionalFormattingRule;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/Save/XLCFUniqueConverter.cs b/ClosedXML/Excel/ConditionalFormats/Save/XLCFUniqueConverter.cs
new file mode 100644
index 0000000..c6b4ef9
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/Save/XLCFUniqueConverter.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFUniqueConverter : IXLCFConverter
+    {
+        public ConditionalFormattingRule Convert(IXLConditionalFormat cf, int priority, XLWorkbook.SaveContext context)
+        {
+            var conditionalFormattingRule = new ConditionalFormattingRule { FormatId = (UInt32)context.DifferentialFormats[cf.Style], Type = cf.ConditionalFormatType.ToOpenXml(), Priority = priority };
+            return conditionalFormattingRule;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMax.cs b/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMax.cs
new file mode 100644
index 0000000..64614d8
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMax.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFColorScaleMax : IXLCFColorScaleMax
+    {
+        private readonly XLConditionalFormat _conditionalFormat;
+        public XLCFColorScaleMax(XLConditionalFormat conditionalFormat)
+        {
+            _conditionalFormat = conditionalFormat;
+        }
+
+        public void Maximum(XLCFContentType type, String value, XLColor color)
+        {
+            _conditionalFormat.Values.Add(new XLFormula { Value = value });
+            _conditionalFormat.Colors.Add(color);
+            _conditionalFormat.ContentTypes.Add(type);
+        }
+        public void Maximum(XLCFContentType type, Double value, XLColor color)
+        {
+            Maximum(type, value.ToInvariantString(), color);
+        }
+        public void HighestValue(XLColor color)
+        {
+            Maximum(XLCFContentType.Maximum, "0", color);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMid.cs b/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMid.cs
new file mode 100644
index 0000000..13c31ec
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMid.cs
@@ -0,0 +1,36 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFColorScaleMid : IXLCFColorScaleMid
+    {
+        private readonly XLConditionalFormat _conditionalFormat;
+        public XLCFColorScaleMid(XLConditionalFormat conditionalFormat)
+        {
+            _conditionalFormat = conditionalFormat;
+        }
+        public IXLCFColorScaleMax Midpoint(XLCFContentType type, String value, XLColor color)
+        {
+            _conditionalFormat.Values.Add(new XLFormula { Value = value });
+            _conditionalFormat.Colors.Add(color);
+            _conditionalFormat.ContentTypes.Add(type);
+            return new XLCFColorScaleMax(_conditionalFormat);
+        }
+        public IXLCFColorScaleMax Midpoint(XLCFContentType type, Double value, XLColor color)
+        {
+            return Midpoint(type, value.ToInvariantString(), color);
+        }
+        public void Maximum(XLCFContentType type, String value, XLColor color)
+        {
+            Midpoint(type, value, color);
+        }
+        public void Maximum(XLCFContentType type, Double value, XLColor color)
+        {
+            Maximum(type, value.ToInvariantString(), color);
+        }
+        public void HighestValue(XLColor color)
+        {
+            Midpoint(XLCFContentType.Maximum, "0", color);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMin.cs b/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMin.cs
new file mode 100644
index 0000000..0c33c04
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLCFColorScaleMin.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFColorScaleMin : IXLCFColorScaleMin
+    {
+        private readonly XLConditionalFormat _conditionalFormat;
+        public XLCFColorScaleMin(XLConditionalFormat conditionalFormat)
+        {
+            _conditionalFormat = conditionalFormat;
+        }
+
+        public IXLCFColorScaleMid Minimum(XLCFContentType type, String value, XLColor color)
+        {
+            _conditionalFormat.Values.Initialize(new XLFormula { Value = value });
+            _conditionalFormat.Colors.Initialize(color);
+            _conditionalFormat.ContentTypes.Initialize(type);
+            return new XLCFColorScaleMid(_conditionalFormat);
+        }
+        public IXLCFColorScaleMid Minimum(XLCFContentType type, Double value, XLColor color)
+        {
+            return Minimum(type, value.ToInvariantString(), color);
+        }
+
+        public IXLCFColorScaleMid LowestValue(XLColor color)
+        {
+            return Minimum(XLCFContentType.Minimum, "0", color);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMax.cs b/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMax.cs
new file mode 100644
index 0000000..cfedb03
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMax.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFDataBarMax : IXLCFDataBarMax
+    {
+        private readonly XLConditionalFormat _conditionalFormat;
+        public XLCFDataBarMax(XLConditionalFormat conditionalFormat)
+        {
+            _conditionalFormat = conditionalFormat;
+        }
+
+        public void Maximum(XLCFContentType type, String value)
+        {
+            _conditionalFormat.ContentTypes.Add(type);
+            _conditionalFormat.Values.Add(new XLFormula { Value = value });
+        }
+        public void Maximum(XLCFContentType type, Double value)
+        {
+            Maximum(type, value.ToInvariantString());
+        }
+
+        public void HighestValue()
+        {
+            Maximum(XLCFContentType.Maximum, "0");
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMin.cs b/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMin.cs
new file mode 100644
index 0000000..11770f8
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLCFDataBarMin.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFDataBarMin : IXLCFDataBarMin
+    {
+        private readonly XLConditionalFormat _conditionalFormat;
+        public XLCFDataBarMin(XLConditionalFormat conditionalFormat)
+        {
+            _conditionalFormat = conditionalFormat;
+        }
+
+        public IXLCFDataBarMax Minimum(XLCFContentType type, String value)
+        {
+            _conditionalFormat.ContentTypes.Initialize(type);
+            _conditionalFormat.Values.Initialize(new XLFormula { Value = value });
+            return new XLCFDataBarMax(_conditionalFormat);
+        }
+        public IXLCFDataBarMax Minimum(XLCFContentType type, Double value)
+        {
+            return Minimum(type, value.ToInvariantString());
+        }
+
+        public IXLCFDataBarMax LowestValue()
+        {
+            return Minimum(XLCFContentType.Minimum, "0");
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/XLCFIconSet.cs b/ClosedXML/Excel/ConditionalFormats/XLCFIconSet.cs
new file mode 100644
index 0000000..6210197
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLCFIconSet.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCFIconSet : IXLCFIconSet
+    {
+        private readonly XLConditionalFormat _conditionalFormat;
+        public XLCFIconSet(XLConditionalFormat conditionalFormat)
+        {
+            _conditionalFormat = conditionalFormat;
+        }
+        public IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, String value, XLCFContentType type)
+        {
+            _conditionalFormat.IconSetOperators.Add(setOperator);
+            _conditionalFormat.Values.Add(new XLFormula { Value = value });
+            _conditionalFormat.ContentTypes.Add(type);
+            return new XLCFIconSet(_conditionalFormat);
+        }
+        public IXLCFIconSet AddValue(XLCFIconSetOperator setOperator, Double value, XLCFContentType type)
+        {
+            return AddValue(setOperator, value.ToInvariantString(), type);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/ConditionalFormats/XLConditionalFormat.cs b/ClosedXML/Excel/ConditionalFormats/XLConditionalFormat.cs
new file mode 100644
index 0000000..d42b9fc
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLConditionalFormat.cs
@@ -0,0 +1,357 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLConditionalFormat: IXLConditionalFormat, IXLStylized
+    {
+        
+        public XLConditionalFormat(XLRange range, Boolean copyDefaultModify = false)
+        {
+            Range = range;
+            Style = new XLStyle(this, range.Worksheet.Style);
+            Values = new XLDictionary<XLFormula>();
+            Colors = new XLDictionary<XLColor>();
+            ContentTypes = new XLDictionary<XLCFContentType>();
+            IconSetOperators = new XLDictionary<XLCFIconSetOperator>();
+            CopyDefaultModify = copyDefaultModify;
+        }
+        public XLConditionalFormat(XLConditionalFormat other)
+        {
+            Range = other.Range;
+            Style = new XLStyle(this, other.Style);
+            Values = new XLDictionary<XLFormula>(other.Values);
+            Colors = new XLDictionary<XLColor>(other.Colors);
+            ContentTypes = new XLDictionary<XLCFContentType>(other.ContentTypes);
+            IconSetOperators = new XLDictionary<XLCFIconSetOperator>(other.IconSetOperators);
+
+
+            ConditionalFormatType = other.ConditionalFormatType;
+            TimePeriod = other.TimePeriod;
+            IconSetStyle = other.IconSetStyle;
+            Operator = other.Operator;
+            Bottom = other.Bottom;
+            Percent = other.Percent;
+            ReverseIconOrder = other.ReverseIconOrder;
+            ShowIconOnly = other.ShowIconOnly;
+            ShowBarOnly = other.ShowBarOnly;
+        }
+
+        public Boolean CopyDefaultModify { get; set; }
+        private IXLStyle _style;
+        private Int32 _styleCacheId;
+        public IXLStyle Style{ get { return GetStyle(); } set { SetStyle(value); } }
+        private IXLStyle GetStyle()
+        {
+            //return _style;
+            if (_style != null)
+                return _style;
+
+            return _style = new XLStyle(this, Range.Worksheet.Workbook.GetStyleById(_styleCacheId), CopyDefaultModify);
+        }
+        private void SetStyle(IXLStyle styleToUse)
+        {
+            //_style = new XLStyle(this, styleToUse);
+            _styleCacheId = Range.Worksheet.Workbook.GetStyleId(styleToUse);
+            _style = null;
+            StyleChanged = false;
+        }
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return Style;
+                UpdatingStyle = false;
+            }
+        }
+
+        public bool UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle { get; set; }
+
+        public IXLRanges RangesUsed
+        {
+            get { return new XLRanges(); }
+        }
+
+        public bool StyleChanged { get; set; }
+        public XLDictionary<XLFormula> Values { get; private set; }
+        public XLDictionary<XLColor> Colors { get; private set; }
+        public XLDictionary<XLCFContentType> ContentTypes { get; private set; }
+        public XLDictionary<XLCFIconSetOperator> IconSetOperators { get; private set; }
+
+        public IXLRange Range { get; set; }
+        public XLConditionalFormatType ConditionalFormatType { get; set; }
+        public XLTimePeriod TimePeriod { get; set; }
+        public XLIconSetStyle IconSetStyle { get; set; }
+        public XLCFOperator Operator { get;  set; }
+        public Boolean Bottom { get;  set; }
+        public Boolean Percent { get;  set; }
+        public Boolean ReverseIconOrder { get;  set; }
+        public Boolean ShowIconOnly { get;  set; }
+        public Boolean ShowBarOnly { get;  set; }
+
+        public void CopyFrom(IXLConditionalFormat other)
+        {
+            Style = other.Style;
+            ConditionalFormatType = other.ConditionalFormatType;
+            TimePeriod = other.TimePeriod;
+            IconSetStyle = other.IconSetStyle;
+            Operator = other.Operator;
+            Bottom = other.Bottom;
+            Percent = other.Percent;
+            ReverseIconOrder = other.ReverseIconOrder;
+            ShowIconOnly = other.ShowIconOnly;
+            ShowBarOnly = other.ShowBarOnly;
+
+            Values.Clear();
+            other.Values.ForEach(kp => Values.Add(kp.Key, new XLFormula(kp.Value)));
+            //CopyDictionary(Values, other.Values);
+            CopyDictionary(Colors, other.Colors);
+            CopyDictionary(ContentTypes, other.ContentTypes);
+            CopyDictionary(IconSetOperators, other.IconSetOperators);
+        }
+
+        private void CopyDictionary<T>(XLDictionary<T> target, XLDictionary<T> source)
+        {
+            target.Clear();
+            source.ForEach(kp => target.Add(kp.Key, kp.Value));
+        }
+
+        public IXLStyle WhenIsBlank()
+        {
+            ConditionalFormatType = XLConditionalFormatType.IsBlank;
+            return Style;
+        }
+        public IXLStyle WhenNotBlank()
+        {
+            ConditionalFormatType = XLConditionalFormatType.NotBlank;
+            return Style;
+        }
+        public IXLStyle WhenIsError()
+        {
+            ConditionalFormatType = XLConditionalFormatType.IsError;
+            return Style;
+        }
+        public IXLStyle WhenNotError()
+        {
+            ConditionalFormatType = XLConditionalFormatType.NotError;
+            return Style;
+        }
+        public IXLStyle WhenDateIs(XLTimePeriod timePeriod)
+        {
+            TimePeriod = timePeriod;
+            ConditionalFormatType = XLConditionalFormatType.TimePeriod;
+            return Style;
+        }
+        public IXLStyle WhenContains(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            ConditionalFormatType = XLConditionalFormatType.ContainsText;
+            Operator = XLCFOperator.Contains;
+            return Style;
+        }
+        public IXLStyle WhenNotContains(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            ConditionalFormatType = XLConditionalFormatType.NotContainsText;
+            Operator = XLCFOperator.NotContains;
+            return Style;
+        }
+        public IXLStyle WhenStartsWith(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            ConditionalFormatType = XLConditionalFormatType.StartsWith;
+            Operator = XLCFOperator.StartsWith;
+            return Style;
+        }
+        public IXLStyle WhenEndsWith(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            ConditionalFormatType = XLConditionalFormatType.EndsWith;
+            Operator = XLCFOperator.EndsWith;
+            return Style;
+        }
+
+        public IXLStyle WhenEquals(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            Operator = XLCFOperator.Equal;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenNotEquals(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            Operator = XLCFOperator.NotEqual;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenGreaterThan(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            Operator = XLCFOperator.GreaterThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenLessThan(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            Operator = XLCFOperator.LessThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenEqualOrGreaterThan(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            Operator = XLCFOperator.EqualOrGreaterThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenEqualOrLessThan(String value)
+        {
+            Values.Initialize(new XLFormula { Value = value });
+            Operator = XLCFOperator.EqualOrLessThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenBetween(String minValue, String maxValue)
+        {
+            Values.Initialize(new XLFormula { Value = minValue });
+            Values.Add(new XLFormula { Value = maxValue });
+            Operator = XLCFOperator.Between;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenNotBetween(String minValue, String maxValue)
+        {
+            Values.Initialize(new XLFormula { Value = minValue });
+            Values.Add(new XLFormula { Value = maxValue });
+            Operator = XLCFOperator.NotBetween;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+
+        public IXLStyle WhenEquals(Double value)
+        {
+            Values.Initialize(new XLFormula(value));
+            Operator = XLCFOperator.Equal;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenNotEquals(Double value)
+        {
+            Values.Initialize(new XLFormula(value));
+            Operator = XLCFOperator.NotEqual;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenGreaterThan(Double value)
+        {
+            Values.Initialize(new XLFormula(value));
+            Operator = XLCFOperator.GreaterThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenLessThan(Double value)
+        {
+            Values.Initialize(new XLFormula(value));
+            Operator = XLCFOperator.LessThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenEqualOrGreaterThan(Double value)
+        {
+            Values.Initialize(new XLFormula(value));
+            Operator = XLCFOperator.EqualOrGreaterThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenEqualOrLessThan(Double value)
+        {
+            Values.Initialize(new XLFormula(value));
+            Operator = XLCFOperator.EqualOrLessThan;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenBetween(Double minValue, Double maxValue)
+    {
+            Values.Initialize(new XLFormula (minValue));
+            Values.Add(new XLFormula(maxValue));
+            Operator = XLCFOperator.Between;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+        public IXLStyle WhenNotBetween(Double minValue, Double maxValue)
+        {
+            Values.Initialize(new XLFormula(minValue));
+            Values.Add(new XLFormula(maxValue));
+            Operator = XLCFOperator.NotBetween;
+            ConditionalFormatType = XLConditionalFormatType.CellIs;
+            return Style;
+        }
+
+        public IXLStyle WhenIsDuplicate()
+        {
+            ConditionalFormatType = XLConditionalFormatType.IsDuplicate;
+            return Style;
+        }
+        public IXLStyle WhenIsUnique()
+        {
+            ConditionalFormatType = XLConditionalFormatType.IsUnique;
+            return Style;
+        }
+        public IXLStyle WhenIsTrue(String formula)
+        {
+            String f = formula.TrimStart()[0] == '=' ? formula : "=" + formula;
+            Values.Initialize(new XLFormula {Value = f});
+            ConditionalFormatType = XLConditionalFormatType.Expression;
+            return Style;
+        }
+        public IXLStyle WhenIsTop(Int32 value, XLTopBottomType topBottomType = XLTopBottomType.Items)
+        {
+            Values.Initialize(new XLFormula(value));
+            Percent = topBottomType == XLTopBottomType.Percent;
+            ConditionalFormatType = XLConditionalFormatType.Top10;
+            Bottom = false;
+            return Style;
+        }
+        public IXLStyle WhenIsBottom(Int32 value, XLTopBottomType topBottomType = XLTopBottomType.Items)
+        {
+            Values.Initialize(new XLFormula(value));
+            Percent = topBottomType == XLTopBottomType.Percent;
+            ConditionalFormatType = XLConditionalFormatType.Top10;
+            Bottom = true;
+            return Style;
+        }
+        
+        public IXLCFColorScaleMin ColorScale()
+        {
+            ConditionalFormatType = XLConditionalFormatType.ColorScale;
+            return new XLCFColorScaleMin(this);
+        }
+        public IXLCFDataBarMin DataBar(XLColor color, Boolean showBarOnly = false)
+        {
+            Colors.Initialize(color);
+            ShowBarOnly = showBarOnly;
+            ConditionalFormatType = XLConditionalFormatType.DataBar;
+            return new XLCFDataBarMin(this);
+        }
+        public IXLCFIconSet IconSet(XLIconSetStyle iconSetStyle, Boolean reverseIconOrder = false, Boolean showIconOnly = false)
+        {
+            IconSetOperators.Clear();
+            Values.Clear();
+            ContentTypes.Clear();
+            ConditionalFormatType = XLConditionalFormatType.IconSet;
+            IconSetStyle = iconSetStyle;
+            ReverseIconOrder = reverseIconOrder;
+            ShowIconOnly = showIconOnly;
+            return new XLCFIconSet(this);
+        }
+    }
+}
+
diff --git a/ClosedXML/Excel/ConditionalFormats/XLConditionalFormats.cs b/ClosedXML/Excel/ConditionalFormats/XLConditionalFormats.cs
new file mode 100644
index 0000000..0b221ad
--- /dev/null
+++ b/ClosedXML/Excel/ConditionalFormats/XLConditionalFormats.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLConditionalFormats: IXLConditionalFormats
+    {
+        private readonly List<IXLConditionalFormat> _conditionalFormats = new List<IXLConditionalFormat>();
+        public void Add(IXLConditionalFormat conditionalFormat)
+        {
+            _conditionalFormats.Add(conditionalFormat);
+        }
+
+        public IEnumerator<IXLConditionalFormat> GetEnumerator()
+        {
+            return _conditionalFormats.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public void Remove(Predicate<IXLConditionalFormat> predicate)
+        {
+            _conditionalFormats.RemoveAll(predicate);
+        }
+
+        public void RemoveAll()
+        {
+            _conditionalFormats.Clear();
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Coordinates/IXLAddress.cs b/ClosedXML/Excel/Coordinates/IXLAddress.cs
new file mode 100644
index 0000000..48ad531
--- /dev/null
+++ b/ClosedXML/Excel/Coordinates/IXLAddress.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLAddress : IEqualityComparer<IXLAddress>, IEquatable<IXLAddress>
+    {
+        IXLWorksheet Worksheet { get; }
+        Int32 RowNumber { get; }
+        Int32 ColumnNumber { get; }
+        String ColumnLetter { get; }
+        Boolean FixedRow { get; }
+        Boolean FixedColumn { get; }
+        String ToStringRelative();
+        String ToStringRelative(Boolean includeSheet);
+        String ToStringFixed();
+        String ToStringFixed(XLReferenceStyle referenceStyle);
+        String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet);
+        String ToString(XLReferenceStyle referenceStyle);
+        String UniqueId { get; }
+    }
+}
diff --git a/ClosedXML/Excel/Coordinates/XLAddress.cs b/ClosedXML/Excel/Coordinates/XLAddress.cs
new file mode 100644
index 0000000..d9b9a8e
--- /dev/null
+++ b/ClosedXML/Excel/Coordinates/XLAddress.cs
@@ -0,0 +1,383 @@
+using System;
+using System.Diagnostics;
+
+namespace ClosedXML.Excel
+{
+    internal class XLAddress : IXLAddress
+    {
+        #region Static
+        /// <summary>
+        /// Create address without worksheet. For calculation only!
+        /// </summary>
+        /// <param name="cellAddressString"></param>
+        /// <returns></returns>
+        public static XLAddress Create(string cellAddressString)
+        {
+            return Create(null, cellAddressString);
+        }
+
+        public static XLAddress Create(XLAddress cellAddress)
+        {
+            return new XLAddress(cellAddress.Worksheet, cellAddress.RowNumber, cellAddress.ColumnNumber, cellAddress.FixedRow, cellAddress.FixedColumn);
+        }
+
+        public static XLAddress Create(XLWorksheet worksheet, string cellAddressString)
+        {
+            var fixedColumn = cellAddressString[0] == '$';
+            Int32 startPos;
+            if (fixedColumn)
+            {
+                startPos = 1;
+            }
+            else
+            {
+                startPos = 0;
+            }
+
+            int rowPos = startPos;
+            while (cellAddressString[rowPos] > '9')
+            {
+                rowPos++;
+            }
+
+            var fixedRow = cellAddressString[rowPos] == '$';
+            string columnLetter;
+            int rowNumber;
+            if (fixedRow)
+            {
+                if (fixedColumn)
+                {
+                    columnLetter = cellAddressString.Substring(startPos, rowPos - 1);
+                }
+                else
+                {
+                    columnLetter = cellAddressString.Substring(startPos, rowPos);
+                }
+
+                rowNumber = int.Parse(cellAddressString.Substring(rowPos + 1), XLHelper.NumberFormatForParse);
+            }
+            else
+            {
+                if (fixedColumn)
+                {
+                    columnLetter = cellAddressString.Substring(startPos, rowPos - 1);
+                }
+                else
+                {
+                    columnLetter = cellAddressString.Substring(startPos, rowPos);
+                }
+
+                rowNumber = Int32.Parse(cellAddressString.Substring(rowPos), XLHelper.NumberFormatForParse);
+            }
+            return new XLAddress(worksheet, rowNumber, columnLetter, fixedRow, fixedColumn);
+        }
+        #endregion
+        #region Private fields
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        private bool _fixedRow;
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        private bool _fixedColumn;
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        private string _columnLetter;
+
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        private readonly int _rowNumber;
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        private readonly int _columnNumber;
+        private string _trimmedAddress;
+        #endregion
+        #region Constructors
+        /// <summary>
+        /// 	Initializes a new <see cref = "XLAddress" /> struct using a mixed notation.  Attention: without worksheet for calculation only!
+        /// </summary>
+        /// <param name = "rowNumber">The row number of the cell address.</param>
+        /// <param name = "columnLetter">The column letter of the cell address.</param>
+        /// <param name = "fixedRow"></param>
+        /// <param name = "fixedColumn"></param>
+        public XLAddress(int rowNumber, string columnLetter, bool fixedRow, bool fixedColumn)
+                : this(null, rowNumber, columnLetter, fixedRow, fixedColumn)
+        {
+        }
+        /// <summary>
+        /// 	Initializes a new <see cref = "XLAddress" /> struct using a mixed notation.
+        /// </summary>
+        /// <param name = "worksheet"></param>
+        /// <param name = "rowNumber">The row number of the cell address.</param>
+        /// <param name = "columnLetter">The column letter of the cell address.</param>
+        /// <param name = "fixedRow"></param>
+        /// <param name = "fixedColumn"></param>
+        public XLAddress(XLWorksheet worksheet, int rowNumber, string columnLetter, bool fixedRow, bool fixedColumn)
+                : this(worksheet, rowNumber, XLHelper.GetColumnNumberFromLetter(columnLetter), fixedRow, fixedColumn)
+        {
+            _columnLetter = columnLetter;
+        }
+
+        /// <summary>
+        /// 	Initializes a new <see cref = "XLAddress" /> struct using R1C1 notation. Attention: without worksheet for calculation only!
+        /// </summary>
+        /// <param name = "rowNumber">The row number of the cell address.</param>
+        /// <param name = "columnNumber">The column number of the cell address.</param>
+        /// <param name = "fixedRow"></param>
+        /// <param name = "fixedColumn"></param>
+        public XLAddress(int rowNumber, int columnNumber, bool fixedRow, bool fixedColumn)
+                : this(null, rowNumber, columnNumber, fixedRow, fixedColumn)
+        {
+        }
+        /// <summary>
+        /// 	Initializes a new <see cref = "XLAddress" /> struct using R1C1 notation.
+        /// </summary>
+        /// <param name = "worksheet"></param>
+        /// <param name = "rowNumber">The row number of the cell address.</param>
+        /// <param name = "columnNumber">The column number of the cell address.</param>
+        /// <param name = "fixedRow"></param>
+        /// <param name = "fixedColumn"></param>
+        public XLAddress(XLWorksheet worksheet, int rowNumber, int columnNumber, bool fixedRow, bool fixedColumn)
+
+        {
+            Worksheet = worksheet;
+
+            _rowNumber = rowNumber;
+            _columnNumber = columnNumber;
+            _columnLetter = null;
+            _fixedColumn = fixedColumn;
+            _fixedRow = fixedRow;
+
+            
+        }
+        #endregion
+        #region Properties
+        public XLWorksheet Worksheet { get; internal set; }
+        IXLWorksheet IXLAddress.Worksheet
+        {
+            [DebuggerStepThrough]
+            get { return Worksheet; }
+        }
+
+        public bool HasWorksheet
+        {
+            [DebuggerStepThrough]
+            get { return Worksheet != null; }
+        }
+
+        public bool FixedRow
+        {
+            get { return _fixedRow; }
+            set { _fixedRow = value; }
+        }
+
+        public bool FixedColumn
+        {
+            get { return _fixedColumn; }
+            set { _fixedColumn = value; }
+        }
+
+        /// <summary>
+        /// 	Gets the row number of this address.
+        /// </summary>
+        public Int32 RowNumber
+        {
+            get { return _rowNumber; }
+        }
+
+        /// <summary>
+        /// 	Gets the column number of this address.
+        /// </summary>
+        public Int32 ColumnNumber
+        {
+            get { return _columnNumber; }
+        }
+
+        /// <summary>
+        /// 	Gets the column letter(s) of this address.
+        /// </summary>
+        public String ColumnLetter
+        {
+            get { return _columnLetter ?? (_columnLetter = XLHelper.GetColumnLetterFromNumber(_columnNumber)); }
+        }
+        #endregion
+        #region Overrides
+        public override string ToString()
+        {
+            String retVal = ColumnLetter;
+            if (_fixedColumn)
+            {
+                retVal = "$" + retVal;
+            }
+            if (_fixedRow)
+            {
+                retVal += "$";
+            }
+            retVal += _rowNumber.ToInvariantString();
+            return retVal;
+        }
+
+        public string ToString(XLReferenceStyle referenceStyle)
+        {
+            if (referenceStyle == XLReferenceStyle.A1)
+            {
+                return ColumnLetter + _rowNumber.ToInvariantString();
+            }
+            if (referenceStyle == XLReferenceStyle.R1C1)
+            {
+                return String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
+            }
+            if (HasWorksheet && Worksheet.Workbook.ReferenceStyle == XLReferenceStyle.R1C1)
+            {
+                return String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
+            }
+            return ColumnLetter + _rowNumber.ToInvariantString();
+        }
+        #endregion
+        #region Methods
+        public string GetTrimmedAddress()
+        {
+            return _trimmedAddress ?? (_trimmedAddress = ColumnLetter + _rowNumber.ToInvariantString());
+        }
+
+
+
+        #endregion
+        #region Operator Overloads
+        public static XLAddress operator +(XLAddress left, XLAddress right)
+        {
+            return new XLAddress(left.Worksheet,
+                                 left.RowNumber + right.RowNumber,
+                                 left.ColumnNumber + right.ColumnNumber,
+                                 left._fixedRow,
+                                 left._fixedColumn);
+        }
+
+        public static XLAddress operator -(XLAddress left, XLAddress right)
+        {
+            return new XLAddress(left.Worksheet,
+                                 left.RowNumber - right.RowNumber,
+                                 left.ColumnNumber - right.ColumnNumber,
+                                 left._fixedRow,
+                                 left._fixedColumn);
+        }
+
+        public static XLAddress operator +(XLAddress left, Int32 right)
+        {
+            return new XLAddress(left.Worksheet,
+                                 left.RowNumber + right,
+                                 left.ColumnNumber + right,
+                                 left._fixedRow,
+                                 left._fixedColumn);
+        }
+
+        public static XLAddress operator -(XLAddress left, Int32 right)
+        {
+            return new XLAddress(left.Worksheet,
+                                 left.RowNumber - right,
+                                 left.ColumnNumber - right,
+                                 left._fixedRow,
+                                 left._fixedColumn);
+        }
+
+        public static Boolean operator ==(XLAddress left, XLAddress right)
+        {
+            if (ReferenceEquals(left, right))
+            {
+                return true;
+            }
+            return !ReferenceEquals(left, null) && left.Equals(right);
+        }
+
+        public static Boolean operator !=(XLAddress left, XLAddress right)
+        {
+            return !(left == right);
+        }
+        #endregion
+        #region Interface Requirements
+        #region IEqualityComparer<XLCellAddress> Members
+        public Boolean Equals(IXLAddress x, IXLAddress y)
+        {
+            return x == y;
+        }
+
+        public Int32 GetHashCode(IXLAddress obj)
+        {
+            return obj.GetHashCode();
+        }
+
+        public new Boolean Equals(object x, object y)
+        {
+            return x == y;
+        }
+
+        public Int32 GetHashCode(object obj)
+        {
+            return (obj).GetHashCode();
+        }
+
+        public override int GetHashCode()
+        {
+            return _rowNumber ^ _columnNumber;
+        }
+        #endregion
+        #region IEquatable<XLCellAddress> Members
+        public bool Equals(IXLAddress other)
+        {
+            var right = other as XLAddress;
+            if (ReferenceEquals(right, null))
+            {
+                return false;
+            }
+            return _rowNumber == right._rowNumber && _columnNumber == right._columnNumber;
+        }
+
+        public override Boolean Equals(Object other)
+        {
+            return Equals((XLAddress) other);
+        }
+        #endregion
+        #endregion
+
+        public String ToStringRelative()
+        {
+            return ToStringRelative(false);
+        }
+
+        public String ToStringFixed()
+        {
+            return ToStringFixed(XLReferenceStyle.Default);
+        }
+
+        public String ToStringRelative(Boolean includeSheet)
+        {
+            if (includeSheet)
+                return String.Format("'{0}'!{1}",
+                    Worksheet.Name,
+                    GetTrimmedAddress());
+
+            return GetTrimmedAddress();
+        }
+
+        public String ToStringFixed(XLReferenceStyle referenceStyle)
+        {
+            return ToStringFixed(referenceStyle, false);
+        }
+
+        public String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet)
+        {
+            String address;
+            if (referenceStyle == XLReferenceStyle.A1)
+                address = String.Format("${0}${1}", ColumnLetter, _rowNumber.ToInvariantString());
+            else if (referenceStyle == XLReferenceStyle.R1C1)
+                address = String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
+            else if (HasWorksheet && Worksheet.Workbook.ReferenceStyle == XLReferenceStyle.R1C1)
+                address = String.Format("R{0}C{1}", _rowNumber.ToInvariantString(), ColumnNumber);
+            else
+                address = String.Format("${0}${1}", ColumnLetter, _rowNumber.ToInvariantString());
+
+            if (includeSheet)
+                return String.Format("'{0}'!{1}",
+                    Worksheet.Name,
+                    address);
+
+            return address;
+        }
+
+        public String UniqueId { get { return RowNumber.ToString("0000000") + ColumnNumber.ToString("00000"); } }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Coordinates/XLSheetPoint.cs b/ClosedXML/Excel/Coordinates/XLSheetPoint.cs
new file mode 100644
index 0000000..1d71682
--- /dev/null
+++ b/ClosedXML/Excel/Coordinates/XLSheetPoint.cs
@@ -0,0 +1,41 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal struct XLSheetPoint:IEquatable<XLSheetPoint>
+    {
+        public XLSheetPoint(Int32  row, Int32 column)
+        {
+            Row = row;
+            Column = column;
+        }
+
+        public readonly Int32 Row;
+        public readonly Int32 Column;
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLSheetPoint)obj);
+        }
+
+        public bool Equals(XLSheetPoint other)
+        {
+            return Row == other.Row && Column == other.Column;
+        }
+
+        public override int GetHashCode()
+        {
+            return (Row * -1) ^ Column;
+        }
+
+        public static bool operator==(XLSheetPoint a, XLSheetPoint b)
+        {
+            return a.Row == b.Row && a.Column == b.Column;
+        }
+
+        public static bool operator !=(XLSheetPoint a, XLSheetPoint b)
+        {
+            return a.Row != b.Row || a.Column != b.Column;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Coordinates/XLSheetRange.cs b/ClosedXML/Excel/Coordinates/XLSheetRange.cs
new file mode 100644
index 0000000..2845011
--- /dev/null
+++ b/ClosedXML/Excel/Coordinates/XLSheetRange.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal struct XLSheetRange:IEquatable<XLSheetRange>
+    {
+        public XLSheetRange(XLSheetPoint firstPoint, XLSheetPoint lastPoint)
+        {
+            FirstPoint = firstPoint;
+            LastPoint = lastPoint;
+        }
+
+        public readonly XLSheetPoint FirstPoint;
+        public readonly XLSheetPoint LastPoint;
+
+        public bool Equals(XLSheetRange other)
+        {
+            return FirstPoint.Equals(other.FirstPoint) && LastPoint.Equals(other.LastPoint);
+        }
+
+        public override int GetHashCode()
+        {
+            return FirstPoint.GetHashCode() ^ LastPoint.GetHashCode();
+        }
+    }
+}
diff --git a/ClosedXML/Excel/CustomProperties/IXLCustomProperties.cs b/ClosedXML/Excel/CustomProperties/IXLCustomProperties.cs
new file mode 100644
index 0000000..afdbff2
--- /dev/null
+++ b/ClosedXML/Excel/CustomProperties/IXLCustomProperties.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLCustomProperties: IEnumerable<IXLCustomProperty>
+    {
+        void Add(IXLCustomProperty customProperty);
+        void Add<T>(String name, T value);
+        void Delete(String name);
+        IXLCustomProperty CustomProperty(String name);
+        
+    }
+}
diff --git a/ClosedXML/Excel/CustomProperties/IXLCustomProperty.cs b/ClosedXML/Excel/CustomProperties/IXLCustomProperty.cs
new file mode 100644
index 0000000..f34e306
--- /dev/null
+++ b/ClosedXML/Excel/CustomProperties/IXLCustomProperty.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLCustomPropertyType { Text, Number, Date, Boolean}
+    public interface IXLCustomProperty
+    {
+        String Name { get; set; }
+        XLCustomPropertyType Type { get; }
+        Object Value { get; set; }
+        T GetValue<T>();
+    }
+}
diff --git a/ClosedXML/Excel/CustomProperties/XLCustomProperties.cs b/ClosedXML/Excel/CustomProperties/XLCustomProperties.cs
new file mode 100644
index 0000000..98e98ac
--- /dev/null
+++ b/ClosedXML/Excel/CustomProperties/XLCustomProperties.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCustomProperties: IXLCustomProperties, IEnumerable<IXLCustomProperty>
+    {
+        XLWorkbook workbook;
+        public XLCustomProperties(XLWorkbook workbook)
+        {
+            this.workbook = workbook;
+        }
+
+        private Dictionary<String, IXLCustomProperty> customProperties = new Dictionary<String, IXLCustomProperty>();
+        public void Add(IXLCustomProperty customProperty)
+        {
+            customProperties.Add(customProperty.Name, customProperty);
+        }
+        public void Add<T>(String name, T value)
+        {
+            var cp = new XLCustomProperty(workbook) { Name = name, Value = value };
+            Add(cp);
+        }
+
+        public void Delete(String name)
+        {
+            customProperties.Remove(name);
+        }
+        public IXLCustomProperty CustomProperty(String name)
+        {
+            return customProperties[name];
+        }
+
+        public IEnumerator<IXLCustomProperty> GetEnumerator()
+        {
+            return customProperties.Values.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+      
+    }
+}
diff --git a/ClosedXML/Excel/CustomProperties/XLCustomProperty.cs b/ClosedXML/Excel/CustomProperties/XLCustomProperty.cs
new file mode 100644
index 0000000..36e6f56
--- /dev/null
+++ b/ClosedXML/Excel/CustomProperties/XLCustomProperty.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLCustomProperty : IXLCustomProperty
+    {
+        private readonly XLWorkbook _workbook;
+
+        private String name;
+
+        public XLCustomProperty(XLWorkbook workbook)
+        {
+            _workbook = workbook;
+        }
+
+        #region IXLCustomProperty Members
+
+        public String Name
+        {
+            get { return name; }
+            set
+            {
+                if (_workbook.CustomProperties.Any(t => t.Name == value))
+                    throw new ArgumentException(
+                        String.Format("This workbook already contains a custom property named '{0}'", value));
+
+                name = value;
+            }
+        }
+
+        public XLCustomPropertyType Type
+        {
+            get
+            {
+                Double dTest;
+                if (Value is DateTime)
+                    return XLCustomPropertyType.Date;
+                
+                if (Value is Boolean)
+                    return XLCustomPropertyType.Boolean;
+                
+                if (Double.TryParse(Value.ToString(), out dTest))
+                    return XLCustomPropertyType.Number;
+                
+                return XLCustomPropertyType.Text;
+            }
+        }
+
+        public Object Value { get; set; }
+
+        public T GetValue<T>()
+        {
+            return (T)Convert.ChangeType(Value, typeof(T));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/IXLDataValidation.cs b/ClosedXML/Excel/DataValidation/IXLDataValidation.cs
new file mode 100644
index 0000000..f2072de
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/IXLDataValidation.cs
@@ -0,0 +1,44 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLErrorStyle { Stop, Warning, Information }
+    public enum XLAllowedValues { AnyValue, WholeNumber, Decimal, Date, Time, TextLength, List, Custom }
+    public enum XLOperator { EqualTo, NotEqualTo, GreaterThan, LessThan, EqualOrGreaterThan, EqualOrLessThan, Between, NotBetween }
+    public interface IXLDataValidation
+    {
+        IXLRanges Ranges { get; set; }
+        //void Delete();
+        //void CopyFrom(IXLDataValidation dataValidation);
+        Boolean ShowInputMessage { get; set; }
+        Boolean ShowErrorMessage { get; set; }
+        Boolean IgnoreBlanks { get; set; }
+        Boolean InCellDropdown { get; set; }
+        String InputTitle { get; set; }
+        String InputMessage { get; set; }
+        String ErrorTitle { get; set; }
+        String ErrorMessage { get; set; }
+        XLErrorStyle ErrorStyle { get; set; }
+        XLAllowedValues AllowedValues { get; set; }
+        XLOperator Operator { get; set; }
+
+        String Value { get; set; }
+        String MinValue { get; set; }
+        String MaxValue { get; set; }
+
+        XLWholeNumberCriteria WholeNumber { get; }
+        XLDecimalCriteria Decimal { get; }
+        XLDateCriteria Date { get; }
+        XLTimeCriteria Time { get; }
+        XLTextLengthCriteria TextLength { get; }
+
+        void List(String list);
+        void List(String list, Boolean inCellDropdown);
+        void List(IXLRange range);
+        void List(IXLRange range, Boolean inCellDropdown);
+
+        void Custom(String customValidation);
+        void Clear();
+        Boolean IsDirty();
+    }
+}
diff --git a/ClosedXML/Excel/DataValidation/IXLDataValidations.cs b/ClosedXML/Excel/DataValidation/IXLDataValidations.cs
new file mode 100644
index 0000000..eb8aa6b
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/IXLDataValidations.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDataValidations: IEnumerable<IXLDataValidation>
+    {
+        void Add(IXLDataValidation dataValidation);
+        Boolean ContainsSingle(IXLRange range);
+        
+    }
+}
diff --git a/ClosedXML/Excel/DataValidation/IXLValidationCriteria.cs b/ClosedXML/Excel/DataValidation/IXLValidationCriteria.cs
new file mode 100644
index 0000000..b5be419
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/IXLValidationCriteria.cs
@@ -0,0 +1,34 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLValidationCriteria
+    {
+        void EqualTo(String value);
+        void NotEqualTo(String value);
+        void GreaterThan(String value);
+        void LessThan(String value);
+        void EqualOrGreaterThan(String value);
+        void EqualOrLessThan(String value);
+        void Between(String minValue, String maxValue);
+        void NotBetween(String minValue, String maxValue);
+
+        void EqualTo(IXLRange range);
+        void NotEqualTo(IXLRange range);
+        void GreaterThan(IXLRange range);
+        void LessThan(IXLRange range);
+        void EqualOrGreaterThan(IXLRange range);
+        void EqualOrLessThan(IXLRange range);
+        void Between(IXLRange minValue, IXLRange maxValue);
+        void NotBetween(IXLRange minValue, IXLRange maxValue);
+
+        void EqualTo(IXLCell cell);
+        void NotEqualTo(IXLCell cell);
+        void GreaterThan(IXLCell cell);
+        void LessThan(IXLCell cell);
+        void EqualOrGreaterThan(IXLCell cell);
+        void EqualOrLessThan(IXLCell cell);
+        void Between(IXLCell minValue, IXLCell maxValue);
+        void NotBetween(IXLCell minValue, IXLCell maxValue);
+    }
+}
diff --git a/ClosedXML/Excel/DataValidation/XLDataValidation.cs b/ClosedXML/Excel/DataValidation/XLDataValidation.cs
new file mode 100644
index 0000000..2371e2b
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLDataValidation.cs
@@ -0,0 +1,194 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDataValidation : IXLDataValidation
+    {
+        public XLDataValidation(IXLRanges ranges)
+        {
+            
+            Ranges = new XLRanges();
+            ranges.ForEach(r=>
+                               {
+                                   var newR =
+                                       new XLRange(new XLRangeParameters(r.RangeAddress as XLRangeAddress,
+                                                                         r.Worksheet.Style) {IgnoreEvents = true});
+                                   (Ranges as XLRanges).Add(newR);
+                               } );
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+            AllowedValues = XLAllowedValues.AnyValue;
+            IgnoreBlanks = true;
+            ShowErrorMessage = true;
+            ShowInputMessage = true;
+            InCellDropdown = true;
+            InputTitle = String.Empty;
+            InputMessage = String.Empty;
+            ErrorTitle = String.Empty;
+            ErrorMessage = String.Empty;
+            ErrorStyle = XLErrorStyle.Stop;
+            Operator = XLOperator.Between;
+            Value = String.Empty;
+            MinValue = String.Empty;
+            MaxValue = String.Empty;
+        }
+
+        public Boolean IsDirty()
+        {
+            return
+                AllowedValues != XLAllowedValues.AnyValue
+                || (ShowInputMessage &&
+                  (!XLHelper.IsNullOrWhiteSpace(InputTitle) || !XLHelper.IsNullOrWhiteSpace(InputMessage)))
+                ||(ShowErrorMessage &&
+                  (!XLHelper.IsNullOrWhiteSpace(ErrorTitle) || !XLHelper.IsNullOrWhiteSpace(ErrorMessage)));
+
+        }
+
+        public XLDataValidation(IXLDataValidation dataValidation)
+        {
+            CopyFrom(dataValidation);
+        }
+
+        #region IXLDataValidation Members
+
+        public IXLRanges Ranges { get; set; }
+
+
+        public Boolean IgnoreBlanks { get; set; }
+        public Boolean InCellDropdown { get; set; }
+        public Boolean ShowInputMessage { get; set; }
+        public String InputTitle { get; set; }
+        public String InputMessage { get; set; }
+        public Boolean ShowErrorMessage { get; set; }
+        public String ErrorTitle { get; set; }
+        public String ErrorMessage { get; set; }
+        public XLErrorStyle ErrorStyle { get; set; }
+        private XLAllowedValues _allowedValues;
+        public XLAllowedValues AllowedValues
+        {
+            get { return _allowedValues; }
+            set { _allowedValues = value; }
+        }
+        
+        public XLOperator Operator { get; set; }
+
+        public String Value
+        {
+            get { return MinValue; }
+            set { MinValue = value; }
+        }
+
+        public String MinValue { get; set; }
+        public String MaxValue { get; set; }
+
+        public XLWholeNumberCriteria WholeNumber
+        {
+            get
+            {
+                AllowedValues = XLAllowedValues.WholeNumber;
+                return new XLWholeNumberCriteria(this);
+            }
+        }
+
+        public XLDecimalCriteria Decimal
+        {
+            get
+            {
+                AllowedValues = XLAllowedValues.Decimal;
+                return new XLDecimalCriteria(this);
+            }
+        }
+
+        public XLDateCriteria Date
+        {
+            get
+            {
+                AllowedValues = XLAllowedValues.Date;
+                return new XLDateCriteria(this);
+            }
+        }
+
+        public XLTimeCriteria Time
+        {
+            get
+            {
+                AllowedValues = XLAllowedValues.Time;
+                return new XLTimeCriteria(this);
+            }
+        }
+
+        public XLTextLengthCriteria TextLength
+        {
+            get
+            {
+                AllowedValues = XLAllowedValues.TextLength;
+                return new XLTextLengthCriteria(this);
+            }
+        }
+
+        public void List(String list)
+        {
+            List(list, true);
+        }
+
+        public void List(String list, Boolean inCellDropdown)
+        {
+            AllowedValues = XLAllowedValues.List;
+            InCellDropdown = inCellDropdown;
+            Value = list;
+        }
+
+        public void List(IXLRange range)
+        {
+            List(range, true);
+        }
+
+        public void List(IXLRange range, Boolean inCellDropdown)
+        {
+            List(range.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true));
+        }
+
+        public void Custom(String customValidation)
+        {
+            AllowedValues = XLAllowedValues.Custom;
+            Value = customValidation;
+        }
+
+        #endregion
+
+        public void CopyFrom(IXLDataValidation dataValidation)
+        {
+            if (dataValidation == this) return;
+
+            if (Ranges == null && dataValidation.Ranges != null)
+            {
+                Ranges = new XLRanges();
+                dataValidation.Ranges.ForEach(r => Ranges.Add(r));
+            }
+
+
+            IgnoreBlanks = dataValidation.IgnoreBlanks;
+            InCellDropdown = dataValidation.InCellDropdown;
+            ShowErrorMessage = dataValidation.ShowErrorMessage;
+            ShowInputMessage = dataValidation.ShowInputMessage;
+            InputTitle = dataValidation.InputTitle;
+            InputMessage = dataValidation.InputMessage;
+            ErrorTitle = dataValidation.ErrorTitle;
+            ErrorMessage = dataValidation.ErrorMessage;
+            ErrorStyle = dataValidation.ErrorStyle;
+            AllowedValues = dataValidation.AllowedValues;
+            Operator = dataValidation.Operator;
+            MinValue = dataValidation.MinValue;
+            MaxValue = dataValidation.MaxValue;
+
+        }
+
+        public void Clear()
+        {
+            Initialize();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/XLDataValidations.cs b/ClosedXML/Excel/DataValidation/XLDataValidations.cs
new file mode 100644
index 0000000..8ebd76f
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLDataValidations.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+    using System.Linq;
+
+    internal class XLDataValidations : IXLDataValidations
+    {
+        private readonly List<IXLDataValidation> _dataValidations = new List<IXLDataValidation>();
+
+        #region IXLDataValidations Members
+
+        public void Add(IXLDataValidation dataValidation)
+        {
+            _dataValidations.Add(dataValidation);
+        }
+
+        public IEnumerator<IXLDataValidation> GetEnumerator()
+        {
+            return _dataValidations.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public Boolean ContainsSingle(IXLRange range)
+        {
+            Int32 count = 0;
+            foreach (var xlDataValidation in _dataValidations.Where(dv => dv.Ranges.Contains(range)))
+            {
+                count++;
+                if (count > 1) return false;
+            }
+
+            return count == 1;
+        }
+
+        #endregion
+
+        public void Delete(IXLDataValidation dataValidation)
+        {
+            _dataValidations.RemoveAll(dv => dv.Ranges.Equals(dataValidation.Ranges));
+        }
+
+        public void Delete(IXLRange range)
+        {
+            _dataValidations.RemoveAll(dv => dv.Ranges.Contains(range));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/XLDateCriteria.cs b/ClosedXML/Excel/DataValidation/XLDateCriteria.cs
new file mode 100644
index 0000000..792e6b0
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLDateCriteria.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Globalization;
+
+namespace ClosedXML.Excel
+{
+    public class XLDateCriteria : XLValidationCriteria
+    {
+        public XLDateCriteria(IXLDataValidation dataValidation)
+            : base(dataValidation)
+        {
+        }
+
+        public void EqualTo(DateTime value)
+        {
+            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+
+        public void NotEqualTo(DateTime value)
+        {
+            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+
+        public void GreaterThan(DateTime value)
+        {
+            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+
+        public void LessThan(DateTime value)
+        {
+            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+
+        public void EqualOrGreaterThan(DateTime value)
+        {
+            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+
+        public void EqualOrLessThan(DateTime value)
+        {
+            dataValidation.Value = value.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+
+        public void Between(DateTime minValue, DateTime maxValue)
+        {
+            dataValidation.MinValue = minValue.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.MaxValue = maxValue.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.Between;
+        }
+
+        public void NotBetween(DateTime minValue, DateTime maxValue)
+        {
+            dataValidation.MinValue = minValue.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.MaxValue = maxValue.ToOADate().ToString(CultureInfo.InvariantCulture);
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/XLDecimalCriteria.cs b/ClosedXML/Excel/DataValidation/XLDecimalCriteria.cs
new file mode 100644
index 0000000..93f190b
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLDecimalCriteria.cs
@@ -0,0 +1,62 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public class XLDecimalCriteria : XLValidationCriteria
+    {
+        public XLDecimalCriteria(IXLDataValidation dataValidation)
+            : base(dataValidation)
+        {
+        }
+
+        public void EqualTo(Double value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+
+        public void NotEqualTo(Double value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+
+        public void GreaterThan(Double value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+
+        public void LessThan(Double value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+
+        public void EqualOrGreaterThan(Double value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+
+        public void EqualOrLessThan(Double value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+
+        public void Between(Double minValue, Double maxValue)
+        {
+            dataValidation.MinValue = minValue.ToString();
+            dataValidation.MaxValue = maxValue.ToString();
+            dataValidation.Operator = XLOperator.Between;
+        }
+
+        public void NotBetween(Double minValue, Double maxValue)
+        {
+            dataValidation.MinValue = minValue.ToString();
+            dataValidation.MaxValue = maxValue.ToString();
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/XLTextLengthCriteria.cs b/ClosedXML/Excel/DataValidation/XLTextLengthCriteria.cs
new file mode 100644
index 0000000..876b802
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLTextLengthCriteria.cs
@@ -0,0 +1,62 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public class XLTextLengthCriteria : XLValidationCriteria
+    {
+        public XLTextLengthCriteria(IXLDataValidation dataValidation)
+            : base(dataValidation)
+        {
+        }
+
+        public void EqualTo(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+
+        public void NotEqualTo(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+
+        public void GreaterThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+
+        public void LessThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+
+        public void EqualOrGreaterThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+
+        public void EqualOrLessThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+
+        public void Between(Int32 minValue, Int32 maxValue)
+        {
+            dataValidation.MinValue = minValue.ToString();
+            dataValidation.MaxValue = maxValue.ToString();
+            dataValidation.Operator = XLOperator.Between;
+        }
+
+        public void NotBetween(Int32 minValue, Int32 maxValue)
+        {
+            dataValidation.MinValue = minValue.ToString();
+            dataValidation.MaxValue = maxValue.ToString();
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/XLTimeCriteria.cs b/ClosedXML/Excel/DataValidation/XLTimeCriteria.cs
new file mode 100644
index 0000000..5d93a2e
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLTimeCriteria.cs
@@ -0,0 +1,67 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public class XLTimeCriteria : XLValidationCriteria
+    {
+        public XLTimeCriteria(IXLDataValidation dataValidation)
+            : base(dataValidation)
+        {
+        }
+
+        private static String GetXLTime(TimeSpan value)
+        {
+            return (value.TotalHours / 24.0).ToString();
+        }
+
+        public void EqualTo(TimeSpan value)
+        {
+            dataValidation.Value = GetXLTime(value);
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+
+        public void NotEqualTo(TimeSpan value)
+        {
+            dataValidation.Value = GetXLTime(value);
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+
+        public void GreaterThan(TimeSpan value)
+        {
+            dataValidation.Value = GetXLTime(value);
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+
+        public void LessThan(TimeSpan value)
+        {
+            dataValidation.Value = GetXLTime(value);
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+
+        public void EqualOrGreaterThan(TimeSpan value)
+        {
+            dataValidation.Value = GetXLTime(value);
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+
+        public void EqualOrLessThan(TimeSpan value)
+        {
+            dataValidation.Value = GetXLTime(value);
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+
+        public void Between(TimeSpan minValue, TimeSpan maxValue)
+        {
+            dataValidation.MinValue = GetXLTime(minValue);
+            dataValidation.MaxValue = GetXLTime(maxValue);
+            dataValidation.Operator = XLOperator.Between;
+        }
+
+        public void NotBetween(TimeSpan minValue, TimeSpan maxValue)
+        {
+            dataValidation.MinValue = GetXLTime(minValue);
+            dataValidation.MaxValue = GetXLTime(maxValue);
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/XLValidationCriteria.cs b/ClosedXML/Excel/DataValidation/XLValidationCriteria.cs
new file mode 100644
index 0000000..449e688
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLValidationCriteria.cs
@@ -0,0 +1,169 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public abstract class XLValidationCriteria : IXLValidationCriteria
+    {
+        protected IXLDataValidation dataValidation;
+
+        internal XLValidationCriteria(IXLDataValidation dataValidation)
+        {
+            this.dataValidation = dataValidation;
+        }
+
+        #region IXLValidationCriteria Members
+
+        public void EqualTo(String value)
+        {
+            dataValidation.Value = value;
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+
+        public void NotEqualTo(String value)
+        {
+            dataValidation.Value = value;
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+
+        public void GreaterThan(String value)
+        {
+            dataValidation.Value = value;
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+
+        public void LessThan(String value)
+        {
+            dataValidation.Value = value;
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+
+        public void EqualOrGreaterThan(String value)
+        {
+            dataValidation.Value = value;
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+
+        public void EqualOrLessThan(String value)
+        {
+            dataValidation.Value = value;
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+
+        public void Between(String minValue, String maxValue)
+        {
+            dataValidation.MinValue = minValue;
+            dataValidation.MaxValue = maxValue;
+            dataValidation.Operator = XLOperator.Between;
+        }
+
+        public void NotBetween(String minValue, String maxValue)
+        {
+            dataValidation.MinValue = minValue;
+            dataValidation.MaxValue = maxValue;
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+
+
+        public void EqualTo(IXLRange range)
+        {
+            dataValidation.Value = range.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+
+        public void NotEqualTo(IXLRange range)
+        {
+            dataValidation.Value = range.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+
+        public void GreaterThan(IXLRange range)
+        {
+            dataValidation.Value = range.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+
+        public void LessThan(IXLRange range)
+        {
+            dataValidation.Value = range.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+
+        public void EqualOrGreaterThan(IXLRange range)
+        {
+            dataValidation.Value = range.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+
+        public void EqualOrLessThan(IXLRange range)
+        {
+            dataValidation.Value = range.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+
+        public void Between(IXLRange minValue, IXLRange maxValue)
+        {
+            dataValidation.MinValue =  minValue.RangeAddress.ToStringFixed();
+            dataValidation.MaxValue =  maxValue.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.Between;
+        }
+
+        public void NotBetween(IXLRange minValue, IXLRange maxValue)
+        {
+            dataValidation.MinValue = minValue.RangeAddress.ToStringFixed();
+            dataValidation.MaxValue = maxValue.RangeAddress.ToStringFixed();
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+
+        public void EqualTo(IXLCell cell)
+        {
+            dataValidation.Value = cell.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+
+        public void NotEqualTo(IXLCell cell)
+        {
+            dataValidation.Value = cell.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+
+        public void GreaterThan(IXLCell cell)
+        {
+            dataValidation.Value = cell.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+
+        public void LessThan(IXLCell cell)
+        {
+            dataValidation.Value = cell.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+
+        public void EqualOrGreaterThan(IXLCell cell)
+        {
+            dataValidation.Value = cell.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+
+        public void EqualOrLessThan(IXLCell cell)
+        {
+            dataValidation.Value = cell.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+
+        public void Between(IXLCell minValue, IXLCell maxValue)
+        {
+            dataValidation.MinValue = minValue.Address.ToStringFixed();
+            dataValidation.MaxValue = maxValue.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.Between;
+        }
+
+        public void NotBetween(IXLCell minValue, IXLCell maxValue)
+        {
+            dataValidation.MinValue = minValue.Address.ToStringFixed();
+            dataValidation.MaxValue = maxValue.Address.ToStringFixed();
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/DataValidation/XLWholeNumberCriteria.cs b/ClosedXML/Excel/DataValidation/XLWholeNumberCriteria.cs
new file mode 100644
index 0000000..01c8dba
--- /dev/null
+++ b/ClosedXML/Excel/DataValidation/XLWholeNumberCriteria.cs
@@ -0,0 +1,57 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public class XLWholeNumberCriteria : XLValidationCriteria
+    {
+        public XLWholeNumberCriteria(IXLDataValidation dataValidation): base(dataValidation)
+        {
+            
+        }
+
+        public void EqualTo(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualTo;
+        }
+        public void NotEqualTo(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.NotEqualTo;
+        }
+        public void GreaterThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.GreaterThan;
+        }
+        public void LessThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.LessThan;
+        }
+        public void EqualOrGreaterThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualOrGreaterThan;
+        }
+        public void EqualOrLessThan(Int32 value)
+        {
+            dataValidation.Value = value.ToString();
+            dataValidation.Operator = XLOperator.EqualOrLessThan;
+        }
+        public void Between(Int32 minValue, Int32 maxValue)
+        {
+            dataValidation.MinValue = minValue.ToString();
+            dataValidation.MaxValue = maxValue.ToString();
+            dataValidation.Operator = XLOperator.Between;
+        }
+        public void NotBetween(Int32 minValue, Int32 maxValue)
+        {
+            dataValidation.MinValue = minValue.ToString();
+            dataValidation.MaxValue = maxValue.ToString();
+            dataValidation.Operator = XLOperator.NotBetween;
+        }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/IXLDrawing.cs b/ClosedXML/Excel/Drawings/IXLDrawing.cs
new file mode 100644
index 0000000..e83422a
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/IXLDrawing.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLDrawingAnchor { MoveAndSizeWithCells, MoveWithCells, Absolute}
+    public interface IXLDrawing<T>
+    {
+        Int32 ShapeId { get; }
+
+        Boolean Visible { get; set; }
+        T SetVisible();
+        T SetVisible(Boolean hidden);
+                
+        ////String Name { get; set; }
+        ////T SetName(String name);
+
+        ////String Description { get; set; }
+        ////T SetDescription(String description);
+
+        IXLDrawingPosition Position { get;  }
+
+        Int32 ZOrder { get; set; }
+        T SetZOrder(Int32 zOrder);
+
+        //Boolean HorizontalFlip { get; set; }
+        //T SetHorizontalFlip();
+        //T SetHorizontalFlip(Boolean horizontalFlip);
+
+        //Boolean VerticalFlip { get; set; }
+        //T SetVerticalFlip();
+        //T SetVerticalFlip(Boolean verticalFlip);
+
+        //Int32 Rotation { get; set; }
+        //T SetRotation(Int32 rotation);
+
+        //Int32 ExtentLength { get; set; }
+        //T SetExtentLength(Int32 ExtentLength);
+
+        //Int32 ExtentWidth { get; set; }
+        //T SetExtentWidth(Int32 extentWidth);
+
+        IXLDrawingStyle Style { get; }
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/IXLDrawingPosition.cs b/ClosedXML/Excel/Drawings/IXLDrawingPosition.cs
new file mode 100644
index 0000000..ac22822
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/IXLDrawingPosition.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingPosition
+    {
+        Int32 Column { get; set; }
+        IXLDrawingPosition SetColumn(Int32 column);
+        Double ColumnOffset { get; set; }
+        IXLDrawingPosition SetColumnOffset(Double columnOffset);
+
+        Int32 Row { get; set; }
+        IXLDrawingPosition SetRow(Int32 row);
+        Double RowOffset { get; set; }
+        IXLDrawingPosition SetRowOffset(Double rowOffset);
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingAlignment.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingAlignment.cs
new file mode 100644
index 0000000..ab838a6
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingAlignment.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLDrawingTextDirection
+    {
+        Context,
+        LeftToRight,
+        RightToLeft
+    }
+    public enum XLDrawingTextOrientation
+    {
+        LeftToRight,
+        Vertical,
+        BottomToTop,
+        TopToBottom
+    }
+    public enum XLDrawingHorizontalAlignment { Left, Justify, Center, Right, Distributed }
+    public enum XLDrawingVerticalAlignment { Top, Justify, Center, Bottom, Distributed }
+    public interface IXLDrawingAlignment
+    {
+        XLDrawingHorizontalAlignment Horizontal { get; set; }
+        XLDrawingVerticalAlignment Vertical { get; set; }
+        Boolean AutomaticSize { get; set; }
+        XLDrawingTextDirection Direction { get; set; }
+        XLDrawingTextOrientation Orientation { get; set; }
+
+        IXLDrawingStyle SetHorizontal(XLDrawingHorizontalAlignment value);
+        IXLDrawingStyle SetVertical(XLDrawingVerticalAlignment value);
+        IXLDrawingStyle SetAutomaticSize(); IXLDrawingStyle SetAutomaticSize(Boolean value);
+        IXLDrawingStyle SetDirection(XLDrawingTextDirection value);
+        IXLDrawingStyle SetOrientation(XLDrawingTextOrientation value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingColorsAndLines.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingColorsAndLines.cs
new file mode 100644
index 0000000..135cc55
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingColorsAndLines.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLDashStyle
+    {
+        Solid,
+        RoundDot,
+        SquareDot,
+        Dash,
+        DashDot,
+        LongDash,
+        LongDashDot,
+        LongDashDotDot
+    }
+    public enum XLLineStyle
+    {
+        Single, ThinThin, ThinThick, ThickThin, ThickBetweenThin
+    }
+    public interface IXLDrawingColorsAndLines
+    {
+        XLColor FillColor { get; set; }
+        Double FillTransparency { get; set; }
+        XLColor LineColor { get; set; }
+        Double LineTransparency { get; set; }
+        Double LineWeight { get; set; }
+        XLDashStyle LineDash { get; set; }
+        XLLineStyle LineStyle { get; set; }
+
+        IXLDrawingStyle SetFillColor(XLColor value);
+        IXLDrawingStyle SetFillTransparency(Double value);
+        IXLDrawingStyle SetLineColor(XLColor value);
+        IXLDrawingStyle SetLineTransparency(Double value);
+        IXLDrawingStyle SetLineWeight(Double value);
+        IXLDrawingStyle SetLineDash(XLDashStyle value);
+        IXLDrawingStyle SetLineStyle(XLLineStyle value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingFont.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingFont.cs
new file mode 100644
index 0000000..d63ced5
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingFont.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingFont : IXLFontBase
+    {
+        IXLDrawingStyle SetBold(); IXLDrawingStyle SetBold(Boolean value);
+        IXLDrawingStyle SetItalic(); IXLDrawingStyle SetItalic(Boolean value);
+        IXLDrawingStyle SetUnderline(); IXLDrawingStyle SetUnderline(XLFontUnderlineValues value);
+        IXLDrawingStyle SetStrikethrough(); IXLDrawingStyle SetStrikethrough(Boolean value);
+        IXLDrawingStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
+        IXLDrawingStyle SetShadow(); IXLDrawingStyle SetShadow(Boolean value);
+        IXLDrawingStyle SetFontSize(Double value);
+        IXLDrawingStyle SetFontColor(XLColor value);
+        IXLDrawingStyle SetFontName(String value);
+        IXLDrawingStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingMargins.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingMargins.cs
new file mode 100644
index 0000000..cce06e8
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingMargins.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingMargins
+    {
+        Boolean Automatic { get; set; }
+        Double Left { get; set; }
+        Double Right { get; set; }
+        Double Top { get; set; }
+        Double Bottom { get; set; }
+        Double All { set; }
+
+        IXLDrawingStyle SetAutomatic(); IXLDrawingStyle SetAutomatic(Boolean value);
+        IXLDrawingStyle SetLeft(Double value);
+        IXLDrawingStyle SetRight(Double value);
+        IXLDrawingStyle SetTop(Double value);
+        IXLDrawingStyle SetBottom(Double value);
+        IXLDrawingStyle SetAll(Double value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingProperties.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingProperties.cs
new file mode 100644
index 0000000..cf2118b
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingProperties.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingProperties
+    {
+        XLDrawingAnchor Positioning { get; set; }
+        IXLDrawingStyle SetPositioning(XLDrawingAnchor value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingProtection.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingProtection.cs
new file mode 100644
index 0000000..67ff8cd
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingProtection.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingProtection
+    {
+        Boolean Locked { get; set; }
+        Boolean LockText { get; set; }
+
+        IXLDrawingStyle SetLocked(); IXLDrawingStyle SetLocked(Boolean value);
+        IXLDrawingStyle SetLockText(); IXLDrawingStyle SetLockText(Boolean value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingSize.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingSize.cs
new file mode 100644
index 0000000..5025a9d
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingSize.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingSize
+    {
+        Boolean AutomaticSize { get; set; }
+        Double Height { get; set; }
+        Double Width { get; set; }
+
+        IXLDrawingStyle SetAutomaticSize(); IXLDrawingStyle SetAutomaticSize(Boolean value);
+        IXLDrawingStyle SetHeight(Double value);
+        IXLDrawingStyle SetWidth(Double value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingStyle.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingStyle.cs
new file mode 100644
index 0000000..fac4343
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingStyle.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingStyle
+    {
+        //IXLDrawingFont Font { get; }
+        IXLDrawingAlignment Alignment { get; }
+        IXLDrawingColorsAndLines ColorsAndLines { get; }
+        IXLDrawingSize Size { get; }
+        IXLDrawingProtection Protection { get; }
+        IXLDrawingProperties Properties { get; }
+        IXLDrawingMargins Margins { get; }
+        IXLDrawingWeb Web { get; }
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/IXLDrawingWeb.cs b/ClosedXML/Excel/Drawings/Style/IXLDrawingWeb.cs
new file mode 100644
index 0000000..abc5ccd
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/IXLDrawingWeb.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLDrawingWeb
+    {
+        String AlternateText { get; set; }
+        IXLDrawingStyle SetAlternateText(String value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingAlignment.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingAlignment.cs
new file mode 100644
index 0000000..789b5c4
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingAlignment.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingAlignment: IXLDrawingAlignment
+    {
+        private readonly IXLDrawingStyle _style;
+
+        public XLDrawingAlignment(IXLDrawingStyle style)
+        {
+            _style = style;
+        }
+        public XLDrawingHorizontalAlignment Horizontal { get; set; }		public IXLDrawingStyle SetHorizontal(XLDrawingHorizontalAlignment value) { Horizontal = value; return _style; }
+        public XLDrawingVerticalAlignment Vertical { get; set; }		public IXLDrawingStyle SetVertical(XLDrawingVerticalAlignment value) { Vertical = value; return _style; }
+        public Boolean AutomaticSize { get; set; }	public IXLDrawingStyle SetAutomaticSize() { AutomaticSize = true; return _style; }	public IXLDrawingStyle SetAutomaticSize(Boolean value) { AutomaticSize = value; return _style; }
+        public XLDrawingTextDirection Direction { get; set; }		public IXLDrawingStyle SetDirection(XLDrawingTextDirection value) { Direction = value; return _style; }
+        public XLDrawingTextOrientation Orientation { get; set; }		public IXLDrawingStyle SetOrientation(XLDrawingTextOrientation value) { Orientation = value; return _style; }
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingColorsAndLines.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingColorsAndLines.cs
new file mode 100644
index 0000000..5ed7386
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingColorsAndLines.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingColorsAndLines: IXLDrawingColorsAndLines
+    {
+                private readonly IXLDrawingStyle _style;
+
+        public XLDrawingColorsAndLines(IXLDrawingStyle style)
+        {
+            _style = style;
+        }
+        public XLColor FillColor { get; set; }		public IXLDrawingStyle SetFillColor(XLColor value) { FillColor = value; return _style; }
+        public Double FillTransparency { get; set; }		public IXLDrawingStyle SetFillTransparency(Double value) { FillTransparency = value; return _style; }
+        public XLColor LineColor { get; set; }		public IXLDrawingStyle SetLineColor(XLColor value) { LineColor = value; return _style; }
+        public Double LineTransparency { get; set; }		public IXLDrawingStyle SetLineTransparency(Double value) { LineTransparency = value; return _style; }
+        public Double LineWeight { get; set; }		public IXLDrawingStyle SetLineWeight(Double value) { LineWeight = value; return _style; }
+        public XLDashStyle LineDash { get; set; }		public IXLDrawingStyle SetLineDash(XLDashStyle value) { LineDash = value; return _style; }
+        public XLLineStyle LineStyle { get; set; }		public IXLDrawingStyle SetLineStyle(XLLineStyle value) { LineStyle = value; return _style; }
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingFont.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingFont.cs
new file mode 100644
index 0000000..a96b07e
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingFont.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingFont : IXLDrawingFont
+    {
+        private readonly IXLDrawingStyle _style;
+
+        public XLDrawingFont(IXLDrawingStyle style)
+        {
+            _style = style;
+            FontName = "Tahoma";
+            FontSize = 9;
+            Underline = XLFontUnderlineValues.None;
+            FontColor = XLColor.FromIndex(64);
+        }
+
+        public Boolean Bold { get; set; }
+        public Boolean Italic { get; set; }
+        public XLFontUnderlineValues Underline { get; set; }
+        public Boolean Strikethrough { get; set; }
+        public XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
+        public Boolean Shadow { get; set; }
+        public Double FontSize { get; set; }
+        public XLColor FontColor { get; set; }
+        public String FontName { get; set; }
+        public XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
+
+
+        public IXLDrawingStyle SetBold()
+        {
+            Bold = true;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetBold(Boolean value)
+        {
+            Bold = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetItalic()
+        {
+            Italic = true;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetItalic(Boolean value)
+        {
+            Italic = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetUnderline()
+        {
+            Underline = XLFontUnderlineValues.Single;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetUnderline(XLFontUnderlineValues value)
+        {
+            Underline = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetStrikethrough()
+        {
+            Strikethrough = true;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetStrikethrough(Boolean value)
+        {
+            Strikethrough = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value)
+        {
+            VerticalAlignment = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetShadow()
+        {
+            Shadow = true;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetShadow(Boolean value)
+        {
+            Shadow = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetFontSize(Double value)
+        {
+            FontSize = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetFontColor(XLColor value)
+        {
+            FontColor = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetFontName(String value)
+        {
+            FontName = value;
+            return _style;
+        }
+
+        public IXLDrawingStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value)
+        {
+            FontFamilyNumbering = value;
+            return _style;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingMargins.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingMargins.cs
new file mode 100644
index 0000000..3694114
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingMargins.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingMargins: IXLDrawingMargins
+    {
+        private readonly IXLDrawingStyle _style;
+        public XLDrawingMargins(IXLDrawingStyle style)
+        {
+            _style = style;
+        }
+        public Boolean Automatic { get; set; }	public IXLDrawingStyle SetAutomatic() { Automatic = true; return _style; }	public IXLDrawingStyle SetAutomatic(Boolean value) { Automatic = value; return _style; }
+        Double _left;
+        public Double Left { get { return _left; } set { _left = value; Automatic = false; } }		
+        public IXLDrawingStyle SetLeft(Double value) { Left = value; return _style; }
+        Double _right;
+        public Double Right { get { return _right; } set { _right = value; Automatic = false; } }		public IXLDrawingStyle SetRight(Double value) { Right = value; return _style; }
+        Double _top;
+        public Double Top { get { return _top; } set { _top = value; Automatic = false; } }		public IXLDrawingStyle SetTop(Double value) { Top = value; return _style; }
+        Double _bottom;
+        public Double Bottom { get { return _bottom; } set { _bottom = value; Automatic = false; } }		public IXLDrawingStyle SetBottom(Double value) { Bottom = value; return _style; }
+        public Double All
+        {
+            set
+            {
+                _left = value;
+                _right = value;
+                _top = value;
+                _bottom = value;
+                Automatic = false;
+            }
+        }	
+        public IXLDrawingStyle SetAll(Double value) { All = value; return _style; }
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingProperties.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingProperties.cs
new file mode 100644
index 0000000..6f0ce19
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingProperties.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingProperties : IXLDrawingProperties
+    {
+                private readonly IXLDrawingStyle _style;
+
+        public XLDrawingProperties(IXLDrawingStyle style)
+        {
+            _style = style;
+        }
+        public XLDrawingAnchor Positioning { get; set; }		public IXLDrawingStyle SetPositioning(XLDrawingAnchor value) { Positioning = value; return _style; }
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingProtection.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingProtection.cs
new file mode 100644
index 0000000..d95633c
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingProtection.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingProtection : IXLDrawingProtection
+    {
+                private readonly IXLDrawingStyle _style;
+
+        public XLDrawingProtection(IXLDrawingStyle style)
+        {
+            _style = style;
+        }
+        public Boolean Locked { get; set; }	public IXLDrawingStyle SetLocked() { Locked = true; return _style; }	public IXLDrawingStyle SetLocked(Boolean value) { Locked = value; return _style; }
+        public Boolean LockText { get; set; }	public IXLDrawingStyle SetLockText() { LockText = true; return _style; }	public IXLDrawingStyle SetLockText(Boolean value) { LockText = value; return _style; }
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingSize.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingSize.cs
new file mode 100644
index 0000000..11f30f9
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingSize.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingSize : IXLDrawingSize
+    {
+                private readonly IXLDrawingStyle _style;
+
+        public XLDrawingSize(IXLDrawingStyle style)
+        {
+            _style = style;
+        }
+
+        public Boolean AutomaticSize { get { return _style.Alignment.AutomaticSize; } set { _style.Alignment.AutomaticSize = value; } }	
+        public IXLDrawingStyle SetAutomaticSize() { AutomaticSize = true; return _style; }	public IXLDrawingStyle SetAutomaticSize(Boolean value) { AutomaticSize = value; return _style; }
+        public Double Height { get; set; }		public IXLDrawingStyle SetHeight(Double value) { Height = value; return _style; }
+        public Double Width { get; set; }		public IXLDrawingStyle SetWidth(Double value) { Width = value; return _style; }
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingStyle.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingStyle.cs
new file mode 100644
index 0000000..056f639
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingStyle.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingStyle: IXLDrawingStyle
+    {
+        public XLDrawingStyle()
+        {
+            //Font = new XLDrawingFont(this);
+            Alignment = new XLDrawingAlignment(this);
+            ColorsAndLines = new XLDrawingColorsAndLines(this);
+            Size = new XLDrawingSize(this);
+            Protection = new XLDrawingProtection(this);
+            Properties = new XLDrawingProperties(this);
+            Margins = new XLDrawingMargins(this);
+            Web = new XLDrawingWeb(this);
+        }
+        //public IXLDrawingFont Font { get; private set; }
+        public IXLDrawingAlignment Alignment { get; private set; }
+        public IXLDrawingColorsAndLines ColorsAndLines { get; private set; }
+        public IXLDrawingSize Size { get; private set; }
+        public IXLDrawingProtection Protection { get; private set; }
+        public IXLDrawingProperties Properties { get; private set; }
+        public IXLDrawingMargins Margins { get; private set; }
+        public IXLDrawingWeb Web { get; private set; }
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/Style/XLDrawingWeb.cs b/ClosedXML/Excel/Drawings/Style/XLDrawingWeb.cs
new file mode 100644
index 0000000..c3fe40d
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/Style/XLDrawingWeb.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingWeb : IXLDrawingWeb
+    {
+        private readonly IXLDrawingStyle _style;
+
+        public XLDrawingWeb(IXLDrawingStyle style)
+        {
+            _style = style;
+        }
+        public String AlternateText { get; set; }		public IXLDrawingStyle SetAlternateText(String value) { AlternateText = value; return _style; }
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/XLDrawing.cs b/ClosedXML/Excel/Drawings/XLDrawing.cs
new file mode 100644
index 0000000..9f55075
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/XLDrawing.cs
@@ -0,0 +1,114 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawing<T>: IXLDrawing<T>
+    {
+        internal T Container;
+        public XLDrawing()
+        {
+            Style = new XLDrawingStyle();
+            Position = new XLDrawingPosition();
+        }
+
+        public Int32 ShapeId { get; internal set; }
+
+        public Boolean Visible { get; set; }
+        public T SetVisible()
+        {
+            Visible = true;
+            return Container;
+        }
+        public T SetVisible(Boolean hidden)
+        {
+            Visible = hidden;
+            return Container;
+        }
+
+        public String Name { get; set; }
+        public T SetName(String name)
+        {
+            Name = name;
+            return Container;
+        }
+
+        public String Description { get; set; }
+        public T SetDescription(String description)
+        {
+            Description = description;
+            return Container;
+        }
+
+        public IXLDrawingPosition Position { get; private set; }
+
+        public Int32 ZOrder { get; set; }
+        public T SetZOrder(Int32 zOrder)
+        {
+            ZOrder = zOrder;
+            return Container;
+        }
+
+        public Boolean HorizontalFlip { get; set; }
+        public T SetHorizontalFlip()
+        {
+            HorizontalFlip = true;
+            return Container;
+        }
+        public T SetHorizontalFlip(Boolean horizontalFlip)
+        {
+            HorizontalFlip = horizontalFlip;
+            return Container;
+        }
+
+        public Boolean VerticalFlip { get; set; }
+        public T SetVerticalFlip()
+        {
+            VerticalFlip = true;
+            return Container;
+        }
+        public T SetVerticalFlip(Boolean verticalFlip)
+        {
+            VerticalFlip = verticalFlip;
+            return Container;
+        }
+
+        public Int32 Rotation { get; set; }
+        public T SetRotation(Int32 rotation)
+        {
+            Rotation = rotation;
+            return Container;
+        }
+
+        public Int32 OffsetX { get; set; }
+        public T SetOffsetX(Int32 offsetX)
+        {
+            OffsetX = offsetX;
+            return Container;
+        }
+
+        public Int32 OffsetY { get; set; }
+        public T SetOffsetY(Int32 offsetY)
+        {
+            OffsetY = offsetY;
+            return Container;
+        }
+
+        public Int32 ExtentLength { get; set; }
+        public T SetExtentLength(Int32 extentLength)
+        {
+            ExtentLength = extentLength;
+            return Container;
+        }
+
+        public Int32 ExtentWidth { get; set; }
+        public T SetExtentWidth(Int32 extentWidth)
+        {
+            ExtentWidth = extentWidth;
+            return Container;
+        }
+
+        public IXLDrawingStyle Style { get; private set; }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/Drawings/XLDrawingPosition.cs b/ClosedXML/Excel/Drawings/XLDrawingPosition.cs
new file mode 100644
index 0000000..ccb73ae
--- /dev/null
+++ b/ClosedXML/Excel/Drawings/XLDrawingPosition.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLDrawingPosition: IXLDrawingPosition
+    {
+        public Int32 Column { get; set; }
+        public IXLDrawingPosition SetColumn(Int32 column) { Column = column; return this; }
+        public Double ColumnOffset { get; set; }
+        public IXLDrawingPosition SetColumnOffset(Double columnOffset) { ColumnOffset = columnOffset; return this; }
+         
+        public Int32 Row { get; set; }
+        public IXLDrawingPosition SetRow(Int32 row) { Row = row; return this; }
+        public Double RowOffset { get; set; }
+        public IXLDrawingPosition SetRowOffset(Double rowOffset) { RowOffset = rowOffset; return this; }
+    }
+}
diff --git a/ClosedXML/Excel/EnumConverter.cs b/ClosedXML/Excel/EnumConverter.cs
new file mode 100644
index 0000000..e1384ca
--- /dev/null
+++ b/ClosedXML/Excel/EnumConverter.cs
@@ -0,0 +1,1262 @@
+using System;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml.Vml;
+
+namespace ClosedXML.Excel
+{
+    internal static class EnumConverter
+    {
+        #region To OpenXml
+        public static UnderlineValues ToOpenXml(this XLFontUnderlineValues value)
+        {
+            switch (value)
+            {
+                case XLFontUnderlineValues.Double:
+                    return UnderlineValues.Double;
+                case XLFontUnderlineValues.DoubleAccounting:
+                    return UnderlineValues.DoubleAccounting;
+                case XLFontUnderlineValues.None:
+                    return UnderlineValues.None;
+                case XLFontUnderlineValues.Single:
+                    return UnderlineValues.Single;
+                case XLFontUnderlineValues.SingleAccounting:
+                    return UnderlineValues.SingleAccounting;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static OrientationValues ToOpenXml(this XLPageOrientation value)
+        {
+            switch (value)
+            {
+                case XLPageOrientation.Default:
+                    return OrientationValues.Default;
+                case XLPageOrientation.Landscape:
+                    return OrientationValues.Landscape;
+                case XLPageOrientation.Portrait:
+                    return OrientationValues.Portrait;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static VerticalAlignmentRunValues ToOpenXml(this XLFontVerticalTextAlignmentValues value)
+        {
+            switch (value)
+            {
+                case XLFontVerticalTextAlignmentValues.Baseline:
+                    return VerticalAlignmentRunValues.Baseline;
+                case XLFontVerticalTextAlignmentValues.Subscript:
+                    return VerticalAlignmentRunValues.Subscript;
+                case XLFontVerticalTextAlignmentValues.Superscript:
+                    return VerticalAlignmentRunValues.Superscript;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static PatternValues ToOpenXml(this XLFillPatternValues value)
+        {
+            switch (value)
+            {
+                case XLFillPatternValues.DarkDown:
+                    return PatternValues.DarkDown;
+                case XLFillPatternValues.DarkGray:
+                    return PatternValues.DarkGray;
+                case XLFillPatternValues.DarkGrid:
+                    return PatternValues.DarkGrid;
+                case XLFillPatternValues.DarkHorizontal:
+                    return PatternValues.DarkHorizontal;
+                case XLFillPatternValues.DarkTrellis:
+                    return PatternValues.DarkTrellis;
+                case XLFillPatternValues.DarkUp:
+                    return PatternValues.DarkUp;
+                case XLFillPatternValues.DarkVertical:
+                    return PatternValues.DarkVertical;
+                case XLFillPatternValues.Gray0625:
+                    return PatternValues.Gray0625;
+                case XLFillPatternValues.Gray125:
+                    return PatternValues.Gray125;
+                case XLFillPatternValues.LightDown:
+                    return PatternValues.LightDown;
+                case XLFillPatternValues.LightGray:
+                    return PatternValues.LightGray;
+                case XLFillPatternValues.LightGrid:
+                    return PatternValues.LightGrid;
+                case XLFillPatternValues.LightHorizontal:
+                    return PatternValues.LightHorizontal;
+                case XLFillPatternValues.LightTrellis:
+                    return PatternValues.LightTrellis;
+                case XLFillPatternValues.LightUp:
+                    return PatternValues.LightUp;
+                case XLFillPatternValues.LightVertical:
+                    return PatternValues.LightVertical;
+                case XLFillPatternValues.MediumGray:
+                    return PatternValues.MediumGray;
+                case XLFillPatternValues.None:
+                    return PatternValues.None;
+                case XLFillPatternValues.Solid:
+                    return PatternValues.Solid;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static BorderStyleValues ToOpenXml(this XLBorderStyleValues value)
+        {
+            switch (value)
+            {
+                case XLBorderStyleValues.DashDot:
+                    return BorderStyleValues.DashDot;
+                case XLBorderStyleValues.DashDotDot:
+                    return BorderStyleValues.DashDotDot;
+                case XLBorderStyleValues.Dashed:
+                    return BorderStyleValues.Dashed;
+                case XLBorderStyleValues.Dotted:
+                    return BorderStyleValues.Dotted;
+                case XLBorderStyleValues.Double:
+                    return BorderStyleValues.Double;
+                case XLBorderStyleValues.Hair:
+                    return BorderStyleValues.Hair;
+                case XLBorderStyleValues.Medium:
+                    return BorderStyleValues.Medium;
+                case XLBorderStyleValues.MediumDashDot:
+                    return BorderStyleValues.MediumDashDot;
+                case XLBorderStyleValues.MediumDashDotDot:
+                    return BorderStyleValues.MediumDashDotDot;
+                case XLBorderStyleValues.MediumDashed:
+                    return BorderStyleValues.MediumDashed;
+                case XLBorderStyleValues.None:
+                    return BorderStyleValues.None;
+                case XLBorderStyleValues.SlantDashDot:
+                    return BorderStyleValues.SlantDashDot;
+                case XLBorderStyleValues.Thick:
+                    return BorderStyleValues.Thick;
+                case XLBorderStyleValues.Thin:
+                    return BorderStyleValues.Thin;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static HorizontalAlignmentValues ToOpenXml(this XLAlignmentHorizontalValues value)
+        {
+            switch (value)
+            {
+                case XLAlignmentHorizontalValues.Center:
+                    return HorizontalAlignmentValues.Center;
+                case XLAlignmentHorizontalValues.CenterContinuous:
+                    return HorizontalAlignmentValues.CenterContinuous;
+                case XLAlignmentHorizontalValues.Distributed:
+                    return HorizontalAlignmentValues.Distributed;
+                case XLAlignmentHorizontalValues.Fill:
+                    return HorizontalAlignmentValues.Fill;
+                case XLAlignmentHorizontalValues.General:
+                    return HorizontalAlignmentValues.General;
+                case XLAlignmentHorizontalValues.Justify:
+                    return HorizontalAlignmentValues.Justify;
+                case XLAlignmentHorizontalValues.Left:
+                    return HorizontalAlignmentValues.Left;
+                case XLAlignmentHorizontalValues.Right:
+                    return HorizontalAlignmentValues.Right;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static VerticalAlignmentValues ToOpenXml(this XLAlignmentVerticalValues value)
+        {
+            switch (value)
+            {
+                case XLAlignmentVerticalValues.Bottom:
+                    return VerticalAlignmentValues.Bottom;
+                case XLAlignmentVerticalValues.Center:
+                    return VerticalAlignmentValues.Center;
+                case XLAlignmentVerticalValues.Distributed:
+                    return VerticalAlignmentValues.Distributed;
+                case XLAlignmentVerticalValues.Justify:
+                    return VerticalAlignmentValues.Justify;
+                case XLAlignmentVerticalValues.Top:
+                    return VerticalAlignmentValues.Top;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static PageOrderValues ToOpenXml(this XLPageOrderValues value)
+        {
+            switch (value)
+            {
+                case XLPageOrderValues.DownThenOver:
+                    return PageOrderValues.DownThenOver;
+                case XLPageOrderValues.OverThenDown:
+                    return PageOrderValues.OverThenDown;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static CellCommentsValues ToOpenXml(this XLShowCommentsValues value)
+        {
+            switch (value)
+            {
+                case XLShowCommentsValues.AsDisplayed:
+                    return CellCommentsValues.AsDisplayed;
+                case XLShowCommentsValues.AtEnd:
+                    return CellCommentsValues.AtEnd;
+                case XLShowCommentsValues.None:
+                    return CellCommentsValues.None;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static PrintErrorValues ToOpenXml(this XLPrintErrorValues value)
+        {
+            switch (value)
+            {
+                case XLPrintErrorValues.Blank:
+                    return PrintErrorValues.Blank;
+                case XLPrintErrorValues.Dash:
+                    return PrintErrorValues.Dash;
+                case XLPrintErrorValues.Displayed:
+                    return PrintErrorValues.Displayed;
+                case XLPrintErrorValues.NA:
+                    return PrintErrorValues.NA;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static CalculateModeValues ToOpenXml(this XLCalculateMode value)
+        {
+            switch (value)
+            {
+                case XLCalculateMode.Auto:
+                    return CalculateModeValues.Auto;
+                case XLCalculateMode.AutoNoTable:
+                    return CalculateModeValues.AutoNoTable;
+                case XLCalculateMode.Manual:
+                    return CalculateModeValues.Manual;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static ReferenceModeValues ToOpenXml(this XLReferenceStyle value)
+        {
+            switch (value)
+            {
+                case XLReferenceStyle.R1C1:
+                    return ReferenceModeValues.R1C1;
+                case XLReferenceStyle.A1:
+                    return ReferenceModeValues.A1;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static uint ToOpenXml(this XLAlignmentReadingOrderValues value)
+        {
+            switch (value)
+            {
+                case XLAlignmentReadingOrderValues.ContextDependent:
+                    return 0;
+                case XLAlignmentReadingOrderValues.LeftToRight:
+                    return 1;
+                case XLAlignmentReadingOrderValues.RightToLeft:
+                    return 2;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static TotalsRowFunctionValues ToOpenXml(this XLTotalsRowFunction value)
+        {
+            switch (value)
+            {
+                case XLTotalsRowFunction.None:
+                    return TotalsRowFunctionValues.None;
+                case XLTotalsRowFunction.Sum:
+                    return TotalsRowFunctionValues.Sum;
+                case XLTotalsRowFunction.Minimum:
+                    return TotalsRowFunctionValues.Minimum;
+                case XLTotalsRowFunction.Maximum:
+                    return TotalsRowFunctionValues.Maximum;
+                case XLTotalsRowFunction.Average:
+                    return TotalsRowFunctionValues.Average;
+                case XLTotalsRowFunction.Count:
+                    return TotalsRowFunctionValues.Count;
+                case XLTotalsRowFunction.CountNumbers:
+                    return TotalsRowFunctionValues.CountNumbers;
+                case XLTotalsRowFunction.StandardDeviation:
+                    return TotalsRowFunctionValues.StandardDeviation;
+                case XLTotalsRowFunction.Variance:
+                    return TotalsRowFunctionValues.Variance;
+                case XLTotalsRowFunction.Custom:
+                    return TotalsRowFunctionValues.Custom;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static DataValidationValues ToOpenXml(this XLAllowedValues value)
+        {
+            switch (value)
+            {
+                case XLAllowedValues.AnyValue:
+                    return DataValidationValues.None;
+                case XLAllowedValues.Custom:
+                    return DataValidationValues.Custom;
+                case XLAllowedValues.Date:
+                    return DataValidationValues.Date;
+                case XLAllowedValues.Decimal:
+                    return DataValidationValues.Decimal;
+                case XLAllowedValues.List:
+                    return DataValidationValues.List;
+                case XLAllowedValues.TextLength:
+                    return DataValidationValues.TextLength;
+                case XLAllowedValues.Time:
+                    return DataValidationValues.Time;
+                case XLAllowedValues.WholeNumber:
+                    return DataValidationValues.Whole;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static DataValidationErrorStyleValues ToOpenXml(this XLErrorStyle value)
+        {
+            switch (value)
+            {
+                case XLErrorStyle.Information:
+                    return DataValidationErrorStyleValues.Information;
+                case XLErrorStyle.Warning:
+                    return DataValidationErrorStyleValues.Warning;
+                case XLErrorStyle.Stop:
+                    return DataValidationErrorStyleValues.Stop;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static DataValidationOperatorValues ToOpenXml(this XLOperator value)
+        {
+            switch (value)
+            {
+                case XLOperator.Between:
+                    return DataValidationOperatorValues.Between;
+                case XLOperator.EqualOrGreaterThan:
+                    return DataValidationOperatorValues.GreaterThanOrEqual;
+                case XLOperator.EqualOrLessThan:
+                    return DataValidationOperatorValues.LessThanOrEqual;
+                case XLOperator.EqualTo:
+                    return DataValidationOperatorValues.Equal;
+                case XLOperator.GreaterThan:
+                    return DataValidationOperatorValues.GreaterThan;
+                case XLOperator.LessThan:
+                    return DataValidationOperatorValues.LessThan;
+                case XLOperator.NotBetween:
+                    return DataValidationOperatorValues.NotBetween;
+                case XLOperator.NotEqualTo:
+                    return DataValidationOperatorValues.NotEqual;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static SheetStateValues ToOpenXml(this XLWorksheetVisibility value)
+        {
+            switch (value)
+            {
+                case XLWorksheetVisibility.Visible:
+                    return SheetStateValues.Visible;
+                case XLWorksheetVisibility.Hidden:
+                    return SheetStateValues.Hidden;
+                case XLWorksheetVisibility.VeryHidden:
+                    return SheetStateValues.VeryHidden;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static PhoneticAlignmentValues ToOpenXml(this XLPhoneticAlignment value)
+        {
+            switch (value)
+            {
+                case XLPhoneticAlignment.Center :
+                    return  PhoneticAlignmentValues.Center;
+                case XLPhoneticAlignment.Distributed:
+                    return PhoneticAlignmentValues.Distributed;
+                case XLPhoneticAlignment.Left:
+                    return PhoneticAlignmentValues.Left;
+                case XLPhoneticAlignment.NoControl:
+                    return PhoneticAlignmentValues.NoControl;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static PhoneticValues ToOpenXml(this XLPhoneticType value)
+        {
+            switch (value)
+            {
+                case XLPhoneticType.FullWidthKatakana:
+                    return PhoneticValues.FullWidthKatakana;
+                case XLPhoneticType.HalfWidthKatakana:
+                    return PhoneticValues.HalfWidthKatakana;
+                case XLPhoneticType.Hiragana:
+                    return PhoneticValues.Hiragana;
+                case XLPhoneticType.NoConversion:
+                    return PhoneticValues.NoConversion;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static DataConsolidateFunctionValues ToOpenXml(this XLPivotSummary value)
+        {
+            switch (value)
+            {
+                case XLPivotSummary.Sum: return DataConsolidateFunctionValues.Sum;
+                case XLPivotSummary.Count: return DataConsolidateFunctionValues.Count;
+                case XLPivotSummary.Average: return DataConsolidateFunctionValues.Average;
+                case XLPivotSummary.Minimum: return DataConsolidateFunctionValues.Minimum;
+                case XLPivotSummary.Maximum: return DataConsolidateFunctionValues.Maximum;
+                case XLPivotSummary.Product: return DataConsolidateFunctionValues.Product;
+                case XLPivotSummary.CountNumbers: return DataConsolidateFunctionValues.CountNumbers;
+                case XLPivotSummary.StandardDeviation: return DataConsolidateFunctionValues.StandardDeviation;
+                case XLPivotSummary.PopulationStandardDeviation: return DataConsolidateFunctionValues.StandardDeviationP;
+                case XLPivotSummary.Variance: return DataConsolidateFunctionValues.Variance;
+                case XLPivotSummary.PopulationVariance: return DataConsolidateFunctionValues.VarianceP;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static ShowDataAsValues ToOpenXml(this XLPivotCalculation value)
+        {
+            switch (value)
+            {
+                case XLPivotCalculation.Normal: return ShowDataAsValues.Normal;
+                case XLPivotCalculation.DifferenceFrom: return ShowDataAsValues.Difference;
+                case XLPivotCalculation.PctOf: return ShowDataAsValues.Percent;
+                case XLPivotCalculation.PctDifferenceFrom: return ShowDataAsValues.PercentageDifference;
+                case XLPivotCalculation.RunningTotal: return ShowDataAsValues.RunTotal;
+                case XLPivotCalculation.PctOfRow: return ShowDataAsValues.PercentOfRaw; // There's a typo in the OpenXML SDK =)
+                case XLPivotCalculation.PctOfColumn: return ShowDataAsValues.PercentOfColumn;
+                case XLPivotCalculation.PctOfTotal: return ShowDataAsValues.PercentOfTotal;
+                case XLPivotCalculation.Index: return ShowDataAsValues.Index;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static FilterOperatorValues ToOpenXml(this XLFilterOperator value)
+        {
+            switch(value)
+            {
+                case XLFilterOperator.Equal: return FilterOperatorValues.Equal;
+                case XLFilterOperator.NotEqual: return FilterOperatorValues.NotEqual;
+                case XLFilterOperator.GreaterThan: return FilterOperatorValues.GreaterThan;
+                case XLFilterOperator.EqualOrGreaterThan: return FilterOperatorValues.GreaterThanOrEqual;
+                case XLFilterOperator.LessThan: return FilterOperatorValues.LessThan;
+                case XLFilterOperator.EqualOrLessThan: return FilterOperatorValues.LessThanOrEqual;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static DynamicFilterValues ToOpenXml(this XLFilterDynamicType value)
+        {
+            switch (value)
+            {
+                case XLFilterDynamicType.AboveAverage: return DynamicFilterValues.AboveAverage;
+                case XLFilterDynamicType.BelowAverage: return DynamicFilterValues.BelowAverage;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static SheetViewValues ToOpenXml(this XLSheetViewOptions value)
+        {
+            switch (value)
+            {
+                case XLSheetViewOptions.Normal: return SheetViewValues.Normal;
+                case XLSheetViewOptions.PageBreakPreview: return SheetViewValues.PageBreakPreview;
+                case XLSheetViewOptions.PageLayout: return SheetViewValues.PageLayout;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static StrokeLineStyleValues ToOpenXml(this XLLineStyle value)
+        {
+            switch (value)
+            {
+                case XLLineStyle.Single : return StrokeLineStyleValues.Single ;
+                case XLLineStyle.ThickBetweenThin: return StrokeLineStyleValues.ThickBetweenThin;
+                case XLLineStyle.ThickThin: return StrokeLineStyleValues.ThickThin;
+                case XLLineStyle.ThinThick: return StrokeLineStyleValues.ThinThick;
+                case XLLineStyle.ThinThin: return StrokeLineStyleValues.ThinThin;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static ConditionalFormatValues ToOpenXml(this XLConditionalFormatType value)
+        {
+            switch (value)
+            {
+                case XLConditionalFormatType.Expression: return ConditionalFormatValues.Expression;
+                case XLConditionalFormatType.CellIs: return ConditionalFormatValues.CellIs;
+                case XLConditionalFormatType.ColorScale: return ConditionalFormatValues.ColorScale;
+                case XLConditionalFormatType.DataBar: return ConditionalFormatValues.DataBar;
+                case XLConditionalFormatType.IconSet: return ConditionalFormatValues.IconSet;
+                case XLConditionalFormatType.Top10: return ConditionalFormatValues.Top10;
+                case XLConditionalFormatType.IsUnique: return ConditionalFormatValues.UniqueValues;
+                case XLConditionalFormatType.IsDuplicate: return ConditionalFormatValues.DuplicateValues;
+                case XLConditionalFormatType.ContainsText: return ConditionalFormatValues.ContainsText;
+                case XLConditionalFormatType.NotContainsText: return ConditionalFormatValues.NotContainsText;
+                case XLConditionalFormatType.StartsWith: return ConditionalFormatValues.BeginsWith;
+                case XLConditionalFormatType.EndsWith: return ConditionalFormatValues.EndsWith;
+                case XLConditionalFormatType.IsBlank: return ConditionalFormatValues.ContainsBlanks;
+                case XLConditionalFormatType.NotBlank: return ConditionalFormatValues.NotContainsBlanks;
+                case XLConditionalFormatType.IsError: return ConditionalFormatValues.ContainsErrors;
+                case XLConditionalFormatType.NotError: return ConditionalFormatValues.NotContainsErrors;
+                case XLConditionalFormatType.TimePeriod: return ConditionalFormatValues.TimePeriod;
+                case XLConditionalFormatType.AboveAverage: return ConditionalFormatValues.AboveAverage;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static ConditionalFormatValueObjectValues ToOpenXml(this XLCFContentType value)
+        {
+            switch (value)
+            {
+                case XLCFContentType.Number: return ConditionalFormatValueObjectValues.Number;
+                case XLCFContentType.Percent: return ConditionalFormatValueObjectValues.Percent;
+                case XLCFContentType.Maximum: return ConditionalFormatValueObjectValues.Max;
+                case XLCFContentType.Minimum: return ConditionalFormatValueObjectValues.Min;
+                case XLCFContentType.Formula: return ConditionalFormatValueObjectValues.Formula;
+                case XLCFContentType.Percentile: return ConditionalFormatValueObjectValues.Percentile;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static ConditionalFormattingOperatorValues ToOpenXml(this XLCFOperator value)
+        {
+            switch (value)
+            {
+                case XLCFOperator.LessThan: return ConditionalFormattingOperatorValues.LessThan;
+                case XLCFOperator.EqualOrLessThan: return ConditionalFormattingOperatorValues.LessThanOrEqual;
+                case XLCFOperator.Equal: return ConditionalFormattingOperatorValues.Equal;
+                case XLCFOperator.NotEqual: return ConditionalFormattingOperatorValues.NotEqual;
+                case XLCFOperator.EqualOrGreaterThan: return ConditionalFormattingOperatorValues.GreaterThanOrEqual;
+                case XLCFOperator.GreaterThan: return ConditionalFormattingOperatorValues.GreaterThan;
+                case XLCFOperator.Between: return ConditionalFormattingOperatorValues.Between;
+                case XLCFOperator.NotBetween: return ConditionalFormattingOperatorValues.NotBetween;
+                case XLCFOperator.Contains : return ConditionalFormattingOperatorValues.ContainsText;
+                case XLCFOperator.NotContains: return ConditionalFormattingOperatorValues.NotContains;
+                case XLCFOperator.StartsWith: return ConditionalFormattingOperatorValues.BeginsWith;
+                case XLCFOperator.EndsWith: return ConditionalFormattingOperatorValues.EndsWith;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static IconSetValues ToOpenXml(this XLIconSetStyle value)
+        {
+            switch (value)
+            {
+                case XLIconSetStyle.ThreeArrows: return IconSetValues.ThreeArrows;
+                case XLIconSetStyle.ThreeArrowsGray: return IconSetValues.ThreeArrowsGray;
+                case XLIconSetStyle.ThreeFlags: return IconSetValues.ThreeFlags;
+                case XLIconSetStyle.ThreeTrafficLights1: return IconSetValues.ThreeTrafficLights1;
+                case XLIconSetStyle.ThreeTrafficLights2: return IconSetValues.ThreeTrafficLights2;
+                case XLIconSetStyle.ThreeSigns: return IconSetValues.ThreeSigns;
+                case XLIconSetStyle.ThreeSymbols: return IconSetValues.ThreeSymbols;
+                case XLIconSetStyle.ThreeSymbols2: return IconSetValues.ThreeSymbols2;
+                case XLIconSetStyle.FourArrows: return IconSetValues.FourArrows;
+                case XLIconSetStyle.FourArrowsGray: return IconSetValues.FourArrowsGray;
+                case XLIconSetStyle.FourRedToBlack: return IconSetValues.FourRedToBlack;
+                case XLIconSetStyle.FourRating: return IconSetValues.FourRating;
+                case XLIconSetStyle.FourTrafficLights: return IconSetValues.FourTrafficLights;
+                case XLIconSetStyle.FiveArrows: return IconSetValues.FiveArrows;
+                case XLIconSetStyle.FiveArrowsGray: return IconSetValues.FiveArrowsGray;
+                case XLIconSetStyle.FiveRating: return IconSetValues.FiveRating;
+                case XLIconSetStyle.FiveQuarters: return IconSetValues.FiveQuarters;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        #endregion
+        #region To ClosedXml
+        public static XLFontUnderlineValues ToClosedXml(this UnderlineValues value)
+        {
+            switch (value)
+            {
+                case UnderlineValues.Double:
+                    return XLFontUnderlineValues.Double;
+                case UnderlineValues.DoubleAccounting:
+                    return XLFontUnderlineValues.DoubleAccounting;
+                case UnderlineValues.None:
+                    return XLFontUnderlineValues.None;
+                case UnderlineValues.Single:
+                    return XLFontUnderlineValues.Single;
+                case UnderlineValues.SingleAccounting:
+                    return XLFontUnderlineValues.SingleAccounting;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLPageOrientation ToClosedXml(this OrientationValues value)
+        {
+            switch (value)
+            {
+                case OrientationValues.Default:
+                    return XLPageOrientation.Default;
+                case OrientationValues.Landscape:
+                    return XLPageOrientation.Landscape;
+                case OrientationValues.Portrait:
+                    return XLPageOrientation.Portrait;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLFontVerticalTextAlignmentValues ToClosedXml(this VerticalAlignmentRunValues value)
+        {
+            switch (value)
+            {
+                case VerticalAlignmentRunValues.Baseline:
+                    return XLFontVerticalTextAlignmentValues.Baseline;
+                case VerticalAlignmentRunValues.Subscript:
+                    return XLFontVerticalTextAlignmentValues.Subscript;
+                case VerticalAlignmentRunValues.Superscript:
+                    return XLFontVerticalTextAlignmentValues.Superscript;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLFillPatternValues ToClosedXml(this PatternValues value)
+        {
+            switch (value)
+            {
+                case PatternValues.DarkDown:
+                    return XLFillPatternValues.DarkDown;
+                case PatternValues.DarkGray:
+                    return XLFillPatternValues.DarkGray;
+                case PatternValues.DarkGrid:
+                    return XLFillPatternValues.DarkGrid;
+                case PatternValues.DarkHorizontal:
+                    return XLFillPatternValues.DarkHorizontal;
+                case PatternValues.DarkTrellis:
+                    return XLFillPatternValues.DarkTrellis;
+                case PatternValues.DarkUp:
+                    return XLFillPatternValues.DarkUp;
+                case PatternValues.DarkVertical:
+                    return XLFillPatternValues.DarkVertical;
+                case PatternValues.Gray0625:
+                    return XLFillPatternValues.Gray0625;
+                case PatternValues.Gray125:
+                    return XLFillPatternValues.Gray125;
+                case PatternValues.LightDown:
+                    return XLFillPatternValues.LightDown;
+                case PatternValues.LightGray:
+                    return XLFillPatternValues.LightGray;
+                case PatternValues.LightGrid:
+                    return XLFillPatternValues.LightGrid;
+                case PatternValues.LightHorizontal:
+                    return XLFillPatternValues.LightHorizontal;
+                case PatternValues.LightTrellis:
+                    return XLFillPatternValues.LightTrellis;
+                case PatternValues.LightUp:
+                    return XLFillPatternValues.LightUp;
+                case PatternValues.LightVertical:
+                    return XLFillPatternValues.LightVertical;
+                case PatternValues.MediumGray:
+                    return XLFillPatternValues.MediumGray;
+                case PatternValues.None:
+                    return XLFillPatternValues.None;
+                case PatternValues.Solid:
+                    return XLFillPatternValues.Solid;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLBorderStyleValues ToClosedXml(this BorderStyleValues value)
+        {
+            switch (value)
+            {
+                case BorderStyleValues.DashDot:
+                    return XLBorderStyleValues.DashDot;
+                case BorderStyleValues.DashDotDot:
+                    return XLBorderStyleValues.DashDotDot;
+                case BorderStyleValues.Dashed:
+                    return XLBorderStyleValues.Dashed;
+                case BorderStyleValues.Dotted:
+                    return XLBorderStyleValues.Dotted;
+                case BorderStyleValues.Double:
+                    return XLBorderStyleValues.Double;
+                case BorderStyleValues.Hair:
+                    return XLBorderStyleValues.Hair;
+                case BorderStyleValues.Medium:
+                    return XLBorderStyleValues.Medium;
+                case BorderStyleValues.MediumDashDot:
+                    return XLBorderStyleValues.MediumDashDot;
+                case BorderStyleValues.MediumDashDotDot:
+                    return XLBorderStyleValues.MediumDashDotDot;
+                case BorderStyleValues.MediumDashed:
+                    return XLBorderStyleValues.MediumDashed;
+                case BorderStyleValues.None:
+                    return XLBorderStyleValues.None;
+                case BorderStyleValues.SlantDashDot:
+                    return XLBorderStyleValues.SlantDashDot;
+                case BorderStyleValues.Thick:
+                    return XLBorderStyleValues.Thick;
+                case BorderStyleValues.Thin:
+                    return XLBorderStyleValues.Thin;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLAlignmentHorizontalValues ToClosedXml(this HorizontalAlignmentValues value)
+        {
+            switch (value)
+            {
+                case HorizontalAlignmentValues.Center:
+                    return XLAlignmentHorizontalValues.Center;
+                case HorizontalAlignmentValues.CenterContinuous:
+                    return XLAlignmentHorizontalValues.CenterContinuous;
+                case HorizontalAlignmentValues.Distributed:
+                    return XLAlignmentHorizontalValues.Distributed;
+                case HorizontalAlignmentValues.Fill:
+                    return XLAlignmentHorizontalValues.Fill;
+                case HorizontalAlignmentValues.General:
+                    return XLAlignmentHorizontalValues.General;
+                case HorizontalAlignmentValues.Justify:
+                    return XLAlignmentHorizontalValues.Justify;
+                case HorizontalAlignmentValues.Left:
+                    return XLAlignmentHorizontalValues.Left;
+                case HorizontalAlignmentValues.Right:
+                    return XLAlignmentHorizontalValues.Right;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLAlignmentVerticalValues ToClosedXml(this VerticalAlignmentValues value)
+        {
+            switch (value)
+            {
+                case VerticalAlignmentValues.Bottom:
+                    return XLAlignmentVerticalValues.Bottom;
+                case VerticalAlignmentValues.Center:
+                    return XLAlignmentVerticalValues.Center;
+                case VerticalAlignmentValues.Distributed:
+                    return XLAlignmentVerticalValues.Distributed;
+                case VerticalAlignmentValues.Justify:
+                    return XLAlignmentVerticalValues.Justify;
+                case VerticalAlignmentValues.Top:
+                    return XLAlignmentVerticalValues.Top;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLPageOrderValues ToClosedXml(this PageOrderValues value)
+        {
+            switch (value)
+            {
+                case PageOrderValues.DownThenOver:
+                    return XLPageOrderValues.DownThenOver;
+                case PageOrderValues.OverThenDown:
+                    return XLPageOrderValues.OverThenDown;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLShowCommentsValues ToClosedXml(this CellCommentsValues value)
+        {
+            switch (value)
+            {
+                case CellCommentsValues.AsDisplayed:
+                    return XLShowCommentsValues.AsDisplayed;
+                case CellCommentsValues.AtEnd:
+                    return XLShowCommentsValues.AtEnd;
+                case CellCommentsValues.None:
+                    return XLShowCommentsValues.None;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLPrintErrorValues ToClosedXml(this PrintErrorValues value)
+        {
+            switch (value)
+            {
+                case PrintErrorValues.Blank:
+                    return XLPrintErrorValues.Blank;
+                case PrintErrorValues.Dash:
+                    return XLPrintErrorValues.Dash;
+                case PrintErrorValues.Displayed:
+                    return XLPrintErrorValues.Displayed;
+                case PrintErrorValues.NA:
+                    return XLPrintErrorValues.NA;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLCalculateMode ToClosedXml(this CalculateModeValues value)
+        {
+            switch (value)
+            {
+                case CalculateModeValues.Auto:
+                    return XLCalculateMode.Auto;
+                case CalculateModeValues.AutoNoTable:
+                    return XLCalculateMode.AutoNoTable;
+                case CalculateModeValues.Manual:
+                    return XLCalculateMode.Manual;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLReferenceStyle ToClosedXml(this ReferenceModeValues value)
+        {
+            switch (value)
+            {
+                case ReferenceModeValues.R1C1:
+                    return XLReferenceStyle.R1C1;
+                case ReferenceModeValues.A1:
+                    return XLReferenceStyle.A1;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLAlignmentReadingOrderValues ToClosedXml(this uint value)
+        {
+            switch (value)
+            {
+                case 0:
+                    return XLAlignmentReadingOrderValues.ContextDependent;
+                case 1:
+                    return XLAlignmentReadingOrderValues.LeftToRight;
+                case 2:
+                    return XLAlignmentReadingOrderValues.RightToLeft;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLTotalsRowFunction ToClosedXml(this TotalsRowFunctionValues value)
+        {
+            switch (value)
+            {
+                case TotalsRowFunctionValues.None:
+                    return XLTotalsRowFunction.None;
+                case TotalsRowFunctionValues.Sum:
+                    return XLTotalsRowFunction.Sum;
+                case TotalsRowFunctionValues.Minimum:
+                    return XLTotalsRowFunction.Minimum;
+                case TotalsRowFunctionValues.Maximum:
+                    return XLTotalsRowFunction.Maximum;
+                case TotalsRowFunctionValues.Average:
+                    return XLTotalsRowFunction.Average;
+                case TotalsRowFunctionValues.Count:
+                    return XLTotalsRowFunction.Count;
+                case TotalsRowFunctionValues.CountNumbers:
+                    return XLTotalsRowFunction.CountNumbers;
+                case TotalsRowFunctionValues.StandardDeviation:
+                    return XLTotalsRowFunction.StandardDeviation;
+                case TotalsRowFunctionValues.Variance:
+                    return XLTotalsRowFunction.Variance;
+                case TotalsRowFunctionValues.Custom:
+                    return XLTotalsRowFunction.Custom;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLAllowedValues ToClosedXml(this DataValidationValues value)
+        {
+            switch (value)
+            {
+                case DataValidationValues.None:
+                    return XLAllowedValues.AnyValue;
+                case DataValidationValues.Custom:
+                    return XLAllowedValues.Custom;
+                case DataValidationValues.Date:
+                    return XLAllowedValues.Date;
+                case DataValidationValues.Decimal:
+                    return XLAllowedValues.Decimal;
+                case DataValidationValues.List:
+                    return XLAllowedValues.List;
+                case DataValidationValues.TextLength:
+                    return XLAllowedValues.TextLength;
+                case DataValidationValues.Time:
+                    return XLAllowedValues.Time;
+                case DataValidationValues.Whole:
+                    return XLAllowedValues.WholeNumber;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLErrorStyle ToClosedXml(this DataValidationErrorStyleValues value)
+        {
+            switch (value)
+            {
+                case DataValidationErrorStyleValues.Information:
+                    return XLErrorStyle.Information;
+                case DataValidationErrorStyleValues.Warning:
+                    return XLErrorStyle.Warning;
+                case DataValidationErrorStyleValues.Stop:
+                    return XLErrorStyle.Stop;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLOperator ToClosedXml(this DataValidationOperatorValues value)
+        {
+            switch (value)
+            {
+                case DataValidationOperatorValues.Between:
+                    return XLOperator.Between;
+                case DataValidationOperatorValues.GreaterThanOrEqual:
+                    return XLOperator.EqualOrGreaterThan;
+                case DataValidationOperatorValues.LessThanOrEqual:
+                    return XLOperator.EqualOrLessThan;
+                case DataValidationOperatorValues.Equal:
+                    return XLOperator.EqualTo;
+                case DataValidationOperatorValues.GreaterThan:
+                    return XLOperator.GreaterThan;
+                case DataValidationOperatorValues.LessThan:
+                    return XLOperator.LessThan;
+                case DataValidationOperatorValues.NotBetween:
+                    return XLOperator.NotBetween;
+                case DataValidationOperatorValues.NotEqual:
+                    return XLOperator.NotEqualTo;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLWorksheetVisibility ToClosedXml(this SheetStateValues value)
+        {
+            switch (value)
+            {
+                case SheetStateValues.Visible:
+                    return XLWorksheetVisibility.Visible;
+                case SheetStateValues.Hidden:
+                    return XLWorksheetVisibility.Hidden;
+                case SheetStateValues.VeryHidden:
+                    return XLWorksheetVisibility.VeryHidden;
+                    #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                    #endregion
+            }
+        }
+        public static XLPhoneticAlignment ToClosedXml(this PhoneticAlignmentValues value)
+        {
+            switch (value)
+            {
+                case PhoneticAlignmentValues.Center:
+                    return XLPhoneticAlignment.Center;
+                case PhoneticAlignmentValues.Distributed:
+                    return XLPhoneticAlignment.Distributed;
+                case PhoneticAlignmentValues.Left:
+                    return XLPhoneticAlignment.Left;
+                case PhoneticAlignmentValues.NoControl:
+                    return XLPhoneticAlignment.NoControl;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLPhoneticType ToClosedXml(this PhoneticValues value)
+        {
+            switch (value)
+            {
+                case PhoneticValues.FullWidthKatakana: return XLPhoneticType.FullWidthKatakana;
+                case PhoneticValues.HalfWidthKatakana:
+                    return XLPhoneticType.HalfWidthKatakana;
+                case PhoneticValues.Hiragana:
+                    return XLPhoneticType.Hiragana;
+                case PhoneticValues.NoConversion:
+                    return XLPhoneticType.NoConversion;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLPivotSummary ToClosedXml(this DataConsolidateFunctionValues value)
+        {
+            switch (value)
+            {
+                case DataConsolidateFunctionValues.Sum: return XLPivotSummary.Sum;
+                case DataConsolidateFunctionValues.Count: return XLPivotSummary.Count;
+                case DataConsolidateFunctionValues.Average: return XLPivotSummary.Average;
+                case DataConsolidateFunctionValues.Minimum: return XLPivotSummary.Minimum;
+                case DataConsolidateFunctionValues.Maximum: return XLPivotSummary.Maximum;
+                case DataConsolidateFunctionValues.Product: return XLPivotSummary.Product;
+                case DataConsolidateFunctionValues.CountNumbers: return XLPivotSummary.CountNumbers;
+                case DataConsolidateFunctionValues.StandardDeviation: return XLPivotSummary.StandardDeviation;
+                case DataConsolidateFunctionValues.StandardDeviationP: return XLPivotSummary.PopulationStandardDeviation;
+                case DataConsolidateFunctionValues.Variance: return XLPivotSummary.Variance;
+                case DataConsolidateFunctionValues.VarianceP: return XLPivotSummary.PopulationVariance;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLPivotCalculation ToClosedXml(this ShowDataAsValues value)
+        {
+            switch (value)
+            {
+                case ShowDataAsValues.Normal: return XLPivotCalculation.Normal;
+                case ShowDataAsValues.Difference: return XLPivotCalculation.DifferenceFrom;
+                case ShowDataAsValues.Percent: return XLPivotCalculation.PctOf;
+                case ShowDataAsValues.PercentageDifference: return XLPivotCalculation.PctDifferenceFrom;
+                case ShowDataAsValues.RunTotal: return XLPivotCalculation.RunningTotal;
+                case ShowDataAsValues.PercentOfRaw: return XLPivotCalculation.PctOfRow; // There's a typo in the OpenXML SDK =)
+                case ShowDataAsValues.PercentOfColumn: return XLPivotCalculation.PctOfColumn;
+                case ShowDataAsValues.PercentOfTotal: return XLPivotCalculation.PctOfTotal;
+                case ShowDataAsValues.Index: return XLPivotCalculation.Index;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLFilterOperator ToClosedXml(this FilterOperatorValues value)
+        {
+            switch (value)
+            {
+                case FilterOperatorValues.Equal: return XLFilterOperator.Equal;
+                case FilterOperatorValues.NotEqual: return XLFilterOperator.NotEqual;
+                case FilterOperatorValues.GreaterThan: return XLFilterOperator.GreaterThan;
+                case FilterOperatorValues.LessThan: return XLFilterOperator.LessThan;
+                case FilterOperatorValues.GreaterThanOrEqual: return XLFilterOperator.EqualOrGreaterThan;
+                case FilterOperatorValues.LessThanOrEqual: return XLFilterOperator.EqualOrLessThan;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLFilterDynamicType ToClosedXml(this DynamicFilterValues value)
+        {
+            switch (value)
+            {
+                case DynamicFilterValues.AboveAverage: return XLFilterDynamicType.AboveAverage;
+                case DynamicFilterValues.BelowAverage: return XLFilterDynamicType.BelowAverage;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLSheetViewOptions ToClosedXml(this SheetViewValues value)
+        {
+            switch (value)
+            {
+                case SheetViewValues.Normal: return XLSheetViewOptions.Normal;
+                case SheetViewValues.PageBreakPreview: return XLSheetViewOptions.PageBreakPreview;
+                case SheetViewValues.PageLayout: return XLSheetViewOptions.PageLayout;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLLineStyle ToClosedXml(this StrokeLineStyleValues value)
+        {
+            switch (value)
+            {
+                case StrokeLineStyleValues.Single: return XLLineStyle.Single;
+                case StrokeLineStyleValues.ThickBetweenThin: return XLLineStyle.ThickBetweenThin;
+                case StrokeLineStyleValues.ThickThin: return XLLineStyle.ThickThin;
+                case StrokeLineStyleValues.ThinThick: return XLLineStyle.ThinThick;
+                case StrokeLineStyleValues.ThinThin: return XLLineStyle.ThinThin;
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLConditionalFormatType ToClosedXml(this ConditionalFormatValues value)
+        {
+            switch (value)
+            {
+                case ConditionalFormatValues.Expression: return XLConditionalFormatType.Expression;
+                case ConditionalFormatValues.CellIs: return XLConditionalFormatType.CellIs;
+                case ConditionalFormatValues.ColorScale: return XLConditionalFormatType.ColorScale;
+                case ConditionalFormatValues.DataBar: return XLConditionalFormatType.DataBar;
+                case ConditionalFormatValues.IconSet: return XLConditionalFormatType.IconSet;
+                case ConditionalFormatValues.Top10: return XLConditionalFormatType.Top10;
+                case ConditionalFormatValues.UniqueValues: return XLConditionalFormatType.IsUnique;
+                case ConditionalFormatValues.DuplicateValues: return XLConditionalFormatType.IsDuplicate;
+                case ConditionalFormatValues.ContainsText: return XLConditionalFormatType.ContainsText;
+                case ConditionalFormatValues.NotContainsText: return XLConditionalFormatType.NotContainsText;
+                case ConditionalFormatValues.BeginsWith: return XLConditionalFormatType.StartsWith;
+                case ConditionalFormatValues.EndsWith: return XLConditionalFormatType.EndsWith;
+                case ConditionalFormatValues.ContainsBlanks: return XLConditionalFormatType.IsBlank;
+                case ConditionalFormatValues.NotContainsBlanks: return XLConditionalFormatType.NotBlank;
+                case ConditionalFormatValues.ContainsErrors: return XLConditionalFormatType.IsError;
+                case ConditionalFormatValues.NotContainsErrors: return XLConditionalFormatType.NotError;
+                case ConditionalFormatValues.TimePeriod: return XLConditionalFormatType.TimePeriod;
+                case ConditionalFormatValues.AboveAverage: return XLConditionalFormatType.AboveAverage;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLCFContentType ToClosedXml(this ConditionalFormatValueObjectValues value)
+        {
+            switch (value)
+            {
+                case ConditionalFormatValueObjectValues.Number: return XLCFContentType.Number;
+                case ConditionalFormatValueObjectValues.Percent: return XLCFContentType.Percent;
+                case ConditionalFormatValueObjectValues.Max: return XLCFContentType.Maximum;
+                case ConditionalFormatValueObjectValues.Min: return XLCFContentType.Minimum;
+                case ConditionalFormatValueObjectValues.Formula: return XLCFContentType.Formula;
+                case ConditionalFormatValueObjectValues.Percentile: return XLCFContentType.Percentile;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        public static XLCFOperator ToClosedXml(this ConditionalFormattingOperatorValues value)
+        {
+            switch (value)
+            {
+                case ConditionalFormattingOperatorValues.LessThan: return XLCFOperator.LessThan;
+                case ConditionalFormattingOperatorValues.LessThanOrEqual: return XLCFOperator.EqualOrLessThan;
+                case ConditionalFormattingOperatorValues.Equal: return XLCFOperator.Equal;
+                case ConditionalFormattingOperatorValues.NotEqual: return XLCFOperator.NotEqual;
+                case ConditionalFormattingOperatorValues.GreaterThanOrEqual: return XLCFOperator.EqualOrGreaterThan;
+                case ConditionalFormattingOperatorValues.GreaterThan: return XLCFOperator.GreaterThan;
+                case ConditionalFormattingOperatorValues.Between: return XLCFOperator.Between;
+                case ConditionalFormattingOperatorValues.NotBetween: return XLCFOperator.NotBetween;
+                case ConditionalFormattingOperatorValues.ContainsText: return XLCFOperator.Contains;
+                case ConditionalFormattingOperatorValues.NotContains: return XLCFOperator.NotContains;
+                case ConditionalFormattingOperatorValues.BeginsWith: return XLCFOperator.StartsWith;
+                case ConditionalFormattingOperatorValues.EndsWith: return XLCFOperator.EndsWith;
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+
+        public static XLIconSetStyle ToClosedXml(this IconSetValues value)
+        {
+            switch (value)
+            {
+                case IconSetValues.ThreeArrows: return XLIconSetStyle.ThreeArrows;
+                case IconSetValues.ThreeArrowsGray: return XLIconSetStyle.ThreeArrowsGray;
+                case IconSetValues.ThreeFlags: return XLIconSetStyle.ThreeFlags;
+                case IconSetValues.ThreeTrafficLights1: return XLIconSetStyle.ThreeTrafficLights1;
+                case IconSetValues.ThreeTrafficLights2: return XLIconSetStyle.ThreeTrafficLights2;
+                case IconSetValues.ThreeSigns: return XLIconSetStyle.ThreeSigns;
+                case IconSetValues.ThreeSymbols: return XLIconSetStyle.ThreeSymbols;
+                case IconSetValues.ThreeSymbols2: return XLIconSetStyle.ThreeSymbols2;
+                case IconSetValues.FourArrows: return XLIconSetStyle.FourArrows;
+                case IconSetValues.FourArrowsGray: return XLIconSetStyle.FourArrowsGray;
+                case IconSetValues.FourRedToBlack: return XLIconSetStyle.FourRedToBlack;
+                case IconSetValues.FourRating: return XLIconSetStyle.FourRating;
+                case IconSetValues.FourTrafficLights: return XLIconSetStyle.FourTrafficLights;
+                case IconSetValues.FiveArrows: return XLIconSetStyle.FiveArrows;
+                case IconSetValues.FiveArrowsGray: return XLIconSetStyle.FiveArrowsGray;
+                case IconSetValues.FiveRating: return XLIconSetStyle.FiveRating;
+                case IconSetValues.FiveQuarters: return XLIconSetStyle.FiveQuarters;
+
+
+                #region default
+                default:
+                    throw new ApplicationException("Not implemented value!");
+                #endregion
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Hyperlinks/IXLHyperlinks.cs b/ClosedXML/Excel/Hyperlinks/IXLHyperlinks.cs
new file mode 100644
index 0000000..2fd3b44
--- /dev/null
+++ b/ClosedXML/Excel/Hyperlinks/IXLHyperlinks.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLHyperlinks: IEnumerable<XLHyperlink>
+    {
+        void Add(XLHyperlink hyperlink);
+        void Delete(XLHyperlink hyperlink);
+        void Delete(IXLAddress address);
+        
+    }
+}
diff --git a/ClosedXML/Excel/Hyperlinks/XLHyperlink_Internal.cs b/ClosedXML/Excel/Hyperlinks/XLHyperlink_Internal.cs
new file mode 100644
index 0000000..db4f36b
--- /dev/null
+++ b/ClosedXML/Excel/Hyperlinks/XLHyperlink_Internal.cs
@@ -0,0 +1,67 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public partial class XLHyperlink
+    {
+        internal XLHyperlink()
+        { 
+
+        }
+
+        internal XLHyperlink(XLHyperlink hyperlink)
+        {
+            _externalAddress = hyperlink._externalAddress;
+            _internalAddress = hyperlink._internalAddress;
+            Tooltip = hyperlink.Tooltip;
+            IsExternal = hyperlink.IsExternal;
+        }
+
+        internal void SetValues(String address, String tooltip)
+        {
+            Tooltip = tooltip;
+            if (address[0] == '.')
+            {
+                _externalAddress = new Uri(address, UriKind.Relative);
+                IsExternal = true;
+            }
+            else
+            {
+                Uri uri;
+                if(Uri.TryCreate(address, UriKind.Absolute, out uri))
+                {
+                    _externalAddress = uri;
+                    IsExternal = true;
+                }
+                else
+                {
+                    _internalAddress = address;
+                    IsExternal = false;    
+                }
+            }
+        }
+
+        internal void SetValues(Uri uri, String tooltip)
+        {
+            Tooltip = tooltip;
+            _externalAddress = uri;
+            IsExternal = true;
+        }
+
+        internal void SetValues(IXLCell cell, String tooltip)
+        {
+            Tooltip = tooltip;
+            _internalAddress = cell.Address.ToString();
+            IsExternal = false;
+        }
+
+        internal void SetValues(IXLRangeBase range, String tooltip)
+        {
+            Tooltip = tooltip;
+            _internalAddress = range.RangeAddress.ToString();
+            IsExternal = false;
+        }
+
+        internal XLWorksheet Worksheet { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Hyperlinks/XLHyperlink_public.cs b/ClosedXML/Excel/Hyperlinks/XLHyperlink_public.cs
new file mode 100644
index 0000000..3f0dab5
--- /dev/null
+++ b/ClosedXML/Excel/Hyperlinks/XLHyperlink_public.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    public partial class XLHyperlink
+    {
+        private Uri _externalAddress;
+        private String _internalAddress;
+
+        public XLHyperlink(String address)
+        {
+            SetValues(address, String.Empty);
+        }
+
+        public XLHyperlink(String address, String tooltip)
+        {
+            SetValues(address, tooltip);
+        }
+
+        public XLHyperlink(IXLCell cell)
+        {
+            SetValues(cell, String.Empty);
+        }
+
+        public XLHyperlink(IXLCell cell, String tooltip)
+        {
+            SetValues(cell, tooltip);
+        }
+
+        public XLHyperlink(IXLRangeBase range)
+        {
+            SetValues(range, String.Empty);
+        }
+
+        public XLHyperlink(IXLRangeBase range, String tooltip)
+        {
+            SetValues(range, tooltip);
+        }
+
+        public XLHyperlink(Uri uri)
+        {
+            SetValues(uri, String.Empty);
+        }
+
+        public XLHyperlink(Uri uri, String tooltip)
+        {
+            SetValues(uri, tooltip);
+        }
+
+        public Boolean IsExternal { get; set; }
+
+        public Uri ExternalAddress
+        {
+            get
+            {
+                return IsExternal ? _externalAddress : null;
+            }
+            set
+            {
+                _externalAddress = value;
+                IsExternal = true;
+            }
+        }
+
+        public IXLCell Cell { get; internal set; }
+
+        public String InternalAddress
+        {
+            get
+            {
+                if (IsExternal)
+                    return null;
+                if (_internalAddress.Contains('!'))
+                {
+                    return _internalAddress[0] != '\''
+                               ? String.Format("'{0}'!{1}", _internalAddress.Substring(0, _internalAddress.IndexOf('!')),
+                                               _internalAddress.Substring(_internalAddress.IndexOf('!') + 1))
+                               : _internalAddress;
+                }
+                return String.Format("'{0}'!{1}", Worksheet.Name, _internalAddress);
+            }
+            set
+            {
+                _internalAddress = value;
+                IsExternal = false;
+            }
+        }
+
+        public String Tooltip { get; set; }
+
+        public void Delete()
+        {
+            if (Cell == null) return;
+            Worksheet.Hyperlinks.Delete(Cell.Address);
+            if (Cell.Style.Font.FontColor.Equals(XLColor.FromTheme(XLThemeColor.Hyperlink)))
+                Cell.Style.Font.FontColor = Worksheet.Style.Font.FontColor;
+
+            Cell.Style.Font.Underline = Worksheet.Style.Font.Underline;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Hyperlinks/XLHyperlinks.cs b/ClosedXML/Excel/Hyperlinks/XLHyperlinks.cs
new file mode 100644
index 0000000..8d980da
--- /dev/null
+++ b/ClosedXML/Excel/Hyperlinks/XLHyperlinks.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    internal class XLHyperlinks: IXLHyperlinks
+    {
+        private Dictionary<IXLAddress, XLHyperlink> hyperlinks = new Dictionary<IXLAddress, XLHyperlink>();
+        public IEnumerator<XLHyperlink> GetEnumerator()
+        {
+            return hyperlinks.Values.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public void Add(XLHyperlink hyperlink)
+        {
+            hyperlinks.Add(hyperlink.Cell.Address, hyperlink);
+        }
+
+        public void Delete(XLHyperlink hyperlink)
+        {
+            hyperlinks.Remove(hyperlink.Cell.Address);
+        }
+
+        public void Delete(IXLAddress address)
+        {
+            hyperlinks.Remove(address);
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/IXLOutline.cs b/ClosedXML/Excel/IXLOutline.cs
new file mode 100644
index 0000000..aae00ee
--- /dev/null
+++ b/ClosedXML/Excel/IXLOutline.cs
@@ -0,0 +1,11 @@
+
+namespace ClosedXML.Excel
+{
+    public enum XLOutlineSummaryVLocation { Top, Bottom };
+    public enum XLOutlineSummaryHLocation { Left, Right };
+    public interface IXLOutline
+    {
+        XLOutlineSummaryVLocation SummaryVLocation { get; set; }
+        XLOutlineSummaryHLocation SummaryHLocation { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/IXLSheetProtection.cs b/ClosedXML/Excel/IXLSheetProtection.cs
new file mode 100644
index 0000000..149ae06
--- /dev/null
+++ b/ClosedXML/Excel/IXLSheetProtection.cs
@@ -0,0 +1,46 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLSheetProtection
+    {
+        Boolean Protected { get; set; }
+
+        Boolean AutoFilter { get; set; }
+        Boolean DeleteColumns { get; set; }
+        Boolean DeleteRows { get; set; }
+        Boolean FormatCells { get; set; }
+        Boolean FormatColumns { get; set; }
+        Boolean FormatRows { get; set; }
+        Boolean InsertColumns { get; set; }
+        Boolean InsertHyperlinks { get; set; }
+        Boolean InsertRows { get; set; }
+        Boolean Objects { get; set; }
+        Boolean PivotTables { get; set; }
+        Boolean Scenarios { get; set; }
+        Boolean SelectLockedCells { get; set; }
+        Boolean SelectUnlockedCells { get; set; }
+        Boolean Sort { get; set; }
+
+        IXLSheetProtection SetAutoFilter(); IXLSheetProtection SetAutoFilter(Boolean value);
+        IXLSheetProtection SetDeleteColumns(); IXLSheetProtection SetDeleteColumns(Boolean value);
+        IXLSheetProtection SetDeleteRows(); IXLSheetProtection SetDeleteRows(Boolean value);
+        IXLSheetProtection SetFormatCells(); IXLSheetProtection SetFormatCells(Boolean value);
+        IXLSheetProtection SetFormatColumns(); IXLSheetProtection SetFormatColumns(Boolean value);
+        IXLSheetProtection SetFormatRows(); IXLSheetProtection SetFormatRows(Boolean value);
+        IXLSheetProtection SetInsertColumns(); IXLSheetProtection SetInsertColumns(Boolean value);
+        IXLSheetProtection SetInsertHyperlinks(); IXLSheetProtection SetInsertHyperlinks(Boolean value);
+        IXLSheetProtection SetInsertRows(); IXLSheetProtection SetInsertRows(Boolean value);
+        IXLSheetProtection SetObjects(); IXLSheetProtection SetObjects(Boolean value);
+        IXLSheetProtection SetPivotTables(); IXLSheetProtection SetPivotTables(Boolean value);
+        IXLSheetProtection SetScenarios(); IXLSheetProtection SetScenarios(Boolean value);
+        IXLSheetProtection SetSelectLockedCells(); IXLSheetProtection SetSelectLockedCells(Boolean value);
+        IXLSheetProtection SetSelectUnlockedCells(); IXLSheetProtection SetSelectUnlockedCells(Boolean value);
+        IXLSheetProtection SetSort(); IXLSheetProtection SetSort(Boolean value);
+
+        IXLSheetProtection Protect();
+        IXLSheetProtection Protect(String password);
+        IXLSheetProtection Unprotect();
+        IXLSheetProtection Unprotect(String password);
+    }
+}
diff --git a/ClosedXML/Excel/IXLSheetView.cs b/ClosedXML/Excel/IXLSheetView.cs
new file mode 100644
index 0000000..eee1ed0
--- /dev/null
+++ b/ClosedXML/Excel/IXLSheetView.cs
@@ -0,0 +1,38 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLSheetViewOptions { Normal, PageBreakPreview, PageLayout }
+    public interface IXLSheetView
+    {
+        /// <summary>
+        /// Gets or sets the row after which the vertical split should take place.
+        /// </summary>
+        Int32 SplitRow { get; set; }
+        /// <summary>
+        /// Gets or sets the column after which the horizontal split should take place.
+        /// </summary>
+        Int32 SplitColumn { get; set; }
+        //Boolean FreezePanes { get; set; }
+        /// <summary>
+        /// Freezes the top X rows.
+        /// </summary>
+        /// <param name="rows">The rows to freeze.</param>
+        void FreezeRows(Int32 rows);
+        /// <summary>
+        /// Freezes the left X columns.
+        /// </summary>
+        /// <param name="columns">The columns to freeze.</param>
+        void FreezeColumns(Int32 columns);
+        /// <summary>
+        /// Freezes the specified rows and columns.
+        /// </summary>
+        /// <param name="rows">The rows to freeze.</param>
+        /// <param name="columns">The columns to freeze.</param>
+        void Freeze(Int32 rows, Int32 columns);
+
+        XLSheetViewOptions View { get; set; }
+
+        IXLSheetView SetView(XLSheetViewOptions value);
+    }
+}
diff --git a/ClosedXML/Excel/IXLTheme.cs b/ClosedXML/Excel/IXLTheme.cs
new file mode 100644
index 0000000..b4daa78
--- /dev/null
+++ b/ClosedXML/Excel/IXLTheme.cs
@@ -0,0 +1,19 @@
+
+namespace ClosedXML.Excel
+{
+    public interface IXLTheme
+    {
+        XLColor Background1 { get; set; }
+        XLColor Text1 { get; set; }
+        XLColor Background2 { get; set; }
+        XLColor Text2 { get; set; }
+        XLColor Accent1 { get; set; }
+        XLColor Accent2 { get; set; }
+        XLColor Accent3 { get; set; }
+        XLColor Accent4 { get; set; }
+        XLColor Accent5 { get; set; }
+        XLColor Accent6 { get; set; }
+        XLColor Hyperlink { get; set; }
+        XLColor FollowedHyperlink { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/IXLWorksheet.cs b/ClosedXML/Excel/IXLWorksheet.cs
new file mode 100644
index 0000000..0d9dcd6
--- /dev/null
+++ b/ClosedXML/Excel/IXLWorksheet.cs
@@ -0,0 +1,372 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLWorksheetVisibility { Visible, Hidden, VeryHidden }
+    public interface IXLWorksheet : IXLRangeBase
+    {
+        /// <summary>
+        /// Gets the workbook that contains this worksheet
+        /// </summary>
+        XLWorkbook Workbook { get; }
+
+        /// <summary>
+        /// Gets or sets the default column width for this worksheet.
+        /// </summary>
+        Double ColumnWidth { get; set; }
+        /// <summary>
+        /// Gets or sets the default row height for this worksheet.
+        /// </summary>
+        Double RowHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name (caption) of this worksheet.
+        /// </summary>
+        String Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position of the sheet.
+        /// <para>When setting the Position all other sheets' positions are shifted accordingly.</para>
+        /// </summary>
+        Int32 Position { get; set; }
+
+        /// <summary>
+        /// Gets an object to manipulate the sheet's print options.
+        /// </summary>
+        IXLPageSetup PageSetup { get; }
+        /// <summary>
+        /// Gets an object to manipulate the Outline levels.
+        /// </summary>
+        IXLOutline Outline { get; }
+
+        /// <summary>
+        /// Gets the first row of the worksheet.
+        /// </summary>
+        IXLRow FirstRow();
+        /// <summary>
+        /// Gets the first row of the worksheet that contains a cell with a value.
+        /// <para>Formatted empty cells do not count.</para>
+        /// </summary>
+        IXLRow FirstRowUsed();
+        /// <summary>
+        /// Gets the first row of the worksheet that contains a cell with a value.
+        /// </summary>
+        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
+        IXLRow FirstRowUsed(Boolean includeFormats);
+        /// <summary>
+        /// Gets the last row of the worksheet.
+        /// </summary>
+        IXLRow LastRow();
+        /// <summary>
+        /// Gets the last row of the worksheet that contains a cell with a value.
+        /// </summary>
+        IXLRow LastRowUsed();
+        /// <summary>
+        /// Gets the last row of the worksheet that contains a cell with a value.
+        /// </summary>
+        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
+        IXLRow LastRowUsed(Boolean includeFormats);
+        /// <summary>
+        /// Gets the first column of the worksheet.
+        /// </summary>
+        IXLColumn FirstColumn();
+        /// <summary>
+        /// Gets the first column of the worksheet that contains a cell with a value.
+        /// </summary>
+        IXLColumn FirstColumnUsed();
+        /// <summary>
+        /// Gets the first column of the worksheet that contains a cell with a value.
+        /// </summary>
+        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
+        IXLColumn FirstColumnUsed(Boolean includeFormats);
+        /// <summary>
+        /// Gets the last column of the worksheet.
+        /// </summary>
+        IXLColumn LastColumn();
+        /// <summary>
+        /// Gets the last column of the worksheet that contains a cell with a value.
+        /// </summary>
+        IXLColumn LastColumnUsed();
+        /// <summary>
+        /// Gets the last column of the worksheet that contains a cell with a value.
+        /// </summary>
+        /// <param name="includeFormats">If set to <c>true</c> formatted empty cells will count as used.</param>
+        IXLColumn LastColumnUsed(Boolean includeFormats);
+        /// <summary>
+        /// Gets a collection of all columns in this worksheet.
+        /// </summary>
+        IXLColumns Columns();
+        /// <summary>
+        /// Gets a collection of the specified columns in this worksheet, separated by commas.
+        /// <para>e.g. Columns("G:H"), Columns("10:11,13:14"), Columns("P:Q,S:T"), Columns("V")</para>
+        /// </summary>
+        /// <param name="columns">The columns to return.</param>
+        IXLColumns Columns(String columns);
+        /// <summary>
+        /// Gets a collection of the specified columns in this worksheet.
+        /// </summary>
+        /// <param name="firstColumn">The first column to return.</param>
+        /// <param name="lastColumn">The last column to return.</param>
+        IXLColumns Columns(String firstColumn, String lastColumn);
+        /// <summary>
+        /// Gets a collection of the specified columns in this worksheet.
+        /// </summary>
+        /// <param name="firstColumn">The first column to return.</param>
+        /// <param name="lastColumn">The last column to return.</param>
+        IXLColumns Columns(Int32 firstColumn, Int32 lastColumn);
+        /// <summary>
+        /// Gets a collection of all rows in this worksheet.
+        /// </summary>
+        IXLRows Rows();
+        /// <summary>
+        /// Gets a collection of the specified rows in this worksheet, separated by commas.
+        /// <para>e.g. Rows("4:5"), Rows("7:8,10:11"), Rows("13")</para>
+        /// </summary>
+        /// <param name="rows">The rows to return.</param>
+        IXLRows Rows(String rows);
+        /// <summary>
+        /// Gets a collection of the specified rows in this worksheet.
+        /// </summary>
+        /// <param name="firstRow">The first row to return.</param>
+        /// <param name="lastRow">The last row to return.</param>
+        /// <returns></returns>
+        IXLRows Rows(Int32 firstRow, Int32 lastRow);
+        /// <summary>
+        /// Gets the specified row of the worksheet.
+        /// </summary>
+        /// <param name="row">The worksheet's row.</param>
+        IXLRow Row(Int32 row);
+        /// <summary>
+        /// Gets the specified column of the worksheet.
+        /// </summary>
+        /// <param name="column">The worksheet's column.</param>
+        IXLColumn Column(Int32 column);
+        /// <summary>
+        /// Gets the specified column of the worksheet.
+        /// </summary>
+        /// <param name="column">The worksheet's column.</param>
+        IXLColumn Column(String column);
+        /// <summary>
+        /// Gets the cell at the specified row and column.
+        /// </summary>
+        /// <param name="row">The cell's row.</param>
+        /// <param name="column">The cell's column.</param>
+        IXLCell Cell(int row, int column);
+        /// <summary>Gets the cell at the specified address.</summary>
+        /// <param name="cellAddressInRange">The cell address in the worksheet.</param>
+        IXLCell Cell(string cellAddressInRange);
+        /// <summary>
+        /// Gets the cell at the specified row and column.
+        /// </summary>
+        /// <param name="row">The cell's row.</param>
+        /// <param name="column">The cell's column.</param>
+        IXLCell Cell(int row, string column);
+        /// <summary>Gets the cell at the specified address.</summary>
+        /// <param name="cellAddressInRange">The cell address in the worksheet.</param>
+        IXLCell Cell(IXLAddress cellAddressInRange);
+
+        /// <summary>
+        /// Returns the specified range.
+        /// </summary>
+        /// <param name="rangeAddress">The range boundaries.</param>
+        IXLRange Range(IXLRangeAddress rangeAddress);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <para>e.g. Range("A1"), Range("A1:C2")</para>
+        /// <param name="rangeAddress">The range boundaries.</param>
+        IXLRange Range(string rangeAddress);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCell">The first cell in the range.</param>
+        /// <param name="lastCell"> The last cell in the range.</param>
+        IXLRange Range(IXLCell firstCell, IXLCell lastCell);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCellAddress">The first cell address in the worksheet.</param>
+        /// <param name="lastCellAddress"> The last cell address in the worksheet.</param>
+        IXLRange Range(string firstCellAddress, string lastCellAddress);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCellAddress">The first cell address in the worksheet.</param>
+        /// <param name="lastCellAddress"> The last cell address in the worksheet.</param>
+        IXLRange Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress);
+
+        /// <summary>Returns a collection of ranges, separated by commas.</summary>
+        /// <para>e.g. Ranges("A1"), Ranges("A1:C2"), Ranges("A1:B2,D1:D4")</para>
+        /// <param name="ranges">The ranges to return.</param>
+        IXLRanges Ranges(string ranges);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCellRow">   The first cell's row of the range to return.</param>
+        /// <param name="firstCellColumn">The first cell's column of the range to return.</param>
+        /// <param name="lastCellRow">    The last cell's row of the range to return.</param>
+        /// <param name="lastCellColumn"> The last cell's column of the range to return.</param>
+        /// <returns>.</returns>
+        IXLRange Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn);
+
+        /// <summary>Gets the number of rows in this worksheet.</summary>
+        int RowCount();
+
+        /// <summary>Gets the number of columns in this worksheet.</summary>
+        int ColumnCount();
+
+        /// <summary>
+        /// Collapses all outlined rows.
+        /// </summary>
+        IXLWorksheet CollapseRows();
+        /// <summary>
+        /// Collapses all outlined columns.
+        /// </summary>
+        IXLWorksheet CollapseColumns();
+        /// <summary>
+        /// Expands all outlined rows.
+        /// </summary>
+        IXLWorksheet ExpandRows();
+        /// <summary>
+        /// Expands all outlined columns.
+        /// </summary>
+        IXLWorksheet ExpandColumns();
+
+        /// <summary>
+        /// Collapses the outlined rows of the specified level.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        IXLWorksheet CollapseRows(Int32 outlineLevel);
+        /// <summary>
+        /// Collapses the outlined columns of the specified level.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        IXLWorksheet CollapseColumns(Int32 outlineLevel);
+        /// <summary>
+        /// Expands the outlined rows of the specified level.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        IXLWorksheet ExpandRows(Int32 outlineLevel);
+        /// <summary>
+        /// Expands the outlined columns of the specified level.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        IXLWorksheet ExpandColumns(Int32 outlineLevel);
+
+        /// <summary>
+        /// Deletes this worksheet.
+        /// </summary>
+        void Delete();
+
+
+        /// <summary>
+        /// Gets an object to manage this worksheet's named ranges.
+        /// </summary>
+        IXLNamedRanges NamedRanges { get; }
+        /// <summary>
+        /// Gets the specified named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the range.</param>
+        IXLNamedRange NamedRange(String rangeName);
+
+        /// <summary>
+        /// Gets an object to manage how the worksheet is going to displayed by Excel.
+        /// </summary>
+        IXLSheetView SheetView { get; }
+
+        /// <summary>
+        /// Gets the Excel table of the given index
+        /// </summary>
+        /// <param name="index">Index of the table to return</param>
+        IXLTable Table(Int32 index);
+        /// <summary>
+        /// Gets the Excel table of the given name
+        /// </summary>
+        /// <param name="name">Name of the table to return</param>
+        IXLTable Table(String name);
+        /// <summary>
+        /// Gets an object to manage this worksheet's Excel tables
+        /// </summary>
+        IXLTables Tables { get; }
+
+        /// <summary>
+        /// Copies the 
+        /// </summary>
+        /// <param name="newSheetName"></param>
+        /// <returns></returns>
+        IXLWorksheet CopyTo(String newSheetName);
+        IXLWorksheet CopyTo(String newSheetName, Int32 position);
+        IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName);
+        IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName, Int32 position);
+
+        IXLRange RangeUsed();
+        IXLRange RangeUsed(bool includeFormats);
+
+        IXLDataValidations DataValidations { get; }
+
+        XLWorksheetVisibility Visibility { get; set; }
+        IXLWorksheet Hide();
+        IXLWorksheet Unhide();
+
+        IXLSheetProtection Protection { get; }
+        IXLSheetProtection Protect();
+        IXLSheetProtection Protect(String password);
+        IXLSheetProtection Unprotect();
+        IXLSheetProtection Unprotect(String password);
+
+        IXLSortElements SortRows { get; }
+        IXLSortElements SortColumns { get; }
+
+        IXLRange Sort();
+
+        IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+
+        //IXLCharts Charts { get; }
+
+        Boolean ShowFormulas { get; set; }
+        Boolean ShowGridLines { get; set; }
+        Boolean ShowOutlineSymbols { get; set; }
+        Boolean ShowRowColHeaders { get; set; }
+        Boolean ShowRuler { get; set; }
+        Boolean ShowWhiteSpace { get; set; }
+        Boolean ShowZeros { get; set; }
+
+        IXLWorksheet SetShowFormulas(); IXLWorksheet SetShowFormulas(Boolean value);
+        IXLWorksheet SetShowGridLines(); IXLWorksheet SetShowGridLines(Boolean value);
+        IXLWorksheet SetShowOutlineSymbols(); IXLWorksheet SetShowOutlineSymbols(Boolean value);
+        IXLWorksheet SetShowRowColHeaders(); IXLWorksheet SetShowRowColHeaders(Boolean value);
+        IXLWorksheet SetShowRuler(); IXLWorksheet SetShowRuler(Boolean value);
+        IXLWorksheet SetShowWhiteSpace(); IXLWorksheet SetShowWhiteSpace(Boolean value);
+        IXLWorksheet SetShowZeros(); IXLWorksheet SetShowZeros(Boolean value);
+
+
+        XLColor TabColor { get; set; }
+        IXLWorksheet SetTabColor(XLColor color);
+
+        Boolean TabSelected { get; set; }
+        Boolean TabActive { get; set; }
+
+        IXLWorksheet SetTabSelected(); IXLWorksheet SetTabSelected(Boolean value);
+        IXLWorksheet SetTabActive(); IXLWorksheet SetTabActive(Boolean value);
+
+        IXLPivotTable PivotTable(String name);
+        IXLPivotTables PivotTables { get; }
+
+        Boolean RightToLeft { get; set; }
+        IXLWorksheet SetRightToLeft(); IXLWorksheet SetRightToLeft(Boolean value);
+
+        IXLBaseAutoFilter AutoFilter { get; }
+
+        IXLRows RowsUsed(Boolean includeFormats = false, Func<IXLRow, Boolean> predicate = null);
+        IXLRows RowsUsed(Func<IXLRow, Boolean> predicate);
+        IXLColumns ColumnsUsed(Boolean includeFormats = false, Func<IXLColumn, Boolean> predicate = null);
+        IXLColumns ColumnsUsed(Func<IXLColumn, Boolean> predicate);
+
+        IXLRanges MergedRanges { get; }
+        IXLConditionalFormats ConditionalFormats { get; }
+
+        IXLRanges SelectedRanges { get; }
+        IXLCell ActiveCell { get; set; }
+
+        Object Evaluate(String expression);
+
+        String Author { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/IXLWorksheets.cs b/ClosedXML/Excel/IXLWorksheets.cs
new file mode 100644
index 0000000..ea10629
--- /dev/null
+++ b/ClosedXML/Excel/IXLWorksheets.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLWorksheets: IEnumerable<IXLWorksheet>
+    {
+        int Count { get; }
+        bool TryGetWorksheet(string sheetName,out IXLWorksheet worksheet);
+
+        IXLWorksheet Worksheet(String sheetName);
+        IXLWorksheet Worksheet(Int32 position);
+        IXLWorksheet Add(String sheetName);
+        IXLWorksheet Add(String sheetName, Int32 position);
+        IXLWorksheet Add(DataTable dataTable);
+        IXLWorksheet Add(DataTable dataTable, String sheetName);
+        void Add(DataSet dataSet);
+        void Delete(String sheetName);
+        void Delete(Int32 position);
+
+        
+    }
+}
diff --git a/ClosedXML/Excel/Misc/XLCallbackAction.cs b/ClosedXML/Excel/Misc/XLCallbackAction.cs
new file mode 100644
index 0000000..9238200
--- /dev/null
+++ b/ClosedXML/Excel/Misc/XLCallbackAction.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel.Misc
+{
+	internal class XLCallbackAction
+	{
+		public XLCallbackAction(Action<XLRange, Int32> action)
+		{
+			this.Action = action;
+		}
+
+		public Action<XLRange, Int32> Action { get; set; }
+	}
+}
diff --git a/ClosedXML/Excel/Misc/XLDictionary.cs b/ClosedXML/Excel/Misc/XLDictionary.cs
new file mode 100644
index 0000000..a79707c
--- /dev/null
+++ b/ClosedXML/Excel/Misc/XLDictionary.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public class XLDictionary<T>: Dictionary<Int32, T>
+    {
+        public XLDictionary()
+        {
+            
+        }
+        public XLDictionary(XLDictionary<T> other)
+        {
+            other.Values.ForEach(Add);
+        }
+
+        public void Initialize(T value)
+        {
+            if (Count > 0)
+                Clear();
+
+            Add(value);
+        }
+
+        public void Add(T value)
+        {
+            Add(Count + 1, value);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Misc/XLFormula.cs b/ClosedXML/Excel/Misc/XLFormula.cs
new file mode 100644
index 0000000..2ff7a44
--- /dev/null
+++ b/ClosedXML/Excel/Misc/XLFormula.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public class XLFormula
+    {
+        public XLFormula()
+        {}
+
+        public XLFormula(XLFormula defaultFormula)
+        {
+            _value = defaultFormula._value;
+            IsFormula = defaultFormula.IsFormula;
+        }
+
+        public XLFormula(String value)
+        {
+            Value = value;
+        }
+
+        public XLFormula(double value)
+        {
+            Value = value.ToInvariantString();
+        }
+        
+        public XLFormula(int value)
+        {
+            Value = value.ToInvariantString();
+        }
+
+        internal String _value;
+        public String Value 
+        { 
+            get { return _value; }
+            set
+            {
+                if (value == null)
+                {
+                    _value = String.Empty;
+                }
+                else
+                {
+                    _value = value.Trim();
+                    IsFormula = !XLHelper.IsNullOrWhiteSpace(_value) && _value.TrimStart()[0] == '=' ;
+                    if (IsFormula)
+                        _value = _value.Substring(1);
+                }
+                
+
+            }
+        }
+
+        public Boolean IsFormula { get; internal set; }
+    }
+}
diff --git a/ClosedXML/Excel/Misc/XLIdManager.cs b/ClosedXML/Excel/Misc/XLIdManager.cs
new file mode 100644
index 0000000..1c8c7fd
--- /dev/null
+++ b/ClosedXML/Excel/Misc/XLIdManager.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLIdManager
+    {
+        private HashSet<Int32> _hash = new HashSet<Int32>();
+        
+
+        public Int32 GetNext()
+        {
+            if (_hash.Count == 0)
+            {
+                _hash.Add(1);
+                return 1;
+            }
+
+            Int32 id = 1;
+            while (true)
+            {
+                if (!_hash.Contains(id))
+                {
+                    _hash.Add(id);
+                    return id;
+                }
+                id++;
+            }
+        }
+        public void Add(Int32 value)
+        {
+            _hash.Add(value);
+        }
+        public void Add(IEnumerable<Int32> values)
+        {
+            values.ForEach(v => _hash.Add(v));
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Misc/XLReentrantEnumerableSet.cs b/ClosedXML/Excel/Misc/XLReentrantEnumerableSet.cs
new file mode 100644
index 0000000..c902733
--- /dev/null
+++ b/ClosedXML/Excel/Misc/XLReentrantEnumerableSet.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+namespace ClosedXML.Excel.Misc
+{
+	/// <summary>
+	/// This is most definitely NOT thread-safe, but it is reentrant (e.g. you can insert and remove
+	/// items during enumeration)
+	/// </summary>
+	/// <typeparam name="T"></typeparam>
+	internal class XLReentrantEnumerableSet<T> : IEnumerable<T>
+	{
+		private HashSet<T> _hashSet;
+		private List<T> _list;
+
+		private int _activeEnumerators;
+
+		public XLReentrantEnumerableSet()
+		{
+			_list = new List<T>();
+			_hashSet = new HashSet<T>();
+		}
+
+		public void Add(T item)
+		{
+			if(!_hashSet.Contains(item))
+			{
+				// Add item to end of list
+				_list.Add(item);
+
+				// Store the item in the hashset too.
+				_hashSet.Add(item);
+			}
+		}
+
+		public void Remove(T item)
+		{
+			_hashSet.Remove(item);
+			
+			fixup();
+		}
+
+		private void fixup()
+		{
+			// Only fixup the list if there are no active enumerators
+			if(_activeEnumerators > 0)
+				return;
+
+			// Only fixup the list if there are more than a certain number of items to deal with
+			// This saves fixing up the list continually.
+			if(_list.Count < 1000 || (_list.Count < _hashSet.Count * 1.5))
+				return;
+
+			// Rebuild the list skipping out omitted items
+			_list = _list.Where(item => _hashSet.Contains(item)).ToList();
+		}
+		
+		public IEnumerator<T> GetEnumerator()
+		{
+			// Mark that we are enumerating
+			_activeEnumerators++;
+			try
+			{
+				int idx = 0;
+
+				// Important, store count here, as more items may be added while we are enumerating
+				// and we only want to enumerate items that were already there.
+				int count = _list.Count;
+				while(idx < count)
+				{
+					var item = _list[idx];
+
+					// Skip over items in the list which aren't in the hashset; they could have been
+					// removed while we were enumerating or previously removed.
+					if(_hashSet.Contains(item))
+					{
+						yield return item;
+					}
+
+					idx++;
+				}
+
+			}
+			finally
+			{
+				// Finished enumerating, can now fixup
+				_activeEnumerators--;
+				fixup();
+			}
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return this.GetEnumerator();
+		}
+	}
+}
diff --git a/ClosedXML/Excel/NamedRanges/IXLNamedRange.cs b/ClosedXML/Excel/NamedRanges/IXLNamedRange.cs
new file mode 100644
index 0000000..886f1e0
--- /dev/null
+++ b/ClosedXML/Excel/NamedRanges/IXLNamedRange.cs
@@ -0,0 +1,91 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLNamedRange
+    {
+        /// <summary>
+        /// Gets or sets the name of the range.
+        /// </summary>
+        /// <value>
+        /// The name of the range.
+        /// </value>
+        String Name { get; set; }
+
+        /// <summary>
+        /// Gets the ranges associated with this named range.
+        /// <para>Note: A named range can point to multiple ranges.</para>
+        /// </summary>
+        IXLRanges Ranges { get; }
+
+        /// <summary>
+        /// Gets or sets the comment for this named range.
+        /// </summary>
+        /// <value>
+        /// The comment for this named range.
+        /// </value>
+        String Comment { get; set; }
+
+        /// <summary>
+        /// Adds the specified range to this named range.
+        /// <para>Note: A named range can point to multiple ranges.</para>
+        /// </summary>
+        /// <param name="workbook">Workbook containing the range</param>
+        /// <param name="rangeAddress">The range address to add.</param>
+        IXLRanges Add(XLWorkbook workbook, String rangeAddress);
+
+        /// <summary>
+        /// Adds the specified range to this named range.
+        /// <para>Note: A named range can point to multiple ranges.</para>
+        /// </summary>
+        /// <param name="range">The range to add.</param>
+        IXLRanges Add(IXLRange range);
+
+        /// <summary>
+        /// Adds the specified ranges to this named range.
+        /// <para>Note: A named range can point to multiple ranges.</para>
+        /// </summary>
+        /// <param name="ranges">The ranges to add.</param>
+        IXLRanges Add(IXLRanges ranges);
+
+
+        /// <summary>
+        /// Deletes this named range (not the cells).
+        /// </summary>
+        void Delete();
+
+        /// <summary>
+        /// Clears the list of ranges associated with this named range.
+        /// <para>(it does not clear the cells)</para>
+        /// </summary>
+        void Clear();
+
+        /// <summary>
+        /// Removes the specified range from this named range.
+        /// <para>Note: A named range can point to multiple ranges.</para>
+        /// </summary>
+        /// <param name="rangeAddress">The range address to remove.</param>
+        void Remove(String rangeAddress);
+
+        /// <summary>
+        /// Removes the specified range from this named range.
+        /// <para>Note: A named range can point to multiple ranges.</para>
+        /// </summary>
+        /// <param name="rangeAddress">The range to remove.</param>
+        void Remove(IXLRange range);
+
+        /// <summary>
+        /// Removes the specified ranges from this named range.
+        /// <para>Note: A named range can point to multiple ranges.</para>
+        /// </summary>
+        /// <param name="rangeAddress">The ranges to remove.</param>
+        void Remove(IXLRanges ranges);
+
+
+        IXLNamedRange SetRefersTo(String range);
+        IXLNamedRange SetRefersTo(IXLRangeBase range);
+        IXLNamedRange SetRefersTo(IXLRanges ranges);
+
+        String RefersTo { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/NamedRanges/IXLNamedRanges.cs b/ClosedXML/Excel/NamedRanges/IXLNamedRanges.cs
new file mode 100644
index 0000000..bec7353
--- /dev/null
+++ b/ClosedXML/Excel/NamedRanges/IXLNamedRanges.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLNamedRanges: IEnumerable<IXLNamedRange>
+    {
+        /// <summary>
+        /// Gets the specified named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the range.</param>
+        IXLNamedRange NamedRange(String rangeName);
+        
+        /// <summary>
+        /// Adds a new named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the range to add.</param>
+        /// <param name="rangeAddress">The range address to add.</param>
+        /// <returns></returns>
+        IXLNamedRange Add(String rangeName, String rangeAddress);
+
+        /// <summary>
+        /// Adds a new named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the range to add.</param>
+        /// <param name="range">The range to add.</param>
+        /// <returns></returns>
+        IXLNamedRange Add(String rangeName, IXLRange range);
+
+        /// <summary>
+        /// Adds a new named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the range to add.</param>
+        /// <param name="ranges">The ranges to add.</param>
+        /// <returns></returns>
+        IXLNamedRange Add(String rangeName, IXLRanges ranges);
+
+        /// <summary>
+        /// Adds a new named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the ranges to add.</param>
+        /// <param name="rangeAddress">The range address to add.</param>
+        /// <param name="comment">The comment for the new named range.</param>
+        IXLNamedRange Add(String rangeName, String rangeAddress, String comment);
+
+        /// <summary>
+        /// Adds a new named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the ranges to add.</param>
+        /// <param name="range">The range to add.</param>
+        /// <param name="comment">The comment for the new named range.</param>
+        IXLNamedRange Add(String rangeName, IXLRange range, String comment);
+
+        /// <summary>
+        /// Adds a new named range.
+        /// </summary>
+        /// <param name="rangeName">Name of the ranges to add.</param>
+        /// <param name="ranges">The ranges to add.</param>
+        /// <param name="comment">The comment for the new named range.</param>
+        IXLNamedRange Add(String rangeName, IXLRanges ranges, String comment);
+
+        /// <summary>
+        /// Deletes the specified named range (not the cells).
+        /// </summary>
+        /// <param name="rangeName">Name of the range to delete.</param>
+        void Delete(String rangeName);
+
+        /// <summary>
+        /// Deletes the specified named range's index (not the cells).
+        /// </summary>
+        /// <param name="rangeIndex">Index of the named range to delete.</param>
+        void Delete(Int32 rangeIndex);
+
+
+        /// <summary>
+        /// Deletes all named ranges (not the cells).
+        /// </summary>
+        void DeleteAll();
+
+        Boolean TryGetValue(String name, out IXLNamedRange range);
+
+        Boolean Contains(String name);
+    }
+}
diff --git a/ClosedXML/Excel/NamedRanges/XLNamedRange.cs b/ClosedXML/Excel/NamedRanges/XLNamedRange.cs
new file mode 100644
index 0000000..a2958fb
--- /dev/null
+++ b/ClosedXML/Excel/NamedRanges/XLNamedRange.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Text.RegularExpressions;
+
+    internal class XLNamedRange: IXLNamedRange
+    {
+
+        private List<String> _rangeList = new List<String>();
+        private readonly XLNamedRanges _namedRanges;
+        public XLNamedRange(XLNamedRanges namedRanges , String rangeName, String range,  String comment = null)
+        {
+            Name = rangeName;
+            _rangeList.Add(range);
+            Comment = comment;
+            _namedRanges = namedRanges;
+        }
+
+        public XLNamedRange(XLNamedRanges namedRanges, String rangeName, IXLRanges ranges, String comment = null)
+        {
+            Name = rangeName;
+            ranges.ForEach(r => _rangeList.Add(r.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true)));
+            Comment = comment;
+            _namedRanges = namedRanges;
+        }
+
+        public String Name { get; set; }
+        public IXLRanges Ranges
+        {
+            get
+            {
+                var ranges = new XLRanges();
+                foreach (var rangeToAdd in 
+                   from rangeAddress in _rangeList.SelectMany(c=>c.Split(',')).Where(s=>s[0] != '"')
+                   let match = XLHelper.NamedRangeReferenceRegex.Match(rangeAddress)
+                   select
+                       match.Groups["Sheet"].Success
+                       ?  _namedRanges.Workbook.WorksheetsInternal.Worksheet(match.Groups["Sheet"].Value).Range(match.Groups["Range"].Value) as IXLRangeBase
+                       : _namedRanges.Workbook.Worksheets.SelectMany(sheet => sheet.Tables).Single(table => table.Name == match.Groups["Table"].Value).DataRange.Column(match.Groups["Column"].Value) )
+                {
+                    ranges.Add(rangeToAdd);
+                }
+                return ranges;
+            }
+        }
+
+        public String Comment { get; set; }
+
+        public IXLRanges Add(XLWorkbook workbook, String rangeAddress)
+        {
+            var ranges = new XLRanges();
+            var byExclamation = rangeAddress.Split('!');
+            var wsName = byExclamation[0].Replace("'", "");
+            var rng = byExclamation[1];
+            var rangeToAdd = workbook.WorksheetsInternal.Worksheet(wsName).Range(rng);
+
+            ranges.Add(rangeToAdd);
+            return Add(ranges);
+        }
+        public IXLRanges Add(IXLRange range)
+        {
+            var ranges = new XLRanges {range};
+            return Add(ranges);
+        }
+        public IXLRanges Add(IXLRanges ranges)
+        {
+            ranges.ForEach(r => _rangeList.Add(r.ToString()));
+            return ranges;
+        }
+
+        public void Delete()
+        {
+            _namedRanges.Delete(Name);
+        }
+        public void Clear()
+        {
+            _rangeList.Clear();
+        }
+        public void Remove(String rangeAddress)
+        {
+            _rangeList.Remove(rangeAddress);
+        }
+        public void Remove(IXLRange range)
+        {
+            _rangeList.Remove(range.ToString());
+        }
+        public void Remove(IXLRanges ranges)
+        {
+            ranges.ForEach(r => _rangeList.Remove(r.ToString()));
+        }
+
+
+        public override string ToString()
+        {
+            String retVal = _rangeList.Aggregate(String.Empty, (agg, r) => agg + (r + ","));
+            if (retVal.Length > 0) retVal = retVal.Substring(0, retVal.Length - 1);
+            return retVal;
+        }
+
+        public String RefersTo
+        {
+            get { return ToString(); }
+            set
+            {
+                _rangeList.Clear();
+                _rangeList.Add(value);
+            }
+        }
+
+        internal List<String> RangeList
+        {
+            get { return _rangeList; }
+            set { _rangeList = value; }
+        }
+
+        public IXLNamedRange SetRefersTo(String range)
+        {
+            RefersTo = range;
+            return this;
+        }
+        public IXLNamedRange SetRefersTo(IXLRangeBase range)
+        {
+            _rangeList.Clear();
+            _rangeList.Add(range.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true));
+            return this;
+        }
+        public IXLNamedRange SetRefersTo(IXLRanges ranges)
+        {
+            _rangeList.Clear();
+            ranges.ForEach(r => _rangeList.Add(r.RangeAddress.ToStringFixed(XLReferenceStyle.A1, true)));
+            return this;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/NamedRanges/XLNamedRanges.cs b/ClosedXML/Excel/NamedRanges/XLNamedRanges.cs
new file mode 100644
index 0000000..2b0b015
--- /dev/null
+++ b/ClosedXML/Excel/NamedRanges/XLNamedRanges.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLNamedRanges: IXLNamedRanges
+    {
+        readonly Dictionary<String, IXLNamedRange> _namedRanges = new Dictionary<String, IXLNamedRange>();
+        internal XLWorkbook Workbook { get; set; }
+       
+        public XLNamedRanges(XLWorkbook workbook)
+        {
+            Workbook = workbook;
+        }
+
+        #region IXLNamedRanges Members
+
+        public IXLNamedRange NamedRange(String rangeName)
+        {
+            IXLNamedRange range;
+            if (_namedRanges.TryGetValue(rangeName, out range))
+                return range;
+
+            return null;
+        }
+
+        public IXLNamedRange Add(String rangeName, String rangeAddress)
+        {
+            return Add(rangeName, rangeAddress, null);
+        }
+        public IXLNamedRange Add(String rangeName, IXLRange range)
+        {
+            return Add(rangeName, range, null);
+        }
+        public IXLNamedRange Add(String rangeName, IXLRanges ranges)
+        {
+            return Add(rangeName, ranges, null);
+        }
+        public IXLNamedRange Add(String rangeName, String rangeAddress, String comment )
+        {
+            var namedRange = new XLNamedRange(this, rangeName, rangeAddress, comment);
+            _namedRanges.Add(rangeName, namedRange);
+            return namedRange;
+        }
+        public IXLNamedRange Add(String rangeName, IXLRange range, String comment)
+        {
+            var ranges = new XLRanges {range};
+            return Add(rangeName, ranges, comment);
+        }
+        public IXLNamedRange Add(String rangeName, IXLRanges ranges, String comment)
+        {
+            var namedRange = new XLNamedRange(this, rangeName, ranges, comment);
+            _namedRanges.Add(rangeName, namedRange);
+            return namedRange;
+        }
+
+        public void Delete(String rangeName)
+        {
+            _namedRanges.Remove(rangeName);
+        }
+        public void Delete(Int32 rangeIndex)
+        {
+            _namedRanges.Remove(_namedRanges.ElementAt(rangeIndex).Key);
+        }
+        public void DeleteAll()
+        {
+            _namedRanges.Clear();
+        }
+        
+        #endregion
+
+        #region IEnumerable<IXLNamedRange> Members
+
+        public IEnumerator<IXLNamedRange> GetEnumerator()
+        {
+            return _namedRanges.Values.GetEnumerator();
+        }
+
+        #endregion
+
+        #region IEnumerable Members
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        #endregion
+
+        public Boolean TryGetValue(String name, out IXLNamedRange range)
+        {
+            if (_namedRanges.TryGetValue(name, out range)) return true;
+
+            range = Workbook.NamedRange(name);
+            return range != null;
+        }
+
+        public Boolean Contains(String name)
+        {
+            if (_namedRanges.ContainsKey(name)) return true;
+            return Workbook.NamedRange(name) != null;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/IXLHFItem.cs b/ClosedXML/Excel/PageSetup/IXLHFItem.cs
new file mode 100644
index 0000000..2710292
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/IXLHFItem.cs
@@ -0,0 +1,48 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLHFPredefinedText
+    { 
+        PageNumber, NumberOfPages, Date, Time, FullPath, Path, File, SheetName
+    }
+    public enum XLHFOccurrence
+    { 
+        AllPages, OddPages, EvenPages, FirstPage
+    }
+
+    public interface IXLHFItem: IXLWithRichString
+    {
+        /// <summary>
+        /// Gets the text of the specified header/footer occurrence.
+        /// </summary>
+        /// <param name="occurrence">The occurrence.</param>
+        String GetText(XLHFOccurrence occurrence);
+
+        /// <summary>
+        /// Adds the given predefined text to this header/footer item.
+        /// </summary>
+        /// <param name="predefinedText">The predefined text to add to this header/footer item.</param>
+        IXLRichString AddText(XLHFPredefinedText predefinedText);
+
+        /// <summary>
+        /// Adds the given text to this header/footer item.
+        /// </summary>
+        /// <param name="text">The text to add to this header/footer item.</param>
+        /// <param name="occurrence">The occurrence for the text.</param>
+        IXLRichString AddText(String text, XLHFOccurrence occurrence);
+
+        /// <summary>
+        /// Adds the given predefined text to this header/footer item.
+        /// </summary>
+        /// <param name="predefinedText">The predefined text to add to this header/footer item.</param>
+        /// <param name="occurrence">The occurrence for the predefined text.</param>
+        IXLRichString AddText(XLHFPredefinedText predefinedText, XLHFOccurrence occurrence);
+
+        /// <summary>Clears the text/formats of this header/footer item.</summary>
+        /// <param name="occurrence">The occurrence to clear.</param>
+        void Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages);
+
+        IXLRichString AddImage(String imagePath, XLHFOccurrence occurrence = XLHFOccurrence.AllPages);
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/IXLHeaderFooter.cs b/ClosedXML/Excel/PageSetup/IXLHeaderFooter.cs
new file mode 100644
index 0000000..c8c2f7c
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/IXLHeaderFooter.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLHFMode { OddPagesOnly, OddAndEvenPages, Odd }
+    public interface IXLHeaderFooter
+    {
+        /// <summary>
+        /// Gets the left header/footer item.
+        /// </summary>
+        IXLHFItem Left { get; }
+
+        /// <summary>
+        /// Gets the middle header/footer item.
+        /// </summary>
+        IXLHFItem Center { get; }
+
+        /// <summary>
+        /// Gets the right header/footer item.
+        /// </summary>
+        IXLHFItem Right { get; }
+
+        /// <summary>
+        /// Gets the text of the specified header/footer occurrence.
+        /// </summary>
+        /// <param name="occurrence">The occurrence.</param>
+        String GetText(XLHFOccurrence occurrence);
+
+        IXLHeaderFooter Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages);
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/IXLMargins.cs b/ClosedXML/Excel/PageSetup/IXLMargins.cs
new file mode 100644
index 0000000..2a1e40b
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/IXLMargins.cs
@@ -0,0 +1,39 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLMargins
+    {
+        /// <summary>Gets or sets the Left margin.</summary>
+        /// <value>The Left margin.</value>
+        Double Left { get; set; }
+
+        /// <summary>Gets or sets the Right margin.</summary>
+        /// <value>The Right margin.</value>
+        Double Right { get; set; }
+
+        /// <summary>Gets or sets the Top margin.</summary>
+        /// <value>The Top margin.</value>
+        Double Top { get; set; }
+
+        /// <summary>Gets or sets the Bottom margin.</summary>
+        /// <value>The Bottom margin.</value>
+        Double Bottom { get; set; }
+
+        /// <summary>Gets or sets the Header margin.</summary>
+        /// <value>The Header margin.</value>
+        Double Header { get; set; }
+
+        /// <summary>Gets or sets the Footer margin.</summary>
+        /// <value>The Footer margin.</value>
+        Double Footer { get; set; }
+
+        IXLMargins SetLeft(Double value);
+        IXLMargins SetRight(Double value);
+        IXLMargins SetTop(Double value);
+        IXLMargins SetBottom(Double value);
+        IXLMargins SetHeader(Double value);
+        IXLMargins SetFooter(Double value);
+
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/IXLPageSetup.cs b/ClosedXML/Excel/PageSetup/IXLPageSetup.cs
new file mode 100644
index 0000000..463c0ee
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/IXLPageSetup.cs
@@ -0,0 +1,311 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public enum XLPageOrientation { Default, Portrait, Landscape }
+    public enum XLPaperSize
+    {
+        LetterPaper = 1,
+        LetterSmallPaper = 2,
+        TabloidPaper = 3,
+        LedgerPaper = 4,
+        LegalPaper = 5,
+        StatementPaper = 6,
+        ExecutivePaper = 7,
+        A3Paper = 8,
+        A4Paper = 9,
+        A4SmallPaper = 10,
+        A5Paper = 11,
+        B4Paper = 12,
+        B5Paper = 13,
+        FolioPaper = 14,
+        QuartoPaper = 15,
+        StandardPaper = 16,
+        StandardPaper1 = 17,
+        NotePaper = 18,
+        No9Envelope = 19,
+        No10Envelope = 20,
+        No11Envelope = 21,
+        No12Envelope = 22,
+        No14Envelope = 23,
+        CPaper = 24,
+        DPaper = 25,
+        EPaper = 26,
+        DlEnvelope = 27,
+        C5Envelope = 28,
+        C3Envelope = 29,
+        C4Envelope = 30,
+        C6Envelope = 31,
+        C65Envelope = 32,
+        B4Envelope = 33,
+        B5Envelope = 34,
+        B6Envelope = 35,
+        ItalyEnvelope = 36,
+        MonarchEnvelope = 37,
+        No634Envelope = 38,
+        UsStandardFanfold = 39,
+        GermanStandardFanfold = 40,
+        GermanLegalFanfold = 41,
+        IsoB4 = 42,
+        JapaneseDoublePostcard = 43,
+        StandardPaper2 = 44,
+        StandardPaper3 = 45,
+        StandardPaper4 = 46,
+        InviteEnvelope = 47,
+        LetterExtraPaper = 50,
+        LegalExtraPaper = 51,
+        TabloidExtraPaper = 52,
+        A4ExtraPaper = 53,
+        LetterTransversePaper = 54,
+        A4TransversePaper = 55,
+        LetterExtraTransversePaper = 56,
+        SuperaSuperaA4Paper = 57,
+        SuperbSuperbA3Paper = 58,
+        LetterPlusPaper = 59,
+        A4PlusPaper = 60,
+        A5TransversePaper = 61,
+        JisB5TransversePaper = 62,
+        A3ExtraPaper = 63,
+        A5ExtraPaper = 64,
+        IsoB5ExtraPaper = 65,
+        A2Paper = 66,
+        A3TransversePaper = 67,
+        A3ExtraTransversePaper = 68
+    }
+    public enum XLPageOrderValues { DownThenOver, OverThenDown }
+    public enum XLShowCommentsValues { None, AtEnd, AsDisplayed }
+    public enum XLPrintErrorValues { Blank, Dash, Displayed, NA }
+    
+    public interface IXLPageSetup
+    {
+        /// <summary>
+        /// Gets an object to manage the print areas of the worksheet.
+        /// </summary>
+        IXLPrintAreas PrintAreas { get; }
+        /// <summary>
+        /// Gets the first row that will repeat on the top of the printed pages.
+        /// <para>Use SetRowsToRepeatAtTop() to set the rows that will be repeated on the top of the printed pages.</para>
+        /// </summary>
+        Int32 FirstRowToRepeatAtTop { get; }
+        /// <summary>
+        /// Gets the last row that will repeat on the top of the printed pages.
+        /// <para>Use SetRowsToRepeatAtTop() to set the rows that will be repeated on the top of the printed pages.</para>
+        /// </summary>
+        Int32 LastRowToRepeatAtTop { get; }
+        /// <summary>
+        /// Sets the rows to repeat on the top of the printed pages.
+        /// </summary>
+        /// <param name="range">The range of rows to repeat on the top of the printed pages.</param>
+        void SetRowsToRepeatAtTop(String range);
+        /// <summary>
+        /// Sets the rows to repeat on the top of the printed pages.
+        /// </summary>
+        /// <param name="firstRowToRepeatAtTop">The first row to repeat at top.</param>
+        /// <param name="lastRowToRepeatAtTop">The last row to repeat at top.</param>
+        void SetRowsToRepeatAtTop(Int32 firstRowToRepeatAtTop, Int32 lastRowToRepeatAtTop);
+
+        /// <summary>Gets the first column to repeat on the left of the printed pages.</summary>
+        /// <value>The first column to repeat on the left of the printed pages.</value>
+        Int32 FirstColumnToRepeatAtLeft { get; }
+        /// <summary>Gets the last column to repeat on the left of the printed pages.</summary>
+        /// <value>The last column to repeat on the left of the printed pages.</value>
+        Int32 LastColumnToRepeatAtLeft { get; }
+        /// <summary>
+        /// Sets the rows to repeat on the left of the printed pages.
+        /// </summary>
+        /// <param name="firstColumnToRepeatAtLeft">The first column to repeat at left.</param>
+        /// <param name="lastColumnToRepeatAtLeft">The last column to repeat at left.</param>
+        void SetColumnsToRepeatAtLeft(Int32 firstColumnToRepeatAtLeft, Int32 lastColumnToRepeatAtLeft);
+        /// <summary>
+        /// Sets the rows to repeat on the left of the printed pages.
+        /// </summary>
+        /// <param name="range">The range of rows to repeat on the left of the printed pages.</param>
+        void SetColumnsToRepeatAtLeft(String range);
+
+        /// <summary>Gets or sets the page orientation for printing.</summary>
+        /// <value>The page orientation.</value>
+        XLPageOrientation PageOrientation { get; set; }
+        /// <summary>
+        /// Gets or sets the number of pages wide (horizontal) the worksheet will be printed on.
+        /// <para>If you don't specify the PagesTall, Excel will adjust that value</para>
+        /// <para>based on the contents of the worksheet and the PagesWide number.</para>
+        /// <para>Setting this value will override the Scale value.</para>
+        /// </summary>
+        Int32 PagesWide { get; set; }
+        /// <summary>
+        /// Gets or sets the number of pages tall (vertical) the worksheet will be printed on.
+        /// <para>If you don't specify the PagesWide, Excel will adjust that value</para>
+        /// <para>based on the contents of the worksheet and the PagesTall number.</para>
+        /// <para>Setting this value will override the Scale value.</para>
+        /// </summary>
+        Int32 PagesTall { get; set; }
+        /// <summary>
+        /// Gets or sets the scale at which the worksheet will be printed.
+        /// <para>The worksheet will be printed on as many pages as necessary to print at the given scale.</para>
+        /// <para>Setting this value will override the PagesWide and PagesTall values.</para>
+        /// </summary>
+        Int32 Scale { get; set; }
+        /// <summary>
+        /// Gets or sets the horizontal dpi for printing the worksheet.
+        /// </summary>
+        Int32 HorizontalDpi { get; set; }
+        /// <summary>
+        /// Gets or sets the vertical dpi for printing the worksheet.
+        /// </summary>
+        Int32 VerticalDpi { get; set; }
+        /// <summary>
+        /// Gets or sets the page number that will begin the printout.
+        /// <para>For example, the first page of your printout could be numbered page 5.</para>
+        /// </summary>
+        Int64 FirstPageNumber { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether the worksheet will be centered on the page horizontally.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the worksheet will be centered on the page horizontally; otherwise, <c>false</c>.
+        /// </value>
+        Boolean CenterHorizontally { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether the worksheet will be centered on the page vertically.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the worksheet will be centered on the page vartically; otherwise, <c>false</c>.
+        /// </value>
+        Boolean CenterVertically { get; set; }
+        /// <summary>
+        /// Sets the scale at which the worksheet will be printed. This is equivalent to setting the Scale property.
+        /// <para>The worksheet will be printed on as many pages as necessary to print at the given scale.</para>
+        /// <para>Setting this value will override the PagesWide and PagesTall values.</para>
+        /// </summary>
+        /// <param name="pctOfNormalSize">The scale at which the worksheet will be printed.</param>
+        void AdjustTo(Int32 pctOfNormalSize);
+        /// <summary>
+        /// Gets or sets the number of pages the worksheet will be printed on.
+        /// <para>This is equivalent to setting both PagesWide and PagesTall properties.</para>
+        /// <para>Setting this value will override the Scale value.</para>
+        /// </summary>
+        /// <param name="pagesWide">The pages wide.</param>
+        /// <param name="pagesTall">The pages tall.</param>
+        void FitToPages(Int32 pagesWide, Int32 pagesTall);
+        /// <summary>
+        /// Gets or sets the size of the paper to print the worksheet.
+        /// </summary>
+        XLPaperSize PaperSize { get; set; }
+        /// <summary>
+        /// Gets an object to work with the page margins.
+        /// </summary>
+        IXLMargins Margins { get; }
+
+        /// <summary>
+        /// Gets an object to work with the page headers.
+        /// </summary>
+        IXLHeaderFooter Header { get; }
+        /// <summary>
+        /// Gets an object to work with the page footers.
+        /// </summary>
+        IXLHeaderFooter Footer { get; }
+        /// <summary>
+        /// Gets or sets a value indicating whether Excel will automatically adjust the font size to the scale of the worksheet.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if Excel will automatically adjust the font size to the scale of the worksheet; otherwise, <c>false</c>.
+        /// </value>
+        Boolean ScaleHFWithDocument { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether the header and footer margins are aligned with the left and right margins of the worksheet.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the header and footer margins are aligned with the left and right margins of the worksheet; otherwise, <c>false</c>.
+        /// </value>
+        Boolean AlignHFWithMargins { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the gridlines will be printed.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the gridlines will be printed; otherwise, <c>false</c>.
+        /// </value>
+        Boolean ShowGridlines { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether to show row numbers and column letters/numbers.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> to show row numbers and column letters/numbers; otherwise, <c>false</c>.
+        /// </value>
+        Boolean ShowRowAndColumnHeadings { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether the worksheet will be printed in black and white.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the worksheet will be printed in black and white; otherwise, <c>false</c>.
+        /// </value>
+        Boolean BlackAndWhite { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether the worksheet will be printed in draft quality.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the worksheet will be printed in draft quality; otherwise, <c>false</c>.
+        /// </value>
+        Boolean DraftQuality { get; set; }
+        /// <summary>
+        /// Gets or sets the page order for printing.
+        /// </summary>
+        XLPageOrderValues PageOrder { get; set; }
+        /// <summary>
+        /// Gets or sets how the comments will be printed.
+        /// </summary>
+        XLShowCommentsValues ShowComments { get; set; }
+
+        /// <summary>
+        /// Gets a list with the row breaks (for printing).
+        /// </summary>
+        List<Int32> RowBreaks { get; }
+        /// <summary>
+        /// Gets a list with the column breaks (for printing).
+        /// </summary>
+        List<Int32> ColumnBreaks { get; }
+        /// <summary>
+        /// Adds a horizontal page break after the given row.
+        /// </summary>
+        /// <param name="row">The row to insert the break.</param>
+        void AddHorizontalPageBreak(Int32 row);
+
+        /// <summary>
+        /// Adds a vertical page break after the given column.
+        /// </summary>
+        /// <param name="column">The column to insert the break.</param>
+        void AddVerticalPageBreak(Int32 column);
+
+        /// <summary>
+        /// Gets or sets how error values will be printed.
+        /// </summary>
+        XLPrintErrorValues PrintErrorValue { get; set; }
+
+        IXLPageSetup SetPageOrientation(XLPageOrientation value);
+        IXLPageSetup SetPagesWide(Int32 value);
+        IXLPageSetup SetPagesTall(Int32 value);
+        IXLPageSetup SetScale(Int32 value);
+        IXLPageSetup SetHorizontalDpi(Int32 value);
+        IXLPageSetup SetVerticalDpi(Int32 value);
+        IXLPageSetup SetFirstPageNumber(Int64 value);
+        IXLPageSetup SetCenterHorizontally(); IXLPageSetup SetCenterHorizontally(Boolean value);
+        IXLPageSetup SetCenterVertically(); IXLPageSetup SetCenterVertically(Boolean value);
+        IXLPageSetup SetPaperSize(XLPaperSize value);
+        IXLPageSetup SetScaleHFWithDocument(); IXLPageSetup SetScaleHFWithDocument(Boolean value);
+        IXLPageSetup SetAlignHFWithMargins(); IXLPageSetup SetAlignHFWithMargins(Boolean value);
+        IXLPageSetup SetShowGridlines(); IXLPageSetup SetShowGridlines(Boolean value);
+        IXLPageSetup SetShowRowAndColumnHeadings(); IXLPageSetup SetShowRowAndColumnHeadings(Boolean value);
+        IXLPageSetup SetBlackAndWhite(); IXLPageSetup SetBlackAndWhite(Boolean value);
+        IXLPageSetup SetDraftQuality(); IXLPageSetup SetDraftQuality(Boolean value);
+        IXLPageSetup SetPageOrder(XLPageOrderValues value);
+        IXLPageSetup SetShowComments(XLShowCommentsValues value);
+        IXLPageSetup SetPrintErrorValue(XLPrintErrorValues value);
+
+
+        Boolean DifferentFirstPageOnHF { get; set; }
+        IXLPageSetup SetDifferentFirstPageOnHF(); IXLPageSetup SetDifferentFirstPageOnHF(Boolean value);
+        Boolean DifferentOddEvenPagesOnHF { get; set; }
+        IXLPageSetup SetDifferentOddEvenPagesOnHF(); IXLPageSetup SetDifferentOddEvenPagesOnHF(Boolean value);
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/IXLPrintAreas.cs b/ClosedXML/Excel/PageSetup/IXLPrintAreas.cs
new file mode 100644
index 0000000..48b5816
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/IXLPrintAreas.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLPrintAreas: IEnumerable<IXLRange>
+    {
+        /// <summary>Removes the print areas from the worksheet.</summary>
+        void Clear();
+
+        /// <summary>Adds a range to the print areas.</summary>
+        /// <param name="firstCellRow">   The first cell row.</param>
+        /// <param name="firstCellColumn">The first cell column.</param>
+        /// <param name="lastCellRow">    The last cell row.</param>
+        /// <param name="lastCellColumn"> The last cell column.</param>
+        void Add(Int32 firstCellRow, Int32 firstCellColumn, Int32 lastCellRow, Int32 lastCellColumn);
+
+        /// <summary>Adds a range to the print areas.</summary>
+        /// <param name="rangeAddress">The range address to add.</param>
+        void Add(String rangeAddress);
+
+        /// <summary>Adds a range to the print areas.</summary>
+        /// <param name="firstCellAddress">The first cell address.</param>
+        /// <param name="lastCellAddress"> The last cell address.</param>
+        void Add(String firstCellAddress, String lastCellAddress);
+
+        /// <summary>Adds a range to the print areas.</summary>
+        /// <param name="firstCellAddress">The first cell address.</param>
+        /// <param name="lastCellAddress"> The last cell address.</param>
+        void Add(IXLAddress firstCellAddress, IXLAddress lastCellAddress);
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/XLHFItem.cs b/ClosedXML/Excel/PageSetup/XLHFItem.cs
new file mode 100644
index 0000000..7e3ccda
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/XLHFItem.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLHFItem : IXLHFItem
+    {
+        private readonly XLWorksheet _worksheet;
+        public XLHFItem(XLWorksheet worksheet)
+        {
+            _worksheet = worksheet;
+        }
+        public XLHFItem(XLHFItem defaultHFItem, XLWorksheet worksheet)
+            :this(worksheet)
+        {
+            defaultHFItem.texts.ForEach(kp => texts.Add(kp.Key, kp.Value));
+        }
+        private readonly Dictionary<XLHFOccurrence, List<XLHFText>> texts = new Dictionary<XLHFOccurrence, List<XLHFText>>();
+        public String GetText(XLHFOccurrence occurrence)
+        {
+            var sb = new StringBuilder();
+            if(texts.ContainsKey(occurrence))
+            {
+                foreach (var hfText in texts[occurrence])
+                    sb.Append(hfText.GetHFText(sb.ToString()));
+            }
+
+            return sb.ToString();
+        }
+
+        public IXLRichString AddText(String text)
+        {
+            return AddText(text, XLHFOccurrence.AllPages);
+        }
+        public IXLRichString AddText(XLHFPredefinedText predefinedText)
+        {
+            return AddText(predefinedText, XLHFOccurrence.AllPages);
+        }
+
+        public IXLRichString AddText(String text, XLHFOccurrence occurrence)
+        {
+            XLRichString richText = new XLRichString(text, XLWorkbook.DefaultStyle.Font, this);
+
+            var hfText = new XLHFText(richText, _worksheet);
+            if (occurrence == XLHFOccurrence.AllPages)
+            {
+                AddTextToOccurrence(hfText, XLHFOccurrence.EvenPages);
+                AddTextToOccurrence(hfText, XLHFOccurrence.FirstPage);
+                AddTextToOccurrence(hfText, XLHFOccurrence.OddPages);
+            }
+            else
+            {
+                AddTextToOccurrence(hfText, occurrence);
+            }
+
+            return richText;
+        }
+
+        public IXLRichString AddNewLine()
+        {
+            return AddText(Environment.NewLine);
+        }
+
+        public IXLRichString AddImage(String imagePath, XLHFOccurrence occurrence = XLHFOccurrence.AllPages)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void AddTextToOccurrence(XLHFText hfText, XLHFOccurrence occurrence)
+        {
+            if (texts.ContainsKey(occurrence))
+                texts[occurrence].Add(hfText);
+            else
+                texts.Add(occurrence, new List<XLHFText> { hfText });
+        }
+
+        public IXLRichString AddText(XLHFPredefinedText predefinedText, XLHFOccurrence occurrence)
+        {
+            String hfText;
+            switch (predefinedText)
+            {
+                case XLHFPredefinedText.PageNumber: hfText = "&P"; break;
+                case XLHFPredefinedText.NumberOfPages : hfText = "&N"; break;
+                case XLHFPredefinedText.Date : hfText = "&D"; break;
+                case XLHFPredefinedText.Time : hfText = "&T"; break;
+                case XLHFPredefinedText.Path : hfText = "&Z"; break;
+                case XLHFPredefinedText.File : hfText = "&F"; break;
+                case XLHFPredefinedText.SheetName : hfText = "&A"; break;
+                case XLHFPredefinedText.FullPath: hfText = "&Z&F"; break;
+                default: throw new NotImplementedException();
+            }
+            return AddText(hfText, occurrence);
+        }
+
+        public void Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages)
+        {
+            if (occurrence == XLHFOccurrence.AllPages)
+            {
+                ClearOccurrence(XLHFOccurrence.EvenPages);
+                ClearOccurrence(XLHFOccurrence.FirstPage);
+                ClearOccurrence(XLHFOccurrence.OddPages);
+            }
+            else
+            {
+                ClearOccurrence(occurrence);
+            }
+        }
+
+        private void ClearOccurrence(XLHFOccurrence occurrence)
+        {
+            if (texts.ContainsKey(occurrence))
+                texts.Remove(occurrence);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/XLHFText.cs b/ClosedXML/Excel/PageSetup/XLHFText.cs
new file mode 100644
index 0000000..ed921ea
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/XLHFText.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLHFText
+    {
+        private readonly XLWorksheet _worksheet;
+        public XLHFText(XLRichString richText, XLWorksheet worksheet)
+        {
+            RichText = richText;
+            _worksheet = worksheet;
+        }
+        public XLRichString RichText { get; private set; }
+
+        public String GetHFText(String prevText)
+        {
+            StringBuilder sb = new StringBuilder();
+            var wsFont = _worksheet.Style.Font;
+
+            if (RichText.FontName != null && RichText.FontName != wsFont.FontName)
+                sb.Append("&\"" + RichText.FontName);
+            else
+                sb.Append("&\"-");
+
+            if (RichText.Bold && RichText.Italic)
+                sb.Append(",Bold Italic\"");
+            else if (RichText.Bold)
+                sb.Append(",Bold\"");
+            else if (RichText.Italic)
+                sb.Append(",Italic\"");
+            else
+                sb.Append(",Regular\"");
+
+            if (RichText.FontSize > 0 && Math.Abs(RichText.FontSize - wsFont.FontSize) > XLHelper.Epsilon)
+                sb.Append("&" + RichText.FontSize);
+
+            if (RichText.Strikethrough && !wsFont.Strikethrough)
+                sb.Append("&S");
+
+            if (RichText.VerticalAlignment != wsFont.VerticalAlignment)
+            {
+                if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Subscript)
+                    sb.Append("&Y");
+                else if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Superscript)
+                    sb.Append("&X");
+            }
+
+            if (RichText.Underline != wsFont.Underline)
+            {
+                if (RichText.Underline == XLFontUnderlineValues.Single)
+                    sb.Append("&U");
+                else if (RichText.Underline == XLFontUnderlineValues.Double)
+                    sb.Append("&E");
+            }
+
+            var lastColorPosition = prevText.LastIndexOf("&K");
+
+            if (
+                (lastColorPosition >= 0 && !RichText.FontColor.Equals(XLColor.FromHtml("#" + prevText.Substring(lastColorPosition + 2, 6))))
+                || (lastColorPosition == -1 && !RichText.FontColor.Equals(wsFont.FontColor))
+                )
+                sb.Append("&K" + RichText.FontColor.Color.ToHex().Substring(2));
+
+            sb.Append(RichText.Text);
+
+            if (RichText.Underline != wsFont.Underline)
+            {
+                if (RichText.Underline == XLFontUnderlineValues.Single)
+                    sb.Append("&U");
+                else if (RichText.Underline == XLFontUnderlineValues.Double)
+                    sb.Append("&E");
+            }
+
+            if (RichText.VerticalAlignment != wsFont.VerticalAlignment)
+            {
+                if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Subscript)
+                    sb.Append("&Y");
+                else if (RichText.VerticalAlignment == XLFontVerticalTextAlignmentValues.Superscript)
+                    sb.Append("&X");
+            }
+
+            if (RichText.Strikethrough && !wsFont.Strikethrough)
+                sb.Append("&S");
+
+            return sb.ToString();
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs b/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs
new file mode 100644
index 0000000..1da5789
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    using System.Linq;
+
+    internal class XLHeaderFooter: IXLHeaderFooter
+    {
+        public XLHeaderFooter(XLWorksheet worksheet)
+        {
+            Left = new XLHFItem(worksheet);
+            Right = new XLHFItem(worksheet);
+            Center = new XLHFItem(worksheet);
+            SetAsInitial();
+        }
+
+        public XLHeaderFooter(XLHeaderFooter defaultHF, XLWorksheet worksheet)
+        {
+            defaultHF.innerTexts.ForEach(kp => innerTexts.Add(kp.Key, kp.Value));
+            Left = new XLHFItem(defaultHF.Left as XLHFItem, worksheet);
+            Center = new XLHFItem(defaultHF.Center as XLHFItem, worksheet);
+            Right = new XLHFItem(defaultHF.Right as XLHFItem, worksheet);
+            SetAsInitial();
+        }
+
+        public IXLHFItem Left { get; private set; }
+        public IXLHFItem Center { get; private set; }
+        public IXLHFItem Right { get; private set; }
+
+        public String GetText(XLHFOccurrence occurrence)
+        {
+            if (innerTexts.ContainsKey(occurrence)) return innerTexts[occurrence];
+
+            var retVal = String.Empty;
+            var leftText = Left.GetText(occurrence);
+            var centerText = Center.GetText(occurrence);
+            var rightText = Right.GetText(occurrence);
+            retVal += leftText.Length > 0 ? "&L" + leftText : String.Empty;
+            retVal += centerText.Length > 0 ? "&C" + centerText : String.Empty;
+            retVal += rightText.Length > 0 ? "&R" + rightText : String.Empty;
+            if (retVal.Length > 255)
+                throw new ArgumentOutOfRangeException("Headers and Footers cannot be longer than 255 characters (including style markups)");
+            return retVal;
+        }
+
+        private Dictionary<XLHFOccurrence, String> innerTexts = new Dictionary<XLHFOccurrence, String>();
+        internal String SetInnerText(XLHFOccurrence occurrence, String text)
+        { 
+            if (innerTexts.ContainsKey(occurrence))
+                innerTexts[occurrence] = text;
+            else
+                innerTexts.Add(occurrence, text);
+
+            return innerTexts[occurrence];
+        }
+
+        private Dictionary<XLHFOccurrence, String> _initialTexts;
+
+        private Boolean _changed;
+        internal Boolean Changed
+        {
+            get
+            {
+                return _changed || _initialTexts.Any(it => GetText(it.Key) != it.Value);
+            }
+            set { _changed = value; }
+        }
+
+        internal void SetAsInitial()
+        {
+            _initialTexts = new Dictionary<XLHFOccurrence, string>();
+            foreach (var o in Enum.GetValues(typeof(XLHFOccurrence)).Cast<XLHFOccurrence>())
+            {
+                _initialTexts.Add(o, GetText(o));
+            }
+        }
+
+
+        public IXLHeaderFooter Clear(XLHFOccurrence occurrence = XLHFOccurrence.AllPages)
+        {
+            Left.Clear(occurrence);
+            Right.Clear(occurrence);
+            Center.Clear(occurrence);
+            return this;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/XLMargins.cs b/ClosedXML/Excel/PageSetup/XLMargins.cs
new file mode 100644
index 0000000..896254a
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/XLMargins.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLMargins: IXLMargins
+    {
+        public Double Left { get; set; }
+        public Double Right { get; set; }
+        public Double Top { get; set; }
+        public Double Bottom { get; set; }
+        public Double Header { get; set; }
+        public Double Footer { get; set; }
+
+        public IXLMargins SetLeft(Double value) { Left = value; return this; }
+        public IXLMargins SetRight(Double value) { Right = value; return this; }
+        public IXLMargins SetTop(Double value) { Top = value; return this; }
+        public IXLMargins SetBottom(Double value) { Bottom = value; return this; }
+        public IXLMargins SetHeader(Double value) { Header = value; return this; }
+        public IXLMargins SetFooter(Double value) { Footer = value; return this; }
+
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/XLPageSetup.cs b/ClosedXML/Excel/PageSetup/XLPageSetup.cs
new file mode 100644
index 0000000..5eaa80a
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/XLPageSetup.cs
@@ -0,0 +1,255 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPageSetup : IXLPageSetup
+    {
+        public XLPageSetup(XLPageSetup defaultPageOptions, XLWorksheet worksheet)
+        {
+            
+            if (defaultPageOptions != null)
+            {
+                PrintAreas = new XLPrintAreas(defaultPageOptions.PrintAreas as XLPrintAreas, worksheet);
+                CenterHorizontally = defaultPageOptions.CenterHorizontally;
+                CenterVertically = defaultPageOptions.CenterVertically;
+                FirstPageNumber = defaultPageOptions.FirstPageNumber;
+                HorizontalDpi = defaultPageOptions.HorizontalDpi;
+                PageOrientation = defaultPageOptions.PageOrientation;
+                VerticalDpi = defaultPageOptions.VerticalDpi;
+
+                PaperSize = defaultPageOptions.PaperSize;
+                _pagesTall = defaultPageOptions.PagesTall;
+                _pagesWide = defaultPageOptions.PagesWide;
+                _scale = defaultPageOptions.Scale;
+                
+
+                if (defaultPageOptions.Margins != null)
+                {
+                    Margins = new XLMargins
+                                  {
+                                Top = defaultPageOptions.Margins.Top,
+                                Bottom = defaultPageOptions.Margins.Bottom,
+                                Left = defaultPageOptions.Margins.Left,
+                                Right = defaultPageOptions.Margins.Right,
+                                Header = defaultPageOptions.Margins.Header,
+                                Footer = defaultPageOptions.Margins.Footer
+                            };
+                }
+                AlignHFWithMargins = defaultPageOptions.AlignHFWithMargins;
+                ScaleHFWithDocument = defaultPageOptions.ScaleHFWithDocument;
+                ShowGridlines = defaultPageOptions.ShowGridlines;
+                ShowRowAndColumnHeadings = defaultPageOptions.ShowRowAndColumnHeadings;
+                BlackAndWhite = defaultPageOptions.BlackAndWhite;
+                DraftQuality = defaultPageOptions.DraftQuality;
+                PageOrder = defaultPageOptions.PageOrder;
+
+                ColumnBreaks = defaultPageOptions.ColumnBreaks.ToList();
+                RowBreaks = defaultPageOptions.RowBreaks.ToList();
+                Header = new XLHeaderFooter(defaultPageOptions.Header as XLHeaderFooter, worksheet);
+                Footer = new XLHeaderFooter(defaultPageOptions.Footer as XLHeaderFooter, worksheet);
+                PrintErrorValue = defaultPageOptions.PrintErrorValue;
+            }
+            else
+            {
+                PrintAreas = new XLPrintAreas(worksheet);
+                Header = new XLHeaderFooter(worksheet);
+                Footer = new XLHeaderFooter(worksheet);
+                ColumnBreaks = new List<Int32>();
+                RowBreaks = new List<Int32>();
+            }
+        }
+        public IXLPrintAreas PrintAreas { get; private set; }
+
+
+        public Int32 FirstRowToRepeatAtTop { get; private set; }
+        public Int32 LastRowToRepeatAtTop { get; private set; }
+        public void SetRowsToRepeatAtTop(String range)
+        {
+            var arrRange = range.Replace("$", "").Split(':');
+            SetRowsToRepeatAtTop(Int32.Parse(arrRange[0]), Int32.Parse(arrRange[1]));
+        }
+        public void SetRowsToRepeatAtTop(Int32 firstRowToRepeatAtTop, Int32 lastRowToRepeatAtTop)
+        {
+            if (firstRowToRepeatAtTop <= 0) throw new ArgumentOutOfRangeException("The first row has to be greater than zero.");
+            if (firstRowToRepeatAtTop > lastRowToRepeatAtTop) throw new ArgumentOutOfRangeException("The first row has to be less than the second row.");
+
+            FirstRowToRepeatAtTop = firstRowToRepeatAtTop;
+            LastRowToRepeatAtTop = lastRowToRepeatAtTop;
+        }
+        public Int32 FirstColumnToRepeatAtLeft { get; private set; }
+        public Int32 LastColumnToRepeatAtLeft { get; private set; }
+        public void SetColumnsToRepeatAtLeft(String range)
+        {
+            var arrRange = range.Replace("$", "").Split(':');
+            Int32 iTest;
+            if (Int32.TryParse(arrRange[0], out iTest))
+                SetColumnsToRepeatAtLeft(Int32.Parse(arrRange[0]), Int32.Parse(arrRange[1]));
+            else
+                SetColumnsToRepeatAtLeft(arrRange[0], arrRange[1]);
+        }
+        public void SetColumnsToRepeatAtLeft(String firstColumnToRepeatAtLeft, String lastColumnToRepeatAtLeft)
+        {
+            SetColumnsToRepeatAtLeft(XLHelper.GetColumnNumberFromLetter(firstColumnToRepeatAtLeft), XLHelper.GetColumnNumberFromLetter(lastColumnToRepeatAtLeft));
+        }
+        public void SetColumnsToRepeatAtLeft(Int32 firstColumnToRepeatAtLeft, Int32 lastColumnToRepeatAtLeft)
+        {
+            if (firstColumnToRepeatAtLeft <= 0) throw new ArgumentOutOfRangeException("The first column has to be greater than zero.");
+            if (firstColumnToRepeatAtLeft > lastColumnToRepeatAtLeft) throw new ArgumentOutOfRangeException("The first column has to be less than the second column.");
+
+            FirstColumnToRepeatAtLeft = firstColumnToRepeatAtLeft;
+            LastColumnToRepeatAtLeft = lastColumnToRepeatAtLeft;
+        }
+
+        public XLPageOrientation PageOrientation { get; set; }
+        public XLPaperSize PaperSize { get; set; }
+        public Int32 HorizontalDpi { get; set; }
+        public Int32 VerticalDpi { get; set; }
+        public Int64 FirstPageNumber { get; set; }
+        public Boolean CenterHorizontally { get; set; }
+        public Boolean CenterVertically { get; set; }
+        public XLPrintErrorValues PrintErrorValue { get; set; }
+        public IXLMargins Margins { get; set; }
+
+        private Int32 _pagesWide;
+        public Int32 PagesWide 
+        {
+            get
+            {
+                return _pagesWide;
+            }
+            set
+            {
+                _pagesWide = value;
+                if (_pagesWide >0)
+                    _scale = 0;
+            }
+        }
+        
+        private Int32 _pagesTall;
+        public Int32 PagesTall
+        {
+            get
+            {
+                return _pagesTall;
+            }
+            set
+            {
+                _pagesTall = value;
+                if (_pagesTall >0)
+                    _scale = 0;
+            }
+        }
+
+        private Int32 _scale;
+        public Int32 Scale
+        {
+            get
+            {
+                return _scale;
+            }
+            set
+            {
+                _scale = value;
+                if (_scale <= 0) return;
+                _pagesTall = 0;
+                _pagesWide = 0;
+            }
+        }
+
+        public void AdjustTo(Int32 pctOfNormalSize)
+        {
+            Scale = pctOfNormalSize;
+            _pagesWide = 0;
+            _pagesTall = 0;
+        }
+        public void FitToPages(Int32 pagesWide, Int32 pagesTall)
+        {
+            _pagesWide = pagesWide;
+            this._pagesTall = pagesTall;
+            _scale = 0;
+        }
+
+
+        public IXLHeaderFooter Header { get; private set; }
+        public IXLHeaderFooter Footer { get; private set; }
+
+        public Boolean ScaleHFWithDocument { get; set; }
+        public Boolean AlignHFWithMargins { get; set; }
+
+        public Boolean ShowGridlines { get; set; }
+        public Boolean ShowRowAndColumnHeadings { get; set; }
+        public Boolean BlackAndWhite { get; set; }
+        public Boolean DraftQuality { get; set; }
+
+        public XLPageOrderValues PageOrder { get; set; }
+        public XLShowCommentsValues ShowComments { get; set; }
+
+        public List<Int32> RowBreaks { get; private set; }
+        public List<Int32> ColumnBreaks { get; private set; }
+        public void AddHorizontalPageBreak(Int32 row)
+        {
+            if (!RowBreaks.Contains(row))
+                RowBreaks.Add(row);
+        }
+        public void AddVerticalPageBreak(Int32 column)
+        {
+            if (!ColumnBreaks.Contains(column))
+                ColumnBreaks.Add(column);
+        }
+
+        //public void SetPageBreak(IXLRange range, XLPageBreakLocations breakLocation)
+        //{
+        //    switch (breakLocation)
+        //    {
+        //        case XLPageBreakLocations.AboveRange: RowBreaks.Add(range.Internals.Worksheet.Row(range.RowNumber)); break;
+        //        case XLPageBreakLocations.BelowRange: RowBreaks.Add(range.Internals.Worksheet.Row(range.RowCount())); break;
+        //        case XLPageBreakLocations.LeftOfRange: ColumnBreaks.Add(range.Internals.Worksheet.Column(range.ColumnNumber)); break;
+        //        case XLPageBreakLocations.RightOfRange: ColumnBreaks.Add(range.Internals.Worksheet.Column(range.ColumnCount())); break;
+        //        default: throw new NotImplementedException();
+        //    }
+        //}
+
+        public IXLPageSetup SetPageOrientation(XLPageOrientation value) { PageOrientation = value; return this; }
+        public IXLPageSetup SetPagesWide(Int32 value) { PagesWide = value; return this; }
+        public IXLPageSetup SetPagesTall(Int32 value) { PagesTall = value; return this; }
+        public IXLPageSetup SetScale(Int32 value) { Scale = value; return this; }
+        public IXLPageSetup SetHorizontalDpi(Int32 value) { HorizontalDpi = value; return this; }
+        public IXLPageSetup SetVerticalDpi(Int32 value) { VerticalDpi = value; return this; }
+        public IXLPageSetup SetFirstPageNumber(Int64 value) { FirstPageNumber = value; return this; }
+        public IXLPageSetup SetCenterHorizontally() { CenterHorizontally = true; return this; }	public IXLPageSetup SetCenterHorizontally(Boolean value) { CenterHorizontally = value; return this; }
+        public IXLPageSetup SetCenterVertically() { CenterVertically = true; return this; }	public IXLPageSetup SetCenterVertically(Boolean value) { CenterVertically = value; return this; }
+        public IXLPageSetup SetPaperSize(XLPaperSize value) { PaperSize = value; return this; }
+        public IXLPageSetup SetScaleHFWithDocument() { ScaleHFWithDocument = true; return this; }	public IXLPageSetup SetScaleHFWithDocument(Boolean value) { ScaleHFWithDocument = value; return this; }
+        public IXLPageSetup SetAlignHFWithMargins() { AlignHFWithMargins = true; return this; }	public IXLPageSetup SetAlignHFWithMargins(Boolean value) { AlignHFWithMargins = value; return this; }
+        public IXLPageSetup SetShowGridlines() { ShowGridlines = true; return this; }	public IXLPageSetup SetShowGridlines(Boolean value) { ShowGridlines = value; return this; }
+        public IXLPageSetup SetShowRowAndColumnHeadings() { ShowRowAndColumnHeadings = true; return this; }	public IXLPageSetup SetShowRowAndColumnHeadings(Boolean value) { ShowRowAndColumnHeadings = value; return this; }
+        public IXLPageSetup SetBlackAndWhite() { BlackAndWhite = true; return this; }	public IXLPageSetup SetBlackAndWhite(Boolean value) { BlackAndWhite = value; return this; }
+        public IXLPageSetup SetDraftQuality() { DraftQuality = true; return this; }	public IXLPageSetup SetDraftQuality(Boolean value) { DraftQuality = value; return this; }
+        public IXLPageSetup SetPageOrder(XLPageOrderValues value) { PageOrder = value; return this; }
+        public IXLPageSetup SetShowComments(XLShowCommentsValues value) { ShowComments = value; return this; }
+        public IXLPageSetup SetPrintErrorValue(XLPrintErrorValues value) { PrintErrorValue = value; return this; }
+
+        public Boolean DifferentFirstPageOnHF { get; set; }
+        public IXLPageSetup SetDifferentFirstPageOnHF()
+        {
+            return SetDifferentFirstPageOnHF(true);
+        }
+        public IXLPageSetup SetDifferentFirstPageOnHF(Boolean value)
+        {
+            DifferentFirstPageOnHF = value;
+            return this;
+        }
+        public Boolean DifferentOddEvenPagesOnHF { get; set; }
+        public IXLPageSetup SetDifferentOddEvenPagesOnHF()
+        {
+            return SetDifferentOddEvenPagesOnHF(true);
+        }
+        public IXLPageSetup SetDifferentOddEvenPagesOnHF(Boolean value)
+        {
+            DifferentOddEvenPagesOnHF = value;
+            return this;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PageSetup/XLPrintAreas.cs b/ClosedXML/Excel/PageSetup/XLPrintAreas.cs
new file mode 100644
index 0000000..797d2fc
--- /dev/null
+++ b/ClosedXML/Excel/PageSetup/XLPrintAreas.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPrintAreas : IXLPrintAreas
+    {
+        List<IXLRange> ranges = new List<IXLRange>();
+        private XLWorksheet worksheet;
+        public XLPrintAreas(XLWorksheet worksheet)
+        {
+            this.worksheet = worksheet;
+        }
+
+        public XLPrintAreas(XLPrintAreas defaultPrintAreas, XLWorksheet worksheet)
+        {
+            ranges = defaultPrintAreas.ranges.ToList();
+            this.worksheet = worksheet;
+        }
+
+        public void Clear()
+        {
+            ranges.Clear();
+        }
+
+        public void Add(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn)
+        {
+            ranges.Add(worksheet.Range(firstCellRow, firstCellColumn, lastCellRow, lastCellColumn));
+        }
+
+        public void Add(string rangeAddress)
+        {
+            ranges.Add(worksheet.Range(rangeAddress));
+        }
+
+        public void Add(string firstCellAddress, string lastCellAddress)
+        {
+            ranges.Add(worksheet.Range(firstCellAddress, lastCellAddress));
+        }
+
+        public void Add(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
+        {
+            ranges.Add(worksheet.Range(firstCellAddress, lastCellAddress));
+        }
+
+        public IEnumerator<IXLRange> GetEnumerator()
+        {
+            return ranges.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/IXLPivotField.cs b/ClosedXML/Excel/PivotTables/IXLPivotField.cs
new file mode 100644
index 0000000..8e69e8b
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/IXLPivotField.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLSubtotalFunction
+    {
+        Automatic,
+        None,
+        Sum,
+        Count,
+        Average,
+        Minimum,
+        Maximum,
+        Product,
+        CountNumbers,
+        StandardDeviation,
+        PopulationStandardDeviation,
+        Variance,
+        PopulationVariance,
+    }
+    public enum XLPivotLayout { Outline, Tabular, Compact }
+    public interface IXLPivotField
+    {
+        String SourceName { get; }
+        String CustomName { get; set; }
+
+        List<XLSubtotalFunction> Subtotals { get; }
+        Boolean IncludeNewItemsInFilter { get; set; }
+
+        XLPivotLayout Layout { get; set; }
+        Boolean SubtotalsAtTop { get; set; }
+        Boolean RepeatItemLabels { get; set; }
+        Boolean InsertBlankLines  { get; set; }
+        Boolean ShowBlankItems { get; set; }
+        Boolean InsertPageBreaks { get; set; }
+
+        IXLPivotField SetCustomName(String value);
+
+        IXLPivotField AddSubtotal(XLSubtotalFunction value);
+        IXLPivotField SetIncludeNewItemsInFilter(); IXLPivotField SetIncludeNewItemsInFilter(Boolean value);
+
+        IXLPivotField SetLayout(XLPivotLayout value);
+        IXLPivotField SetSubtotalsAtTop(); IXLPivotField SetSubtotalsAtTop(Boolean value);
+        IXLPivotField SetRepeatItemLabels(); IXLPivotField SetRepeatItemLabels(Boolean value);
+        IXLPivotField SetInsertBlankLines(); IXLPivotField SetInsertBlankLines(Boolean value);
+        IXLPivotField SetShowBlankItems(); IXLPivotField SetShowBlankItems(Boolean value);
+        IXLPivotField SetInsertPageBreaks(); IXLPivotField SetInsertPageBreaks(Boolean value);
+
+        List<string> SharedStrings { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/IXLPivotFields.cs b/ClosedXML/Excel/PivotTables/IXLPivotFields.cs
new file mode 100644
index 0000000..7b01687
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/IXLPivotFields.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLPivotFields: IEnumerable<IXLPivotField>
+    {
+        IXLPivotField Add(String sourceName);
+        IXLPivotField Add(String sourceName, String customName);
+        void Clear();
+        void Remove(String sourceName);
+
+        int IndexOf(IXLPivotField pf);
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/IXLPivotTable.cs b/ClosedXML/Excel/PivotTables/IXLPivotTable.cs
new file mode 100644
index 0000000..414f421
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/IXLPivotTable.cs
@@ -0,0 +1,213 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLPivotTableTheme
+    {
+        PivotStyleDark1,
+        PivotStyleDark10,
+        PivotStyleDark11,
+        PivotStyleDark12,
+        PivotStyleDark13,
+        PivotStyleDark14,
+        PivotStyleDark15,
+        PivotStyleDark16,
+        PivotStyleDark17,
+        PivotStyleDark18,
+        PivotStyleDark19,
+        PivotStyleDark2,
+        PivotStyleDark20,
+        PivotStyleDark21,
+        PivotStyleDark22,
+        PivotStyleDark23,
+        PivotStyleDark24,
+        PivotStyleDark25,
+        PivotStyleDark26,
+        PivotStyleDark27,
+        PivotStyleDark28,
+        PivotStyleDark3,
+        PivotStyleDark4,
+        PivotStyleDark5,
+        PivotStyleDark6,
+        PivotStyleDark7,
+        PivotStyleDark8,
+        PivotStyleDark9,
+        PivotStyleLight1,
+        PivotStyleLight10,
+        PivotStyleLight11,
+        PivotStyleLight12,
+        PivotStyleLight13,
+        PivotStyleLight14,
+        PivotStyleLight15,
+        PivotStyleLight16,
+        PivotStyleLight17,
+        PivotStyleLight18,
+        PivotStyleLight19,
+        PivotStyleLight2,
+        PivotStyleLight20,
+        PivotStyleLight21,
+        PivotStyleLight22,
+        PivotStyleLight23,
+        PivotStyleLight24,
+        PivotStyleLight25,
+        PivotStyleLight26,
+        PivotStyleLight27,
+        PivotStyleLight28,
+        PivotStyleLight3,
+        PivotStyleLight4,
+        PivotStyleLight5,
+        PivotStyleLight6,
+        PivotStyleLight7,
+        PivotStyleLight8,
+        PivotStyleLight9,
+        PivotStyleMedium1,
+        PivotStyleMedium10,
+        PivotStyleMedium11,
+        PivotStyleMedium12,
+        PivotStyleMedium13,
+        PivotStyleMedium14,
+        PivotStyleMedium15,
+        PivotStyleMedium16,
+        PivotStyleMedium17,
+        PivotStyleMedium18,
+        PivotStyleMedium19,
+        PivotStyleMedium2,
+        PivotStyleMedium20,
+        PivotStyleMedium21,
+        PivotStyleMedium22,
+        PivotStyleMedium23,
+        PivotStyleMedium24,
+        PivotStyleMedium25,
+        PivotStyleMedium26,
+        PivotStyleMedium27,
+        PivotStyleMedium28,
+        PivotStyleMedium3,
+        PivotStyleMedium4,
+        PivotStyleMedium5,
+        PivotStyleMedium6,
+        PivotStyleMedium7,
+        PivotStyleMedium8,
+        PivotStyleMedium9
+    }
+
+    public enum XLPivotSubtotals
+    {
+        DoNotShow,
+        AtTop,
+        AtBottom
+    }
+
+    public enum XLFilterAreaOrder { DownThenOver, OverThenDown }
+    public enum XLItemsToRetain { Automatic, None, Max }
+
+    public interface IXLPivotTable
+    {
+        XLPivotTableTheme Theme { get; set; }
+
+        IXLPivotFields Fields { get; }
+        IXLPivotFields ReportFilters { get; }
+        IXLPivotFields  ColumnLabels { get; }
+        IXLPivotFields RowLabels { get; }
+        IXLPivotValues Values { get; }
+
+        String Name { get; set; }
+        String Title { get; set; }
+        String Description { get; set; }
+
+        IXLCell TargetCell { get; set; }
+        IXLRange SourceRange { get; set; }
+
+        Boolean MergeAndCenterWithLabels { get; set; } // MergeItem
+        Int32 RowLabelIndent { get; set; } // Indent
+        XLFilterAreaOrder FilterAreaOrder { get; set; } // PageOverThenDown 
+        Int32 FilterFieldsPageWrap { get; set; } // PageWrap
+        String ErrorValueReplacement { get; set; } // ErrorCaption
+        String EmptyCellReplacement { get; set; } // MissingCaption
+        Boolean AutofitColumns { get; set; } //UseAutoFormatting 
+        Boolean PreserveCellFormatting { get; set; } // PreserveFormatting 
+        
+        Boolean ShowGrandTotalsRows { get; set; } // RowGrandTotals 
+        Boolean ShowGrandTotalsColumns { get; set; } // ColumnGrandTotals 
+        Boolean FilteredItemsInSubtotals { get; set; } // Subtotal filtered page items
+        Boolean AllowMultipleFilters { get; set; } // MultipleFieldFilters 
+        Boolean UseCustomListsForSorting { get; set; } // CustomListSort 
+
+        Boolean ShowExpandCollapseButtons { get; set; }
+        Boolean ShowContextualTooltips { get; set; }
+        Boolean ShowPropertiesInTooltips { get; set; }
+        Boolean DisplayCaptionsAndDropdowns { get; set; }
+        Boolean ClassicPivotTableLayout { get; set; }
+        Boolean ShowValuesRow { get; set; }
+        Boolean ShowEmptyItemsOnRows { get; set; }
+        Boolean ShowEmptyItemsOnColumns { get; set; }
+        Boolean DisplayItemLabels { get; set; }
+        Boolean SortFieldsAtoZ { get; set; }
+
+        Boolean PrintExpandCollapsedButtons { get; set; }
+        Boolean RepeatRowLabels { get; set; }
+        Boolean PrintTitles { get; set; }
+
+        Boolean SaveSourceData { get; set; }
+        Boolean EnableShowDetails { get; set; }
+        Boolean RefreshDataOnOpen { get; set; }
+        XLItemsToRetain ItemsToRetainPerField { get; set; }
+        Boolean EnableCellEditing { get; set; }
+
+        IXLPivotTable SetName(String value);
+        IXLPivotTable SetTitle(String value);
+        IXLPivotTable SetDescription(String value);
+
+        IXLPivotTable SetMergeAndCenterWithLabels(); IXLPivotTable SetMergeAndCenterWithLabels(Boolean value);
+        IXLPivotTable SetRowLabelIndent(Int32 value);
+        IXLPivotTable SetFilterAreaOrder(XLFilterAreaOrder value);
+        IXLPivotTable SetFilterFieldsPageWrap(Int32 value);
+        IXLPivotTable SetErrorValueReplacement(String value);
+        IXLPivotTable SetEmptyCellReplacement(String value);
+        IXLPivotTable SetAutofitColumns(); IXLPivotTable SetAutofitColumns(Boolean value);
+        IXLPivotTable SetPreserveCellFormatting(); IXLPivotTable SetPreserveCellFormatting(Boolean value);
+
+        IXLPivotTable SetShowGrandTotalsRows(); IXLPivotTable SetShowGrandTotalsRows(Boolean value);
+        IXLPivotTable SetShowGrandTotalsColumns(); IXLPivotTable SetShowGrandTotalsColumns(Boolean value);
+        IXLPivotTable SetFilteredItemsInSubtotals(); IXLPivotTable SetFilteredItemsInSubtotals(Boolean value);
+        IXLPivotTable SetAllowMultipleFilters(); IXLPivotTable SetAllowMultipleFilters(Boolean value);
+        IXLPivotTable SetUseCustomListsForSorting(); IXLPivotTable SetUseCustomListsForSorting(Boolean value);
+
+        IXLPivotTable SetShowExpandCollapseButtons(); IXLPivotTable SetShowExpandCollapseButtons(Boolean value);
+        IXLPivotTable SetShowContextualTooltips(); IXLPivotTable SetShowContextualTooltips(Boolean value);
+        IXLPivotTable SetShowPropertiesInTooltips(); IXLPivotTable SetShowPropertiesInTooltips(Boolean value);
+        IXLPivotTable SetDisplayCaptionsAndDropdowns(); IXLPivotTable SetDisplayCaptionsAndDropdowns(Boolean value);
+        IXLPivotTable SetClassicPivotTableLayout(); IXLPivotTable SetClassicPivotTableLayout(Boolean value);
+        IXLPivotTable SetShowValuesRow(); IXLPivotTable SetShowValuesRow(Boolean value);
+        IXLPivotTable SetShowEmptyItemsOnRows(); IXLPivotTable SetShowEmptyItemsOnRows(Boolean value);
+        IXLPivotTable SetShowEmptyItemsOnColumns(); IXLPivotTable SetShowEmptyItemsOnColumns(Boolean value);
+        IXLPivotTable SetDisplayItemLabels(); IXLPivotTable SetDisplayItemLabels(Boolean value);
+        IXLPivotTable SetSortFieldsAtoZ(); IXLPivotTable SetSortFieldsAtoZ(Boolean value);
+
+        IXLPivotTable SetPrintExpandCollapsedButtons(); IXLPivotTable SetPrintExpandCollapsedButtons(Boolean value);
+        IXLPivotTable SetRepeatRowLabels(); IXLPivotTable SetRepeatRowLabels(Boolean value);
+        IXLPivotTable SetPrintTitles(); IXLPivotTable SetPrintTitles(Boolean value);
+
+        IXLPivotTable SetSaveSourceData(); IXLPivotTable SetSaveSourceData(Boolean value);
+        IXLPivotTable SetEnableShowDetails(); IXLPivotTable SetEnableShowDetails(Boolean value);
+        IXLPivotTable SetRefreshDataOnOpen(); IXLPivotTable SetRefreshDataOnOpen(Boolean value);
+        IXLPivotTable SetItemsToRetainPerField(XLItemsToRetain value);
+        IXLPivotTable SetEnableCellEditing(); IXLPivotTable SetEnableCellEditing(Boolean value);
+
+        Boolean ShowRowHeaders { get; set; }
+        Boolean ShowColumnHeaders { get; set; }
+        Boolean ShowRowStripes { get; set; }
+        Boolean ShowColumnStripes { get; set; }
+        XLPivotSubtotals Subtotals { get; set; }
+        XLPivotLayout Layout { set; }
+        Boolean InsertBlankLines { set; }
+
+        IXLPivotTable SetShowRowHeaders(); IXLPivotTable SetShowRowHeaders(Boolean value);
+        IXLPivotTable SetShowColumnHeaders(); IXLPivotTable SetShowColumnHeaders(Boolean value);
+        IXLPivotTable SetShowRowStripes(); IXLPivotTable SetShowRowStripes(Boolean value);
+        IXLPivotTable SetShowColumnStripes(); IXLPivotTable SetShowColumnStripes(Boolean value);
+        IXLPivotTable SetSubtotals(XLPivotSubtotals value);
+        IXLPivotTable SetLayout(XLPivotLayout value);
+        IXLPivotTable SetInsertBlankLines(); IXLPivotTable SetInsertBlankLines(Boolean value);
+
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/IXLPivotTables.cs b/ClosedXML/Excel/PivotTables/IXLPivotTables.cs
new file mode 100644
index 0000000..1f3bb63
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/IXLPivotTables.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLPivotTables: IEnumerable<IXLPivotTable>
+    {
+        IXLPivotTable PivotTable(String name);
+        void Add(String name, IXLPivotTable pivotTable);
+        IXLPivotTable AddNew(String name, IXLCell target, IXLRange source);
+        void Delete(String name);
+        void DeleteAll();
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValue.cs b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValue.cs
new file mode 100644
index 0000000..48c6190
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValue.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public enum XLPivotSummary
+    {
+        Sum,
+        Count,
+        Average,
+        Minimum,
+        Maximum,
+        Product,
+        CountNumbers,
+        StandardDeviation,
+        PopulationStandardDeviation,
+        Variance,
+        PopulationVariance,
+    }
+
+    public enum XLPivotCalculation
+    {
+        Normal,
+        DifferenceFrom,
+        PctOf,
+        PctDifferenceFrom,
+        RunningTotal,
+        PctOfRow,
+        PctOfColumn,
+        PctOfTotal,
+        Index
+    }
+    public enum XLPivotCalculationItem
+    {
+        Value, Previous, Next
+    }
+
+    public interface IXLPivotValue
+    {
+        String SourceName { get; }
+        String CustomName { get; set; }
+
+        IXLPivotValueFormat NumberFormat { get; }
+
+        XLPivotSummary SummaryFormula { get; set; }
+        XLPivotCalculation Calculation { get; set; }
+        String BaseField { get; set; }
+        String BaseItem { get; set; }
+        XLPivotCalculationItem CalculationItem { get; set; }
+
+        IXLPivotValue SetSummaryFormula(XLPivotSummary value);
+        IXLPivotValue SetCalculation(XLPivotCalculation value);
+        IXLPivotValue SetBaseField(String value);
+        IXLPivotValue SetBaseItem(String value);
+        IXLPivotValue SetCalculationItem(XLPivotCalculationItem value);
+
+
+        IXLPivotValue ShowAsNormal();
+        IXLPivotValueCombination ShowAsDifferenceFrom(String fieldSourceName);
+        IXLPivotValueCombination ShowAsPctFrom(String fieldSourceName);
+        IXLPivotValueCombination ShowAsPctDifferenceFrom(String fieldSourceName);
+        IXLPivotValue ShowAsRunningTotalIn(String fieldSourceName);
+        IXLPivotValue ShowAsPctOfRow();
+        IXLPivotValue ShowAsPctOfColumn();
+        IXLPivotValue ShowAsPctOfTotal();
+        IXLPivotValue ShowAsIndex();
+
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueCombination.cs b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueCombination.cs
new file mode 100644
index 0000000..3e655b8
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueCombination.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLPivotValueCombination
+    {
+        IXLPivotValue And(String item);
+        IXLPivotValue AndPrevious();
+        IXLPivotValue AndNext();
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueFormat.cs b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueFormat.cs
new file mode 100644
index 0000000..6ccaedf
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValueFormat.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLPivotValueFormat: IXLNumberFormatBase
+    {
+        IXLPivotValue SetNumberFormatId(Int32 value);
+        IXLPivotValue SetFormat(String value);
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValues.cs b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValues.cs
new file mode 100644
index 0000000..0d971e6
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/IXLPivotValues.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLPivotValues: IEnumerable<IXLPivotValue>
+    {
+        IXLPivotValue Add(String sourceName);
+        IXLPivotValue Add(String sourceName, String customName);
+        void Clear();
+        void Remove(String sourceName);
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValue.cs b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValue.cs
new file mode 100644
index 0000000..37ec344
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValue.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPivotValue: IXLPivotValue
+    {
+        public XLPivotValue(string sourceName)
+        {
+            SourceName = sourceName;
+            NumberFormat = new XLPivotValueFormat(this);
+        }
+
+        public IXLPivotValueFormat NumberFormat { get; private set; }
+        public String SourceName { get; private set; }	
+        public String CustomName { get; set; }		public IXLPivotValue SetCustomName(String value) { CustomName = value; return this; }
+
+        public XLPivotSummary SummaryFormula { get; set; }		public IXLPivotValue SetSummaryFormula(XLPivotSummary value) { SummaryFormula = value; return this; }
+        public XLPivotCalculation Calculation { get; set; }		public IXLPivotValue SetCalculation(XLPivotCalculation value) { Calculation = value; return this; }
+        public String BaseField { get; set; }		public IXLPivotValue SetBaseField(String value) { BaseField = value; return this; }
+        public String BaseItem { get; set; }		public IXLPivotValue SetBaseItem(String value) { BaseItem = value; return this; }
+        public XLPivotCalculationItem CalculationItem { get; set; }		public IXLPivotValue SetCalculationItem(XLPivotCalculationItem value) { CalculationItem = value; return this; }
+
+
+        public IXLPivotValue ShowAsNormal()
+        {
+            return SetCalculation(XLPivotCalculation.Normal);
+        }
+        public IXLPivotValueCombination ShowAsDifferenceFrom(String fieldSourceName)
+        {
+            BaseField = fieldSourceName;
+            SetCalculation(XLPivotCalculation.DifferenceFrom);
+            return new XLPivotValueCombination(this);
+        }
+        public IXLPivotValueCombination ShowAsPctFrom(String fieldSourceName)
+        {
+            BaseField = fieldSourceName;
+            SetCalculation(XLPivotCalculation.PctOf);
+            return new XLPivotValueCombination(this);
+        }
+        public IXLPivotValueCombination ShowAsPctDifferenceFrom(String fieldSourceName)
+        {
+            BaseField = fieldSourceName;
+            SetCalculation(XLPivotCalculation.PctDifferenceFrom);
+            return new XLPivotValueCombination(this);
+        }
+        public IXLPivotValue ShowAsRunningTotalIn(String fieldSourceName)
+        {
+            BaseField = fieldSourceName;
+            return SetCalculation(XLPivotCalculation.RunningTotal);
+        }
+        public IXLPivotValue ShowAsPctOfRow()
+        {
+            return SetCalculation(XLPivotCalculation.PctOfRow);
+        }
+
+        public IXLPivotValue ShowAsPctOfColumn()
+        {
+            return SetCalculation(XLPivotCalculation.PctOfColumn);
+        }
+
+        public IXLPivotValue ShowAsPctOfTotal()
+        {
+            return SetCalculation(XLPivotCalculation.PctOfTotal);
+        }
+
+        public IXLPivotValue ShowAsIndex()
+        {
+            return SetCalculation(XLPivotCalculation.Index);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueCombination.cs b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueCombination.cs
new file mode 100644
index 0000000..56f04bc
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueCombination.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPivotValueCombination: IXLPivotValueCombination
+    {
+        private readonly IXLPivotValue _pivotValue;
+        public XLPivotValueCombination(IXLPivotValue pivotValue)
+        {
+            _pivotValue = pivotValue;
+        }
+        public IXLPivotValue And(String item)
+        {
+            _pivotValue.BaseItem = item;
+            _pivotValue.CalculationItem = XLPivotCalculationItem.Value;
+            return _pivotValue;
+        }
+        public IXLPivotValue AndPrevious()
+        {
+            _pivotValue.CalculationItem = XLPivotCalculationItem.Previous;
+            return _pivotValue;
+        }
+        public IXLPivotValue AndNext()
+        {
+            _pivotValue.CalculationItem = XLPivotCalculationItem.Next;
+            return _pivotValue;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueFormat.cs b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueFormat.cs
new file mode 100644
index 0000000..191d46c
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValueFormat.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPivotValueFormat: IXLPivotValueFormat
+    {
+        private readonly XLPivotValue _pivotValue;
+        public XLPivotValueFormat(XLPivotValue pivotValue)
+        {
+            _pivotValue = pivotValue;
+            _format = "General";
+            _numberFormatId = 0;
+        }
+
+        private Int32 _numberFormatId = -1;
+        public Int32 NumberFormatId
+        {
+            get { return _numberFormatId; }
+            set
+            {
+                _numberFormatId = value;
+                _format = string.Empty;
+            }
+        }
+
+        private String _format = String.Empty;
+        public String Format
+        {
+            get { return _format; }
+            set
+            {
+                _format = value;
+                _numberFormatId = -1;
+            }
+        }
+
+        public IXLPivotValue SetNumberFormatId(Int32 value)
+        {
+            NumberFormatId = value;
+            return _pivotValue;
+        }
+        public IXLPivotValue SetFormat(String value)
+        {
+            Format = value;
+
+            switch (value)
+            {
+                case "General":
+                    _numberFormatId = 0;
+                    break;
+                case "0":
+                    _numberFormatId = 1;
+                    break;
+                case "0.00":
+                    _numberFormatId = 2;
+                    break;
+                case "#,##0":
+                    _numberFormatId = 3;
+                    break;
+                case "#,##0.00":
+                    _numberFormatId = 4;
+                    break;
+                case "0%":
+                    _numberFormatId = 9;
+                    break;
+                case "0.00%":
+                    _numberFormatId = 10;
+                    break;
+                case "0.00E+00":
+                    _numberFormatId = 11;
+                    break;
+            }
+
+
+            return _pivotValue;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValues.cs b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValues.cs
new file mode 100644
index 0000000..b855923
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/PivotValues/XLPivotValues.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPivotValues: IXLPivotValues
+    {
+        private readonly Dictionary<String, IXLPivotValue> _pivotValues = new Dictionary<string, IXLPivotValue>();
+        public IEnumerator<IXLPivotValue> GetEnumerator()
+        {
+            return _pivotValues.Values.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLPivotValue Add(String sourceName)
+        {
+            return Add(sourceName, sourceName);
+        }
+        public IXLPivotValue Add(String sourceName, String customName)
+        {
+            var pivotValue = new XLPivotValue(sourceName) { CustomName = customName };
+            _pivotValues.Add(sourceName, pivotValue);
+            return pivotValue;
+        }
+
+        public void Clear()
+        {
+            _pivotValues.Clear();
+        }
+        public void Remove(String sourceName)
+        {
+            _pivotValues.Remove(sourceName);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/XLPivotField.cs b/ClosedXML/Excel/PivotTables/XLPivotField.cs
new file mode 100644
index 0000000..84291fd
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/XLPivotField.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+
+    public class XLPivotField: IXLPivotField
+    {
+        public XLPivotField(string sourceName)
+        {
+            SourceName = sourceName;
+            SharedStrings = new List<string>();
+            Subtotals = new List<XLSubtotalFunction>();
+        }
+
+        public String SourceName { get; private set; }	
+        public String CustomName { get; set; }		public IXLPivotField SetCustomName(String value) { CustomName = value; return this; }
+
+        public List<XLSubtotalFunction> Subtotals { get; private set; }		public IXLPivotField AddSubtotal(XLSubtotalFunction value) { Subtotals.Add(value); return this; }
+        public Boolean IncludeNewItemsInFilter { get; set; }	public IXLPivotField SetIncludeNewItemsInFilter() { IncludeNewItemsInFilter = true; return this; }	public IXLPivotField SetIncludeNewItemsInFilter(Boolean value) { IncludeNewItemsInFilter = value; return this; }
+
+        public XLPivotLayout Layout { get; set; }		public IXLPivotField SetLayout(XLPivotLayout value) { Layout = value; return this; }
+        public Boolean SubtotalsAtTop { get; set; }	public IXLPivotField SetSubtotalsAtTop() { SubtotalsAtTop = true; return this; }	public IXLPivotField SetSubtotalsAtTop(Boolean value) { SubtotalsAtTop = value; return this; }
+        public Boolean RepeatItemLabels { get; set; }	public IXLPivotField SetRepeatItemLabels() { RepeatItemLabels = true; return this; }	public IXLPivotField SetRepeatItemLabels(Boolean value) { RepeatItemLabels = value; return this; }
+        public Boolean InsertBlankLines { get; set; }	public IXLPivotField SetInsertBlankLines() { InsertBlankLines = true; return this; }	public IXLPivotField SetInsertBlankLines(Boolean value) { InsertBlankLines = value; return this; }
+        public Boolean ShowBlankItems { get; set; }	public IXLPivotField SetShowBlankItems() { ShowBlankItems = true; return this; }	public IXLPivotField SetShowBlankItems(Boolean value) { ShowBlankItems = value; return this; }
+        public Boolean InsertPageBreaks { get; set; }	public IXLPivotField SetInsertPageBreaks() { InsertPageBreaks = true; return this; }	public IXLPivotField SetInsertPageBreaks(Boolean value) { InsertPageBreaks = value; return this; }
+
+        public List<string> SharedStrings { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/XLPivotFields.cs b/ClosedXML/Excel/PivotTables/XLPivotFields.cs
new file mode 100644
index 0000000..95e15d5
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/XLPivotFields.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public class XLPivotFields: IXLPivotFields
+    {
+        private readonly Dictionary<String, IXLPivotField> _pivotFields = new Dictionary<string, IXLPivotField>();
+        public IEnumerator<IXLPivotField> GetEnumerator()
+        {
+            return _pivotFields.Values.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLPivotField Add(String sourceName)
+        {
+            return Add(sourceName, sourceName);
+        }
+        public IXLPivotField Add(String sourceName, String customName)
+        {
+            var pivotField = new XLPivotField(sourceName) {CustomName = customName};
+            _pivotFields.Add(sourceName, pivotField);
+            return pivotField;
+        }
+
+        public void Clear()
+        {
+            _pivotFields.Clear();
+        }
+        public void Remove(String sourceName)
+        {
+            _pivotFields.Remove(sourceName);
+        }
+
+        public int IndexOf(IXLPivotField pf)
+        {
+            var selectedItem = _pivotFields.Select((item, index) => new {Item = item, Position = index}).FirstOrDefault(i => i.Item.Key == pf.SourceName);
+            if (selectedItem == null)
+                throw new IndexOutOfRangeException("Invalid field name.");
+            return selectedItem.Position;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/XLPivotTable.cs b/ClosedXML/Excel/PivotTables/XLPivotTable.cs
new file mode 100644
index 0000000..dc2b6ee
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/XLPivotTable.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPivotTable: IXLPivotTable
+    {
+        public XLPivotTable()
+        {
+            Fields = new XLPivotFields();
+            ReportFilters = new XLPivotFields();
+            ColumnLabels=new XLPivotFields();
+            RowLabels = new XLPivotFields();
+            Values = new XLPivotValues();
+            Theme = XLPivotTableTheme.PivotStyleLight16;
+
+            SetExcelDefaults();
+        }
+
+        public IXLCell TargetCell { get; set; }
+        public IXLRange SourceRange { get; set; }
+
+        public IXLPivotFields Fields { get; private set; }
+        public IXLPivotFields ReportFilters { get; private set; }
+        public IXLPivotFields ColumnLabels { get; private set; }
+        public IXLPivotFields RowLabels { get; private set; }
+        public IXLPivotValues Values { get; private set; }
+
+        public XLPivotTableTheme Theme { get; set; }		public IXLPivotTable SetTheme(XLPivotTableTheme value) { Theme = value; return this; }
+        public String Name { get; set; }		public IXLPivotTable SetName(String value) { Name = value; return this; }
+        public String Title { get; set; }		public IXLPivotTable SetTitle(String value) { Title = value; return this; }
+        public String Description { get; set; }		public IXLPivotTable SetDescription(String value) { Description = value; return this; }
+
+        public Boolean MergeAndCenterWithLabels { get; set; }	public IXLPivotTable SetMergeAndCenterWithLabels() { MergeAndCenterWithLabels = true; return this; }	public IXLPivotTable SetMergeAndCenterWithLabels(Boolean value) { MergeAndCenterWithLabels = value; return this; }
+        public Int32 RowLabelIndent { get; set; }		public IXLPivotTable SetRowLabelIndent(Int32 value) { RowLabelIndent = value; return this; }
+        public XLFilterAreaOrder FilterAreaOrder { get; set; }		public IXLPivotTable SetFilterAreaOrder(XLFilterAreaOrder value) { FilterAreaOrder = value; return this; }
+        public Int32 FilterFieldsPageWrap { get; set; }		public IXLPivotTable SetFilterFieldsPageWrap(Int32 value) { FilterFieldsPageWrap = value; return this; }
+        public String ErrorValueReplacement { get; set; }		public IXLPivotTable SetErrorValueReplacement(String value) { ErrorValueReplacement = value; return this; }
+        public String EmptyCellReplacement { get; set; }		public IXLPivotTable SetEmptyCellReplacement(String value) { EmptyCellReplacement = value; return this; }
+        public Boolean AutofitColumns { get; set; }	public IXLPivotTable SetAutofitColumns() { AutofitColumns = true; return this; }	public IXLPivotTable SetAutofitColumns(Boolean value) { AutofitColumns = value; return this; }
+        public Boolean PreserveCellFormatting { get; set; }	public IXLPivotTable SetPreserveCellFormatting() { PreserveCellFormatting = true; return this; }	public IXLPivotTable SetPreserveCellFormatting(Boolean value) { PreserveCellFormatting = value; return this; }
+
+        public Boolean ShowGrandTotalsRows { get; set; }	public IXLPivotTable SetShowGrandTotalsRows() { ShowGrandTotalsRows = true; return this; }	public IXLPivotTable SetShowGrandTotalsRows(Boolean value) { ShowGrandTotalsRows = value; return this; }
+        public Boolean ShowGrandTotalsColumns { get; set; }	public IXLPivotTable SetShowGrandTotalsColumns() { ShowGrandTotalsColumns = true; return this; }	public IXLPivotTable SetShowGrandTotalsColumns(Boolean value) { ShowGrandTotalsColumns = value; return this; }
+        public Boolean FilteredItemsInSubtotals { get; set; }	public IXLPivotTable SetFilteredItemsInSubtotals() { FilteredItemsInSubtotals = true; return this; }	public IXLPivotTable SetFilteredItemsInSubtotals(Boolean value) { FilteredItemsInSubtotals = value; return this; }
+        public Boolean AllowMultipleFilters { get; set; }	public IXLPivotTable SetAllowMultipleFilters() { AllowMultipleFilters = true; return this; }	public IXLPivotTable SetAllowMultipleFilters(Boolean value) { AllowMultipleFilters = value; return this; }
+        public Boolean UseCustomListsForSorting { get; set; }	public IXLPivotTable SetUseCustomListsForSorting() { UseCustomListsForSorting = true; return this; }	public IXLPivotTable SetUseCustomListsForSorting(Boolean value) { UseCustomListsForSorting = value; return this; }
+
+        public Boolean ShowExpandCollapseButtons { get; set; }	public IXLPivotTable SetShowExpandCollapseButtons() { ShowExpandCollapseButtons = true; return this; }	public IXLPivotTable SetShowExpandCollapseButtons(Boolean value) { ShowExpandCollapseButtons = value; return this; }
+        public Boolean ShowContextualTooltips { get; set; }	public IXLPivotTable SetShowContextualTooltips() { ShowContextualTooltips = true; return this; }	public IXLPivotTable SetShowContextualTooltips(Boolean value) { ShowContextualTooltips = value; return this; }
+        public Boolean ShowPropertiesInTooltips { get; set; }	public IXLPivotTable SetShowPropertiesInTooltips() { ShowPropertiesInTooltips = true; return this; }	public IXLPivotTable SetShowPropertiesInTooltips(Boolean value) { ShowPropertiesInTooltips = value; return this; }
+        public Boolean DisplayCaptionsAndDropdowns { get; set; }	public IXLPivotTable SetDisplayCaptionsAndDropdowns() { DisplayCaptionsAndDropdowns = true; return this; }	public IXLPivotTable SetDisplayCaptionsAndDropdowns(Boolean value) { DisplayCaptionsAndDropdowns = value; return this; }
+        public Boolean ClassicPivotTableLayout { get; set; }	public IXLPivotTable SetClassicPivotTableLayout() { ClassicPivotTableLayout = true; return this; }	public IXLPivotTable SetClassicPivotTableLayout(Boolean value) { ClassicPivotTableLayout = value; return this; }
+        public Boolean ShowValuesRow { get; set; }	public IXLPivotTable SetShowValuesRow() { ShowValuesRow = true; return this; }	public IXLPivotTable SetShowValuesRow(Boolean value) { ShowValuesRow = value; return this; }
+        public Boolean ShowEmptyItemsOnRows { get; set; }	public IXLPivotTable SetShowEmptyItemsOnRows() { ShowEmptyItemsOnRows = true; return this; }	public IXLPivotTable SetShowEmptyItemsOnRows(Boolean value) { ShowEmptyItemsOnRows = value; return this; }
+        public Boolean ShowEmptyItemsOnColumns { get; set; }	public IXLPivotTable SetShowEmptyItemsOnColumns() { ShowEmptyItemsOnColumns = true; return this; }	public IXLPivotTable SetShowEmptyItemsOnColumns(Boolean value) { ShowEmptyItemsOnColumns = value; return this; }
+        public Boolean DisplayItemLabels { get; set; }	public IXLPivotTable SetDisplayItemLabels() { DisplayItemLabels = true; return this; }	public IXLPivotTable SetDisplayItemLabels(Boolean value) { DisplayItemLabels = value; return this; }
+        public Boolean SortFieldsAtoZ { get; set; }	public IXLPivotTable SetSortFieldsAtoZ() { SortFieldsAtoZ = true; return this; }	public IXLPivotTable SetSortFieldsAtoZ(Boolean value) { SortFieldsAtoZ = value; return this; }
+
+        public Boolean PrintExpandCollapsedButtons { get; set; }	public IXLPivotTable SetPrintExpandCollapsedButtons() { PrintExpandCollapsedButtons = true; return this; }	public IXLPivotTable SetPrintExpandCollapsedButtons(Boolean value) { PrintExpandCollapsedButtons = value; return this; }
+        public Boolean RepeatRowLabels { get; set; }	public IXLPivotTable SetRepeatRowLabels() { RepeatRowLabels = true; return this; }	public IXLPivotTable SetRepeatRowLabels(Boolean value) { RepeatRowLabels = value; return this; }
+        public Boolean PrintTitles { get; set; }	public IXLPivotTable SetPrintTitles() { PrintTitles = true; return this; }	public IXLPivotTable SetPrintTitles(Boolean value) { PrintTitles = value; return this; }
+
+        public Boolean SaveSourceData { get; set; }	public IXLPivotTable SetSaveSourceData() { SaveSourceData = true; return this; }	public IXLPivotTable SetSaveSourceData(Boolean value) { SaveSourceData = value; return this; }
+        public Boolean EnableShowDetails { get; set; }	public IXLPivotTable SetEnableShowDetails() { EnableShowDetails = true; return this; }	public IXLPivotTable SetEnableShowDetails(Boolean value) { EnableShowDetails = value; return this; }
+        public Boolean RefreshDataOnOpen { get; set; }	public IXLPivotTable SetRefreshDataOnOpen() { RefreshDataOnOpen = true; return this; }	public IXLPivotTable SetRefreshDataOnOpen(Boolean value) { RefreshDataOnOpen = value; return this; }
+        public XLItemsToRetain ItemsToRetainPerField { get; set; }		public IXLPivotTable SetItemsToRetainPerField(XLItemsToRetain value) { ItemsToRetainPerField = value; return this; }
+        public Boolean EnableCellEditing { get; set; }	public IXLPivotTable SetEnableCellEditing() { EnableCellEditing = true; return this; }	public IXLPivotTable SetEnableCellEditing(Boolean value) { EnableCellEditing = value; return this; }
+
+
+        public Boolean ShowRowHeaders { get; set; }	public IXLPivotTable SetShowRowHeaders() { ShowRowHeaders = true; return this; }	public IXLPivotTable SetShowRowHeaders(Boolean value) { ShowRowHeaders = value; return this; }
+        public Boolean ShowColumnHeaders { get; set; }	public IXLPivotTable SetShowColumnHeaders() { ShowColumnHeaders = true; return this; }	public IXLPivotTable SetShowColumnHeaders(Boolean value) { ShowColumnHeaders = value; return this; }
+        public Boolean ShowRowStripes { get; set; }	public IXLPivotTable SetShowRowStripes() { ShowRowStripes = true; return this; }	public IXLPivotTable SetShowRowStripes(Boolean value) { ShowRowStripes = value; return this; }
+        public Boolean ShowColumnStripes { get; set; }	public IXLPivotTable SetShowColumnStripes() { ShowColumnStripes = true; return this; }	public IXLPivotTable SetShowColumnStripes(Boolean value) { ShowColumnStripes = value; return this; }
+        public XLPivotSubtotals Subtotals { get; set; }		public IXLPivotTable SetSubtotals(XLPivotSubtotals value) { Subtotals = value; return this; }
+
+        public XLPivotLayout Layout
+        {
+            set { Fields.ForEach(f=>f.SetLayout(value)); }
+        }
+
+        public IXLPivotTable SetLayout(XLPivotLayout value) { Layout = value; return this; }
+
+        public Boolean InsertBlankLines
+        {
+            set { Fields.ForEach(f=>f.SetInsertBlankLines(value)); }
+        }
+
+        public IXLPivotTable SetInsertBlankLines() { InsertBlankLines = true; return this; }	public IXLPivotTable SetInsertBlankLines(Boolean value) { InsertBlankLines = value; return this; }
+
+        private void SetExcelDefaults()
+        {
+            EmptyCellReplacement = String.Empty;
+            AutofitColumns = true;
+            PreserveCellFormatting = true;
+            ShowGrandTotalsColumns = true;
+            ShowGrandTotalsRows = true;
+            UseCustomListsForSorting = true;
+            ShowExpandCollapseButtons = true;
+            ShowContextualTooltips = true;
+            DisplayCaptionsAndDropdowns = true;
+            RepeatRowLabels = true;
+            SaveSourceData = true;
+            EnableShowDetails = true;
+            ShowColumnHeaders = true;
+            ShowRowHeaders = true;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/PivotTables/XLPivotTables.cs b/ClosedXML/Excel/PivotTables/XLPivotTables.cs
new file mode 100644
index 0000000..fe945b3
--- /dev/null
+++ b/ClosedXML/Excel/PivotTables/XLPivotTables.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPivotTables: IXLPivotTables
+    {
+        private readonly Dictionary<String, XLPivotTable> _pivotTables = new Dictionary<string, XLPivotTable>();
+        public IEnumerator<IXLPivotTable> GetEnumerator()
+        {
+            return _pivotTables.Values.Cast<IXLPivotTable>().GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public XLPivotTable PivotTable(String name)
+        {
+            return _pivotTables[name];
+        }
+        IXLPivotTable IXLPivotTables.PivotTable(String name)
+        {
+            return PivotTable(name);
+        }
+        public void Delete(String name)
+        {
+            _pivotTables.Remove(name);
+        }
+        public void DeleteAll()
+        {
+            _pivotTables.Clear();
+        }
+
+        public void Add(String name, IXLPivotTable pivotTable)
+        {
+            _pivotTables.Add(name, (XLPivotTable)pivotTable);
+        }
+
+        public IXLPivotTable AddNew(string name, IXLCell target, IXLRange source)
+        {
+            var pivotTable = new XLPivotTable { Name = name, TargetCell = target, SourceRange = source };
+            _pivotTables.Add(name, pivotTable);
+            return pivotTable;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/IXLBaseCollection.cs b/ClosedXML/Excel/Ranges/IXLBaseCollection.cs
new file mode 100644
index 0000000..118db37
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLBaseCollection.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLBaseCollection<TSingle, TMultiple>: IEnumerable<TSingle>
+    { 
+        Int32 Count { get; }
+
+        IXLStyle Style { get; set; }
+
+        IXLDataValidation SetDataValidation();
+
+        /// <summary>
+        /// Creates a named range out of these ranges. 
+        /// <para>If the named range exists, it will add these ranges to that named range.</para>
+        /// <para>The default scope for the named range is Workbook.</para>
+        /// </summary>
+        /// <param name="rangeName">Name of the range.</param>
+        TMultiple AddToNamed(String rangeName);
+
+        /// <summary>
+        /// Creates a named range out of these ranges. 
+        /// <para>If the named range exists, it will add these ranges to that named range.</para>
+        /// <param name="rangeName">Name of the range.</param>
+        /// <param name="scope">The scope for the named range.</param>
+        /// </summary>
+        TMultiple AddToNamed(String rangeName, XLScope scope);
+
+        /// <summary>
+        /// Creates a named range out of these ranges. 
+        /// <para>If the named range exists, it will add these ranges to that named range.</para>
+        /// <param name="rangeName">Name of the range.</param>
+        /// <param name="scope">The scope for the named range.</param>
+        /// <param name="comment">The comments for the named range.</param>
+        /// </summary>
+        TMultiple AddToNamed(String rangeName, XLScope scope, String comment);
+
+        /// <summary>
+        /// Sets the cells' value.
+        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
+        /// <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
+        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
+        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
+        /// </summary>
+        /// <value>
+        /// The object containing the value(s) to set.
+        /// </value>
+        Object Value { set; }
+
+        TMultiple SetValue<T>(T value);
+
+        /// <summary>
+        /// Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        TMultiple SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of these ranges.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        TMultiple Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/IXLRange.cs b/ClosedXML/Excel/Ranges/IXLRange.cs
new file mode 100644
index 0000000..b813037
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRange.cs
@@ -0,0 +1,247 @@
+using System;
+
+
+namespace ClosedXML.Excel
+{
+    public enum XLShiftDeletedCells { ShiftCellsUp, ShiftCellsLeft }
+    public enum XLTransposeOptions { MoveCells, ReplaceCells }
+    public enum XLSearchContents { Values, Formulas, ValuesAndFormulas }
+    public interface IXLRange: IXLRangeBase
+    {
+        /// <summary>
+        /// Gets the cell at the specified row and column.
+        /// <para>The cell address is relative to the parent range.</para>
+        /// </summary>
+        /// <param name="row">The cell's row.</param>
+        /// <param name="column">The cell's column.</param>
+        IXLCell Cell(int row, int column);
+
+        /// <summary>Gets the cell at the specified address.</summary>
+        /// <para>The cell address is relative to the parent range.</para>
+        /// <param name="cellAddressInRange">The cell address in the parent range.</param>
+        IXLCell Cell(string cellAddressInRange);
+
+        /// <summary>
+        /// Gets the cell at the specified row and column.
+        /// <para>The cell address is relative to the parent range.</para>
+        /// </summary>
+        /// <param name="row">The cell's row.</param>
+        /// <param name="column">The cell's column.</param>
+        IXLCell Cell(int row, string column);
+        /// <summary>Gets the cell at the specified address.</summary>
+        /// <para>The cell address is relative to the parent range.</para>
+        /// <param name="cellAddressInRange">The cell address in the parent range.</param>
+        IXLCell Cell(IXLAddress cellAddressInRange);
+
+        /// <summary>
+        /// Gets the specified column of the range.
+        /// </summary>
+        /// <param name="column">The range column.</param>
+        IXLRangeColumn Column(int column);
+        /// <summary>
+        /// Gets the specified column of the range.
+        /// </summary>
+        /// <param name="column">The range column.</param>
+        IXLRangeColumn Column(string column);
+        /// <summary>
+        /// Gets the first column of the range.
+        /// </summary>
+        IXLRangeColumn FirstColumn(Func<IXLRangeColumn, Boolean> predicate = null);
+        /// <summary>
+        /// Gets the first column of the range that contains a cell with a value.
+        /// </summary>
+        IXLRangeColumn FirstColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null);
+        IXLRangeColumn FirstColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null);
+        /// <summary>
+        /// Gets the last column of the range.
+        /// </summary>
+        IXLRangeColumn LastColumn(Func<IXLRangeColumn, Boolean> predicate = null);
+        /// <summary>
+        /// Gets the last column of the range that contains a cell with a value.
+        /// </summary>
+        IXLRangeColumn LastColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null);
+        IXLRangeColumn LastColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null);
+        /// <summary>
+        /// Gets a collection of all columns in this range.
+        /// </summary>
+        IXLRangeColumns Columns(Func<IXLRangeColumn, Boolean> predicate = null);
+        /// <summary>
+        /// Gets a collection of the specified columns in this range.
+        /// </summary>
+        /// <param name="firstColumn">The first column to return.</param>
+        /// <param name="lastColumn">The last column to return.</param>
+        IXLRangeColumns Columns(int firstColumn, int lastColumn);
+        /// <summary>
+        /// Gets a collection of the specified columns in this range.
+        /// </summary>
+        /// <param name="firstColumn">The first column to return.</param>
+        /// <param name="lastColumn">The last column to return.</param>
+        IXLRangeColumns Columns(string firstColumn, string lastColumn);
+        /// <summary>
+        /// Gets a collection of the specified columns in this range, separated by commas.
+        /// <para>e.g. Columns("G:H"), Columns("10:11,13:14"), Columns("P:Q,S:T"), Columns("V")</para>
+        /// </summary>
+        /// <param name="columns">The columns to return.</param>
+        IXLRangeColumns Columns(string columns);
+
+        /// <summary>
+        /// Gets the first row of the range.
+        /// </summary>
+        IXLRangeRow FirstRow(Func<IXLRangeRow, Boolean> predicate = null);
+        /// <summary>
+        /// Gets the first row of the range that contains a cell with a value.
+        /// </summary>
+        IXLRangeRow FirstRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null);
+        IXLRangeRow FirstRowUsed(Func<IXLRangeRow, Boolean> predicate = null);
+        /// <summary>
+        /// Gets the last row of the range.
+        /// </summary>
+        IXLRangeRow LastRow(Func<IXLRangeRow, Boolean> predicate = null);
+        /// <summary>
+        /// Gets the last row of the range that contains a cell with a value.
+        /// </summary>
+        IXLRangeRow LastRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null);
+        IXLRangeRow LastRowUsed(Func<IXLRangeRow, Boolean> predicate = null);
+        /// <summary>
+        /// Gets the specified row of the range.
+        /// </summary>
+        /// <param name="row">The range row.</param>
+        IXLRangeRow Row(int row);
+
+        IXLRangeRows Rows(Func<IXLRangeRow, Boolean> predicate = null);
+
+        /// <summary>
+        /// Gets a collection of the specified rows in this range.
+        /// </summary>
+        /// <param name="firstRow">The first row to return.</param>
+        /// <param name="lastRow">The last row to return.</param>
+        /// <returns></returns>
+        IXLRangeRows Rows(int firstRow, int lastRow);
+        /// <summary>
+        /// Gets a collection of the specified rows in this range, separated by commas.
+        /// <para>e.g. Rows("4:5"), Rows("7:8,10:11"), Rows("13")</para>
+        /// </summary>
+        /// <param name="rows">The rows to return.</param>
+        IXLRangeRows Rows(string rows);
+
+        /// <summary>
+        /// Returns the specified range.
+        /// </summary>
+        /// <param name="rangeAddress">The range boundaries.</param>
+        IXLRange Range(IXLRangeAddress rangeAddress);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <para>e.g. Range("A1"), Range("A1:C2")</para>
+        /// <param name="rangeAddress">The range boundaries.</param>
+        IXLRange Range(string rangeAddress);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCell">The first cell in the range.</param>
+        /// <param name="lastCell"> The last cell in the range.</param>
+        IXLRange Range(IXLCell firstCell, IXLCell lastCell);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCellAddress">The first cell address in the range.</param>
+        /// <param name="lastCellAddress"> The last cell address in the range.</param>
+        IXLRange Range(string firstCellAddress, string lastCellAddress);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCellAddress">The first cell address in the range.</param>
+        /// <param name="lastCellAddress"> The last cell address in the range.</param>
+        IXLRange Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress);
+
+        /// <summary>Returns a collection of ranges, separated by commas.</summary>
+        /// <para>e.g. Ranges("A1"), Ranges("A1:C2"), Ranges("A1:B2,D1:D4")</para>
+        /// <param name="ranges">The ranges to return.</param>
+        IXLRanges Ranges(string ranges);
+
+        /// <summary>Returns the specified range.</summary>
+        /// <param name="firstCellRow">   The first cell's row of the range to return.</param>
+        /// <param name="firstCellColumn">The first cell's column of the range to return.</param>
+        /// <param name="lastCellRow">    The last cell's row of the range to return.</param>
+        /// <param name="lastCellColumn"> The last cell's column of the range to return.</param>
+        /// <returns>.</returns>
+        IXLRange Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn);
+
+        /// <summary>Gets the number of rows in this range.</summary>
+        int RowCount();
+
+        /// <summary>Gets the number of columns in this range.</summary>
+        int ColumnCount();
+
+        /// <summary>
+        /// Inserts X number of columns to the right of this range.
+        /// <para>All cells to the right of this range will be shifted X number of columns.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">Number of columns to insert.</param>
+        IXLRangeColumns InsertColumnsAfter(int numberOfColumns);
+        IXLRangeColumns InsertColumnsAfter(int numberOfColumns, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of columns to the left of this range.
+        /// <para>This range and all cells to the right of this range will be shifted X number of columns.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">Number of columns to insert.</param>
+        IXLRangeColumns InsertColumnsBefore(int numberOfColumns);
+        IXLRangeColumns InsertColumnsBefore(int numberOfColumns, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of rows on top of this range.
+        /// <para>This range and all cells below this range will be shifted X number of rows.</para>
+        /// </summary>
+        /// <param name="numberOfRows">Number of rows to insert.</param>
+        IXLRangeRows InsertRowsAbove(int numberOfRows);
+        IXLRangeRows InsertRowsAbove(int numberOfRows, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of rows below this range.
+        /// <para>All cells below this range will be shifted X number of rows.</para>
+        /// </summary>
+        /// <param name="numberOfRows">Number of rows to insert.</param>
+        IXLRangeRows InsertRowsBelow(int numberOfRows);
+        IXLRangeRows InsertRowsBelow(int numberOfRows, Boolean expandRange);
+
+        /// <summary>
+        /// Deletes this range and shifts the surrounding cells accordingly.
+        /// </summary>
+        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
+        void Delete(XLShiftDeletedCells shiftDeleteCells);
+
+        /// <summary>
+        /// Transposes the contents and styles of all cells in this range.
+        /// </summary>
+        /// <param name="transposeOption">How to handle the surrounding cells when transposing the range.</param>
+        void Transpose(XLTransposeOptions transposeOption);
+
+        IXLTable AsTable();
+        IXLTable AsTable(String name);
+        IXLTable CreateTable();
+        IXLTable CreateTable(String name);
+
+        IXLRange RangeUsed();
+
+        IXLRange CopyTo(IXLCell target);
+        IXLRange CopyTo(IXLRangeBase target);
+
+        IXLSortElements SortRows { get; }
+        IXLSortElements SortColumns { get; }
+
+        IXLRange Sort();
+
+        IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        
+
+        IXLRange SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of this range.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        new IXLRange Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        IXLRangeRows RowsUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null);
+        IXLRangeRows RowsUsed(Func<IXLRangeRow, Boolean> predicate = null);
+        IXLRangeColumns ColumnsUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null);
+        IXLRangeColumns ColumnsUsed(Func<IXLRangeColumn, Boolean> predicate = null);
+    }
+}
+
diff --git a/ClosedXML/Excel/Ranges/IXLRangeAddress.cs b/ClosedXML/Excel/Ranges/IXLRangeAddress.cs
new file mode 100644
index 0000000..8354d3d
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRangeAddress.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRangeAddress
+    {
+        IXLWorksheet Worksheet { get; }
+
+        /// <summary>
+        /// Gets or sets the first address in the range.
+        /// </summary>
+        /// <value>
+        /// The first address.
+        /// </value>
+        IXLAddress FirstAddress { get; set; }
+        /// <summary>
+        /// Gets or sets the last address in the range.
+        /// </summary>
+        /// <value>
+        /// The last address.
+        /// </value>
+        IXLAddress LastAddress { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this range is invalid.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is invalid; otherwise, <c>false</c>.
+        /// </value>
+        Boolean IsInvalid { get; set; }
+
+        String ToStringRelative();
+        String ToStringRelative(Boolean includeSheet);
+        String ToStringFixed();
+        String ToStringFixed(XLReferenceStyle referenceStyle);
+        String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet);
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/IXLRangeBase.cs b/ClosedXML/Excel/Ranges/IXLRangeBase.cs
new file mode 100644
index 0000000..d86698a
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRangeBase.cs
@@ -0,0 +1,254 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLScope
+    {
+        Workbook,
+        Worksheet
+    } 
+
+    public interface IXLRangeBase: IDisposable
+    {
+        IXLWorksheet Worksheet { get; }
+
+        /// <summary>
+        ///   Gets an object with the boundaries of this range.
+        /// </summary>
+        IXLRangeAddress RangeAddress { get; }
+
+        /// <summary>
+        ///   Sets a value to every cell in this range.
+        ///   <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
+        ///   <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
+        ///   <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
+        ///   <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
+        /// </summary>
+        /// <value>
+        ///   The object containing the value(s) to set.
+        /// </value>
+        Object Value { set; }
+
+        /// <summary>
+        ///   Sets the type of the cells' data.
+        ///   <para>Changing the data type will cause ClosedXML to covert the current value to the new data type.</para>
+        ///   <para>An exception will be thrown if the current value cannot be converted to the new data type.</para>
+        /// </summary>
+        /// <value>
+        ///   The type of the cell's data.
+        /// </value>
+        /// <exception cref = "ArgumentException"></exception>
+        XLCellValues DataType { set; }
+
+        /// <summary>
+        ///   Sets the cells' formula with A1 references.
+        /// </summary>
+        /// <value>The formula with A1 references.</value>
+        String FormulaA1 { set; }
+
+        /// <summary>
+        ///   Sets the cells' formula with R1C1 references.
+        /// </summary>
+        /// <value>The formula with R1C1 references.</value>
+        String FormulaR1C1 { set; }
+
+        IXLStyle Style { get; set; }
+
+        /// <summary>
+        ///   Gets or sets a value indicating whether this cell's text should be shared or not.
+        /// </summary>
+        /// <value>
+        ///   If false the cell's text will not be shared and stored as an inline value.
+        /// </value>
+        Boolean ShareString { set; }
+
+        IXLHyperlinks Hyperlinks { get; }
+
+
+        /// <summary>
+        ///   Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+
+        IXLCells Cells(String cells);
+
+        IXLCells Cells(Func<IXLCell, Boolean> predicate);
+
+        /// <summary>
+        ///   Returns the collection of cells that have a value. Formats are ignored.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        ///   Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name = "includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        IXLCells CellsUsed(Func<IXLCell, Boolean> predicate);
+
+        IXLCells CellsUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate);
+
+        /// <summary>
+        ///   Returns the first cell of this range.
+        /// </summary>
+        IXLCell FirstCell();
+
+        /// <summary>
+        ///   Returns the first cell with a value of this range. Formats are ignored.
+        ///   <para>The cell's address is going to be ([First Row with a value], [First Column with a value])</para>
+        /// </summary>
+        IXLCell FirstCellUsed();
+
+        /// <summary>
+        ///   Returns the first cell with a value of this range.
+        /// </summary>
+        /// <para>The cell's address is going to be ([First Row with a value], [First Column with a value])</para>
+        /// <param name = "includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCell FirstCellUsed(Boolean includeFormats);
+
+        IXLCell FirstCellUsed(Func<IXLCell, Boolean> predicate);
+
+        IXLCell FirstCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate);
+
+        /// <summary>
+        ///   Returns the last cell of this range.
+        /// </summary>
+        IXLCell LastCell();
+
+        /// <summary>
+        ///   Returns the last cell with a value of this range. Formats are ignored.
+        ///   <para>The cell's address is going to be ([Last Row with a value], [Last Column with a value])</para>
+        /// </summary>
+        IXLCell LastCellUsed();
+
+        /// <summary>
+        ///   Returns the last cell with a value of this range.
+        /// </summary>
+        /// <para>The cell's address is going to be ([Last Row with a value], [Last Column with a value])</para>
+        /// <param name = "includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCell LastCellUsed(Boolean includeFormats);
+
+        IXLCell LastCellUsed(Func<IXLCell, Boolean> predicate);
+
+        IXLCell LastCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate);
+
+        /// <summary>
+        ///   Determines whether this range contains the specified range (completely).
+        ///   <para>For partial matches use the range.Intersects method.</para>
+        /// </summary>
+        /// <param name = "rangeAddress">The range address.</param>
+        /// <returns>
+        ///   <c>true</c> if this range contains the specified range; otherwise, <c>false</c>.
+        /// </returns>
+        Boolean Contains(String rangeAddress);
+
+        /// <summary>
+        ///   Determines whether this range contains the specified range (completely).
+        ///   <para>For partial matches use the range.Intersects method.</para>
+        /// </summary>
+        /// <param name = "range">The range to match.</param>
+        /// <returns>
+        ///   <c>true</c> if this range contains the specified range; otherwise, <c>false</c>.
+        /// </returns>
+        Boolean Contains(IXLRangeBase range);
+
+        Boolean Contains(IXLCell cell);
+
+        /// <summary>
+        ///   Determines whether this range intersects the specified range.
+        ///   <para>For whole matches use the range.Contains method.</para>
+        /// </summary>
+        /// <param name = "rangeAddress">The range address.</param>
+        /// <returns>
+        ///   <c>true</c> if this range intersects the specified range; otherwise, <c>false</c>.
+        /// </returns>
+        Boolean Intersects(String rangeAddress);
+
+        /// <summary>
+        ///   Determines whether this range contains the specified range.
+        ///   <para>For whole matches use the range.Contains method.</para>
+        /// </summary>
+        /// <param name = "range">The range to match.</param>
+        /// <returns>
+        ///   <c>true</c> if this range intersects the specified range; otherwise, <c>false</c>.
+        /// </returns>
+        Boolean Intersects(IXLRangeBase range);
+
+        /// <summary>
+        ///   Unmerges this range.
+        /// </summary>
+        IXLRange Unmerge();
+
+        /// <summary>
+        ///   Merges this range.
+        ///   <para>The contents and style of the merged cells will be equal to the first cell.</para>
+        /// </summary>
+        IXLRange Merge();
+
+        IXLRange Merge(Boolean checkIntersect);
+
+        /// <summary>
+        ///   Creates a named range out of this range. 
+        ///   <para>If the named range exists, it will add this range to that named range.</para>
+        ///   <para>The default scope for the named range is Workbook.</para>
+        /// </summary>
+        /// <param name = "rangeName">Name of the range.</param>
+        IXLRange AddToNamed(String rangeName);
+
+        /// <summary>
+        ///   Creates a named range out of this range. 
+        ///   <para>If the named range exists, it will add this range to that named range.</para>
+        ///   <param name = "rangeName">Name of the range.</param>
+        ///   <param name = "scope">The scope for the named range.</param>
+        /// </summary>
+        IXLRange AddToNamed(String rangeName, XLScope scope);
+
+        /// <summary>
+        ///   Creates a named range out of this range. 
+        ///   <para>If the named range exists, it will add this range to that named range.</para>
+        ///   <param name = "rangeName">Name of the range.</param>
+        ///   <param name = "scope">The scope for the named range.</param>
+        ///   <param name = "comment">The comments for the named range.</param>
+        /// </summary>
+        IXLRange AddToNamed(String rangeName, XLScope scope, String comment);
+
+        /// <summary>
+        /// Clears the contents of this range.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLRangeBase Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+        
+        /// <summary>
+        ///   Deletes the cell comments from this range.
+        /// </summary>
+        void DeleteComments();
+
+        IXLRangeBase SetValue<T>(T value);
+
+        /// <summary>
+        ///   Converts this object to a range.
+        /// </summary>
+        IXLRange AsRange();
+
+        Boolean IsMerged();
+        Boolean IsEmpty();
+        Boolean IsEmpty(Boolean includeFormats);
+
+
+        IXLPivotTable CreatePivotTable(IXLCell targetCell);
+        IXLPivotTable CreatePivotTable(IXLCell targetCell, String name);
+
+
+
+        //IXLChart CreateChart(Int32 firstRow, Int32 firstColumn, Int32 lastRow, Int32 lastColumn);
+
+        IXLAutoFilter SetAutoFilter();
+
+        IXLDataValidation SetDataValidation();
+
+        IXLConditionalFormat AddConditionalFormat();
+
+        void Select();
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Ranges/IXLRangeColumn.cs b/ClosedXML/Excel/Ranges/IXLRangeColumn.cs
new file mode 100644
index 0000000..5de5a7f
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRangeColumn.cs
@@ -0,0 +1,110 @@
+using System;
+
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRangeColumn : IXLRangeBase
+    {
+        /// <summary>
+        /// Gets the cell in the specified row.
+        /// </summary>
+        /// <param name="rowNumber">The cell's row.</param>
+        IXLCell Cell(Int32 rowNumber);
+
+        /// <summary>
+        /// Returns the specified group of cells, separated by commas.
+        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1:2,4:5")</para>
+        /// </summary>
+        /// <param name="cellsInColumn">The column cells to return.</param>
+        new IXLCells Cells(String cellsInColumn);
+        /// <summary>
+        /// Returns the specified group of cells.
+        /// </summary>
+        /// <param name="firstRow">The first row in the group of cells to return.</param>
+        /// <param name="lastRow">The last row in the group of cells to return.</param>
+        IXLCells Cells(Int32 firstRow, Int32 lastRow);
+
+        /// <summary>
+        /// Inserts X number of columns to the right of this range.
+        /// <para>All cells to the right of this range will be shifted X number of columns.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">Number of columns to insert.</param>
+        IXLRangeColumns InsertColumnsAfter(int numberOfColumns);
+        IXLRangeColumns InsertColumnsAfter(int numberOfColumns, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of columns to the left of this range.
+        /// <para>This range and all cells to the right of this range will be shifted X number of columns.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">Number of columns to insert.</param>
+        IXLRangeColumns InsertColumnsBefore(int numberOfColumns);
+        IXLRangeColumns InsertColumnsBefore(int numberOfColumns, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of cells on top of this column.
+        /// <para>This column and all cells below it will be shifted X number of rows.</para>
+        /// </summary>
+        /// <param name="numberOfRows">Number of cells to insert.</param>
+        IXLCells InsertCellsAbove(int numberOfRows);
+        IXLCells InsertCellsAbove(int numberOfRows, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of cells below this range.
+        /// <para>All cells below this column will be shifted X number of rows.</para>
+        /// </summary>
+        /// <param name="numberOfRows">Number of cells to insert.</param>
+        IXLCells InsertCellsBelow(int numberOfRows);
+        IXLCells InsertCellsBelow(int numberOfRows, Boolean expandRange);
+
+        /// <summary>
+        /// Deletes this range and shifts the cells at the right.
+        /// </summary>
+        void Delete();
+        /// <summary>
+        /// Deletes this range and shifts the surrounding cells accordingly.
+        /// </summary>
+        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
+        void Delete(XLShiftDeletedCells shiftDeleteCells);
+
+        /// <summary>
+        /// Gets this column's number in the range
+        /// </summary>
+        Int32 ColumnNumber();
+
+        /// <summary>
+        /// Gets this column's letter in the range
+        /// </summary>
+        String ColumnLetter();
+
+        Int32 CellCount();
+
+        IXLRangeColumn CopyTo(IXLCell target);
+        IXLRangeColumn CopyTo(IXLRangeBase target);
+
+        IXLRangeColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+        
+        IXLRangeColumn Column(Int32 start, Int32 end);
+        IXLRangeColumn Column(IXLCell start, IXLCell end);
+        IXLRangeColumns Columns(String columns);
+
+        IXLRangeColumn SetDataType(XLCellValues dataType);
+
+        IXLRangeColumn ColumnLeft();
+        IXLRangeColumn ColumnLeft(Int32 step);
+        IXLRangeColumn ColumnRight();
+        IXLRangeColumn ColumnRight(Int32 step);
+
+        IXLColumn WorksheetColumn();
+
+        IXLTable AsTable();
+        IXLTable AsTable(String name);
+        IXLTable CreateTable();
+        IXLTable CreateTable(String name);
+
+        /// <summary>
+        /// Clears the contents of this column.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        new IXLRangeColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        IXLRangeColumn ColumnUsed(Boolean includeFormats = false);
+    }
+}
+
diff --git a/ClosedXML/Excel/Ranges/IXLRangeColumns.cs b/ClosedXML/Excel/Ranges/IXLRangeColumns.cs
new file mode 100644
index 0000000..90faa05
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRangeColumns.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRangeColumns: IEnumerable<IXLRangeColumn>, IDisposable
+    {
+
+        /// <summary>
+        /// Adds a column range to this group.
+        /// </summary>
+        /// <param name="columRange">The column range to add.</param>
+        void Add(IXLRangeColumn columRange);
+
+        /// <summary>
+        /// Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+        
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        /// <summary>
+        /// Deletes all columns and shifts the columns at the right of them accordingly.
+        /// </summary>
+        void Delete();
+
+        IXLStyle Style { get; set; }
+
+        IXLRangeColumns SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of these columns.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLRangeColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        void Select();
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/IXLRangeRow.cs b/ClosedXML/Excel/Ranges/IXLRangeRow.cs
new file mode 100644
index 0000000..8e641a9
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRangeRow.cs
@@ -0,0 +1,113 @@
+using System;
+
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRangeRow: IXLRangeBase
+    {
+        /// <summary>
+        /// Gets the cell in the specified column.
+        /// </summary>
+        /// <param name="columnNumber">The cell's column.</param>
+        IXLCell Cell(Int32 columnNumber);
+
+        /// <summary>
+        /// Gets the cell in the specified column.
+        /// </summary>
+        /// <param name="columnLetter">The cell's column.</param>
+        IXLCell Cell(String columnLetter);
+
+        /// <summary>
+        /// Returns the specified group of cells, separated by commas.
+        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1:2,4:5")</para>
+        /// </summary>
+        /// <param name="cellsInRow">The row's cells to return.</param>
+        new IXLCells Cells(String cellsInRow);
+        /// <summary>
+        /// Returns the specified group of cells.
+        /// </summary>
+        /// <param name="firstColumn">The first column in the group of cells to return.</param>
+        /// <param name="lastColumn">The last column in the group of cells to return.</param>
+        IXLCells Cells(Int32 firstColumn, Int32 lastColumn);
+        /// <summary>
+        /// Returns the specified group of cells.
+        /// </summary>
+        /// <param name="firstColumn">The first column in the group of cells to return.</param>
+        /// <param name="lastColumn">The last column in the group of cells to return.</param>
+        IXLCells Cells(String firstColumn, String lastColumn);
+
+        /// <summary>
+        /// Inserts X number of cells to the right of this row.
+        /// <para>All cells to the right of this row will be shifted X number of columns.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">Number of cells to insert.</param>
+        IXLCells InsertCellsAfter(int numberOfColumns);
+        IXLCells InsertCellsAfter(int numberOfColumns, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of cells to the left of this row.
+        /// <para>This row and all cells to the right of it will be shifted X number of columns.</para>
+        /// </summary>
+        /// <param name="numberOfColumns">Number of cells to insert.</param>
+        IXLCells InsertCellsBefore(int numberOfColumns);
+        IXLCells InsertCellsBefore(int numberOfColumns, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of rows on top of this row.
+        /// <para>This row and all cells below it will be shifted X number of rows.</para>
+        /// </summary>
+        /// <param name="numberOfRows">Number of rows to insert.</param>
+        IXLRangeRows InsertRowsAbove(int numberOfRows);
+        IXLRangeRows InsertRowsAbove(int numberOfRows, Boolean expandRange);
+        /// <summary>
+        /// Inserts X number of rows below this row.
+        /// <para>All cells below this row will be shifted X number of rows.</para>
+        /// </summary>
+        /// <param name="numberOfRows">Number of rows to insert.</param>
+        IXLRangeRows InsertRowsBelow(int numberOfRows);
+        IXLRangeRows InsertRowsBelow(int numberOfRows, Boolean expandRange);
+
+        /// <summary>
+        /// Deletes this range and shifts the cells below.
+        /// </summary>
+        void Delete();
+        /// <summary>
+        /// Deletes this range and shifts the surrounding cells accordingly.
+        /// </summary>
+        /// <param name="shiftDeleteCells">How to shift the surrounding cells.</param>
+        void Delete(XLShiftDeletedCells shiftDeleteCells);
+
+        /// <summary>
+        /// Gets this row's number in the range
+        /// </summary>
+        Int32 RowNumber();
+
+        Int32 CellCount();
+
+        IXLRangeRow CopyTo(IXLCell target);
+        IXLRangeRow CopyTo(IXLRangeBase target);
+
+        IXLRangeRow Sort();
+        IXLRangeRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+
+        IXLRangeRow Row(Int32 start, Int32 end);
+        IXLRangeRow Row(IXLCell start, IXLCell end);
+        IXLRangeRows Rows(String rows);
+
+        IXLRangeRow SetDataType(XLCellValues dataType);
+
+        IXLRangeRow RowAbove();
+        IXLRangeRow RowAbove(Int32 step);
+        IXLRangeRow RowBelow();
+        IXLRangeRow RowBelow(Int32 step);
+
+        IXLRow WorksheetRow();
+
+        /// <summary>
+        /// Clears the contents of this row.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        new IXLRangeRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        IXLRangeRow RowUsed(Boolean includeFormats = false);
+    }
+}
+
diff --git a/ClosedXML/Excel/Ranges/IXLRangeRows.cs b/ClosedXML/Excel/Ranges/IXLRangeRows.cs
new file mode 100644
index 0000000..5c8d0c4
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRangeRows.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRangeRows : IEnumerable<IXLRangeRow>, IDisposable
+    {
+        /// <summary>
+        /// Adds a row range to this group.
+        /// </summary>
+        /// <param name="rowRange">The row range to add.</param>
+        void Add(IXLRangeRow rowRange);
+
+        /// <summary>
+        /// Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+        
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        /// <summary>
+        /// Deletes all rows and shifts the rows below them accordingly.
+        /// </summary>
+        void Delete();
+
+        IXLStyle Style { get; set; }
+
+        IXLRangeRows SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of these rows.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLRangeRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        void Select();
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/IXLRanges.cs b/ClosedXML/Excel/Ranges/IXLRanges.cs
new file mode 100644
index 0000000..f73e201
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/IXLRanges.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRanges: IEnumerable<IXLRange>, IDisposable
+    {
+        /// <summary>
+        /// Adds the specified range to this group.
+        /// </summary>
+        /// <param name="range">The range to add to this group.</param>
+        void Add(IXLRangeBase range);
+
+        void Add(IXLCell range);
+
+        /// <summary>
+        /// Removes the specified range from this group.
+        /// </summary>
+        /// <param name="range">The range to remove from this group.</param>
+        void Remove(IXLRange range);
+
+        Int32 Count { get; }
+
+        Boolean Contains(IXLRange range);
+
+        IXLStyle Style { get; set; }
+
+        IXLDataValidation SetDataValidation();
+
+        /// <summary>
+        /// Creates a named range out of these ranges. 
+        /// <para>If the named range exists, it will add these ranges to that named range.</para>
+        /// <para>The default scope for the named range is Workbook.</para>
+        /// </summary>
+        /// <param name="rangeName">Name of the range.</param>
+        IXLRanges AddToNamed(String rangeName);
+
+        /// <summary>
+        /// Creates a named range out of these ranges. 
+        /// <para>If the named range exists, it will add these ranges to that named range.</para>
+        /// <param name="rangeName">Name of the range.</param>
+        /// <param name="scope">The scope for the named range.</param>
+        /// </summary>
+        IXLRanges AddToNamed(String rangeName, XLScope scope);
+
+        /// <summary>
+        /// Creates a named range out of these ranges. 
+        /// <para>If the named range exists, it will add these ranges to that named range.</para>
+        /// <param name="rangeName">Name of the range.</param>
+        /// <param name="scope">The scope for the named range.</param>
+        /// <param name="comment">The comments for the named range.</param>
+        /// </summary>
+        IXLRanges AddToNamed(String rangeName, XLScope scope, String comment);
+
+        /// <summary>
+        /// Sets the cells' value.
+        /// <para>If the object is an IEnumerable ClosedXML will copy the collection's data into a table starting from each cell.</para>
+        /// <para>If the object is a range ClosedXML will copy the range starting from each cell.</para>
+        /// <para>Setting the value to an object (not IEnumerable/range) will call the object's ToString() method.</para>
+        /// <para>ClosedXML will try to translate it to the corresponding type, if it can't then the value will be left as a string.</para>
+        /// </summary>
+        /// <value>
+        /// The object containing the value(s) to set.
+        /// </value>
+        Object Value { set; }
+
+        IXLRanges SetValue<T>(T value);
+
+        /// <summary>
+        /// Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        IXLRanges SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of these ranges.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLRanges Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        void Select();
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/Sort/IXLSortElement.cs b/ClosedXML/Excel/Ranges/Sort/IXLSortElement.cs
new file mode 100644
index 0000000..e687bdc
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/Sort/IXLSortElement.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLSortOrder { Ascending, Descending }
+    public enum XLSortOrientation { TopToBottom, LeftToRight }
+    public interface IXLSortElement
+    {
+        Int32 ElementNumber { get; set; }
+        XLSortOrder SortOrder { get; set; }
+        Boolean IgnoreBlanks { get; set; }
+        Boolean MatchCase { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/Sort/IXLSortElements.cs b/ClosedXML/Excel/Ranges/Sort/IXLSortElements.cs
new file mode 100644
index 0000000..8d7c630
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/Sort/IXLSortElements.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLSortElements: IEnumerable<IXLSortElement>
+    {
+        void Add(Int32 elementNumber);
+        void Add(Int32 elementNumber, XLSortOrder sortOrder);
+        void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks);
+        void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase);
+
+        void Add(String elementNumber);
+        void Add(String elementNumber, XLSortOrder sortOrder);
+        void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks);
+        void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase);
+
+        void Clear();
+
+        void Remove(Int32 elementNumber);
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/Sort/XLSortElement.cs b/ClosedXML/Excel/Ranges/Sort/XLSortElement.cs
new file mode 100644
index 0000000..6c17e2d
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/Sort/XLSortElement.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLSortElement: IXLSortElement
+    {
+        public Int32 ElementNumber { get; set; }
+        public XLSortOrder SortOrder { get; set; }
+        public Boolean IgnoreBlanks { get; set; }
+        public Boolean MatchCase { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/Sort/XLSortElements.cs b/ClosedXML/Excel/Ranges/Sort/XLSortElements.cs
new file mode 100644
index 0000000..adbc4cb
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/Sort/XLSortElements.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    internal class XLSortElements: IXLSortElements
+    {
+        List<IXLSortElement> elements = new List<IXLSortElement>();
+        public void Add(Int32 elementNumber)
+        {
+            Add(elementNumber, XLSortOrder.Ascending);
+        }
+        public void Add(Int32 elementNumber, XLSortOrder sortOrder)
+        {
+            Add(elementNumber, sortOrder, true);
+        }
+        public void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks)
+        {
+            Add(elementNumber, sortOrder, ignoreBlanks, false);
+        }
+        public void Add(Int32 elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase)
+        {
+            elements.Add(new XLSortElement()
+            {
+                ElementNumber = elementNumber,
+                SortOrder = sortOrder,
+                IgnoreBlanks = ignoreBlanks,
+                MatchCase = matchCase
+            });
+        }
+
+        public void Add(String elementNumber)
+        {
+            Add(elementNumber, XLSortOrder.Ascending);
+        }
+        public void Add(String elementNumber, XLSortOrder sortOrder)
+        {
+            Add(elementNumber, sortOrder, true);
+        }
+        public void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks)
+        {
+            Add(elementNumber, sortOrder, ignoreBlanks, false);
+        }
+        public void Add(String elementNumber, XLSortOrder sortOrder, Boolean ignoreBlanks, Boolean matchCase)
+        {
+            elements.Add(new XLSortElement()
+            {
+                ElementNumber = XLHelper.GetColumnNumberFromLetter(elementNumber),
+                SortOrder = sortOrder,
+                IgnoreBlanks = ignoreBlanks,
+                MatchCase = matchCase
+            });
+        }
+
+        public IEnumerator<IXLSortElement> GetEnumerator()
+        {
+            return elements.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public void Clear()
+        {
+            elements.Clear();
+        }
+
+        public void Remove(Int32 elementNumber)
+        {
+            elements.RemoveAt(elementNumber - 1);
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/XLRange.cs b/ClosedXML/Excel/Ranges/XLRange.cs
new file mode 100644
index 0000000..6ffdff1
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRange.cs
@@ -0,0 +1,810 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+
+namespace ClosedXML.Excel
+{
+    internal class XLRange : XLRangeBase, IXLRange
+    {
+        #region Constructor
+
+        public XLRange(XLRangeParameters xlRangeParameters)
+            : base(xlRangeParameters.RangeAddress)
+        {
+            RangeParameters = new XLRangeParameters(xlRangeParameters.RangeAddress, xlRangeParameters.DefaultStyle);
+
+            if (!xlRangeParameters.IgnoreEvents)
+            {
+                SubscribeToShiftedRows((range, rowShifted) => this.WorksheetRangeShiftedRows(range, rowShifted));
+                SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
+                //xlRangeParameters.IgnoreEvents = true;
+            }
+            SetStyle(xlRangeParameters.DefaultStyle);
+        }
+
+        #endregion
+
+        public XLRangeParameters RangeParameters { get; private set; }
+
+        #region IXLRange Members
+
+
+        IXLRangeRow IXLRange.Row(Int32 row)
+        {
+            return Row(row);
+        }
+
+        IXLRangeColumn IXLRange.Column(Int32 column)
+        {
+            return Column(column);
+        }
+
+        IXLRangeColumn IXLRange.Column(String column)
+        {
+            return Column(column);
+        }
+
+        public IXLRangeColumns Columns(Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            var retVal = new XLRangeColumns();
+            Int32 columnCount = ColumnCount();
+            for (Int32 c = 1; c <= columnCount; c++)
+            {
+                var column = Column(c);
+                if (predicate == null || predicate(column))
+                    retVal.Add(column);
+                else
+                    column.Dispose();
+            }
+            return retVal;
+        }
+
+        public virtual IXLRangeColumns Columns(Int32 firstColumn, Int32 lastColumn)
+        {
+            var retVal = new XLRangeColumns();
+
+            for (int co = firstColumn; co <= lastColumn; co++)
+                retVal.Add(Column(co));
+            return retVal;
+        }
+
+        public IXLRangeColumns Columns(String firstColumn, String lastColumn)
+        {
+            return Columns(XLHelper.GetColumnNumberFromLetter(firstColumn),
+                           XLHelper.GetColumnNumberFromLetter(lastColumn));
+        }
+
+        public IXLRangeColumns Columns(String columns)
+        {
+            var retVal = new XLRangeColumns();
+            var columnPairs = columns.Split(',');
+            foreach (string tPair in columnPairs.Select(pair => pair.Trim()))
+            {
+                String firstColumn;
+                String lastColumn;
+                if (tPair.Contains(':') || tPair.Contains('-'))
+                {
+                    string[] columnRange = XLHelper.SplitRange(tPair);
+
+                    firstColumn = columnRange[0];
+                    lastColumn = columnRange[1];
+                }
+                else
+                {
+                    firstColumn = tPair;
+                    lastColumn = tPair;
+                }
+
+                Int32 tmp;
+                if (Int32.TryParse(firstColumn, out tmp))
+                {
+                    foreach (IXLRangeColumn col in Columns(Int32.Parse(firstColumn), Int32.Parse(lastColumn)))
+                        retVal.Add(col);
+                }
+                else
+                {
+                    foreach (IXLRangeColumn col in Columns(firstColumn, lastColumn))
+                        retVal.Add(col);
+                }
+            }
+            return retVal;
+        }
+
+        IXLCell IXLRange.Cell(int row, int column)
+        {
+            return Cell(row, column);
+        }
+
+        IXLCell IXLRange.Cell(string cellAddressInRange)
+        {
+            return Cell(cellAddressInRange);
+        }
+
+        IXLCell IXLRange.Cell(int row, string column)
+        {
+            return Cell(row, column);
+        }
+
+        IXLCell IXLRange.Cell(IXLAddress cellAddressInRange)
+        {
+            return Cell(cellAddressInRange);
+        }
+
+        IXLRange IXLRange.Range(IXLRangeAddress rangeAddress)
+        {
+            return Range(rangeAddress);
+        }
+
+        IXLRange IXLRange.Range(string rangeAddress)
+        {
+            return Range(rangeAddress);
+        }
+
+        IXLRange IXLRange.Range(IXLCell firstCell, IXLCell lastCell)
+        {
+            return Range(firstCell, lastCell);
+        }
+
+        IXLRange IXLRange.Range(string firstCellAddress, string lastCellAddress)
+        {
+            return Range(firstCellAddress, lastCellAddress);
+        }
+
+        IXLRange IXLRange.Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
+        {
+            return Range(firstCellAddress, lastCellAddress);
+        }
+
+        IXLRange IXLRange.Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn)
+        {
+            return Range(firstCellRow, firstCellColumn, lastCellRow, lastCellColumn);
+        }
+
+        public IXLRangeRows Rows(Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            var retVal = new XLRangeRows();
+            Int32 rowCount = RowCount();
+            for (Int32 r = 1; r <= rowCount; r++)
+            {
+                var row = Row(r);
+                if (predicate == null || predicate(row))
+                    retVal.Add(Row(r));
+                else
+                    row.Dispose();
+            }
+            return retVal;
+        }
+
+        public IXLRangeRows Rows(Int32 firstRow, Int32 lastRow)
+        {
+            var retVal = new XLRangeRows();
+
+            for (int ro = firstRow; ro <= lastRow; ro++)
+                retVal.Add(Row(ro));
+            return retVal;
+        }
+
+        public IXLRangeRows Rows(String rows)
+        {
+            var retVal = new XLRangeRows();
+            var rowPairs = rows.Split(',');
+            foreach (string tPair in rowPairs.Select(pair => pair.Trim()))
+            {
+                String firstRow;
+                String lastRow;
+                if (tPair.Contains(':') || tPair.Contains('-'))
+                {
+                    string[] rowRange = XLHelper.SplitRange(tPair);
+
+                    firstRow = rowRange[0];
+                    lastRow = rowRange[1];
+                }
+                else
+                {
+                    firstRow = tPair;
+                    lastRow = tPair;
+                }
+                foreach (IXLRangeRow row in Rows(Int32.Parse(firstRow), Int32.Parse(lastRow)))
+                    retVal.Add(row);
+            }
+            return retVal;
+        }
+
+        public void Transpose(XLTransposeOptions transposeOption)
+        {
+            int rowCount = RowCount();
+            int columnCount = ColumnCount();
+            int squareSide = rowCount > columnCount ? rowCount : columnCount;
+
+            var firstCell = FirstCell();
+
+            MoveOrClearForTranspose(transposeOption, rowCount, columnCount);
+            TransposeMerged(squareSide);
+            TransposeRange(squareSide);
+            RangeAddress.LastAddress = new XLAddress(Worksheet,
+                                                     firstCell.Address.RowNumber + columnCount - 1,
+                                                     firstCell.Address.ColumnNumber + rowCount - 1,
+                                                     RangeAddress.LastAddress.FixedRow,
+                                                     RangeAddress.LastAddress.FixedColumn);
+            if (rowCount > columnCount)
+            {
+                var rng = Worksheet.Range(
+                    RangeAddress.LastAddress.RowNumber + 1,
+                    RangeAddress.FirstAddress.ColumnNumber,
+                    RangeAddress.LastAddress.RowNumber + (rowCount - columnCount),
+                    RangeAddress.LastAddress.ColumnNumber);
+                rng.Delete(XLShiftDeletedCells.ShiftCellsUp);
+            }
+            else if (columnCount > rowCount)
+            {
+                var rng = Worksheet.Range(
+                    RangeAddress.FirstAddress.RowNumber,
+                    RangeAddress.LastAddress.ColumnNumber + 1,
+                    RangeAddress.LastAddress.RowNumber,
+                    RangeAddress.LastAddress.ColumnNumber + (columnCount - rowCount));
+                rng.Delete(XLShiftDeletedCells.ShiftCellsLeft);
+            }
+
+            foreach (IXLCell c in Range(1, 1, columnCount, rowCount).Cells())
+            {
+                var border = new XLBorder(this, c.Style.Border);
+                c.Style.Border.TopBorder = border.LeftBorder;
+                c.Style.Border.TopBorderColor = border.LeftBorderColor;
+                c.Style.Border.LeftBorder = border.TopBorder;
+                c.Style.Border.LeftBorderColor = border.TopBorderColor;
+                c.Style.Border.RightBorder = border.BottomBorder;
+                c.Style.Border.RightBorderColor = border.BottomBorderColor;
+                c.Style.Border.BottomBorder = border.RightBorder;
+                c.Style.Border.BottomBorderColor = border.RightBorderColor;
+            }
+        }
+
+        public IXLTable AsTable()
+        {
+            return new XLTable(this, false);
+        }
+
+        public IXLTable AsTable(String name)
+        {
+            return new XLTable(this, name, false);
+        }
+
+        IXLTable IXLRange.CreateTable()
+        {
+            return CreateTable();
+        }
+        public XLTable CreateTable()
+        {
+            return new XLTable(this, true, true);
+        }
+
+        IXLTable IXLRange.CreateTable(String name)
+        {
+            return CreateTable(name);
+        }
+        public XLTable CreateTable(String name)
+        {
+            return new XLTable(this, name, true, true);
+        }
+
+        public IXLTable CreateTable(String name, Boolean setAutofilter)
+        {
+            return new XLTable(this, name, true, setAutofilter);
+        }
+
+        public new IXLRange CopyTo(IXLCell target)
+        {
+            base.CopyTo(target);
+
+            Int32 lastRowNumber = target.Address.RowNumber + RowCount() - 1;
+            if (lastRowNumber > XLHelper.MaxRowNumber)
+                lastRowNumber = XLHelper.MaxRowNumber;
+            Int32 lastColumnNumber = target.Address.ColumnNumber + ColumnCount() - 1;
+            if (lastColumnNumber > XLHelper.MaxColumnNumber)
+                lastColumnNumber = XLHelper.MaxColumnNumber;
+
+            return target.Worksheet.Range(target.Address.RowNumber,
+                                          target.Address.ColumnNumber,
+                                          lastRowNumber,
+                                          lastColumnNumber);
+        }
+
+        public new IXLRange CopyTo(IXLRangeBase target)
+        {
+            base.CopyTo(target);
+
+            Int32 lastRowNumber = target.RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
+            if (lastRowNumber > XLHelper.MaxRowNumber)
+                lastRowNumber = XLHelper.MaxRowNumber;
+            Int32 lastColumnNumber = target.RangeAddress.FirstAddress.ColumnNumber + ColumnCount() - 1;
+            if (lastColumnNumber > XLHelper.MaxColumnNumber)
+                lastColumnNumber = XLHelper.MaxColumnNumber;
+
+            return target.Worksheet.Range(target.RangeAddress.FirstAddress.RowNumber,
+                                          target.RangeAddress.FirstAddress.ColumnNumber,
+                                          lastRowNumber,
+                                          lastColumnNumber);
+        }
+
+        public IXLRange SetDataType(XLCellValues dataType)
+        {
+            DataType = dataType;
+            return this;
+        }
+
+
+        public new IXLRange Sort()
+        {
+            return base.Sort().AsRange();
+        }
+        
+        public new IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            return base.Sort(columnsToSortBy, sortOrder, matchCase, ignoreBlanks).AsRange();
+        }
+        public new IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            return base.Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks).AsRange();
+        }
+        public new IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            return base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks).AsRange();
+        }
+        
+
+        #endregion
+
+        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
+        {
+            ShiftColumns(RangeAddress, range, columnsShifted);
+        }
+
+        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
+        {
+                ShiftRows(RangeAddress, range, rowsShifted);
+        }
+
+        IXLRangeColumn IXLRange.FirstColumn(Func<IXLRangeColumn, Boolean> predicate)
+        {
+            return FirstColumn(predicate);
+        }
+        public XLRangeColumn FirstColumn(Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            if (predicate == null)
+                return Column(1);
+
+            Int32 columnCount = ColumnCount();
+            for (Int32 c = 1; c <= columnCount; c++)
+            {
+                var column = Column(c);
+                if (predicate(column)) return column;
+
+                column.Dispose();
+            }
+
+            return null;
+        }
+
+        IXLRangeColumn IXLRange.LastColumn(Func<IXLRangeColumn, Boolean> predicate)
+        {
+            return LastColumn(predicate);
+        }
+        public XLRangeColumn LastColumn(Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            Int32 columnCount = ColumnCount();
+            if (predicate == null)
+                return Column(columnCount);
+
+            for (Int32 c = columnCount; c >= 1; c--)
+            {
+                var column = Column(c);
+                if (predicate(column)) return column;
+
+                column.Dispose();
+            }
+
+            return null;
+        }
+
+        IXLRangeColumn IXLRange.FirstColumnUsed(Func<IXLRangeColumn, Boolean> predicate )
+        {
+            return FirstColumnUsed(false, predicate);
+        }
+        public XLRangeColumn FirstColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            return FirstColumnUsed(false, predicate);
+        }
+
+        IXLRangeColumn IXLRange.FirstColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate)
+        {
+            return FirstColumnUsed(includeFormats, predicate);
+        }
+        public XLRangeColumn FirstColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            if (predicate == null)
+            {
+                Int32 firstColumnUsed = Worksheet.Internals.CellsCollection.FirstColumnUsed(
+                    RangeAddress.FirstAddress.RowNumber,
+                    RangeAddress.FirstAddress.ColumnNumber,
+                    RangeAddress.LastAddress.RowNumber,
+                    RangeAddress.LastAddress.ColumnNumber,
+                    includeFormats);
+
+                return firstColumnUsed == 0 ? null : Column(firstColumnUsed - RangeAddress.FirstAddress.ColumnNumber + 1);
+            }
+
+            Int32 columnCount = ColumnCount();
+            for (Int32 co = 1; co <= columnCount; co++)
+            {
+                var column = Column(co);
+
+                if (!column.IsEmpty(includeFormats) && predicate(column))
+                    return column;
+                column.Dispose();
+            }
+            return null;
+        }
+
+        IXLRangeColumn IXLRange.LastColumnUsed(Func<IXLRangeColumn, Boolean> predicate)
+        {
+            return LastColumnUsed(false, predicate);
+        }
+        public XLRangeColumn LastColumnUsed(Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            return LastColumnUsed(false, predicate);
+        }
+
+        IXLRangeColumn IXLRange.LastColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate)
+        {
+            return LastColumnUsed(includeFormats, predicate);
+        }
+        public XLRangeColumn LastColumnUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            if (predicate == null)
+            {
+                Int32 lastColumnUsed = Worksheet.Internals.CellsCollection.LastColumnUsed(
+                    RangeAddress.FirstAddress.RowNumber,
+                    RangeAddress.FirstAddress.ColumnNumber,
+                    RangeAddress.LastAddress.RowNumber,
+                    RangeAddress.LastAddress.ColumnNumber,
+                    includeFormats);
+
+                return lastColumnUsed == 0 ? null : Column(lastColumnUsed - RangeAddress.FirstAddress.ColumnNumber + 1);
+            }
+
+            Int32 columnCount = ColumnCount();
+            for (Int32 co = columnCount; co >= 1; co--)
+            {
+                var column = Column(co);
+
+                if (!column.IsEmpty(includeFormats) && predicate(column))
+                    return column;
+                column.Dispose();
+            }
+            return null;
+        }
+
+        IXLRangeRow IXLRange.FirstRow(Func<IXLRangeRow, Boolean> predicate)
+        {
+            return FirstRow(predicate);
+        }
+        public XLRangeRow FirstRow(Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            if (predicate == null)
+                return Row(1);
+
+            Int32 rowCount = RowCount();
+            for (Int32 ro = 1; ro <= rowCount; ro++)
+            {
+                var row = Row(ro);
+                if (predicate(row)) return row;
+
+                row.Dispose();
+            }
+
+            return null;
+        }
+
+        IXLRangeRow IXLRange.LastRow(Func<IXLRangeRow, Boolean> predicate)
+        {
+            return LastRow(predicate);
+        }
+        public XLRangeRow LastRow(Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            Int32 rowCount = RowCount();
+            if (predicate == null)
+                return Row(rowCount);
+
+            for (Int32 ro = rowCount; ro >= 1; ro--)
+            {
+                var row = Row(ro);
+                if (predicate(row)) return row;
+
+                row.Dispose();
+            }
+
+            return null;
+        }
+
+        IXLRangeRow IXLRange.FirstRowUsed(Func<IXLRangeRow, Boolean> predicate)
+        {
+            return FirstRowUsed(false, predicate);
+        }
+        public XLRangeRow FirstRowUsed(Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            return FirstRowUsed(false, predicate);
+        }
+
+        IXLRangeRow IXLRange.FirstRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate)
+        {
+            return FirstRowUsed(includeFormats, predicate);
+        }
+        public XLRangeRow FirstRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            if (predicate == null)
+            {
+                Int32 rowFromCells = Worksheet.Internals.CellsCollection.FirstRowUsed(
+                    RangeAddress.FirstAddress.RowNumber,
+                    RangeAddress.FirstAddress.ColumnNumber,
+                    RangeAddress.LastAddress.RowNumber,
+                    RangeAddress.LastAddress.ColumnNumber,
+                    includeFormats);
+
+                //Int32 rowFromRows = Worksheet.Internals.RowsCollection.FirstRowUsed(includeFormats);
+
+                return rowFromCells == 0 ? null : Row(rowFromCells - RangeAddress.FirstAddress.RowNumber + 1);
+            }
+
+            Int32 rowCount = RowCount();
+            for (Int32 ro = 1; ro <= rowCount; ro++)
+            {
+                var row = Row(ro);
+
+                if (!row.IsEmpty(includeFormats) && predicate(row))
+                    return row;
+                row.Dispose();
+            }
+            return null;
+        }
+
+        IXLRangeRow IXLRange.LastRowUsed(Func<IXLRangeRow, Boolean> predicate)
+        {
+            return LastRowUsed(false, predicate);
+        }
+        public XLRangeRow LastRowUsed(Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            return LastRowUsed(false, predicate);
+        }
+
+        IXLRangeRow IXLRange.LastRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate)
+        {
+            return LastRowUsed(includeFormats, predicate);
+        }
+        public XLRangeRow LastRowUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            if (predicate == null)
+            {
+                Int32 lastRowUsed = Worksheet.Internals.CellsCollection.LastRowUsed(
+                    RangeAddress.FirstAddress.RowNumber,
+                    RangeAddress.FirstAddress.ColumnNumber,
+                    RangeAddress.LastAddress.RowNumber,
+                    RangeAddress.LastAddress.ColumnNumber,
+                    includeFormats);
+
+                return lastRowUsed == 0 ? null : Row(lastRowUsed - RangeAddress.FirstAddress.RowNumber + 1);
+            }
+
+            Int32 rowCount = RowCount();
+            for (Int32 ro = rowCount; ro >= 1; ro--)
+            {
+                var row = Row(ro);
+
+                if (!row.IsEmpty(includeFormats) && predicate(row))
+                    return row;
+                row.Dispose();
+            }
+            return null;
+        }
+
+
+        IXLRangeRows IXLRange.RowsUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate)
+        {
+            return RowsUsed(includeFormats, predicate);
+        }
+        public XLRangeRows RowsUsed(Boolean includeFormats, Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            XLRangeRows rows = new XLRangeRows();
+            Int32 rowCount = RowCount();
+            for (Int32 ro = 1; ro <= rowCount; ro++)
+            {
+                var row = Row(ro);
+
+                if (!row.IsEmpty(includeFormats) && (predicate == null || predicate(row)))
+                    rows.Add(row);
+                else
+                    row.Dispose();
+            }
+            return rows;
+        }
+        IXLRangeRows IXLRange.RowsUsed(Func<IXLRangeRow, Boolean> predicate)
+        {
+            return RowsUsed(predicate);
+        }
+        public XLRangeRows RowsUsed(Func<IXLRangeRow, Boolean> predicate = null)
+        {
+            return RowsUsed(false, predicate);
+        }
+        IXLRangeColumns IXLRange.ColumnsUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate)
+        {
+            return ColumnsUsed(includeFormats, predicate);
+        }
+        public XLRangeColumns ColumnsUsed(Boolean includeFormats, Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            XLRangeColumns columns = new XLRangeColumns();
+            Int32 columnCount = ColumnCount();
+            for (Int32 co = 1; co <= columnCount; co++)
+            {
+                var column = Column(co);
+
+                if (!column.IsEmpty(includeFormats) && (predicate == null || predicate(column)))
+                    columns.Add(column);
+                else
+                    column.Dispose();
+            }
+            return columns;
+        }
+        IXLRangeColumns IXLRange.ColumnsUsed(Func<IXLRangeColumn, Boolean> predicate)
+        {
+            return ColumnsUsed(predicate);
+        }
+        public XLRangeColumns ColumnsUsed(Func<IXLRangeColumn, Boolean> predicate = null)
+        {
+            return ColumnsUsed(false, predicate);
+        }
+
+        public XLRangeRow Row(Int32 row)
+        {
+            if (row <= 0 || row > XLHelper.MaxRowNumber)
+                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}", XLHelper.MaxRowNumber));
+
+            var firstCellAddress = new XLAddress(Worksheet,
+                                                 RangeAddress.FirstAddress.RowNumber + row - 1,
+                                                 RangeAddress.FirstAddress.ColumnNumber,
+                                                 false,
+                                                 false);
+            var lastCellAddress = new XLAddress(Worksheet,
+                                                RangeAddress.FirstAddress.RowNumber + row - 1,
+                                                RangeAddress.LastAddress.ColumnNumber,
+                                                false,
+                                                false);
+            return new XLRangeRow(
+                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), false);
+        }
+
+        
+
+        public XLRangeColumn Column(Int32 column)
+        {
+            if (column <= 0 || column > XLHelper.MaxColumnNumber)
+                throw new IndexOutOfRangeException(String.Format("Column number must be between 1 and {0}", XLHelper.MaxColumnNumber));
+
+            var firstCellAddress = new XLAddress(Worksheet,
+                                                 RangeAddress.FirstAddress.RowNumber,
+                                                 RangeAddress.FirstAddress.ColumnNumber + column - 1,
+                                                 false,
+                                                 false);
+            var lastCellAddress = new XLAddress(Worksheet,
+                                                RangeAddress.LastAddress.RowNumber,
+                                                RangeAddress.FirstAddress.ColumnNumber + column - 1,
+                                                false,
+                                                false);
+            return new XLRangeColumn(
+                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), false);
+        }
+
+        public XLRangeColumn Column(String column)
+        {
+            return Column(XLHelper.GetColumnNumberFromLetter(column));
+        }
+
+        
+
+        private void TransposeRange(int squareSide)
+        {
+            var cellsToInsert = new Dictionary<XLSheetPoint, XLCell>();
+            var cellsToDelete = new List<XLSheetPoint>();
+            var rngToTranspose = Worksheet.Range(
+                RangeAddress.FirstAddress.RowNumber,
+                RangeAddress.FirstAddress.ColumnNumber,
+                RangeAddress.FirstAddress.RowNumber + squareSide - 1,
+                RangeAddress.FirstAddress.ColumnNumber + squareSide - 1);
+
+            Int32 roCount = rngToTranspose.RowCount();
+            Int32 coCount = rngToTranspose.ColumnCount();
+            for (Int32 ro = 1; ro <= roCount; ro++)
+            {
+                for (Int32 co = 1; co <= coCount; co++)
+                {
+                    var oldCell = rngToTranspose.Cell(ro, co);
+                    var newKey = rngToTranspose.Cell(co, ro).Address;
+                        // new XLAddress(Worksheet, c.Address.ColumnNumber, c.Address.RowNumber);
+                    var newCell = new XLCell(Worksheet, newKey, oldCell.GetStyleId());
+                    newCell.CopyFrom(oldCell, true);
+                    cellsToInsert.Add(new XLSheetPoint(newKey.RowNumber, newKey.ColumnNumber), newCell);
+                    cellsToDelete.Add(new XLSheetPoint(oldCell.Address.RowNumber, oldCell.Address.ColumnNumber));
+                }
+            }
+
+            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c));
+            cellsToInsert.ForEach(c => Worksheet.Internals.CellsCollection.Add(c.Key, c.Value));
+        }
+
+        private void TransposeMerged(Int32 squareSide)
+        {
+            var rngToTranspose = Worksheet.Range(
+                RangeAddress.FirstAddress.RowNumber,
+                RangeAddress.FirstAddress.ColumnNumber,
+                RangeAddress.FirstAddress.RowNumber + squareSide - 1,
+                RangeAddress.FirstAddress.ColumnNumber + squareSide - 1);
+
+            foreach (IXLRange merge in Worksheet.Internals.MergedRanges.Where(Contains))
+            {
+                merge.RangeAddress.LastAddress = rngToTranspose.Cell(merge.ColumnCount(), merge.RowCount()).Address;
+            }
+        }
+
+        private void MoveOrClearForTranspose(XLTransposeOptions transposeOption, int rowCount, int columnCount)
+        {
+            if (transposeOption == XLTransposeOptions.MoveCells)
+            {
+                if (rowCount > columnCount)
+                    InsertColumnsAfter(false, rowCount - columnCount, false);
+                else if (columnCount > rowCount)
+                    InsertRowsBelow(false, columnCount - rowCount, false);
+            }
+            else
+            {
+                if (rowCount > columnCount)
+                {
+                    int toMove = rowCount - columnCount;
+                    var rngToClear = Worksheet.Range(
+                        RangeAddress.FirstAddress.RowNumber,
+                        RangeAddress.LastAddress.ColumnNumber + 1,
+                        RangeAddress.LastAddress.RowNumber,
+                        RangeAddress.LastAddress.ColumnNumber + toMove);
+                    rngToClear.Clear();
+                }
+                else if (columnCount > rowCount)
+                {
+                    int toMove = columnCount - rowCount;
+                    var rngToClear = Worksheet.Range(
+                        RangeAddress.LastAddress.RowNumber + 1,
+                        RangeAddress.FirstAddress.ColumnNumber,
+                        RangeAddress.LastAddress.RowNumber + toMove,
+                        RangeAddress.LastAddress.ColumnNumber);
+                    rngToClear.Clear();
+                }
+            }
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = (XLRange)obj;
+            return RangeAddress.Equals(other.RangeAddress)
+                   && Worksheet.Equals(other.Worksheet);
+        }
+
+        public override int GetHashCode()
+        {
+            return RangeAddress.GetHashCode()
+                   ^ Worksheet.GetHashCode();
+        }
+
+        public new IXLRange Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            base.Clear(clearOptions);
+            return this;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/XLRangeAddress.cs b/ClosedXML/Excel/Ranges/XLRangeAddress.cs
new file mode 100644
index 0000000..d5b0e94
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRangeAddress.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLRangeAddress : IXLRangeAddress
+    {
+        #region Private fields
+
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)] private XLAddress _firstAddress;
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)] private XLAddress _lastAddress;
+
+        #endregion
+
+        #region Constructor
+
+        public XLRangeAddress(XLRangeAddress rangeAddress): this(rangeAddress.FirstAddress, rangeAddress.LastAddress)
+        {
+            
+        }
+
+        public XLRangeAddress(XLAddress firstAddress, XLAddress lastAddress)
+        {
+            Worksheet = firstAddress.Worksheet;
+            FirstAddress = XLAddress.Create(firstAddress);
+            LastAddress = XLAddress.Create(lastAddress); 
+        }
+
+        public XLRangeAddress(XLWorksheet worksheet, String rangeAddress)
+        {
+            string addressToUse = rangeAddress.Contains("!")
+                                      ? rangeAddress.Substring(rangeAddress.IndexOf("!") + 1)
+                                      : rangeAddress;
+
+            string firstPart;
+            string secondPart;
+            if (addressToUse.Contains(':'))
+            {
+                var arrRange = addressToUse.Split(':');
+                firstPart = arrRange[0];
+                secondPart = arrRange[1];
+            }
+            else
+            {
+                firstPart = addressToUse;
+                secondPart = addressToUse;
+            }
+
+            if (XLHelper.IsValidA1Address(firstPart))
+            {
+                FirstAddress = XLAddress.Create(worksheet, firstPart);
+                LastAddress = XLAddress.Create(worksheet, secondPart);
+            }
+            else
+            {
+                firstPart = firstPart.Replace("$", String.Empty);
+                secondPart = secondPart.Replace("$", String.Empty);
+                if (char.IsDigit(firstPart[0]))
+                {
+                    FirstAddress = XLAddress.Create(worksheet, "A" + firstPart);
+                    LastAddress = XLAddress.Create(worksheet, XLHelper.MaxColumnLetter + secondPart);
+                }
+                else
+                {
+                    FirstAddress = XLAddress.Create(worksheet, firstPart + "1");
+                    LastAddress = XLAddress.Create(worksheet, secondPart + XLHelper.MaxRowNumber.ToString(CultureInfo.InvariantCulture));    
+                }
+            }
+
+            Worksheet = worksheet;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        public XLWorksheet Worksheet { get; internal set; }
+
+        public XLAddress FirstAddress
+        {
+            get
+            {
+                if (IsInvalid)
+                    throw new Exception("Range is invalid.");
+
+                return _firstAddress;
+            }
+            set { _firstAddress = value; }
+        }
+
+        public XLAddress LastAddress
+        {
+            get
+            {
+                if (IsInvalid)
+                    throw new Exception("Range is an invalid state.");
+
+                return _lastAddress;
+            }
+            set { _lastAddress = value; }
+        }
+
+        IXLWorksheet IXLRangeAddress.Worksheet
+        {
+            get { return Worksheet; }
+        }
+
+        IXLAddress IXLRangeAddress.FirstAddress
+        {
+            [DebuggerStepThrough]
+            get { return FirstAddress; }
+            set { FirstAddress = value as XLAddress; }
+        }
+
+        IXLAddress IXLRangeAddress.LastAddress
+        {
+            [DebuggerStepThrough]
+            get { return LastAddress; }
+            set { LastAddress = value as XLAddress; }
+        }
+
+
+        public bool IsInvalid { get; set; }
+
+        #endregion
+
+        #region Public methods
+
+        public String ToStringRelative()
+        {
+            return ToStringRelative(false);
+        }
+
+        public String ToStringFixed()
+        {
+            return ToStringFixed(XLReferenceStyle.A1);
+        }
+
+        public String ToStringRelative(Boolean includeSheet)
+        {
+            if (includeSheet)
+                return String.Format("'{0}'!{1}:{2}", 
+                    Worksheet.Name, 
+                    _firstAddress.ToStringRelative(),
+                    _lastAddress.ToStringRelative());
+
+            return _firstAddress.ToStringRelative() + ":" + _lastAddress.ToStringRelative();
+        }
+
+        public String ToStringFixed(XLReferenceStyle referenceStyle)
+        {
+            return ToStringFixed(referenceStyle, false);
+        }
+
+        public String ToStringFixed(XLReferenceStyle referenceStyle, Boolean includeSheet)
+        {
+            if (includeSheet)
+                return String.Format("'{0}'!{1}:{2}",
+                    Worksheet.Name,
+                    _firstAddress.ToStringFixed(referenceStyle),
+                    _lastAddress.ToStringFixed(referenceStyle));
+
+            return _firstAddress.ToStringFixed(referenceStyle) + ":" + _lastAddress.ToStringFixed(referenceStyle);           
+        }
+
+        public override string ToString()
+        {
+            return _firstAddress + ":" + _lastAddress;
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = (XLRangeAddress)obj;
+            return Worksheet.Equals(other.Worksheet)
+                   && FirstAddress.Equals(other.FirstAddress)
+                   && LastAddress.Equals(other.LastAddress);
+        }
+
+        public override int GetHashCode()
+        {
+            return
+                Worksheet.GetHashCode()
+                ^ FirstAddress.GetHashCode()
+                ^ LastAddress.GetHashCode();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Ranges/XLRangeBase.cs b/ClosedXML/Excel/Ranges/XLRangeBase.cs
new file mode 100644
index 0000000..87d58f9
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRangeBase.cs
@@ -0,0 +1,2017 @@
+using ClosedXML.Excel.Misc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+
+
+namespace ClosedXML.Excel
+{
+    internal abstract class XLRangeBase : IXLRangeBase, IXLStylized
+    {
+        public Boolean StyleChanged { get; set; }
+        #region Fields
+
+        private IXLStyle _style;
+        private XLSortElements _sortRows;
+        private XLSortElements _sortColumns;
+
+        #endregion
+
+        private Int32 _styleCacheId;
+        protected void SetStyle(IXLStyle styleToUse)
+        {
+            _styleCacheId = Worksheet.Workbook.GetStyleId(styleToUse);
+            _style = null;
+            StyleChanged = false;
+        }
+        protected void SetStyle(Int32 styleId)
+        {
+            _styleCacheId = styleId;
+            _style = null;
+            StyleChanged = false;
+        }
+        public Int32 GetStyleId()
+        {
+            if (StyleChanged)
+                SetStyle(Style);
+
+            return _styleCacheId;
+        }
+        protected IXLStyle GetStyle()
+        {
+            return _style ?? (_style = new XLStyle(this, Worksheet.Workbook.GetStyleById(_styleCacheId)));
+        }
+
+        #region Constructor
+
+        static Int32 IdCounter = 0;
+        readonly Int32 Id;
+
+        protected XLRangeBase(XLRangeAddress rangeAddress)
+        {
+
+            Id = ++IdCounter;
+
+            RangeAddress = new XLRangeAddress(rangeAddress);
+        }
+
+        #endregion
+
+		private XLCallbackAction _shiftedRowsAction;
+
+        protected void SubscribeToShiftedRows(Action<XLRange, Int32> action)
+        {
+            if (Worksheet == null || !Worksheet.EventTrackingEnabled) return;
+
+			_shiftedRowsAction = new XLCallbackAction(action);
+
+			RangeAddress.Worksheet.RangeShiftedRows.Add(_shiftedRowsAction);
+        }
+
+        private XLCallbackAction _shiftedColumnsAction;
+		protected void SubscribeToShiftedColumns(Action<XLRange, Int32> action)
+        {
+            if (Worksheet == null || !Worksheet.EventTrackingEnabled) return;
+
+            _shiftedColumnsAction = new XLCallbackAction(action);
+
+			RangeAddress.Worksheet.RangeShiftedColumns.Add(_shiftedColumnsAction);
+        }
+
+        #region Public properties
+
+        //public XLRangeAddress RangeAddress { get; protected set; }
+
+        private XLRangeAddress _rangeAddress;
+        public XLRangeAddress RangeAddress
+        {
+            get { return _rangeAddress; }
+            protected set { _rangeAddress = value; }
+        }
+
+        public XLWorksheet Worksheet
+        {
+            get { return RangeAddress.Worksheet; }
+        }
+
+        public XLDataValidation NewDataValidation
+        {
+            get
+            {
+                var newRanges = new XLRanges { AsRange() };
+                var dataValidation = new XLDataValidation(newRanges);
+                
+                Worksheet.DataValidations.Add(dataValidation);
+                return dataValidation;
+            }
+        }
+
+        public XLDataValidation DataValidation
+        {
+            get
+            {
+                IXLDataValidation dataValidationToCopy = null;
+                var dvEmpty = new List<IXLDataValidation>();
+                foreach (IXLDataValidation dv in Worksheet.DataValidations)
+                {
+                    foreach (IXLRange dvRange in dv.Ranges.Where(dvRange => dvRange.Intersects(this)))
+                    {
+                        if (dataValidationToCopy == null)
+                            dataValidationToCopy = dv;
+
+                        dv.Ranges.Remove(dvRange);
+                        foreach (var column in dvRange.Columns())
+                        {
+                            if (column.Intersects(this))
+                            {
+                                Int32 dvStart = column.RangeAddress.FirstAddress.RowNumber;
+                                Int32 dvEnd = column.RangeAddress.LastAddress.RowNumber;
+                                Int32 thisStart = RangeAddress.FirstAddress.RowNumber;
+                                Int32 thisEnd = RangeAddress.LastAddress.RowNumber;
+
+                                if (thisStart > dvStart && thisEnd < dvEnd)
+                                {
+                                    var r1 = Worksheet.Column(column.ColumnNumber()).Column(dvStart, thisStart - 1);
+                                    r1.Dispose();
+                                    dv.Ranges.Add(r1);
+                                    var r2 = Worksheet.Column(column.ColumnNumber()).Column(thisEnd + 1, dvEnd);
+                                    r2.Dispose();
+                                    dv.Ranges.Add(r2);
+                                }
+                                else
+                                {
+                                    Int32 coStart;
+                                    if (dvStart < thisStart)
+                                        coStart = dvStart;
+                                    else
+                                        coStart = thisEnd + 1;
+
+                                    if (coStart <= dvEnd)
+                                    {
+                                        Int32 coEnd;
+                                        if (dvEnd > thisEnd)
+                                            coEnd = dvEnd;
+                                        else
+                                            coEnd = thisStart - 1;
+
+                                        if (coEnd >= dvStart)
+                                        {
+                                            var r = Worksheet.Column(column.ColumnNumber()).Column(coStart, coEnd);
+                                            r.Dispose();
+                                            dv.Ranges.Add(r);
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                column.Dispose();
+                                dv.Ranges.Add(column);
+                            }
+                        }
+
+                        if (!dv.Ranges.Any())
+                            dvEmpty.Add(dv);
+                    }
+                }
+
+                dvEmpty.ForEach(dv => Worksheet.DataValidations.Delete(dv));
+
+                var newRanges = new XLRanges {AsRange()};
+                var dataValidation = new XLDataValidation(newRanges);
+                if (dataValidationToCopy != null)
+                    dataValidation.CopyFrom(dataValidationToCopy);
+
+                Worksheet.DataValidations.Add(dataValidation);
+                return dataValidation;
+            }
+        }
+
+        #region IXLRangeBase Members
+
+        IXLRangeAddress IXLRangeBase.RangeAddress
+        {
+            get { return RangeAddress; }
+        }
+
+        IXLWorksheet IXLRangeBase.Worksheet
+        {
+            get { return RangeAddress.Worksheet; }
+        }
+
+        public String FormulaA1
+        {
+            set
+            {
+                Cells().ForEach(c =>
+                                    {
+                                        c.FormulaA1 = value;
+                                        c.FormulaReference = RangeAddress;
+                                    });
+            }
+        }
+
+        public String FormulaR1C1
+        {
+            set
+            {
+                Cells().ForEach(c =>
+                {
+                    c.FormulaR1C1 = value;
+                    c.FormulaReference = RangeAddress;
+                });
+            }
+        }
+
+        public Boolean ShareString
+        {
+            set { Cells().ForEach(c => c.ShareString = value); }
+        }
+
+        public IXLHyperlinks Hyperlinks
+        {
+            get
+            {
+                var hyperlinks = new XLHyperlinks();
+                var hls = from hl in Worksheet.Hyperlinks
+                          where Contains(hl.Cell.AsRange())
+                          select hl;
+                hls.ForEach(hyperlinks.Add);
+                return hyperlinks;
+            }
+        }
+
+
+
+        public Object Value
+        {
+            set { Cells().ForEach(c => c.Value = value); }
+        }
+
+        public XLCellValues DataType
+        {
+            set { Cells().ForEach(c => c.DataType = value); }
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges {AsRange()};
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IXLRangeBase Members
+
+        IXLCell IXLRangeBase.FirstCell()
+        {
+            return FirstCell();
+        }
+
+        IXLCell IXLRangeBase.LastCell()
+        {
+            return LastCell();
+        }
+
+        IXLCell IXLRangeBase.FirstCellUsed()
+        {
+            return FirstCellUsed(false);
+        }
+
+        IXLCell IXLRangeBase.FirstCellUsed(bool includeFormats)
+        {
+            return FirstCellUsed(includeFormats);
+        }
+
+        IXLCell IXLRangeBase.LastCellUsed()
+        {
+            return LastCellUsed(false);
+        }
+
+        IXLCell IXLRangeBase.LastCellUsed(bool includeFormats)
+        {
+            return LastCellUsed(includeFormats);
+        }
+
+        public IXLCells Cells()
+        {
+            var cells = new XLCells(false, false) {RangeAddress};
+            return cells;
+        }
+
+        public IXLCells Cells(String cells)
+        {
+            return Ranges(cells).Cells();
+        }
+
+        public IXLCells Cells(Func<IXLCell, Boolean> predicate)
+        {
+            var cells = new XLCells(false, false, predicate) { RangeAddress };
+            return cells;
+        }
+
+        public IXLCells CellsUsed()
+        {
+            var cells = new XLCells(true, false) {RangeAddress};
+            return cells;
+        }
+
+        IXLCells IXLRangeBase.CellsUsed(Boolean includeFormats)
+        {
+            return CellsUsed(includeFormats);
+        }
+
+        public IXLRange Merge()
+        {
+            return Merge(true);
+        }
+
+        public IXLRange Merge(Boolean checkIntersect)
+        {
+            if (checkIntersect)
+            {
+                string tAddress = RangeAddress.ToString();
+                foreach (var mergedRange in Worksheet.Internals.MergedRanges)
+                {
+                    if (mergedRange.Intersects(tAddress))
+                        Worksheet.Internals.MergedRanges.Remove(mergedRange);
+                }
+            }
+
+            var asRange = AsRange();
+            Worksheet.Internals.MergedRanges.Add(asRange);
+
+            return asRange;
+        }
+
+        public IXLRange Unmerge()
+        {
+            string tAddress = RangeAddress.ToString();
+            var asRange = AsRange();
+            if (Worksheet.Internals.MergedRanges.Select(m => m.RangeAddress.ToString()).Any(mAddress => mAddress == tAddress))
+                Worksheet.Internals.MergedRanges.Remove(asRange);
+
+            return asRange;
+        }
+
+        public IXLRangeBase Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            var includeFormats = clearOptions == XLClearOptions.Formats ||
+                                 clearOptions == XLClearOptions.ContentsAndFormats;
+            foreach (var cell in CellsUsed(includeFormats))
+            {
+                cell.Clear(clearOptions, true);
+            }
+
+            if (includeFormats)
+            {
+                ClearMerged();
+            }
+
+            if (clearOptions == XLClearOptions.ContentsAndFormats)
+            {
+                Worksheet.Internals.CellsCollection.RemoveAll(
+                    RangeAddress.FirstAddress.RowNumber,
+                    RangeAddress.FirstAddress.ColumnNumber,
+                    RangeAddress.LastAddress.RowNumber,
+                    RangeAddress.LastAddress.ColumnNumber
+                    );
+            }
+            return this;
+        }
+
+        public void DeleteComments() {
+            Cells().DeleteComments();
+        }
+
+        public bool Contains(String rangeAddress)
+        {
+            string addressToUse = rangeAddress.Contains("!")
+                                      ? rangeAddress.Substring(rangeAddress.IndexOf("!") + 1)
+                                      : rangeAddress;
+
+            XLAddress firstAddress;
+            XLAddress lastAddress;
+            if (addressToUse.Contains(':'))
+            {
+                var arrRange = addressToUse.Split(':');
+                firstAddress = XLAddress.Create(Worksheet, arrRange[0]);
+                lastAddress = XLAddress.Create(Worksheet, arrRange[1]);
+            }
+            else
+            {
+                firstAddress = XLAddress.Create(Worksheet, addressToUse);
+                lastAddress = XLAddress.Create(Worksheet, addressToUse);
+            }
+            return Contains(firstAddress, lastAddress);
+        }
+
+        public bool Contains(IXLRangeBase range)
+        {
+            return Contains((XLAddress)range.RangeAddress.FirstAddress, (XLAddress)range.RangeAddress.LastAddress);
+        }
+
+        public bool Intersects(string rangeAddress)
+        {
+            using (var range  = Worksheet.Range(rangeAddress))
+                return Intersects(range);
+        }
+
+        public bool Intersects(IXLRangeBase range)
+        {
+            if (range.RangeAddress.IsInvalid || RangeAddress.IsInvalid)
+                return false;
+            var ma = range.RangeAddress;
+            var ra = RangeAddress;
+
+            return !( // See if the two ranges intersect...
+                    ma.FirstAddress.ColumnNumber > ra.LastAddress.ColumnNumber
+                    || ma.LastAddress.ColumnNumber < ra.FirstAddress.ColumnNumber
+                    || ma.FirstAddress.RowNumber > ra.LastAddress.RowNumber
+                    || ma.LastAddress.RowNumber < ra.FirstAddress.RowNumber
+                    );
+        }
+
+        public virtual IXLStyle Style
+        {
+            get { return GetStyle(); }
+            set { Cells().ForEach(c => c.Style = value); }
+        }
+        IXLRange IXLRangeBase.AsRange()
+        {
+            return AsRange();
+        }
+        public virtual XLRange AsRange()
+        {
+            return Worksheet.Range(RangeAddress.FirstAddress, RangeAddress.LastAddress);
+        }
+
+      
+
+        public IXLRange AddToNamed(String rangeName)
+        {
+            return AddToNamed(rangeName, XLScope.Workbook);
+        }
+
+        public IXLRange AddToNamed(String rangeName, XLScope scope)
+        {
+            return AddToNamed(rangeName, scope, null);
+        }
+
+        public IXLRange AddToNamed(String rangeName, XLScope scope, String comment)
+        {
+            var namedRanges = scope == XLScope.Workbook
+                                  ? Worksheet.Workbook.NamedRanges
+                                  : Worksheet.NamedRanges;
+
+            if (namedRanges.Any(nr => String.Compare(nr.Name, rangeName, true) == 0))
+            {
+                var namedRange = namedRanges.Single(nr => String.Compare(nr.Name, rangeName, true) == 0);
+                namedRange.Add(Worksheet.Workbook, RangeAddress.ToStringFixed(XLReferenceStyle.A1, true));
+            }
+            else
+                namedRanges.Add(rangeName, RangeAddress.ToStringFixed(XLReferenceStyle.A1, true), comment);
+            return AsRange();
+        }
+
+        public IXLRangeBase SetValue<T>(T value)
+        {
+            Cells().ForEach(c => c.SetValue(value));
+            return this;
+        }
+
+        public Boolean IsMerged()
+        {
+            return Cells().Any(c => c.IsMerged());
+        }
+
+        public Boolean IsEmpty()
+        {
+            return !CellsUsed().Any() || CellsUsed().Any(c => c.IsEmpty());
+        }
+
+        public Boolean IsEmpty(Boolean includeFormats)
+        {
+            return !CellsUsed(includeFormats).Any<XLCell>() ||
+                   CellsUsed(includeFormats).Any<XLCell>(c => c.IsEmpty(includeFormats));
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public virtual IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                foreach (IXLCell cell in Cells())
+                    yield return cell.Style;
+                UpdatingStyle = false;
+            }
+        }
+
+        public virtual Boolean UpdatingStyle { get; set; }
+
+        public virtual IXLStyle InnerStyle
+        {
+            get { return GetStyle(); }
+            set { SetStyle(value); }
+        }
+
+        #endregion
+
+        public XLCell FirstCell()
+        {
+            return Cell(1, 1);
+        }
+
+        public XLCell LastCell()
+        {
+            return Cell(RowCount(), ColumnCount());
+        }
+
+        public XLCell FirstCellUsed()
+        {
+            return FirstCellUsed(false, null);
+        }
+
+        public XLCell FirstCellUsed(Boolean includeFormats)
+        {
+            return FirstCellUsed(includeFormats, null);
+        }
+
+        IXLCell IXLRangeBase.FirstCellUsed(Func<IXLCell, Boolean> predicate)
+        {
+            return FirstCellUsed(predicate);
+        }
+
+        public XLCell FirstCellUsed(Func<IXLCell, Boolean> predicate)
+        {
+            return FirstCellUsed(false, predicate);
+        }
+
+        IXLCell IXLRangeBase.FirstCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
+        {
+            return FirstCellUsed(includeFormats, predicate);
+        }
+
+        public XLCell FirstCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
+        {
+            Int32 fRow = RangeAddress.FirstAddress.RowNumber;
+            Int32 lRow = RangeAddress.LastAddress.RowNumber;
+            Int32 fColumn = RangeAddress.FirstAddress.ColumnNumber;
+            Int32 lColumn = RangeAddress.LastAddress.ColumnNumber;
+
+            var sp = Worksheet.Internals.CellsCollection.FirstPointUsed(fRow, fColumn, lRow, lColumn, includeFormats, predicate);
+
+            if (includeFormats)
+            {
+                var rowsUsed =
+                    Worksheet.Internals.RowsCollection.Where(r => r.Key >= fRow && r.Key <= lRow && !r.Value.IsEmpty(true));
+
+                var columnsUsed =
+                    Worksheet.Internals.ColumnsCollection.Where(c => c.Key >= fColumn && c.Key <= lColumn && !c.Value.IsEmpty(true));
+
+                // If there's a row or a column then check if the style is different
+                // and pick the first cell and check the style of it, if different
+                // than default then it's your cell.
+
+                Int32 ro = 0;
+                if (rowsUsed.Any())
+                    if (sp.Row > 0)
+                        ro = Math.Min(sp.Row, rowsUsed.First().Key);
+                    else
+                        ro = rowsUsed.First().Key;
+
+                Int32 co = 0;
+                if (columnsUsed.Any())
+                    if (sp.Column > 0)
+                        co = Math.Min(sp.Column, columnsUsed.First().Key);
+                    else
+                        co = columnsUsed.First().Key;
+
+                if (ro > 0 && co > 0)
+                    return Worksheet.Cell(ro, co);
+
+                if (ro > 0 && lColumn < XLHelper.MaxColumnNumber)
+                {
+                    for (co = fColumn; co <= lColumn; co++)
+                    {
+                        var cell = Worksheet.Cell(ro, co);
+                        if (!cell.IsEmpty(true)) return cell;
+                    }
+                }
+                else if (co > 0 && lRow < XLHelper.MaxRowNumber)
+                {
+                    for (ro = fRow; ro <= lRow; ro++)
+                    {
+                        var cell = Worksheet.Cell(ro, co);
+                        if (!cell.IsEmpty(true)) return cell;
+                    }
+                }
+
+                if (Worksheet.MergedRanges.Any(r => r.Intersects(this)))
+                {
+                    Int32 minRo =
+                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Min(r => r.RangeAddress.FirstAddress.RowNumber);
+                    Int32 minCo =
+                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Min(r => r.RangeAddress.FirstAddress.ColumnNumber);
+
+                    return Worksheet.Cell(minRo, minCo);
+                }
+            }
+
+           
+            if (sp.Row > 0) 
+                return Worksheet.Cell(sp.Row, sp.Column);
+
+            return null;
+        }
+
+        public XLCell LastCellUsed()
+        {
+            return LastCellUsed(false, null);
+        }
+
+        public XLCell LastCellUsed(Boolean includeFormats)
+        {
+            return LastCellUsed(includeFormats, null);
+        }
+
+        IXLCell IXLRangeBase.LastCellUsed(Func<IXLCell, Boolean> predicate)
+        {
+            return LastCellUsed(predicate);
+        }
+
+        public XLCell LastCellUsed(Func<IXLCell, Boolean> predicate)
+        {
+            return LastCellUsed(false, predicate);
+        }
+
+        IXLCell IXLRangeBase.LastCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
+        {
+            return LastCellUsed(includeFormats, predicate);
+        }
+
+        public XLCell LastCellUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
+        {
+            Int32 fRow = RangeAddress.FirstAddress.RowNumber;
+            Int32 lRow = RangeAddress.LastAddress.RowNumber;
+            Int32 fColumn = RangeAddress.FirstAddress.ColumnNumber;
+            Int32 lColumn = RangeAddress.LastAddress.ColumnNumber;
+
+            var sp = Worksheet.Internals.CellsCollection.LastPointUsed(fRow, fColumn, lRow, lColumn, includeFormats, predicate);
+
+            if (includeFormats)
+            {
+                var rowsUsed =
+                    Worksheet.Internals.RowsCollection.Where(r => r.Key >= fRow && r.Key <= lRow && !r.Value.IsEmpty(true));
+
+                var columnsUsed =
+                    Worksheet.Internals.ColumnsCollection.Where(c => c.Key >= fColumn && c.Key <= lColumn && !c.Value.IsEmpty(true));
+
+                // If there's a row or a column then check if the style is different
+                // and pick the first cell and check the style of it, if different
+                // than default then it's your cell.
+
+                Int32 ro = 0;
+                if (rowsUsed.Any())
+                    ro = Math.Max(sp.Row, rowsUsed.Last().Key);
+
+                Int32 co = 0;
+                if (columnsUsed.Any())
+                    co = Math.Max(sp.Column, columnsUsed.Last().Key);
+
+                if (ro > 0 && co > 0)
+                    return Worksheet.Cell(ro, co);
+
+                if (ro > 0 && lColumn < XLHelper.MaxColumnNumber)
+                {
+                    for (co = lColumn; co >= fColumn; co--)
+                    {
+                        var cell = Worksheet.Cell(ro, co);
+                        if (!cell.IsEmpty(true)) return cell;
+                    }
+                }
+                else if (co > 0 && lRow < XLHelper.MaxRowNumber)
+                {
+                    for (ro = lRow; ro >= fRow; ro--)
+                    {
+                        var cell = Worksheet.Cell(ro, co);
+                        if (!cell.IsEmpty(true)) return cell;
+                    }
+                }
+
+                if (Worksheet.MergedRanges.Any(r => r.Intersects(this)))
+                {
+                    Int32 minRo =
+                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Max(r => r.RangeAddress.LastAddress.RowNumber);
+                    Int32 minCo =
+                        Worksheet.MergedRanges.Where(r => r.Intersects(this)).Max(r => r.RangeAddress.LastAddress.ColumnNumber);
+
+                    return Worksheet.Cell(minRo, minCo);
+                }
+            }
+
+            
+            if (sp.Row > 0)
+                return Worksheet.Cell(sp.Row, sp.Column);
+
+            return null;
+        }
+
+        public XLCell Cell(Int32 row, Int32 column)
+        {
+            return Cell(new XLAddress(Worksheet, row, column, false, false));
+        }
+
+        public XLCell Cell(String cellAddressInRange)
+        {
+
+            if (XLHelper.IsValidA1Address(cellAddressInRange))
+                return Cell(XLAddress.Create(Worksheet, cellAddressInRange));
+
+            return (XLCell)Worksheet.NamedRange(cellAddressInRange).Ranges.First().FirstCell();
+        }
+
+        public XLCell Cell(Int32 row, String column)
+        {
+            return Cell(new XLAddress(Worksheet, row, column, false, false));
+        }
+
+        public XLCell Cell(IXLAddress cellAddressInRange)
+        {
+            return Cell(cellAddressInRange.RowNumber, cellAddressInRange.ColumnNumber);
+        }
+
+        public XLCell Cell(XLAddress cellAddressInRange)
+        {
+            Int32 absRow = cellAddressInRange.RowNumber + RangeAddress.FirstAddress.RowNumber - 1;
+            Int32 absColumn = cellAddressInRange.ColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1;
+
+            if (absRow <= 0 || absRow > XLHelper.MaxRowNumber)
+            {
+                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}",
+                                                                 XLHelper.MaxRowNumber));
+            }
+
+            if (absColumn <= 0 || absColumn > XLHelper.MaxColumnNumber)
+            {
+                throw new IndexOutOfRangeException(String.Format("Column number must be between 1 and {0}",
+                                                                 XLHelper.MaxColumnNumber));
+            }
+
+            var cell = Worksheet.Internals.CellsCollection.GetCell(absRow,
+                                                                   absColumn);
+
+            if (cell != null)
+                return cell;
+
+            //var style = Style;
+            Int32 styleId = GetStyleId();
+            Int32 worksheetStyleId = Worksheet.GetStyleId();
+
+            if (styleId == worksheetStyleId)
+            {
+                XLRow row;
+                XLColumn column;
+                if (Worksheet.Internals.RowsCollection.TryGetValue(absRow, out row)
+                    && row.GetStyleId() != worksheetStyleId)
+                    styleId = row.GetStyleId();
+                else if (Worksheet.Internals.ColumnsCollection.TryGetValue(absColumn, out column)
+                    && column.GetStyleId() != worksheetStyleId)
+                    styleId = column.GetStyleId();
+            }
+            var absoluteAddress = new XLAddress(cellAddressInRange.Worksheet,
+                                 absRow,
+                                 absColumn,
+                                 cellAddressInRange.FixedRow,
+                                 cellAddressInRange.FixedColumn);
+            var newCell = new XLCell(Worksheet, absoluteAddress, styleId);
+            Worksheet.Internals.CellsCollection.Add(absRow, absColumn, newCell);
+            return newCell;
+        }
+
+        public Int32 RowCount()
+        {
+            return RangeAddress.LastAddress.RowNumber - RangeAddress.FirstAddress.RowNumber + 1;
+        }
+
+        public Int32 RowNumber()
+        {
+            return RangeAddress.FirstAddress.RowNumber;
+        }
+
+        public Int32 ColumnCount()
+        {
+            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
+        }
+
+        public Int32 ColumnNumber()
+        {
+            return RangeAddress.FirstAddress.ColumnNumber;
+        }
+
+        public String ColumnLetter()
+        {
+            return RangeAddress.FirstAddress.ColumnLetter;
+        }
+
+        public virtual XLRange Range(String rangeAddressStr)
+        {
+            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressStr);
+            return Range(rangeAddress);
+        }
+
+        public XLRange Range(IXLCell firstCell, IXLCell lastCell)
+        {
+            var newFirstCellAddress = firstCell.Address as XLAddress;
+            var newLastCellAddress = lastCell.Address as XLAddress;
+            
+            return GetRange(newFirstCellAddress, newLastCellAddress);
+        }
+
+        private XLRange GetRange(XLAddress newFirstCellAddress, XLAddress newLastCellAddress)
+        {
+            var newRangeAddress = new XLRangeAddress(newFirstCellAddress, newLastCellAddress);
+            var xlRangeParameters = new XLRangeParameters(newRangeAddress, Style);
+            if (
+                newFirstCellAddress.RowNumber < RangeAddress.FirstAddress.RowNumber
+                || newFirstCellAddress.RowNumber > RangeAddress.LastAddress.RowNumber
+                || newLastCellAddress.RowNumber > RangeAddress.LastAddress.RowNumber
+                || newFirstCellAddress.ColumnNumber < RangeAddress.FirstAddress.ColumnNumber
+                || newFirstCellAddress.ColumnNumber > RangeAddress.LastAddress.ColumnNumber
+                || newLastCellAddress.ColumnNumber > RangeAddress.LastAddress.ColumnNumber
+                )
+            {
+                throw new ArgumentOutOfRangeException(String.Format(
+                    "The cells {0} and {1} are outside the range '{2}'.",
+                    newFirstCellAddress,
+                    newLastCellAddress,
+                    ToString()));
+            }
+
+            return new XLRange(xlRangeParameters);
+        }
+
+        public XLRange Range(String firstCellAddress, String lastCellAddress)
+        {
+            var rangeAddress = new XLRangeAddress(XLAddress.Create(Worksheet, firstCellAddress),
+                                                  XLAddress.Create(Worksheet, lastCellAddress));
+            return Range(rangeAddress);
+        }
+
+        public XLRange Range(Int32 firstCellRow, Int32 firstCellColumn, Int32 lastCellRow, Int32 lastCellColumn)
+        {
+            var rangeAddress = new XLRangeAddress(new XLAddress(Worksheet, firstCellRow, firstCellColumn, false, false),
+                                                  new XLAddress(Worksheet, lastCellRow, lastCellColumn, false, false));
+            return Range(rangeAddress);
+        }
+
+        public XLRange Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
+        {
+            var rangeAddress = new XLRangeAddress(firstCellAddress as XLAddress, lastCellAddress as XLAddress);
+            return Range(rangeAddress);
+        }
+
+        public XLRange Range(IXLRangeAddress rangeAddress)
+        {
+
+            var newFirstCellAddress = new XLAddress((XLWorksheet)rangeAddress.FirstAddress.Worksheet,
+                                 rangeAddress.FirstAddress.RowNumber + RangeAddress.FirstAddress.RowNumber - 1,
+                                 rangeAddress.FirstAddress.ColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1,
+                                 rangeAddress.FirstAddress.FixedRow,
+                                 rangeAddress.FirstAddress.FixedColumn);
+
+            newFirstCellAddress.FixedRow = rangeAddress.FirstAddress.FixedRow;
+            newFirstCellAddress.FixedColumn = rangeAddress.FirstAddress.FixedColumn;
+
+            var newLastCellAddress = new XLAddress((XLWorksheet)rangeAddress.LastAddress.Worksheet,
+                                rangeAddress.LastAddress.RowNumber + RangeAddress.FirstAddress.RowNumber - 1,
+                                rangeAddress.LastAddress.ColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1,
+                                rangeAddress.LastAddress.FixedRow,
+                                rangeAddress.LastAddress.FixedColumn);
+
+            newLastCellAddress.FixedRow = rangeAddress.LastAddress.FixedRow;
+            newLastCellAddress.FixedColumn = rangeAddress.LastAddress.FixedColumn;
+
+            return GetRange(newFirstCellAddress, newLastCellAddress);
+        }
+
+        public IXLRanges Ranges(String ranges)
+        {
+            var retVal = new XLRanges();
+            var rangePairs = ranges.Split(',');
+            foreach (string pair in rangePairs)
+                retVal.Add(Range(pair.Trim()));
+            return retVal;
+        }
+
+        public IXLRanges Ranges(params String[] ranges)
+        {
+            var retVal = new XLRanges();
+            foreach (string pair in ranges)
+                retVal.Add(Range(pair));
+            return retVal;
+        }
+
+        protected String FixColumnAddress(String address)
+        {
+            Int32 test;
+            if (Int32.TryParse(address, out test))
+                return "A" + address;
+            return address;
+        }
+
+        protected String FixRowAddress(String address)
+        {
+            Int32 test;
+            if (Int32.TryParse(address, out test))
+                return XLHelper.GetColumnLetterFromNumber(test) + "1";
+            return address;
+        }
+
+        public XLCells CellsUsed(bool includeFormats)
+        {
+            var cells = new XLCells(true, includeFormats) {RangeAddress};
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Func<IXLCell, Boolean> predicate)
+        {
+            var cells = new XLCells(true, false, predicate) { RangeAddress };
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Boolean includeFormats, Func<IXLCell, Boolean> predicate)
+        {
+            var cells = new XLCells(true, includeFormats, predicate) { RangeAddress };
+            return cells;
+        }
+
+        public IXLRangeColumns InsertColumnsAfter(Int32 numberOfColumns)
+        {
+            return InsertColumnsAfter(numberOfColumns, true);
+        }
+
+        public IXLRangeColumns InsertColumnsAfter(Int32 numberOfColumns, Boolean expandRange)
+        {
+            var retVal = InsertColumnsAfter(false, numberOfColumns);
+            // Adjust the range
+            if (expandRange)
+            {
+                RangeAddress = new XLRangeAddress(
+                    new XLAddress(Worksheet,
+                                  RangeAddress.FirstAddress.RowNumber,
+                                  RangeAddress.FirstAddress.ColumnNumber,
+                                  RangeAddress.FirstAddress.FixedRow,
+                                  RangeAddress.FirstAddress.FixedColumn),
+                    new XLAddress(Worksheet,
+                                  RangeAddress.LastAddress.RowNumber,
+                                  RangeAddress.LastAddress.ColumnNumber + numberOfColumns,
+                                  RangeAddress.LastAddress.FixedRow,
+                                  RangeAddress.LastAddress.FixedColumn));
+            }
+            return retVal;
+        }
+
+        public IXLRangeColumns InsertColumnsAfter(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
+		{
+			return InsertColumnsAfterInternal(onlyUsedCells, numberOfColumns, formatFromLeft);
+		}
+
+		public void InsertColumnsAfterVoid(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
+		{
+			InsertColumnsAfterInternal(onlyUsedCells, numberOfColumns, formatFromLeft, nullReturn: true);
+		}
+
+        private IXLRangeColumns InsertColumnsAfterInternal(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true, Boolean nullReturn = false)
+        {
+            int columnCount = ColumnCount();
+            int firstColumn = RangeAddress.FirstAddress.ColumnNumber + columnCount;
+            if (firstColumn > XLHelper.MaxColumnNumber)
+                firstColumn = XLHelper.MaxColumnNumber;
+            int lastColumn = firstColumn + ColumnCount() - 1;
+            if (lastColumn > XLHelper.MaxColumnNumber)
+                lastColumn = XLHelper.MaxColumnNumber;
+
+            int firstRow = RangeAddress.FirstAddress.RowNumber;
+            int lastRow = firstRow + RowCount() - 1;
+            if (lastRow > XLHelper.MaxRowNumber)
+                lastRow = XLHelper.MaxRowNumber;
+
+            var newRange = Worksheet.Range(firstRow, firstColumn, lastRow, lastColumn);
+            return newRange.InsertColumnsBeforeInternal(onlyUsedCells, numberOfColumns, formatFromLeft, nullReturn);
+        }
+
+        public IXLRangeColumns InsertColumnsBefore(Int32 numberOfColumns)
+        {
+            return InsertColumnsBefore(numberOfColumns, false);
+        }
+
+        public IXLRangeColumns InsertColumnsBefore(Int32 numberOfColumns, Boolean expandRange)
+        {
+            var retVal = InsertColumnsBefore(false, numberOfColumns);
+            // Adjust the range
+            if (expandRange)
+            {
+                RangeAddress = new XLRangeAddress(
+                    new XLAddress(Worksheet,
+                                  RangeAddress.FirstAddress.RowNumber,
+                                  RangeAddress.FirstAddress.ColumnNumber - numberOfColumns,
+                                  RangeAddress.FirstAddress.FixedRow,
+                                  RangeAddress.FirstAddress.FixedColumn),
+                    new XLAddress(Worksheet,
+                                  RangeAddress.LastAddress.RowNumber,
+                                  RangeAddress.LastAddress.ColumnNumber,
+                                  RangeAddress.LastAddress.FixedRow,
+                                  RangeAddress.LastAddress.FixedColumn));
+            }
+            return retVal;
+        }
+
+		public IXLRangeColumns InsertColumnsBefore(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
+		{
+			return InsertColumnsBeforeInternal(onlyUsedCells, numberOfColumns, formatFromLeft);
+		}
+
+		public void InsertColumnsBeforeVoid(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true)
+		{
+			InsertColumnsBeforeInternal(onlyUsedCells, numberOfColumns, formatFromLeft, nullReturn: true);
+		}
+
+        private IXLRangeColumns InsertColumnsBeforeInternal(Boolean onlyUsedCells, Int32 numberOfColumns, Boolean formatFromLeft = true, Boolean nullReturn = false)
+        {
+            foreach (XLWorksheet ws in Worksheet.Workbook.WorksheetsInternal)
+            {
+                foreach (XLCell cell in ws.Internals.CellsCollection.GetCells(c => !XLHelper.IsNullOrWhiteSpace(c.FormulaA1)))
+                    using (var asRange = AsRange())
+                        cell.ShiftFormulaColumns(asRange, numberOfColumns);
+            }
+
+
+            var cellsDataValidations = new Dictionary<XLAddress, DataValidationToCopy>();
+            var cellsToInsert = new Dictionary<IXLAddress, XLCell>();
+            var cellsToDelete = new List<IXLAddress>();
+            int firstColumn = RangeAddress.FirstAddress.ColumnNumber;
+            int firstRow = RangeAddress.FirstAddress.RowNumber;
+            int lastRow = RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
+
+            if (!onlyUsedCells)
+            {
+                int lastColumn = Worksheet.Internals.CellsCollection.MaxColumnUsed;
+                if (lastColumn > 0)
+                {
+                    for (int co = lastColumn; co >= firstColumn; co--)
+                    {
+                        for (int ro = lastRow; ro >= firstRow; ro--)
+                        {
+                            var oldKey = new XLAddress(Worksheet, ro, co, false, false);
+                            int newColumn = co + numberOfColumns;
+                            var newKey = new XLAddress(Worksheet, ro, newColumn, false, false);
+                            var oldCell = Worksheet.Internals.CellsCollection.GetCell(ro, co) ??
+                                          Worksheet.Cell(oldKey);
+
+                            var newCell = new XLCell(Worksheet, newKey, oldCell.GetStyleId());
+                            newCell.CopyValues(oldCell);
+                            newCell.FormulaA1 = oldCell.FormulaA1;
+                            cellsToInsert.Add(newKey, newCell);
+                            cellsToDelete.Add(oldKey);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                foreach (
+                    XLCell c in
+                        Worksheet.Internals.CellsCollection.GetCells(firstRow, firstColumn, lastRow,
+                                                                     Worksheet.Internals.CellsCollection.MaxColumnUsed))
+                {
+                    int newColumn = c.Address.ColumnNumber + numberOfColumns;
+                    var newKey = new XLAddress(Worksheet, c.Address.RowNumber, newColumn, false, false);
+                    var newCell = new XLCell(Worksheet, newKey, c.GetStyleId());
+                    newCell.CopyValues(c);
+                    if (c.HasDataValidation)
+                    {
+                        cellsDataValidations.Add(newCell.Address,
+                                                 new DataValidationToCopy
+                                                     {DataValidation = c.DataValidation, SourceAddress = c.Address});
+                        c.DataValidation.Clear();
+                    }
+                    newCell.FormulaA1 = c.FormulaA1;
+                    cellsToInsert.Add(newKey, newCell);
+                    cellsToDelete.Add(c.Address);
+                }
+            }
+
+            cellsDataValidations.ForEach(kp =>
+            {
+                XLCell targetCell;
+                if (!cellsToInsert.TryGetValue(kp.Key, out targetCell))
+                    targetCell = Worksheet.Cell(kp.Key);
+
+                targetCell.CopyDataValidation(Worksheet.Cell(kp.Value.SourceAddress), kp.Value.DataValidation);
+            });
+
+            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c.RowNumber, c.ColumnNumber));
+            cellsToInsert.ForEach(
+                c => Worksheet.Internals.CellsCollection.Add(c.Key.RowNumber, c.Key.ColumnNumber, c.Value));
+            //cellsDataValidations.ForEach(kp => Worksheet.Cell(kp.Key).CopyDataValidation(Worksheet.Cell(kp.Value.SourceAddress), kp.Value.DataValidation));
+
+            Int32 firstRowReturn = RangeAddress.FirstAddress.RowNumber;
+            Int32 lastRowReturn = RangeAddress.LastAddress.RowNumber ;
+            Int32 firstColumnReturn = RangeAddress.FirstAddress.ColumnNumber ;
+            Int32 lastColumnReturn = RangeAddress.FirstAddress.ColumnNumber + numberOfColumns - 1;
+
+            Worksheet.BreakConditionalFormatsIntoCells(cellsToDelete.Except(cellsToInsert.Keys).ToList());
+            using (var asRange = AsRange())
+                Worksheet.NotifyRangeShiftedColumns(asRange, numberOfColumns);
+
+            var rangeToReturn = Worksheet.Range(firstRowReturn, firstColumnReturn, lastRowReturn, lastColumnReturn);
+
+            if (formatFromLeft && rangeToReturn.RangeAddress.FirstAddress.ColumnNumber > 1)
+            {
+                using (var firstColumnUsed = rangeToReturn.FirstColumn())
+                {
+                    using (var model = firstColumnUsed.ColumnLeft())
+                    {
+                        var modelFirstRow = model.FirstCellUsed(true);
+                        var modelLastRow = model.LastCellUsed(true);
+                        if (modelLastRow != null)
+                        {
+                            Int32 firstRoReturned = modelFirstRow.Address.RowNumber
+                                                    - model.RangeAddress.FirstAddress.RowNumber + 1;
+                            Int32 lastRoReturned = modelLastRow.Address.RowNumber
+                                                   - model.RangeAddress.FirstAddress.RowNumber + 1;
+                            for (Int32 ro = firstRoReturned; ro <= lastRoReturned; ro++)
+                            {
+                                rangeToReturn.Row(ro).Style = model.Cell(ro).Style;
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                var lastRoUsed = rangeToReturn.LastRowUsed(true);
+                if (lastRoUsed != null)
+                {
+                    Int32 lastRoReturned = lastRoUsed.RowNumber();
+                    for (Int32 ro = 1; ro <= lastRoReturned; ro++)
+                    {
+                        var styleToUse = Worksheet.Internals.RowsCollection.ContainsKey(ro)
+                                             ? Worksheet.Internals.RowsCollection[ro].Style
+                                             : Worksheet.Style;
+                        rangeToReturn.Row(ro).Style = styleToUse;
+                    }
+                    
+                }
+            }
+
+			if(nullReturn)
+				return null;
+            
+            return rangeToReturn.Columns();
+        }
+
+        public IXLRangeRows InsertRowsBelow(Int32 numberOfRows)
+        {
+            return InsertRowsBelow(numberOfRows, true);
+        }
+
+        public IXLRangeRows InsertRowsBelow(Int32 numberOfRows, Boolean expandRange)
+        {
+            var retVal = InsertRowsBelow(false, numberOfRows);
+            // Adjust the range
+            if (expandRange)
+            {
+                RangeAddress = new XLRangeAddress(
+                    new XLAddress(Worksheet,
+                                  RangeAddress.FirstAddress.RowNumber,
+                                  RangeAddress.FirstAddress.ColumnNumber,
+                                  RangeAddress.FirstAddress.FixedRow,
+                                  RangeAddress.FirstAddress.FixedColumn),
+                    new XLAddress(Worksheet,
+                                  RangeAddress.LastAddress.RowNumber + numberOfRows,
+                                  RangeAddress.LastAddress.ColumnNumber,
+                                  RangeAddress.LastAddress.FixedRow,
+                                  RangeAddress.LastAddress.FixedColumn));
+            }
+            return retVal;
+        }
+
+		public IXLRangeRows InsertRowsBelow(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
+		{
+			return InsertRowsBelowInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: false);
+		}
+
+		public void InsertRowsBelowVoid(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
+		{
+			InsertRowsBelowInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: true);
+		}
+
+		private IXLRangeRows InsertRowsBelowInternal(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove, Boolean nullReturn)
+		{
+            int rowCount = RowCount();
+            int firstRow = RangeAddress.FirstAddress.RowNumber + rowCount;
+            if (firstRow > XLHelper.MaxRowNumber)
+                firstRow = XLHelper.MaxRowNumber;
+            int lastRow = firstRow + RowCount() - 1;
+            if (lastRow > XLHelper.MaxRowNumber)
+                lastRow = XLHelper.MaxRowNumber;
+
+            int firstColumn = RangeAddress.FirstAddress.ColumnNumber;
+            int lastColumn = firstColumn + ColumnCount() - 1;
+            if (lastColumn > XLHelper.MaxColumnNumber)
+                lastColumn = XLHelper.MaxColumnNumber;
+
+            var newRange = Worksheet.Range(firstRow, firstColumn, lastRow, lastColumn);
+            return newRange.InsertRowsAboveInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn);
+        }
+
+        public IXLRangeRows InsertRowsAbove(Int32 numberOfRows)
+        {
+            return InsertRowsAbove(numberOfRows, false);
+        }
+
+        public IXLRangeRows InsertRowsAbove(Int32 numberOfRows, Boolean expandRange)
+        {
+            var retVal = InsertRowsAbove(false, numberOfRows);
+            // Adjust the range
+            if (expandRange)
+            {
+                RangeAddress = new XLRangeAddress(
+                    new XLAddress(Worksheet,
+                                  RangeAddress.FirstAddress.RowNumber - numberOfRows,
+                                  RangeAddress.FirstAddress.ColumnNumber,
+                                  RangeAddress.FirstAddress.FixedRow,
+                                  RangeAddress.FirstAddress.FixedColumn),
+                    new XLAddress(Worksheet,
+                                  RangeAddress.LastAddress.RowNumber,
+                                  RangeAddress.LastAddress.ColumnNumber,
+                                  RangeAddress.LastAddress.FixedRow,
+                                  RangeAddress.LastAddress.FixedColumn));
+            }
+            return retVal;
+        }
+
+        struct DataValidationToCopy
+        {
+            public XLAddress SourceAddress;
+            public XLDataValidation DataValidation;
+        }
+		public void InsertRowsAboveVoid(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
+		{
+			InsertRowsAboveInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: true);
+		}
+		public IXLRangeRows InsertRowsAbove(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove = true)
+		{
+			return InsertRowsAboveInternal(onlyUsedCells, numberOfRows, formatFromAbove, nullReturn: false);
+		}
+
+		private IXLRangeRows InsertRowsAboveInternal(Boolean onlyUsedCells, Int32 numberOfRows, Boolean formatFromAbove, Boolean nullReturn)
+		{
+            using (var asRange = AsRange())
+                foreach (XLWorksheet ws in Worksheet.Workbook.WorksheetsInternal)
+                {
+                    foreach (XLCell cell in ws.Internals.CellsCollection.GetCells(c => !XLHelper.IsNullOrWhiteSpace(c.FormulaA1)))
+                            cell.ShiftFormulaRows(asRange, numberOfRows);
+                }
+
+            var cellsToInsert = new Dictionary<IXLAddress, XLCell>();
+            var cellsToDelete = new List<IXLAddress>();
+            var cellsDataValidations = new Dictionary<XLAddress, DataValidationToCopy>();
+            int firstRow = RangeAddress.FirstAddress.RowNumber;
+            int firstColumn = RangeAddress.FirstAddress.ColumnNumber;
+            int lastColumn = RangeAddress.FirstAddress.ColumnNumber + ColumnCount() - 1;
+
+            if (!onlyUsedCells)
+            {
+                int lastRow = Worksheet.Internals.CellsCollection.MaxRowUsed;
+                if (lastRow > 0)
+                {
+                    for (int ro = lastRow; ro >= firstRow; ro--)
+                    {
+                        for (int co = lastColumn; co >= firstColumn; co--)
+                        {
+                            var oldKey = new XLAddress(Worksheet, ro, co, false, false);
+                            int newRow = ro + numberOfRows;
+                            var newKey = new XLAddress(Worksheet, newRow, co, false, false);
+                            var oldCell = Worksheet.Internals.CellsCollection.GetCell(ro, co) ??
+                                          Worksheet.Cell(oldKey);
+
+                            var newCell = new XLCell(Worksheet, newKey, oldCell.GetStyleId());
+                            newCell.CopyValues(oldCell);
+                            newCell.FormulaA1 = oldCell.FormulaA1;
+                            cellsToInsert.Add(newKey, newCell);
+                            cellsToDelete.Add(oldKey);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                foreach (
+                    XLCell c in
+                        Worksheet.Internals.CellsCollection.GetCells(firstRow, firstColumn,
+                                                                     Worksheet.Internals.CellsCollection.MaxRowUsed,
+                                                                     lastColumn))
+                {
+                    int newRow = c.Address.RowNumber + numberOfRows;
+                    var newKey = new XLAddress(Worksheet, newRow, c.Address.ColumnNumber, false, false);
+                    var newCell = new XLCell(Worksheet, newKey, c.GetStyleId());
+                    newCell.CopyValues(c);
+                    if (c.HasDataValidation)
+                    {
+                        cellsDataValidations.Add(newCell.Address,
+                                                 new DataValidationToCopy
+                                                     {DataValidation = c.DataValidation, SourceAddress = c.Address});
+                        c.DataValidation.Clear();
+                    }
+                    newCell.FormulaA1 = c.FormulaA1;
+                    cellsToInsert.Add(newKey, newCell);
+                    cellsToDelete.Add(c.Address);
+                    
+                }
+            }
+
+            cellsDataValidations.ForEach(kp =>
+                                             {
+                                                 XLCell targetCell;
+                                                 if(!cellsToInsert.TryGetValue(kp.Key, out targetCell))
+                                                     targetCell = Worksheet.Cell(kp.Key);
+
+                                                 targetCell.CopyDataValidation(
+                                                     Worksheet.Cell(kp.Value.SourceAddress), kp.Value.DataValidation);
+                                             });
+
+            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c.RowNumber, c.ColumnNumber));
+            cellsToInsert.ForEach(
+                c => Worksheet.Internals.CellsCollection.Add(c.Key.RowNumber, c.Key.ColumnNumber, c.Value));
+            
+
+            Int32 firstRowReturn = RangeAddress.FirstAddress.RowNumber;
+            Int32 lastRowReturn = RangeAddress.FirstAddress.RowNumber + numberOfRows - 1;
+            Int32 firstColumnReturn = RangeAddress.FirstAddress.ColumnNumber;
+            Int32 lastColumnReturn = RangeAddress.LastAddress.ColumnNumber;
+
+            Worksheet.BreakConditionalFormatsIntoCells(cellsToDelete.Except(cellsToInsert.Keys).ToList());
+            using (var asRange = AsRange())
+                Worksheet.NotifyRangeShiftedRows(asRange, numberOfRows);
+
+            var rangeToReturn = Worksheet.Range(firstRowReturn, firstColumnReturn, lastRowReturn, lastColumnReturn);
+
+            if (formatFromAbove && rangeToReturn.RangeAddress.FirstAddress.RowNumber > 1)
+            {
+                using (var fr = rangeToReturn.FirstRow())
+                {
+                    using (var model = fr.RowAbove())
+                    {
+                        var modelFirstColumn = model.FirstCellUsed(true);
+                        var modelLastColumn = model.LastCellUsed(true);
+                        if (modelLastColumn != null)
+                        {
+                            Int32 firstCoReturned = modelFirstColumn.Address.ColumnNumber
+                                                    - model.RangeAddress.FirstAddress.ColumnNumber + 1;
+                            Int32 lastCoReturned = modelLastColumn.Address.ColumnNumber
+                                                   - model.RangeAddress.FirstAddress.ColumnNumber + 1;
+                            for (Int32 co = firstCoReturned; co <= lastCoReturned; co++)
+                            {
+                                rangeToReturn.Column(co).Style = model.Cell(co).Style;
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                var lastCoUsed = rangeToReturn.LastColumnUsed(true);
+                if (lastCoUsed != null)
+                {
+                    Int32 lastCoReturned = lastCoUsed.ColumnNumber();
+                    for (Int32 co = 1; co <= lastCoReturned; co++)
+                    {
+                        var styleToUse = Worksheet.Internals.ColumnsCollection.ContainsKey(co)
+                                             ? Worksheet.Internals.ColumnsCollection[co].Style
+                                             : Worksheet.Style;
+                        rangeToReturn.Column(co).Style = styleToUse;
+                    }
+                }
+            }
+
+			// Skip calling .Rows() for performance reasons if required.
+			if(nullReturn)
+				return null;
+
+            return rangeToReturn.Rows();
+        }
+
+        private void ClearMerged()
+        {
+            var mergeToDelete = Worksheet.Internals.MergedRanges.Where(Intersects).ToList();
+            mergeToDelete.ForEach(m => Worksheet.Internals.MergedRanges.Remove(m));
+        }
+
+        public Boolean Contains(IXLCell cell)
+        {
+            return Contains(cell.Address as XLAddress);
+        }
+
+        public bool Contains(XLAddress first, XLAddress last)
+        {
+            return Contains(first) && Contains(last);
+        }
+
+        public bool Contains(XLAddress address)
+        {
+            return RangeAddress.FirstAddress.RowNumber <= address.RowNumber &&
+                   address.RowNumber <= RangeAddress.LastAddress.RowNumber &&
+                   RangeAddress.FirstAddress.ColumnNumber <= address.ColumnNumber &&
+                   address.ColumnNumber <= RangeAddress.LastAddress.ColumnNumber;
+        }
+
+        public void Delete(XLShiftDeletedCells shiftDeleteCells)
+        {
+            int numberOfRows = RowCount();
+            int numberOfColumns = ColumnCount();
+            IXLRange shiftedRangeFormula = Worksheet.Range(
+                RangeAddress.FirstAddress.RowNumber,
+                RangeAddress.FirstAddress.ColumnNumber,
+                RangeAddress.LastAddress.RowNumber,
+                RangeAddress.LastAddress.ColumnNumber);
+
+
+            foreach (
+                XLCell cell in
+                    Worksheet.Workbook.Worksheets.Cast<XLWorksheet>().SelectMany(
+                        xlWorksheet => (xlWorksheet).Internals.CellsCollection.GetCells(
+                            c => !XLHelper.IsNullOrWhiteSpace(c.FormulaA1))))
+            {
+                if (shiftDeleteCells == XLShiftDeletedCells.ShiftCellsUp)
+                    cell.ShiftFormulaRows((XLRange)shiftedRangeFormula, numberOfRows * -1);
+                else
+                    cell.ShiftFormulaColumns((XLRange)shiftedRangeFormula, numberOfColumns * -1);
+            }
+
+            // Range to shift...
+            var cellsToInsert = new Dictionary<IXLAddress, XLCell>();
+            //var cellsDataValidations = new Dictionary<XLAddress, DataValidationToCopy>();
+            var cellsToDelete = new List<IXLAddress>();
+            var shiftLeftQuery = Worksheet.Internals.CellsCollection.GetCells(
+                RangeAddress.FirstAddress.RowNumber,
+                RangeAddress.FirstAddress.ColumnNumber,
+                RangeAddress.LastAddress.RowNumber,
+                Worksheet.Internals.CellsCollection.MaxColumnUsed);
+
+            var shiftUpQuery = Worksheet.Internals.CellsCollection.GetCells(
+                RangeAddress.FirstAddress.RowNumber,
+                RangeAddress.FirstAddress.ColumnNumber,
+                Worksheet.Internals.CellsCollection.MaxRowUsed,
+                RangeAddress.LastAddress.ColumnNumber);
+
+
+            int columnModifier = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsLeft ? ColumnCount() : 0;
+            int rowModifier = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsUp ? RowCount() : 0;
+            var cellsQuery = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsLeft ? shiftLeftQuery : shiftUpQuery;
+            foreach (XLCell c in cellsQuery)
+            {
+                var newKey = new XLAddress(Worksheet, c.Address.RowNumber - rowModifier,
+                                           c.Address.ColumnNumber - columnModifier,
+                                           false, false);
+                var newCell = new XLCell(Worksheet, newKey, c.GetStyleId());
+                newCell.CopyValues(c);
+                newCell.FormulaA1 = c.FormulaA1;
+                cellsToDelete.Add(c.Address);
+
+                bool canInsert = shiftDeleteCells == XLShiftDeletedCells.ShiftCellsLeft
+                                     ? c.Address.ColumnNumber > RangeAddress.LastAddress.ColumnNumber
+                                     : c.Address.RowNumber > RangeAddress.LastAddress.RowNumber;
+
+                if (canInsert)
+                    cellsToInsert.Add(newKey, newCell);
+            }
+
+
+            cellsToDelete.ForEach(c => Worksheet.Internals.CellsCollection.Remove(c.RowNumber, c.ColumnNumber));
+            cellsToInsert.ForEach(
+                c => Worksheet.Internals.CellsCollection.Add(c.Key.RowNumber, c.Key.ColumnNumber, c.Value));
+
+            var mergesToRemove = Worksheet.Internals.MergedRanges.Where(Contains).ToList();
+            mergesToRemove.ForEach(r => Worksheet.Internals.MergedRanges.Remove(r));
+
+            var hyperlinksToRemove = Worksheet.Hyperlinks.Where(hl => Contains(hl.Cell.AsRange())).ToList();
+            hyperlinksToRemove.ForEach(hl => Worksheet.Hyperlinks.Delete(hl));
+
+            Worksheet.BreakConditionalFormatsIntoCells(cellsToDelete.Except(cellsToInsert.Keys).ToList());
+            using (var shiftedRange = AsRange())
+            {
+                if (shiftDeleteCells == XLShiftDeletedCells.ShiftCellsUp)
+                    Worksheet.NotifyRangeShiftedRows(shiftedRange, rowModifier * -1);
+                else
+                    Worksheet.NotifyRangeShiftedColumns(shiftedRange, columnModifier * -1);
+            }
+        }
+
+        public override string ToString()
+        {
+            return String.Format("'{0}'!{1}:{2}", Worksheet.Name, RangeAddress.FirstAddress, RangeAddress.LastAddress);
+        }
+
+        protected void ShiftColumns(IXLRangeAddress thisRangeAddress, XLRange shiftedRange, int columnsShifted)
+        {
+            if (thisRangeAddress.IsInvalid || shiftedRange.RangeAddress.IsInvalid) return;
+
+            if ((columnsShifted < 0
+                 // all columns
+                 &&
+                 thisRangeAddress.FirstAddress.ColumnNumber >= shiftedRange.RangeAddress.FirstAddress.ColumnNumber
+                 &&
+                 thisRangeAddress.LastAddress.ColumnNumber <=
+                 shiftedRange.RangeAddress.FirstAddress.ColumnNumber - columnsShifted
+                 // all rows
+                 && thisRangeAddress.FirstAddress.RowNumber >= shiftedRange.RangeAddress.FirstAddress.RowNumber
+                 && thisRangeAddress.LastAddress.RowNumber <= shiftedRange.RangeAddress.LastAddress.RowNumber
+                ) || (
+                         shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
+                         thisRangeAddress.FirstAddress.ColumnNumber
+                         &&
+                         shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber
+                         &&
+                         shiftedRange.RangeAddress.LastAddress.RowNumber >= thisRangeAddress.LastAddress.RowNumber
+                         && shiftedRange.ColumnCount() >
+                         (thisRangeAddress.LastAddress.ColumnNumber - thisRangeAddress.FirstAddress.ColumnNumber + 1)
+                         +
+                         (thisRangeAddress.FirstAddress.ColumnNumber -
+                          shiftedRange.RangeAddress.FirstAddress.ColumnNumber)))
+                thisRangeAddress.IsInvalid = true;
+            else
+            {
+                if (shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber
+                    && shiftedRange.RangeAddress.LastAddress.RowNumber >= thisRangeAddress.LastAddress.RowNumber)
+                {
+                    if (
+                        (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
+                         thisRangeAddress.FirstAddress.ColumnNumber &&
+                         columnsShifted > 0)
+                        ||
+                        (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <
+                         thisRangeAddress.FirstAddress.ColumnNumber &&
+                         columnsShifted < 0)
+                        )
+                    {
+                        thisRangeAddress.FirstAddress = new XLAddress(Worksheet,
+                                                                      thisRangeAddress.FirstAddress.RowNumber,
+                                                                      thisRangeAddress.FirstAddress.ColumnNumber +
+                                                                      columnsShifted,
+                                                                      thisRangeAddress.FirstAddress.FixedRow,
+                                                                      thisRangeAddress.FirstAddress.FixedColumn);
+                    }
+
+                    if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <=
+                        thisRangeAddress.LastAddress.ColumnNumber)
+                    {
+                        thisRangeAddress.LastAddress = new XLAddress(Worksheet,
+                                                                     thisRangeAddress.LastAddress.RowNumber,
+                                                                     thisRangeAddress.LastAddress.ColumnNumber +
+                                                                     columnsShifted,
+                                                                     thisRangeAddress.LastAddress.FixedRow,
+                                                                     thisRangeAddress.LastAddress.FixedColumn);
+                    }
+                }
+            }
+        }
+
+        protected void ShiftRows(IXLRangeAddress thisRangeAddress, XLRange shiftedRange, int rowsShifted)
+        {
+            if (thisRangeAddress.IsInvalid || shiftedRange.RangeAddress.IsInvalid) return;
+
+            if ((rowsShifted < 0
+                 // all columns
+                 && thisRangeAddress.FirstAddress.ColumnNumber >= shiftedRange.RangeAddress.FirstAddress.ColumnNumber
+                 && thisRangeAddress.LastAddress.ColumnNumber <= shiftedRange.RangeAddress.FirstAddress.ColumnNumber
+                 // all rows
+                 && thisRangeAddress.FirstAddress.RowNumber >= shiftedRange.RangeAddress.FirstAddress.RowNumber
+                 && thisRangeAddress.LastAddress.RowNumber <= shiftedRange.RangeAddress.LastAddress.RowNumber - rowsShifted
+                ) || (
+                         shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber
+                         && shiftedRange.RangeAddress.FirstAddress.ColumnNumber <= thisRangeAddress.FirstAddress.ColumnNumber
+                         && shiftedRange.RangeAddress.LastAddress.ColumnNumber >= thisRangeAddress.LastAddress.ColumnNumber
+                         && shiftedRange.RowCount() >
+                            (thisRangeAddress.LastAddress.RowNumber - thisRangeAddress.FirstAddress.RowNumber + 1)
+                            + (thisRangeAddress.FirstAddress.RowNumber - shiftedRange.RangeAddress.FirstAddress.RowNumber)))
+                thisRangeAddress.IsInvalid = true;
+            else
+            {
+                if (shiftedRange.RangeAddress.FirstAddress.ColumnNumber <= thisRangeAddress.FirstAddress.ColumnNumber
+                    && shiftedRange.RangeAddress.LastAddress.ColumnNumber >= thisRangeAddress.LastAddress.ColumnNumber)
+                {
+                    if (
+                        (shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.FirstAddress.RowNumber && rowsShifted > 0)
+                        || (shiftedRange.RangeAddress.FirstAddress.RowNumber < thisRangeAddress.FirstAddress.RowNumber && rowsShifted < 0)
+                        )
+                    {
+                        thisRangeAddress.FirstAddress = new XLAddress(Worksheet,
+                                                                      thisRangeAddress.FirstAddress.RowNumber +
+                                                                      rowsShifted,
+                                                                      thisRangeAddress.FirstAddress.ColumnNumber,
+                                                                      thisRangeAddress.FirstAddress.FixedRow,
+                                                                      thisRangeAddress.FirstAddress.FixedColumn);
+                    }
+
+                    if (shiftedRange.RangeAddress.FirstAddress.RowNumber <= thisRangeAddress.LastAddress.RowNumber)
+                    {
+                        thisRangeAddress.LastAddress = new XLAddress(Worksheet,
+                                                                     thisRangeAddress.LastAddress.RowNumber +
+                                                                     rowsShifted,
+                                                                     thisRangeAddress.LastAddress.ColumnNumber,
+                                                                     thisRangeAddress.LastAddress.FixedRow,
+                                                                     thisRangeAddress.LastAddress.FixedColumn);
+                    }
+                }
+            }
+        }
+
+        public IXLRange RangeUsed()
+        {
+            return RangeUsed(false);
+        }
+
+        public IXLRange RangeUsed(bool includeFormats)
+        {
+            var firstCell = FirstCellUsed(includeFormats);
+            if (firstCell == null)
+                return null;
+            var lastCell = LastCellUsed(includeFormats);
+            return Worksheet.Range(firstCell, lastCell);
+        }
+
+        public virtual void CopyTo(IXLRangeBase target)
+        {
+            CopyTo(target.FirstCell());
+        }
+
+        public virtual void CopyTo(IXLCell target)
+        {
+            target.Value = this;
+        }
+
+        //public IXLChart CreateChart(Int32 firstRow, Int32 firstColumn, Int32 lastRow, Int32 lastColumn)
+        //{
+        //    IXLChart chart = new XLChartWorksheet;
+        //    chart.FirstRow = firstRow;
+        //    chart.LastRow = lastRow;
+        //    chart.LastColumn = lastColumn;
+        //    chart.FirstColumn = firstColumn;
+        //    Worksheet.Charts.Add(chart);
+        //    return chart;
+        //}
+
+
+        IXLPivotTable IXLRangeBase.CreatePivotTable(IXLCell targetCell)
+        {
+            return CreatePivotTable(targetCell);
+        }
+        IXLPivotTable IXLRangeBase.CreatePivotTable(IXLCell targetCell, String name)
+        {
+            return CreatePivotTable(targetCell, name);
+        }
+
+
+        public XLPivotTable CreatePivotTable(IXLCell targetCell)
+        {
+            return CreatePivotTable(targetCell, Guid.NewGuid().ToString());
+        }
+
+        public XLPivotTable CreatePivotTable(IXLCell targetCell, String name)
+        {
+            return (XLPivotTable)Worksheet.PivotTables.AddNew(name, targetCell, AsRange());
+        }
+
+        public IXLAutoFilter SetAutoFilter() 
+        {
+            using (var asRange = AsRange())
+              return Worksheet.AutoFilter.Set(asRange);
+        }
+
+        #region Sort
+
+        public IXLSortElements SortRows
+        {
+            get { return _sortRows ?? (_sortRows = new XLSortElements()); }
+        }
+
+        public IXLSortElements SortColumns
+        {
+            get { return _sortColumns ?? (_sortColumns = new XLSortElements()); }
+        }
+
+        public IXLRangeBase Sort()
+        {
+            if (!SortColumns.Any())
+            {
+                String columnsToSortBy = String.Empty;
+                Int32 maxColumn = ColumnCount();
+                if (maxColumn == XLHelper.MaxColumnNumber)
+                    maxColumn = LastCellUsed(true).Address.ColumnNumber;
+                for (int i = 1; i <= maxColumn; i++)
+                {
+                    columnsToSortBy += i + ",";
+                }
+                columnsToSortBy = columnsToSortBy.Substring(0, columnsToSortBy.Length - 1);
+                return Sort(columnsToSortBy);
+            }
+
+            SortRangeRows();
+            return this;
+        }
+
+        public IXLRangeBase Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            SortColumns.Clear();
+            if (XLHelper.IsNullOrWhiteSpace(columnsToSortBy))
+            {
+                columnsToSortBy = String.Empty;
+                Int32 maxColumn = ColumnCount();
+                if (maxColumn == XLHelper.MaxColumnNumber)
+                    maxColumn = LastCellUsed(true).Address.ColumnNumber;
+                for (int i = 1; i <= maxColumn; i++)
+                {
+                    columnsToSortBy += i + ",";
+                }
+                columnsToSortBy = columnsToSortBy.Substring(0, columnsToSortBy.Length - 1);
+            }
+
+            foreach (string coPairTrimmed in columnsToSortBy.Split(',').Select(coPair => coPair.Trim()))
+            {
+                String coString;
+                String order;
+                if (coPairTrimmed.Contains(' '))
+                {
+                    var pair = coPairTrimmed.Split(' ');
+                    coString = pair[0];
+                    order = pair[1];
+                }
+                else
+                {
+                    coString = coPairTrimmed;
+                    order = sortOrder == XLSortOrder.Ascending ? "ASC" : "DESC";
+                }
+
+                Int32 co;
+                if (!Int32.TryParse(coString, out co))
+                    co = XLHelper.GetColumnNumberFromLetter(coString);
+
+                SortColumns.Add(co, String.Compare(order, "ASC", true) == 0 ? XLSortOrder.Ascending : XLSortOrder.Descending, ignoreBlanks, matchCase);
+            }
+
+            SortRangeRows();
+            return this;
+        }
+
+        public IXLRangeBase Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            return Sort(columnToSortBy.ToString(), sortOrder, matchCase, ignoreBlanks);
+        }
+
+        public IXLRangeBase SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            SortRows.Clear();
+            Int32 maxColumn = ColumnCount();
+            if (maxColumn == XLHelper.MaxColumnNumber)
+                maxColumn = LastCellUsed(true).Address.ColumnNumber;
+
+            for (int i = 1; i <= maxColumn; i++)
+            {
+                SortRows.Add(i, sortOrder, ignoreBlanks, matchCase);
+            }
+
+            SortRangeColumns();
+            return this;
+        }
+
+
+        #region Sort Rows
+
+        private void SortRangeRows()
+        {
+            Int32 maxRow = RowCount();
+            if (maxRow == XLHelper.MaxRowNumber)
+                maxRow = LastCellUsed(true).Address.RowNumber;
+
+            SortingRangeRows(1, maxRow);
+        }
+
+        private void SwapRows(Int32 row1, Int32 row2)
+        {
+            int row1InWs = RangeAddress.FirstAddress.RowNumber + row1 - 1;
+            int row2InWs = RangeAddress.FirstAddress.RowNumber + row2 - 1;
+
+            Int32 firstColumn = RangeAddress.FirstAddress.ColumnNumber;
+            Int32 lastColumn = RangeAddress.LastAddress.ColumnNumber;
+
+            var range1Sp1 = new XLSheetPoint(row1InWs, firstColumn);
+            var range1Sp2 = new XLSheetPoint(row1InWs, lastColumn);
+            var range2Sp1 = new XLSheetPoint(row2InWs, firstColumn);
+            var range2Sp2 = new XLSheetPoint(row2InWs, lastColumn);
+
+            Worksheet.Internals.CellsCollection.SwapRanges(new XLSheetRange(range1Sp1, range1Sp2),
+                                                           new XLSheetRange(range2Sp1, range2Sp2), Worksheet);
+        }
+
+        private int SortRangeRows(int begPoint, int endPoint)
+        {
+            int pivot = begPoint;
+            int m = begPoint + 1;
+            int n = endPoint;
+            while ((m < endPoint) && RowQuick(pivot).CompareTo(RowQuick(m), SortColumns) >= 0)
+                m++;
+
+            while (n > begPoint && RowQuick(pivot).CompareTo(RowQuick(n), SortColumns) <= 0)
+                n--;
+            while (m < n)
+            {
+                SwapRows(m, n);
+
+                while (m < endPoint && RowQuick(pivot).CompareTo(RowQuick(m), SortColumns) >= 0)
+                    m++;
+
+                while (n > begPoint && RowQuick(pivot).CompareTo(RowQuick(n), SortColumns) <= 0)
+                    n--;
+            }
+            if (pivot != n)
+                SwapRows(n, pivot);
+            return n;
+        }
+
+        private void SortingRangeRows(int beg, int end)
+        {
+            if (end == beg)
+                return;
+            int pivot = SortRangeRows(beg, end);
+            if (pivot > beg)
+                SortingRangeRows(beg, pivot - 1);
+            if (pivot < end)
+                SortingRangeRows(pivot + 1, end);
+        }
+
+        #endregion
+
+        #region Sort Columns
+
+        private void SortRangeColumns()
+        {
+            Int32 maxColumn = ColumnCount();
+            if (maxColumn == XLHelper.MaxColumnNumber)
+                maxColumn = LastCellUsed(true).Address.ColumnNumber;
+            SortingRangeColumns(1, maxColumn);
+        }
+
+        private void SwapColumns(Int32 column1, Int32 column2)
+        {
+            int col1InWs = RangeAddress.FirstAddress.ColumnNumber + column1 - 1;
+            int col2InWs = RangeAddress.FirstAddress.ColumnNumber + column2 - 1;
+
+            Int32 firstRow = RangeAddress.FirstAddress.RowNumber;
+            Int32 lastRow = RangeAddress.LastAddress.RowNumber;
+
+            var range1Sp1 = new XLSheetPoint(firstRow, col1InWs);
+            var range1Sp2 = new XLSheetPoint(lastRow, col1InWs);
+            var range2Sp1 = new XLSheetPoint(firstRow, col2InWs);
+            var range2Sp2 = new XLSheetPoint(lastRow, col2InWs);
+
+            Worksheet.Internals.CellsCollection.SwapRanges(new XLSheetRange(range1Sp1, range1Sp2),
+                                                           new XLSheetRange(range2Sp1, range2Sp2), Worksheet);
+        }
+
+        private int SortRangeColumns(int begPoint, int endPoint)
+        {
+            int pivot = begPoint;
+            int m = begPoint + 1;
+            int n = endPoint;
+            while ((m < endPoint) && ColumnQuick(pivot).CompareTo((ColumnQuick(m)), SortRows) >= 0)
+                m++;
+
+            while ((n > begPoint) && ((ColumnQuick(pivot)).CompareTo((ColumnQuick(n)), SortRows) <= 0))
+                n--;
+            while (m < n)
+            {
+                SwapColumns(m, n);
+
+                while ((m < endPoint) && (ColumnQuick(pivot)).CompareTo((ColumnQuick(m)), SortRows) >= 0)
+                    m++;
+
+                while ((n > begPoint) && (ColumnQuick(pivot)).CompareTo((ColumnQuick(n)), SortRows) <= 0)
+                    n--;
+            }
+            if (pivot != n)
+                SwapColumns(n, pivot);
+            return n;
+        }
+
+        private void SortingRangeColumns(int beg, int end)
+        {
+            if (end == beg)
+                return;
+            int pivot = SortRangeColumns(beg, end);
+            if (pivot > beg)
+                SortingRangeColumns(beg, pivot - 1);
+            if (pivot < end)
+                SortingRangeColumns(pivot + 1, end);
+        }
+
+        #endregion
+
+        #endregion
+
+        public XLRangeColumn ColumnQuick(Int32 column)
+        {
+            var firstCellAddress = new XLAddress(Worksheet,
+                                                 RangeAddress.FirstAddress.RowNumber,
+                                                 RangeAddress.FirstAddress.ColumnNumber + column - 1,
+                                                 false,
+                                                 false);
+            var lastCellAddress = new XLAddress(Worksheet,
+                                                RangeAddress.LastAddress.RowNumber,
+                                                RangeAddress.FirstAddress.ColumnNumber + column - 1,
+                                                false,
+                                                false);
+            return new XLRangeColumn(
+                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), true);
+        }
+
+        public XLRangeRow RowQuick(Int32 row)
+        {
+            var firstCellAddress = new XLAddress(Worksheet,
+                                                 RangeAddress.FirstAddress.RowNumber + row - 1,
+                                                 RangeAddress.FirstAddress.ColumnNumber,
+                                                 false,
+                                                 false);
+            var lastCellAddress = new XLAddress(Worksheet,
+                                                RangeAddress.FirstAddress.RowNumber + row - 1,
+                                                RangeAddress.LastAddress.ColumnNumber,
+                                                false,
+                                                false);
+            return new XLRangeRow(
+                new XLRangeParameters(new XLRangeAddress(firstCellAddress, lastCellAddress), Worksheet.Style), true);
+        }
+
+        public void Dispose()
+        {
+			if(_shiftedRowsAction != null)
+            {
+                RangeAddress.Worksheet.RangeShiftedRows.Remove(_shiftedRowsAction);
+				_shiftedRowsAction = null;
+            }
+
+			if(_shiftedColumnsAction != null)
+			{
+				RangeAddress.Worksheet.RangeShiftedColumns.Remove(_shiftedColumnsAction);
+				_shiftedColumnsAction = null;
+			}
+        }
+
+        public IXLDataValidation SetDataValidation()
+        {
+            return DataValidation;
+        }
+
+        public IXLConditionalFormat AddConditionalFormat()
+        {
+            using (var asRange = AsRange())
+            {
+                var cf = new XLConditionalFormat(asRange);
+                Worksheet.ConditionalFormats.Add(cf);
+                return cf;
+            }
+        }
+
+
+        internal IXLConditionalFormat AddConditionalFormat(IXLConditionalFormat source)
+        {
+            using (var asRange = AsRange())
+            {
+                var cf = new XLConditionalFormat(asRange);
+                cf.CopyFrom(source);
+                Worksheet.ConditionalFormats.Add(cf);
+                return cf;
+            }
+        }
+
+        public void Select()
+        {
+            Worksheet.SelectedRanges.Add(AsRange());
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/XLRangeColumn.cs b/ClosedXML/Excel/Ranges/XLRangeColumn.cs
new file mode 100644
index 0000000..77fc1ba
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRangeColumn.cs
@@ -0,0 +1,355 @@
+namespace ClosedXML.Excel
+{
+    using System;
+    using System.Linq;
+	
+
+    internal class XLRangeColumn : XLRangeBase, IXLRangeColumn
+    {
+        #region Constructor
+
+        public XLRangeColumn(XLRangeParameters rangeParameters, bool quickLoad)
+            : base(rangeParameters.RangeAddress)
+        {
+            if (quickLoad) return;
+
+			SubscribeToShiftedRows((range, rowsShifted) => this.WorksheetRangeShiftedRows(range, rowsShifted));
+			SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
+            SetStyle(rangeParameters.DefaultStyle);
+        }
+
+        #endregion
+
+        #region IXLRangeColumn Members
+
+        IXLCell IXLRangeColumn.Cell(int row)
+        {
+            return Cell(row);
+        }
+
+        public new IXLCells Cells(string cellsInColumn)
+        {
+            var retVal = new XLCells(false, false);
+            var rangePairs = cellsInColumn.Split(',');
+            foreach (string pair in rangePairs)
+                retVal.Add(Range(pair.Trim()).RangeAddress);
+            return retVal;
+        }
+
+        public IXLCells Cells(int firstRow, int lastRow)
+        {
+            return Cells(firstRow + ":" + lastRow);
+        }
+
+        public void Delete()
+        {
+            Delete(XLShiftDeletedCells.ShiftCellsLeft);
+        }
+
+        public IXLCells InsertCellsAbove(int numberOfRows)
+        {
+            return InsertCellsAbove(numberOfRows, false);
+        }
+
+        public IXLCells InsertCellsAbove(int numberOfRows, bool expandRange)
+        {
+            return InsertRowsAbove(numberOfRows, expandRange).Cells();
+        }
+
+        public IXLCells InsertCellsBelow(int numberOfRows)
+        {
+            return InsertCellsBelow(numberOfRows, true);
+        }
+
+        public IXLCells InsertCellsBelow(int numberOfRows, bool expandRange)
+        {
+            return InsertRowsBelow(numberOfRows, expandRange).Cells();
+        }
+
+        public int CellCount()
+        {
+            return RangeAddress.LastAddress.RowNumber - RangeAddress.FirstAddress.RowNumber + 1;
+        }
+
+        public IXLRangeColumn Sort(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            base.Sort(1, sortOrder, matchCase, ignoreBlanks);
+            return this;
+        }
+
+
+        public new IXLRangeColumn CopyTo(IXLCell target)
+        {
+            base.CopyTo(target);
+
+            int lastRowNumber = target.Address.RowNumber + RowCount() - 1;
+            if (lastRowNumber > XLHelper.MaxRowNumber)
+                lastRowNumber = XLHelper.MaxRowNumber;
+            int lastColumnNumber = target.Address.ColumnNumber + ColumnCount() - 1;
+            if (lastColumnNumber > XLHelper.MaxColumnNumber)
+                lastColumnNumber = XLHelper.MaxColumnNumber;
+
+            return target.Worksheet.Range(
+                target.Address.RowNumber,
+                target.Address.ColumnNumber,
+                lastRowNumber,
+                lastColumnNumber)
+                .Column(1);
+        }
+
+        public new IXLRangeColumn CopyTo(IXLRangeBase target)
+        {
+            base.CopyTo(target);
+
+            int lastRowNumber = target.RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
+            if (lastRowNumber > XLHelper.MaxRowNumber)
+                lastRowNumber = XLHelper.MaxRowNumber;
+            int lastColumnNumber = target.RangeAddress.FirstAddress.ColumnNumber + ColumnCount() - 1;
+            if (lastColumnNumber > XLHelper.MaxColumnNumber)
+                lastColumnNumber = XLHelper.MaxColumnNumber;
+
+            return target.Worksheet.Range(
+                target.RangeAddress.FirstAddress.RowNumber,
+                target.RangeAddress.FirstAddress.ColumnNumber,
+                lastRowNumber,
+                lastColumnNumber)
+                .Column(1);
+        }
+
+        public IXLRangeColumn Column(int start, int end)
+        {
+            return Range(start, end).FirstColumn();
+        }
+
+        public IXLRangeColumn Column(IXLCell start, IXLCell end)
+        {
+            return Column(start.Address.RowNumber, end.Address.RowNumber);
+        }
+
+        public IXLRangeColumns Columns(string columns)
+        {
+            var retVal = new XLRangeColumns();
+            var rowPairs = columns.Split(',');
+            foreach (string trimmedPair in rowPairs.Select(pair => pair.Trim()))
+            {
+                string firstRow;
+                string lastRow;
+                if (trimmedPair.Contains(':') || trimmedPair.Contains('-'))
+                {
+                    var rowRange = trimmedPair.Contains('-')
+                                       ? trimmedPair.Replace('-', ':').Split(':')
+                                       : trimmedPair.Split(':');
+
+                    firstRow = rowRange[0];
+                    lastRow = rowRange[1];
+                }
+                else
+                {
+                    firstRow = trimmedPair;
+                    lastRow = trimmedPair;
+                }
+
+                retVal.Add(Range(firstRow, lastRow).FirstColumn());
+            }
+
+            return retVal;
+        }
+
+        public IXLRangeColumn SetDataType(XLCellValues dataType)
+        {
+            DataType = dataType;
+            return this;
+        }
+
+        public IXLColumn WorksheetColumn()
+        {
+            return Worksheet.Column(RangeAddress.FirstAddress.ColumnNumber);
+        }
+
+        #endregion
+
+        public XLCell Cell(int row)
+        {
+            return Cell(row, 1);
+        }
+
+        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
+        {
+            ShiftColumns(RangeAddress, range, columnsShifted);
+        }
+
+        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
+        {
+            ShiftRows(RangeAddress, range, rowsShifted);
+        }
+
+        public XLRange Range(int firstRow, int lastRow)
+        {
+            return Range(firstRow, 1, lastRow, 1);
+        }
+
+        public override XLRange Range(string rangeAddressStr)
+        {
+            string rangeAddressToUse;
+            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
+            {
+                if (rangeAddressStr.Contains('-'))
+                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
+
+                var arrRange = rangeAddressStr.Split(':');
+                string firstPart = arrRange[0];
+                string secondPart = arrRange[1];
+                rangeAddressToUse = FixColumnAddress(firstPart) + ":" + FixColumnAddress(secondPart);
+            }
+            else
+                rangeAddressToUse = FixColumnAddress(rangeAddressStr);
+
+            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
+            return Range(rangeAddress);
+        }
+
+        public int CompareTo(XLRangeColumn otherColumn, IXLSortElements rowsToSort)
+        {
+            foreach (IXLSortElement e in rowsToSort)
+            {
+                var thisCell = Cell(e.ElementNumber);
+                var otherCell = otherColumn.Cell(e.ElementNumber);
+                int comparison;
+                bool thisCellIsBlank = thisCell.IsEmpty();
+                bool otherCellIsBlank = otherCell.IsEmpty();
+                if (e.IgnoreBlanks && (thisCellIsBlank || otherCellIsBlank))
+                {
+                    if (thisCellIsBlank && otherCellIsBlank)
+                        comparison = 0;
+                    else
+                    {
+                        if (thisCellIsBlank)
+                            comparison = e.SortOrder == XLSortOrder.Ascending ? 1 : -1;
+                        else
+                            comparison = e.SortOrder == XLSortOrder.Ascending ? -1 : 1;
+                    }
+                }
+                else
+                {
+                    if (thisCell.DataType == otherCell.DataType)
+                    {
+                        if (thisCell.DataType == XLCellValues.Text)
+                        {
+                            comparison = e.MatchCase
+                                             ? thisCell.InnerText.CompareTo(otherCell.InnerText)
+                                             : String.Compare(thisCell.InnerText, otherCell.InnerText, true);
+                        }
+                        else if (thisCell.DataType == XLCellValues.TimeSpan)
+                            comparison = thisCell.GetTimeSpan().CompareTo(otherCell.GetTimeSpan());
+                        else
+                            comparison = Double.Parse(thisCell.InnerText).CompareTo(Double.Parse(otherCell.InnerText));
+                    }
+                    else if (e.MatchCase)
+                        comparison = String.Compare(thisCell.GetString(), otherCell.GetString(), true);
+                    else
+                        comparison = thisCell.GetString().CompareTo(otherCell.GetString());
+                }
+
+                if (comparison != 0)
+                    return e.SortOrder == XLSortOrder.Ascending ? comparison : comparison * -1;
+            }
+
+            return 0;
+        }
+
+        private XLRangeColumn ColumnShift(Int32 columnsToShift)
+        {
+            Int32 columnNumber = ColumnNumber() + columnsToShift;
+            return Worksheet.Range(
+                RangeAddress.FirstAddress.RowNumber,
+                columnNumber,
+                RangeAddress.LastAddress.RowNumber,
+                columnNumber).FirstColumn();
+        }
+
+        #region XLRangeColumn Left
+
+        IXLRangeColumn IXLRangeColumn.ColumnLeft()
+        {
+            return ColumnLeft();
+        }
+
+        IXLRangeColumn IXLRangeColumn.ColumnLeft(Int32 step)
+        {
+            return ColumnLeft(step);
+        }
+
+        public XLRangeColumn ColumnLeft()
+        {
+            return ColumnLeft(1);
+        }
+
+        public XLRangeColumn ColumnLeft(Int32 step)
+        {
+            return ColumnShift(step * -1);
+        }
+
+        #endregion
+
+        #region XLRangeColumn Right
+
+        IXLRangeColumn IXLRangeColumn.ColumnRight()
+        {
+            return ColumnRight();
+        }
+
+        IXLRangeColumn IXLRangeColumn.ColumnRight(Int32 step)
+        {
+            return ColumnRight(step);
+        }
+
+        public XLRangeColumn ColumnRight()
+        {
+            return ColumnRight(1);
+        }
+
+        public XLRangeColumn ColumnRight(Int32 step)
+        {
+            return ColumnShift(step);
+        }
+
+        #endregion
+
+
+        public IXLTable AsTable()
+        {
+            using (var asRange = AsRange())
+               return asRange.AsTable(); 
+        }
+
+        public IXLTable AsTable(string name)
+        {
+            using (var asRange = AsRange())
+                return asRange.AsTable(name);
+        }
+
+        public IXLTable CreateTable()
+        {
+            using (var asRange = AsRange())
+                return asRange.CreateTable();
+        }
+
+        public IXLTable CreateTable(string name)
+        {
+            using (var asRange = AsRange())
+                return asRange.CreateTable(name);
+        }
+
+        public new IXLRangeColumn Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            base.Clear(clearOptions);
+            return this;
+        }
+
+        public IXLRangeColumn ColumnUsed(Boolean includeFormats = false)
+        {
+            return Column(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/Ranges/XLRangeColumns.cs b/ClosedXML/Excel/Ranges/XLRangeColumns.cs
new file mode 100644
index 0000000..83dbfa0
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRangeColumns.cs
@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    internal class XLRangeColumns : IXLRangeColumns, IXLStylized
+    {
+        public Boolean StyleChanged { get; set; }
+        private readonly List<XLRangeColumn> _ranges = new List<XLRangeColumn>();
+        private IXLStyle _style;
+
+        public XLRangeColumns()
+        {
+            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
+        }
+
+        #region IXLRangeColumns Members
+
+        public IXLRangeColumns Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            _ranges.ForEach(c => c.Clear(clearOptions));
+            return this;
+        }
+
+        public void Delete()
+        {
+            _ranges.OrderByDescending(c => c.ColumnNumber()).ForEach(r => r.Delete());
+            _ranges.Clear();
+        }
+
+        public void Add(IXLRangeColumn range)
+        {
+            _ranges.Add((XLRangeColumn)range);
+        }
+
+        public IEnumerator<IXLRangeColumn> GetEnumerator()
+        {
+            return _ranges.Cast<IXLRangeColumn>()
+              .OrderBy(r => r.Worksheet.Position)
+              .ThenBy(r => r.ColumnNumber())
+              .GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLStyle Style
+        {
+            get { return _style; }
+            set
+            {
+                _style = new XLStyle(this, value);
+                _ranges.ForEach(r => r.Style = value);
+            }
+        }
+
+        public IXLCells Cells()
+        {
+            var cells = new XLCells(false, false);
+            foreach (XLRangeColumn container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed()
+        {
+            var cells = new XLCells(true, false);
+            foreach (XLRangeColumn container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Boolean includeFormats)
+        {
+            var cells = new XLCells(true, includeFormats);
+            foreach (XLRangeColumn container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLRangeColumns SetDataType(XLCellValues dataType)
+        {
+            _ranges.ForEach(c => c.DataType = dataType);
+            return this;
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return _style;
+                foreach (XLRangeColumn rng in _ranges)
+                {
+                    yield return rng.Style;
+                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
+                        rng.RangeAddress.FirstAddress.RowNumber,
+                        rng.RangeAddress.FirstAddress.ColumnNumber,
+                        rng.RangeAddress.LastAddress.RowNumber,
+                        rng.RangeAddress.LastAddress.ColumnNumber))
+                        yield return r.Style;
+                }
+                UpdatingStyle = false;
+            }
+        }
+
+        public Boolean UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return _style; }
+            set { _style = new XLStyle(this, value); }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges();
+                this.ForEach(c => retVal.Add(c.AsRange()));
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        public void Dispose()
+        {
+            if (_ranges != null)
+                _ranges.ForEach(r => r.Dispose());
+        }
+
+        public void Select()
+        {
+            foreach (var range in this)
+                range.Select();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Ranges/XLRangeParameters.cs b/ClosedXML/Excel/Ranges/XLRangeParameters.cs
new file mode 100644
index 0000000..f86d3ac
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRangeParameters.cs
@@ -0,0 +1,33 @@
+namespace ClosedXML.Excel
+{
+    internal class XLRangeParameters
+    {
+        #region Constructor
+
+        public XLRangeParameters(XLRangeAddress rangeAddress, IXLStyle defaultStyle)
+        {
+            RangeAddress = rangeAddress;
+            _ignoreEvents = !rangeAddress.Worksheet.EventTrackingEnabled;
+            DefaultStyle = defaultStyle;
+        }
+
+        #endregion
+
+        #region Properties
+
+        public XLRangeAddress RangeAddress { get; private set; }
+
+        public IXLStyle DefaultStyle { get; private set; }
+        private bool _ignoreEvents;
+        public bool IgnoreEvents
+        { 
+            get { return _ignoreEvents; } 
+            set
+            {
+                _ignoreEvents = value;
+            } 
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Ranges/XLRangeRow.cs b/ClosedXML/Excel/Ranges/XLRangeRow.cs
new file mode 100644
index 0000000..802342f
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRangeRow.cs
@@ -0,0 +1,350 @@
+namespace ClosedXML.Excel
+{
+    using System;
+    using System.Linq;
+	
+
+    internal class XLRangeRow : XLRangeBase, IXLRangeRow
+    {
+        #region Constructor
+
+        public XLRangeRow(XLRangeParameters rangeParameters, bool quickLoad)
+            : base(rangeParameters.RangeAddress)
+        {
+            RangeParameters = rangeParameters;
+            if (quickLoad) return;
+            if (!RangeParameters.IgnoreEvents)
+            {
+                SubscribeToShiftedRows((range, rowsShifted) => this.WorksheetRangeShiftedRows(range, rowsShifted));
+                SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
+            }
+            SetStyle(rangeParameters.DefaultStyle);
+        }
+
+        #endregion
+
+        
+        public XLRangeParameters RangeParameters { get; private set; }
+
+        #region IXLRangeRow Members
+
+        public IXLCell Cell(int column)
+        {
+            return Cell(1, column);
+        }
+
+        public new IXLCell Cell(string column)
+        {
+            return Cell(1, column);
+        }
+
+        public void Delete()
+        {
+            Delete(XLShiftDeletedCells.ShiftCellsUp);
+        }
+
+        public IXLCells InsertCellsAfter(int numberOfColumns)
+        {
+            return InsertCellsAfter(numberOfColumns, true);
+        }
+
+        public IXLCells InsertCellsAfter(int numberOfColumns, bool expandRange)
+        {
+            return InsertColumnsAfter(numberOfColumns, expandRange).Cells();
+        }
+
+        public IXLCells InsertCellsBefore(int numberOfColumns)
+        {
+            return InsertCellsBefore(numberOfColumns, false);
+        }
+
+        public IXLCells InsertCellsBefore(int numberOfColumns, bool expandRange)
+        {
+            return InsertColumnsBefore(numberOfColumns, expandRange).Cells();
+        }
+
+        public new IXLCells Cells(string cellsInRow)
+        {
+            var retVal = new XLCells(false, false);
+            var rangePairs = cellsInRow.Split(',');
+            foreach (string pair in rangePairs)
+                retVal.Add(Range(pair.Trim()).RangeAddress);
+            return retVal;
+        }
+
+        public IXLCells Cells(int firstColumn, int lastColumn)
+        {
+            return Cells(firstColumn + ":" + lastColumn);
+        }
+
+        public IXLCells Cells(string firstColumn, string lastColumn)
+        {
+            return Cells(XLHelper.GetColumnNumberFromLetter(firstColumn) + ":"
+                         + XLHelper.GetColumnNumberFromLetter(lastColumn));
+        }
+
+        public int CellCount()
+        {
+            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
+        }
+
+        public new IXLRangeRow Sort()
+        {
+            return SortLeftToRight();
+        }
+
+        public new IXLRangeRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
+            return this;
+        }
+
+        public new IXLRangeRow CopyTo(IXLCell target)
+        {
+            base.CopyTo(target);
+
+            int lastRowNumber = target.Address.RowNumber + RowCount() - 1;
+            if (lastRowNumber > XLHelper.MaxRowNumber)
+                lastRowNumber = XLHelper.MaxRowNumber;
+            int lastColumnNumber = target.Address.ColumnNumber + ColumnCount() - 1;
+            if (lastColumnNumber > XLHelper.MaxColumnNumber)
+                lastColumnNumber = XLHelper.MaxColumnNumber;
+
+            return target.Worksheet.Range(
+                target.Address.RowNumber,
+                target.Address.ColumnNumber,
+                lastRowNumber,
+                lastColumnNumber)
+                .Row(1);
+        }
+
+        public new IXLRangeRow CopyTo(IXLRangeBase target)
+        {
+            base.CopyTo(target);
+            int lastRowNumber = target.RangeAddress.FirstAddress.RowNumber + RowCount() - 1;
+            if (lastRowNumber > XLHelper.MaxRowNumber)
+                lastRowNumber = XLHelper.MaxRowNumber;
+            int lastColumnNumber = target.RangeAddress.LastAddress.ColumnNumber + ColumnCount() - 1;
+            if (lastColumnNumber > XLHelper.MaxColumnNumber)
+                lastColumnNumber = XLHelper.MaxColumnNumber;
+
+            return target.Worksheet.Range(
+                target.RangeAddress.FirstAddress.RowNumber,
+                target.RangeAddress.LastAddress.ColumnNumber,
+                lastRowNumber,
+                lastColumnNumber)
+                .Row(1);
+        }
+
+        public IXLRangeRow Row(int start, int end)
+        {
+            return Range(1, start, 1, end).Row(1);
+        }
+
+        public IXLRangeRow Row(IXLCell start, IXLCell end)
+        {
+            return Row(start.Address.ColumnNumber, end.Address.ColumnNumber);
+        }
+
+        public IXLRangeRows Rows(string rows)
+        {
+            var retVal = new XLRangeRows();
+            var columnPairs = rows.Split(',');
+            foreach (string trimmedPair in columnPairs.Select(pair => pair.Trim()))
+            {
+                string firstColumn;
+                string lastColumn;
+                if (trimmedPair.Contains(':') || trimmedPair.Contains('-'))
+                {
+                    var columnRange = trimmedPair.Contains('-')
+                                          ? trimmedPair.Replace('-', ':').Split(':')
+                                          : trimmedPair.Split(':');
+                    firstColumn = columnRange[0];
+                    lastColumn = columnRange[1];
+                }
+                else
+                {
+                    firstColumn = trimmedPair;
+                    lastColumn = trimmedPair;
+                }
+
+                retVal.Add(Range(firstColumn, lastColumn).FirstRow());
+            }
+
+            return retVal;
+        }
+
+        public IXLRangeRow SetDataType(XLCellValues dataType)
+        {
+            DataType = dataType;
+            return this;
+        }
+
+        public IXLRow WorksheetRow()
+        {
+            return Worksheet.Row(RangeAddress.FirstAddress.RowNumber);
+        }
+
+        #endregion
+
+        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
+        {
+            ShiftColumns(RangeAddress, range, columnsShifted);
+        }
+
+        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
+        {
+            ShiftRows(RangeAddress, range, rowsShifted);
+        }
+
+        public IXLRange Range(int firstColumn, int lastColumn)
+        {
+            return Range(1, firstColumn, 1, lastColumn);
+        }
+
+        public override XLRange Range(string rangeAddressStr)
+        {
+            string rangeAddressToUse;
+            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
+            {
+                if (rangeAddressStr.Contains('-'))
+                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
+
+                var arrRange = rangeAddressStr.Split(':');
+                string firstPart = arrRange[0];
+                string secondPart = arrRange[1];
+                rangeAddressToUse = FixRowAddress(firstPart) + ":" + FixRowAddress(secondPart);
+            }
+            else
+                rangeAddressToUse = FixRowAddress(rangeAddressStr);
+
+            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
+            return Range(rangeAddress);
+        }
+
+        public int CompareTo(XLRangeRow otherRow, IXLSortElements columnsToSort)
+        {
+            foreach (IXLSortElement e in columnsToSort)
+            {
+                var thisCell = (XLCell)Cell(e.ElementNumber);
+                var otherCell = (XLCell)otherRow.Cell(e.ElementNumber);
+                int comparison;
+                bool thisCellIsBlank = thisCell.IsEmpty();
+                bool otherCellIsBlank = otherCell.IsEmpty();
+                if (e.IgnoreBlanks && (thisCellIsBlank || otherCellIsBlank))
+                {
+                    if (thisCellIsBlank && otherCellIsBlank)
+                        comparison = 0;
+                    else
+                    {
+                        if (thisCellIsBlank)
+                            comparison = e.SortOrder == XLSortOrder.Ascending ? 1 : -1;
+                        else
+                            comparison = e.SortOrder == XLSortOrder.Ascending ? -1 : 1;
+                    }
+                }
+                else
+                {
+                    if (thisCell.DataType == otherCell.DataType)
+                    {
+                        if (thisCell.DataType == XLCellValues.Text)
+                        {
+                            comparison = e.MatchCase
+                                             ? thisCell.InnerText.CompareTo(otherCell.InnerText)
+                                             : String.Compare(thisCell.InnerText, otherCell.InnerText, true);
+                        }
+                        else if (thisCell.DataType == XLCellValues.TimeSpan)
+                            comparison = thisCell.GetTimeSpan().CompareTo(otherCell.GetTimeSpan());
+                        else
+                            comparison = Double.Parse(thisCell.InnerText).CompareTo(Double.Parse(otherCell.InnerText));
+                    }
+                    else if (e.MatchCase)
+                        comparison = String.Compare(thisCell.GetString(), otherCell.GetString(), true);
+                    else
+                        comparison = thisCell.GetString().CompareTo(otherCell.GetString());
+                }
+
+                if (comparison != 0)
+                    return e.SortOrder == XLSortOrder.Ascending ? comparison : comparison * -1;
+            }
+
+            return 0;
+        }
+
+        private XLRangeRow RowShift(Int32 rowsToShift)
+        {
+            Int32 rowNum = RowNumber() + rowsToShift;
+
+            var range = Worksheet.Range(
+                rowNum,
+                RangeAddress.FirstAddress.ColumnNumber,
+                rowNum,
+                RangeAddress.LastAddress.ColumnNumber);
+                
+            var result = range.FirstRow();
+            range.Dispose();
+
+            return result;
+        }
+
+        #region XLRangeRow Above
+
+        IXLRangeRow IXLRangeRow.RowAbove()
+        {
+            return RowAbove();
+        }
+
+        IXLRangeRow IXLRangeRow.RowAbove(Int32 step)
+        {
+            return RowAbove(step);
+        }
+
+        public XLRangeRow RowAbove()
+        {
+            return RowAbove(1);
+        }
+
+        public XLRangeRow RowAbove(Int32 step)
+        {
+            return RowShift(step * -1);
+        }
+
+        #endregion
+
+        #region XLRangeRow Below
+
+        IXLRangeRow IXLRangeRow.RowBelow()
+        {
+            return RowBelow();
+        }
+
+        IXLRangeRow IXLRangeRow.RowBelow(Int32 step)
+        {
+            return RowBelow(step);
+        }
+
+        public XLRangeRow RowBelow()
+        {
+            return RowBelow(1);
+        }
+
+        public XLRangeRow RowBelow(Int32 step)
+        {
+            return RowShift(step);
+        }
+
+        #endregion
+
+        public new IXLRangeRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            base.Clear(clearOptions);
+            return this;
+        }
+
+        public IXLRangeRow RowUsed(Boolean includeFormats = false)
+        {
+            return Row(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Ranges/XLRangeRows.cs b/ClosedXML/Excel/Ranges/XLRangeRows.cs
new file mode 100644
index 0000000..76dd6f7
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRangeRows.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    internal class XLRangeRows : IXLRangeRows, IXLStylized
+    {
+        public Boolean StyleChanged { get; set; }
+        private readonly List<XLRangeRow> _ranges = new List<XLRangeRow>();
+        private IXLStyle _style;
+
+        public XLRangeRows()
+        {
+            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
+        }
+
+        #region IXLRangeRows Members
+
+        public IXLRangeRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            _ranges.ForEach(c => c.Clear(clearOptions));
+            return this;
+        }
+
+        public void Delete()
+        {
+            _ranges.OrderByDescending(r => r.RowNumber()).ForEach(r => r.Delete());
+            _ranges.Clear();
+        }
+
+        public void Add(IXLRangeRow range)
+        {
+            _ranges.Add((XLRangeRow)range);
+        }
+
+        public IEnumerator<IXLRangeRow> GetEnumerator()
+        {
+            return _ranges.Cast<IXLRangeRow>()
+                          .OrderBy(r=>r.Worksheet.Position)
+                          .ThenBy(r => r.RowNumber())
+                          .GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLStyle Style
+        {
+            get { return _style; }
+            set
+            {
+                _style = new XLStyle(this, value);
+                _ranges.ForEach(r => r.Style = value);
+            }
+        }
+
+        public IXLCells Cells()
+        {
+            var cells = new XLCells(false, false);
+            foreach (XLRangeRow container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed()
+        {
+            var cells = new XLCells(true, false);
+            foreach (XLRangeRow container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Boolean includeFormats)
+        {
+            var cells = new XLCells(true, includeFormats);
+            foreach (XLRangeRow container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLRangeRows SetDataType(XLCellValues dataType)
+        {
+            _ranges.ForEach(c => c.DataType = dataType);
+            return this;
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return _style;
+                foreach (XLRangeRow rng in _ranges)
+                {
+                    yield return rng.Style;
+                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
+                        rng.RangeAddress.FirstAddress.RowNumber,
+                        rng.RangeAddress.FirstAddress.ColumnNumber,
+                        rng.RangeAddress.LastAddress.RowNumber,
+                        rng.RangeAddress.LastAddress.ColumnNumber))
+                        yield return r.Style;
+                }
+                UpdatingStyle = false;
+            }
+        }
+
+        public Boolean UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return _style; }
+            set { _style = new XLStyle(this, value); }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges();
+                this.ForEach(c => retVal.Add(c.AsRange()));
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        public void Dispose()
+        {
+            if (_ranges != null)
+                _ranges.ForEach(r => r.Dispose());
+        }
+
+        public void Select()
+        {
+            foreach (var range in this)
+                range.Select();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Ranges/XLRanges.cs b/ClosedXML/Excel/Ranges/XLRanges.cs
new file mode 100644
index 0000000..a3b5940
--- /dev/null
+++ b/ClosedXML/Excel/Ranges/XLRanges.cs
@@ -0,0 +1,241 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    internal class XLRanges : IXLRanges, IXLStylized
+    {
+        private readonly List<XLRange> _ranges = new List<XLRange>();
+        private IXLStyle _style;
+
+        public XLRanges()
+        {
+            _style = new XLStyle(this, XLWorkbook.DefaultStyle);
+        }
+
+        #region IXLRanges Members
+
+        public IXLRanges Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            _ranges.ForEach(c => c.Clear(clearOptions));
+            return this;
+        }
+
+        public void Add(XLRange range)
+        {
+            Count++;
+            _ranges.Add(range);
+        }
+
+        public void Add(IXLRangeBase range)
+        {
+            Count++;
+            _ranges.Add(range.AsRange() as XLRange);
+        }
+
+        public void Add(IXLCell cell)
+        {
+            Add(cell.AsRange());
+        }
+
+        public void Remove(IXLRange range)
+        {
+            Count--;
+            _ranges.RemoveAll(r => r.ToString() == range.ToString());
+        }
+
+        public int Count { get; private set; }
+
+        public IEnumerator<IXLRange> GetEnumerator()
+        {
+            var retList = new List<IXLRange>();
+            retList.AddRange(_ranges.Where(r => XLHelper.IsValidRangeAddress(r.RangeAddress)).Cast<IXLRange>());
+            return retList.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLStyle Style
+        {
+            get { return _style; }
+            set
+            {
+                _style = new XLStyle(this, value);
+                foreach (XLRange rng in _ranges)
+                    rng.Style = value;
+            }
+        }
+
+        public Boolean Contains(IXLRange range)
+        {
+            return _ranges.Any(r => !r.RangeAddress.IsInvalid && r.Contains(range));
+        }
+
+        public IXLDataValidation DataValidation
+        {
+            get
+            {
+                foreach (XLRange range in _ranges)
+                {
+                    foreach (IXLDataValidation dv in range.Worksheet.DataValidations)
+                    {
+                        foreach (IXLRange dvRange in dv.Ranges.Where(dvRange => dvRange.Intersects(range)))
+                        {
+                            dv.Ranges.Remove(dvRange);
+                            foreach (IXLCell c in dvRange.Cells().Where(c => !range.Contains(c.Address.ToString())))
+                            {
+                                var r = c.AsRange();
+                                r.Dispose();
+                                dv.Ranges.Add(r);
+                            }
+                        }
+                    }
+                }
+                var dataValidation = new XLDataValidation(this);
+
+                _ranges.First().Worksheet.DataValidations.Add(dataValidation);
+                return dataValidation;
+            }
+        }
+
+        public IXLRanges AddToNamed(String rangeName)
+        {
+            return AddToNamed(rangeName, XLScope.Workbook);
+        }
+
+        public IXLRanges AddToNamed(String rangeName, XLScope scope)
+        {
+            return AddToNamed(rangeName, XLScope.Workbook, null);
+        }
+
+        public IXLRanges AddToNamed(String rangeName, XLScope scope, String comment)
+        {
+            _ranges.ForEach(r => r.AddToNamed(rangeName, scope, comment));
+            return this;
+        }
+
+        public Object Value
+        {
+            set { _ranges.ForEach(r => r.Value = value); }
+        }
+
+        public IXLRanges SetValue<T>(T value)
+        {
+            _ranges.ForEach(r => r.SetValue(value));
+            return this;
+        }
+
+        public IXLCells Cells()
+        {
+            var cells = new XLCells(false, false);
+            foreach (XLRange container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed()
+        {
+            var cells = new XLCells(true, false);
+            foreach (XLRange container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Boolean includeFormats)
+        {
+            var cells = new XLCells(true, includeFormats);
+            foreach (XLRange container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLRanges SetDataType(XLCellValues dataType)
+        {
+            _ranges.ForEach(c => c.DataType = dataType);
+            return this;
+        }
+
+        public void Dispose()
+        {
+            _ranges.ForEach(r => r.Dispose());
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public Boolean StyleChanged { get; set; }
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return _style;
+                foreach (XLRange rng in _ranges)
+                {
+                    yield return rng.Style;
+                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
+                        rng.RangeAddress.FirstAddress.RowNumber,
+                        rng.RangeAddress.FirstAddress.ColumnNumber,
+                        rng.RangeAddress.LastAddress.RowNumber,
+                        rng.RangeAddress.LastAddress.ColumnNumber))
+                        yield return r.Style;
+                }
+                UpdatingStyle = false;
+            }
+        }
+
+        public Boolean UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return _style; }
+            set { _style = new XLStyle(this, value); }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get { return this; }
+        }
+
+        #endregion
+
+        public override string ToString()
+        {
+            String retVal = _ranges.Aggregate(String.Empty, (agg, r) => agg + (r.ToString() + ","));
+            if (retVal.Length > 0) retVal = retVal.Substring(0, retVal.Length - 1);
+            return retVal;
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = (XLRanges)obj;
+
+            return _ranges.Count == other._ranges.Count &&
+                   _ranges.Select(thisRange => Enumerable.Contains(other._ranges, thisRange)).All(foundOne => foundOne);
+        }
+
+        public override int GetHashCode()
+        {
+            return _ranges.Aggregate(0, (current, r) => current ^ r.GetHashCode());
+        }
+
+        public IXLDataValidation SetDataValidation()
+        {
+            return DataValidation;
+        }
+
+        public void Select()
+        {
+            foreach (var range in this)
+                range.Select();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/RichText/IXLFormattedText.cs b/ClosedXML/Excel/RichText/IXLFormattedText.cs
new file mode 100644
index 0000000..b17836c
--- /dev/null
+++ b/ClosedXML/Excel/RichText/IXLFormattedText.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLFormattedText<T> : IEnumerable<IXLRichString>, IEquatable<IXLFormattedText<T>>, IXLWithRichString
+    {
+        Boolean Bold { set; }
+        Boolean Italic { set; }
+        XLFontUnderlineValues Underline { set; }
+        Boolean Strikethrough { set; }
+        XLFontVerticalTextAlignmentValues VerticalAlignment { set; }
+        Boolean Shadow { set; }
+        Double FontSize { set; }
+        XLColor FontColor { set; }
+        String FontName { set; }
+        XLFontFamilyNumberingValues FontFamilyNumbering { set; }
+
+        IXLFormattedText<T> SetBold(); IXLFormattedText<T> SetBold(Boolean value);
+        IXLFormattedText<T> SetItalic(); IXLFormattedText<T> SetItalic(Boolean value);
+        IXLFormattedText<T> SetUnderline(); IXLFormattedText<T> SetUnderline(XLFontUnderlineValues value);
+        IXLFormattedText<T> SetStrikethrough(); IXLFormattedText<T> SetStrikethrough(Boolean value);
+        IXLFormattedText<T> SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
+        IXLFormattedText<T> SetShadow(); IXLFormattedText<T> SetShadow(Boolean value);
+        IXLFormattedText<T> SetFontSize(Double value);
+        IXLFormattedText<T> SetFontColor(XLColor value);
+        IXLFormattedText<T> SetFontName(String value);
+        IXLFormattedText<T> SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
+
+        IXLRichString AddText(String text, IXLFontBase font);
+        IXLFormattedText<T> ClearText();
+        IXLFormattedText<T> ClearFont();
+        IXLFormattedText<T> Substring(Int32 index);
+        IXLFormattedText<T> Substring(Int32 index, Int32 length);
+        Int32 Count { get; }
+        Int32 Length { get; }
+
+        String Text { get; }
+        IXLPhonetics Phonetics { get; }
+        Boolean HasPhonetics { get; }
+    }
+}
diff --git a/ClosedXML/Excel/RichText/IXLPhonetic.cs b/ClosedXML/Excel/RichText/IXLPhonetic.cs
new file mode 100644
index 0000000..a38a5c1
--- /dev/null
+++ b/ClosedXML/Excel/RichText/IXLPhonetic.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLPhonetic: IEquatable<IXLPhonetic>
+    {
+        String Text { get; set; }
+        Int32 Start { get; set; }
+        Int32 End { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/RichText/IXLPhonetics.cs b/ClosedXML/Excel/RichText/IXLPhonetics.cs
new file mode 100644
index 0000000..7a14614
--- /dev/null
+++ b/ClosedXML/Excel/RichText/IXLPhonetics.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public enum XLPhoneticAlignment { Center, Distributed, Left, NoControl }
+    public enum XLPhoneticType { FullWidthKatakana, HalfWidthKatakana, Hiragana, NoConversion }
+    public interface IXLPhonetics : IXLFontBase, IEnumerable<IXLPhonetic>, IEquatable<IXLPhonetics>
+    {
+        IXLPhonetics SetBold(); IXLPhonetics SetBold(Boolean value);
+        IXLPhonetics SetItalic(); IXLPhonetics SetItalic(Boolean value);
+        IXLPhonetics SetUnderline(); IXLPhonetics SetUnderline(XLFontUnderlineValues value);
+        IXLPhonetics SetStrikethrough(); IXLPhonetics SetStrikethrough(Boolean value);
+        IXLPhonetics SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
+        IXLPhonetics SetShadow(); IXLPhonetics SetShadow(Boolean value);
+        IXLPhonetics SetFontSize(Double value);
+        IXLPhonetics SetFontColor(XLColor value);
+        IXLPhonetics SetFontName(String value);
+        IXLPhonetics SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
+
+        IXLPhonetics Add(String text, Int32 start, Int32 end);
+        IXLPhonetics ClearText();
+        IXLPhonetics ClearFont();
+        Int32 Count { get; }
+
+        XLPhoneticAlignment Alignment { get; set; }
+        XLPhoneticType Type { get; set; }
+
+        IXLPhonetics SetAlignment(XLPhoneticAlignment phoneticAlignment);
+        IXLPhonetics SetType(XLPhoneticType phoneticType);
+    }
+}
diff --git a/ClosedXML/Excel/RichText/IXLRichString.cs b/ClosedXML/Excel/RichText/IXLRichString.cs
new file mode 100644
index 0000000..3d97406
--- /dev/null
+++ b/ClosedXML/Excel/RichText/IXLRichString.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLWithRichString
+    {
+        IXLRichString AddText(String text);
+        IXLRichString AddNewLine();
+    }
+    public interface IXLRichString: IXLFontBase, IEquatable<IXLRichString>, IXLWithRichString
+    {
+        String Text { get; set; }
+        
+
+        IXLRichString SetBold(); IXLRichString SetBold(Boolean value);
+        IXLRichString SetItalic(); IXLRichString SetItalic(Boolean value);
+        IXLRichString SetUnderline(); IXLRichString SetUnderline(XLFontUnderlineValues value);
+        IXLRichString SetStrikethrough(); IXLRichString SetStrikethrough(Boolean value);
+        IXLRichString SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
+        IXLRichString SetShadow(); IXLRichString SetShadow(Boolean value);
+        IXLRichString SetFontSize(Double value);
+        IXLRichString SetFontColor(XLColor value);
+        IXLRichString SetFontName(String value);
+        IXLRichString SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
+    }
+}
diff --git a/ClosedXML/Excel/RichText/IXLRichText.cs b/ClosedXML/Excel/RichText/IXLRichText.cs
new file mode 100644
index 0000000..36ac6fc
--- /dev/null
+++ b/ClosedXML/Excel/RichText/IXLRichText.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRichText : IXLFormattedText<IXLRichText>
+    {
+    }
+}
diff --git a/ClosedXML/Excel/RichText/XLFormattedText.cs b/ClosedXML/Excel/RichText/XLFormattedText.cs
new file mode 100644
index 0000000..aa21ed7
--- /dev/null
+++ b/ClosedXML/Excel/RichText/XLFormattedText.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLFormattedText<T>: IXLFormattedText<T>
+    {
+        List<IXLRichString> _richTexts = new List<IXLRichString>();
+
+        protected T Container;
+        readonly IXLFontBase _defaultFont;
+        public XLFormattedText(IXLFontBase defaultFont)
+        {
+            Length = 0;
+            _defaultFont = defaultFont;
+        }
+
+        public XLFormattedText(IXLFormattedText<T> defaultRichText, IXLFontBase defaultFont)
+            : this(defaultFont)
+        {
+            foreach (var rt in defaultRichText)
+                AddText(rt.Text, rt);
+            if (defaultRichText.HasPhonetics)
+            {
+                _phonetics = new XLPhonetics(defaultRichText.Phonetics, defaultFont);
+            }
+        }
+
+        public XLFormattedText(String text, IXLFontBase defaultFont)
+            :this(defaultFont)
+        {
+            AddText(text);
+        }
+
+        public Int32 Count { get { return _richTexts.Count; } }
+        public int Length { get; private set; }
+
+        public IXLRichString AddText(String text)
+        {
+            return AddText(text, _defaultFont);
+        }
+        public IXLRichString AddText(String text, IXLFontBase font)
+        {
+            var richText = new XLRichString(text, font, this);
+            return AddText(richText);
+        }
+
+        public IXLRichString AddText(IXLRichString richText)
+        {
+            _richTexts.Add(richText);
+            Length += richText.Text.Length;
+            return richText;
+        }
+
+        public IXLRichString AddNewLine()
+        {
+            return AddText(Environment.NewLine);
+        }
+
+        public IXLFormattedText<T> ClearText()
+        {
+            _richTexts.Clear();
+            Length = 0;
+            return this;
+        }
+        public IXLFormattedText<T> ClearFont()
+        {
+            String text = Text;
+            ClearText();
+            AddText(text);
+            return this;
+        }
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder(_richTexts.Count);
+            _richTexts.ForEach(rt => sb.Append(rt.Text));
+            return sb.ToString();
+        }
+
+        public IXLFormattedText<T> Substring(Int32 index)
+        {
+            return Substring(index, Length - index);
+        }
+        public IXLFormattedText<T> Substring(Int32 index, Int32 length)
+        {
+            if (index + 1 > Length || (Length - index + 1) < length || length <= 0)
+                throw new IndexOutOfRangeException("Index and length must refer to a location within the string.");
+
+            List<IXLRichString> newRichTexts = new List<IXLRichString>();
+            var retVal = new XLFormattedText<T>(_defaultFont);
+
+            Int32 lastPosition = 0;
+            foreach (var rt in _richTexts)
+            {
+                if (lastPosition >= index + 1 + length) // We already have what we need
+                {
+                    newRichTexts.Add(rt);
+                }
+                else if (lastPosition + rt.Text.Length >= index + 1) // Eureka!
+                {
+                    Int32 startIndex = index - lastPosition;
+
+                    if (startIndex > 0)
+                        newRichTexts.Add(new XLRichString(rt.Text.Substring(0, startIndex), rt, this));
+                    else if (startIndex < 0)
+                        startIndex = 0;
+
+                    Int32 leftToTake = length - retVal.Length;
+                    if (leftToTake > rt.Text.Length - startIndex)
+                        leftToTake = rt.Text.Length - startIndex;
+
+                    XLRichString newRt = new XLRichString(rt.Text.Substring(startIndex, leftToTake), rt, this);
+                    newRichTexts.Add(newRt);
+                    retVal.AddText(newRt);
+
+                    if (startIndex + leftToTake < rt.Text.Length)
+                        newRichTexts.Add(new XLRichString(rt.Text.Substring(startIndex + leftToTake), rt, this));
+                }
+                else // We haven't reached the desired position yet
+                {
+                    newRichTexts.Add(rt);
+                }
+                lastPosition += rt.Text.Length;
+            }
+            _richTexts = newRichTexts;
+            return retVal;
+        }
+
+        public IEnumerator<IXLRichString> GetEnumerator()
+        {
+            return _richTexts.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public Boolean Bold { set { _richTexts.ForEach(rt => rt.Bold = value); } }
+        public Boolean Italic { set { _richTexts.ForEach(rt => rt.Italic = value); } }
+        public XLFontUnderlineValues Underline { set { _richTexts.ForEach(rt => rt.Underline = value); } }
+        public Boolean Strikethrough { set { _richTexts.ForEach(rt => rt.Strikethrough = value); } }
+        public XLFontVerticalTextAlignmentValues VerticalAlignment { set { _richTexts.ForEach(rt => rt.VerticalAlignment = value); } }
+        public Boolean Shadow { set { _richTexts.ForEach(rt => rt.Shadow = value); } }
+        public Double FontSize { set { _richTexts.ForEach(rt => rt.FontSize = value); } }
+        public XLColor FontColor { set { _richTexts.ForEach(rt => rt.FontColor = value); } }
+        public String FontName { set { _richTexts.ForEach(rt => rt.FontName = value); } }
+        public XLFontFamilyNumberingValues FontFamilyNumbering { set { _richTexts.ForEach(rt => rt.FontFamilyNumbering = value); } }
+
+        public IXLFormattedText<T> SetBold() { Bold = true; return this; }	public IXLFormattedText<T> SetBold(Boolean value) { Bold = value; return this; }
+        public IXLFormattedText<T> SetItalic() { Italic = true; return this; }	public IXLFormattedText<T> SetItalic(Boolean value) { Italic = value; return this; }
+        public IXLFormattedText<T> SetUnderline() { Underline = XLFontUnderlineValues.Single; return this; }	public IXLFormattedText<T> SetUnderline(XLFontUnderlineValues value) { Underline = value; return this; }
+        public IXLFormattedText<T> SetStrikethrough() { Strikethrough = true; return this; }	public IXLFormattedText<T> SetStrikethrough(Boolean value) { Strikethrough = value; return this; }
+        public IXLFormattedText<T> SetVerticalAlignment(XLFontVerticalTextAlignmentValues value) { VerticalAlignment = value; return this; }
+        public IXLFormattedText<T> SetShadow() { Shadow = true; return this; }	public IXLFormattedText<T> SetShadow(Boolean value) { Shadow = value; return this; }
+        public IXLFormattedText<T> SetFontSize(Double value) { FontSize = value; return this; }
+        public IXLFormattedText<T> SetFontColor(XLColor value) { FontColor = value; return this; }
+        public IXLFormattedText<T> SetFontName(String value) { FontName = value; return this; }
+        public IXLFormattedText<T> SetFontFamilyNumbering(XLFontFamilyNumberingValues value) { FontFamilyNumbering = value; return this; }
+
+        public bool Equals(IXLFormattedText<T> other)
+        {
+            Int32 count = Count;
+            if (count != other.Count)
+                return false;
+
+            for (Int32 i = 0; i < count; i++)
+            {
+                if (_richTexts.ElementAt(i) != other.ElementAt(i))
+                    return false;
+            }
+
+            return _phonetics == null || Phonetics.Equals(other.Phonetics);
+        }
+
+        public String Text { get { return ToString(); } }
+
+        private IXLPhonetics _phonetics;
+        public IXLPhonetics Phonetics 
+        {
+            get { return _phonetics ?? (_phonetics = new XLPhonetics(_defaultFont)); }
+        }
+
+        public Boolean HasPhonetics { get { return _phonetics != null; } }
+    }
+}
diff --git a/ClosedXML/Excel/RichText/XLPhonetic.cs b/ClosedXML/Excel/RichText/XLPhonetic.cs
new file mode 100644
index 0000000..73118c4
--- /dev/null
+++ b/ClosedXML/Excel/RichText/XLPhonetic.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPhonetic: IXLPhonetic
+    {
+        public XLPhonetic(String text, Int32 start, Int32 end)
+        {
+            Text = text;
+            Start = start;
+            End = end;
+        }
+        public String Text { get; set; }
+        public Int32 Start { get; set; }
+        public Int32 End { get; set; }
+
+        public bool Equals(IXLPhonetic other)
+        {
+            if (other == null)
+                return false;
+
+            return Text == other.Text && Start == other.Start && End == other.End;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/RichText/XLPhonetics.cs b/ClosedXML/Excel/RichText/XLPhonetics.cs
new file mode 100644
index 0000000..afc4e45
--- /dev/null
+++ b/ClosedXML/Excel/RichText/XLPhonetics.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    internal class XLPhonetics : IXLPhonetics
+    {
+        private readonly List<IXLPhonetic> _phonetics = new List<IXLPhonetic>();
+
+        readonly IXLFontBase _defaultFont;
+        public XLPhonetics(IXLFontBase defaultFont)
+        {
+            _defaultFont = defaultFont;
+            Type = XLPhoneticType.FullWidthKatakana;
+            Alignment = XLPhoneticAlignment.Left;
+            this.CopyFont(_defaultFont);
+        }
+
+        public XLPhonetics(IXLPhonetics defaultPhonetics, IXLFontBase defaultFont)
+        {
+            _defaultFont = defaultFont;
+            Type = defaultPhonetics.Type;
+            Alignment = defaultPhonetics.Alignment;
+            
+            this.CopyFont(defaultPhonetics);
+        }
+
+        public Boolean Bold { get; set; }
+        public Boolean Italic { get; set; }
+        public XLFontUnderlineValues Underline { get; set; }
+        public Boolean Strikethrough { get; set; }
+        public XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
+        public Boolean Shadow { get; set; }
+        public Double FontSize { get; set; }
+        public XLColor FontColor { get; set; }
+        public String FontName { get; set; }
+        public XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
+
+        public IXLPhonetics SetBold() { Bold = true; return this; }	public IXLPhonetics SetBold(Boolean value) { Bold = value; return this; }
+        public IXLPhonetics SetItalic() { Italic = true; return this; }	public IXLPhonetics SetItalic(Boolean value) { Italic = value; return this; }
+        public IXLPhonetics SetUnderline() { Underline = XLFontUnderlineValues.Single; return this; }	public IXLPhonetics SetUnderline(XLFontUnderlineValues value) { Underline = value; return this; }
+        public IXLPhonetics SetStrikethrough() { Strikethrough = true; return this; }	public IXLPhonetics SetStrikethrough(Boolean value) { Strikethrough = value; return this; }
+        public IXLPhonetics SetVerticalAlignment(XLFontVerticalTextAlignmentValues value) { VerticalAlignment = value; return this; }
+        public IXLPhonetics SetShadow() { Shadow = true; return this; }	public IXLPhonetics SetShadow(Boolean value) { Shadow = value; return this; }
+        public IXLPhonetics SetFontSize(Double value) { FontSize = value; return this; }
+        public IXLPhonetics SetFontColor(XLColor value) { FontColor = value; return this; }
+        public IXLPhonetics SetFontName(String value) { FontName = value; return this; }
+        public IXLPhonetics SetFontFamilyNumbering(XLFontFamilyNumberingValues value) { FontFamilyNumbering = value; return this; }
+
+        public IXLPhonetics Add(String text, Int32 start, Int32 end)
+        {
+            _phonetics.Add(new XLPhonetic(text, start, end));
+            return this;
+        }
+        public IXLPhonetics ClearText()
+        {
+            _phonetics.Clear();
+            return this;
+        }
+        public IXLPhonetics ClearFont()
+        {
+            this.CopyFont(_defaultFont);
+            return this;
+        }
+
+        public Int32 Count { get { return _phonetics.Count; } }
+
+        public XLPhoneticAlignment Alignment { get; set; }
+        public XLPhoneticType Type { get; set; }
+
+        public IXLPhonetics SetAlignment(XLPhoneticAlignment phoneticAlignment) { Alignment = phoneticAlignment; return this; }
+        public IXLPhonetics SetType(XLPhoneticType phoneticType) { Type = phoneticType; return this; }
+
+        public IEnumerator<IXLPhonetic> GetEnumerator()
+        {
+            return _phonetics.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public bool Equals(IXLPhonetics other)
+        {
+            if (other == null)
+                return false;
+
+            Int32 phoneticsCount = _phonetics.Count;
+            for (Int32 i = 0; i < phoneticsCount; i++)
+            {
+                if (!_phonetics[i].Equals(other.ElementAt(i)))
+                    return false;
+            }
+
+            return
+                   Bold == other.Bold
+                && Italic == other.Italic
+                && Underline == other.Underline
+                && Strikethrough == other.Strikethrough
+                && VerticalAlignment == other.VerticalAlignment
+                && Shadow == other.Shadow
+                && FontSize == other.FontSize
+                && FontColor.Equals(other.FontColor)
+                && FontName == other.FontName
+                && FontFamilyNumbering == other.FontFamilyNumbering
+    ;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/RichText/XLRichString.cs b/ClosedXML/Excel/RichText/XLRichString.cs
new file mode 100644
index 0000000..6500758
--- /dev/null
+++ b/ClosedXML/Excel/RichText/XLRichString.cs
@@ -0,0 +1,85 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLRichString: IXLRichString
+    {
+        IXLWithRichString _withRichString;
+        public XLRichString(String text, IXLFontBase font, IXLWithRichString withRichString)
+        {
+            Text = text;
+            this.CopyFont(font);
+            _withRichString = withRichString;
+        }
+
+        public String Text { get; set; }
+        public IXLRichString AddText(String text)
+        {
+            return _withRichString.AddText(text);
+        }
+
+        public IXLRichString AddNewLine()
+        {
+            return AddText(Environment.NewLine);
+        }
+
+        public Boolean Bold { get; set; }
+        public Boolean Italic { get; set; }
+        public XLFontUnderlineValues Underline { get; set; }
+        public Boolean Strikethrough { get; set; }
+        public XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
+        public Boolean Shadow { get; set; }
+        public Double FontSize { get; set; }
+        public XLColor FontColor { get; set; }
+        public String FontName { get; set; }
+        public XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
+
+        public IXLRichString SetBold() { Bold = true; return this; }	public IXLRichString SetBold(Boolean value) { Bold = value; return this; }
+        public IXLRichString SetItalic() { Italic = true; return this; }	public IXLRichString SetItalic(Boolean value) { Italic = value; return this; }
+        public IXLRichString SetUnderline() { Underline = XLFontUnderlineValues.Single; return this; }	public IXLRichString SetUnderline(XLFontUnderlineValues value) { Underline = value; return this; }
+        public IXLRichString SetStrikethrough() { Strikethrough = true; return this; }	public IXLRichString SetStrikethrough(Boolean value) { Strikethrough = value; return this; }
+        public IXLRichString SetVerticalAlignment(XLFontVerticalTextAlignmentValues value) { VerticalAlignment = value; return this; }
+        public IXLRichString SetShadow() { Shadow = true; return this; }	public IXLRichString SetShadow(Boolean value) { Shadow = value; return this; }
+        public IXLRichString SetFontSize(Double value) { FontSize = value; return this; }
+        public IXLRichString SetFontColor(XLColor value) { FontColor = value; return this; }
+        public IXLRichString SetFontName(String value) { FontName = value; return this; }
+        public IXLRichString SetFontFamilyNumbering(XLFontFamilyNumberingValues value) { FontFamilyNumbering = value; return this; }
+
+        public Boolean Equals(IXLRichString other)
+        {
+            return
+                    Text == other.Text
+                && Bold.Equals(other.Bold)
+                && Italic.Equals(other.Italic)
+                && Underline.Equals(other.Underline)
+                && Strikethrough.Equals(other.Strikethrough)
+                && VerticalAlignment.Equals(other.VerticalAlignment)
+                && Shadow.Equals(other.Shadow)
+                && FontSize.Equals(other.FontSize)
+                && FontColor.Equals(other.FontColor)
+                && FontName.Equals(other.FontName)
+                && FontFamilyNumbering.Equals(other.FontFamilyNumbering)
+                ;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLRichString)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Text.GetHashCode()
+                ^ Bold.GetHashCode()
+                ^ Italic.GetHashCode()
+                ^ (Int32)Underline
+                ^ Strikethrough.GetHashCode()
+                ^ (Int32)VerticalAlignment
+                ^ Shadow.GetHashCode()
+                ^ FontSize.GetHashCode()
+                ^ FontColor.GetHashCode()
+                ^ FontName.GetHashCode()
+                ^ (Int32)FontFamilyNumbering;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/RichText/XLRichText.cs b/ClosedXML/Excel/RichText/XLRichText.cs
new file mode 100644
index 0000000..7d4c65b
--- /dev/null
+++ b/ClosedXML/Excel/RichText/XLRichText.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLRichText: XLFormattedText<IXLRichText>, IXLRichText
+    {
+        
+        public XLRichText(IXLFontBase defaultFont)
+            :base(defaultFont)
+        {
+            Container = this;
+        }
+
+        public XLRichText(XLFormattedText<IXLRichText> defaultRichText, IXLFontBase defaultFont)
+            :base(defaultRichText, defaultFont)
+        {
+            Container = this;
+        }
+
+        public XLRichText(String text, IXLFontBase defaultFont)
+            :base(text, defaultFont)
+        {
+            Container = this;
+        }
+
+    }
+}
diff --git a/ClosedXML/Excel/Rows/IXLRow.cs b/ClosedXML/Excel/Rows/IXLRow.cs
new file mode 100644
index 0000000..e77686d
--- /dev/null
+++ b/ClosedXML/Excel/Rows/IXLRow.cs
@@ -0,0 +1,190 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRow : IXLRangeBase
+    {
+        
+
+        /// <summary>
+        /// Gets or sets the height of this row.
+        /// </summary>
+        /// <value>
+        /// The width of this row.
+        /// </value>
+        Double Height { get; set; }
+
+        /// <summary>
+        /// Deletes this row and shifts the rows below this one accordingly.
+        /// </summary>
+        void Delete();
+
+        /// <summary>
+        /// Gets this row's number
+        /// </summary>
+        Int32 RowNumber();
+
+        /// <summary>
+        /// Inserts X number of rows below this one.
+        /// <para>All rows below will be shifted accordingly.</para>
+        /// </summary>
+        /// <param name="numberOfRows">The number of rows to insert.</param>
+        IXLRows InsertRowsBelow(Int32 numberOfRows);
+
+        /// <summary>
+        /// Inserts X number of rows above this one.
+        /// <para>This row and all below will be shifted accordingly.</para>
+        /// </summary>
+        /// <param name="numberOfRows">The number of rows to insert.</param>
+        IXLRows InsertRowsAbove(Int32 numberOfRows);
+
+        IXLRow AdjustToContents();
+
+        /// <summary>
+        /// Adjusts the height of the row based on its contents, starting from the startColumn.
+        /// </summary>
+        /// <param name="startColumn">The column to start calculating the row height.</param>
+        IXLRow AdjustToContents(Int32 startColumn);
+        /// <summary>
+        /// Adjusts the height of the row based on its contents, starting from the startColumn and ending at endColumn.
+        /// </summary>
+        /// <param name="startColumn">The column to start calculating the row height.</param>
+        /// <param name="endColumn">The column to end calculating the row height.</param>
+        IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn);
+
+
+        IXLRow AdjustToContents(Double minHeight, Double maxHeight);
+        IXLRow AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight);
+        IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight);
+
+        /// <summary>Hides this row.</summary>
+        IXLRow Hide();
+
+        /// <summary>Unhides this row.</summary>
+        IXLRow Unhide();
+
+        /// <summary>
+        /// Gets a value indicating whether this row is hidden or not.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this row is hidden; otherwise, <c>false</c>.
+        /// </value>
+        Boolean IsHidden { get; }
+
+        /// <summary>
+        /// Gets or sets the outline level of this row.
+        /// </summary>
+        /// <value>
+        /// The outline level of this row.
+        /// </value>
+        Int32 OutlineLevel { get; set; }
+
+        /// <summary>
+        /// Adds this row to the next outline level (Increments the outline level for this row by 1).
+        /// </summary>
+        IXLRow Group();
+
+        /// <summary>
+        /// Adds this row to the next outline level (Increments the outline level for this row by 1).
+        /// </summary>
+        /// <param name="collapse">If set to <c>true</c> the row will be shown collapsed.</param>
+        IXLRow Group(Boolean collapse);
+
+        /// <summary>
+        /// Sets outline level for this row.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        IXLRow Group(Int32 outlineLevel);
+
+        /// <summary>
+        /// Sets outline level for this row.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        /// <param name="collapse">If set to <c>true</c> the row will be shown collapsed.</param>
+        IXLRow Group(Int32 outlineLevel, Boolean collapse);
+
+        /// <summary>
+        /// Adds this row to the previous outline level (decrements the outline level for this row by 1).
+        /// </summary>
+        IXLRow Ungroup();
+
+
+        /// <summary>
+        /// Adds this row to the previous outline level (decrements the outline level for this row by 1).
+        /// </summary>
+        /// <param name="fromAll">If set to <c>true</c> it will remove this row from all outline levels.</param>
+        IXLRow Ungroup(Boolean fromAll);
+
+        /// <summary>
+        /// Show this row as collapsed.
+        /// </summary>
+        IXLRow Collapse();
+
+        /// <summary>
+        /// Gets the cell in the specified column.
+        /// </summary>
+        /// <param name="columnNumber">The cell's column.</param>
+        IXLCell Cell(Int32 columnNumber);
+
+        /// <summary>
+        /// Gets the cell in the specified column.
+        /// </summary>
+        /// <param name="columnLetter">The cell's column.</param>
+        IXLCell Cell(String columnLetter);
+
+        /// <summary>
+        /// Returns the specified group of cells, separated by commas.
+        /// <para>e.g. Cells("1"), Cells("1:5"), Cells("1,3:5")</para>
+        /// </summary>
+        /// <param name="cellsInRow">The row's cells to return.</param>
+        new IXLCells Cells(String cellsInRow);
+        /// <summary>
+        /// Returns the specified group of cells.
+        /// </summary>
+        /// <param name="firstColumn">The first column in the group of cells to return.</param>
+        /// <param name="lastColumn">The last column in the group of cells to return.</param>
+        IXLCells Cells(Int32 firstColumn, Int32 lastColumn);
+        /// <summary>
+        /// Returns the specified group of cells.
+        /// </summary>
+        /// <param name="firstColumn">The first column in the group of cells to return.</param>
+        /// <param name="lastColumn">The last column in the group of cells to return.</param>
+        IXLCells Cells(String firstColumn, String lastColumn);
+
+        /// <summary>Expands this row (if it's collapsed).</summary>
+        IXLRow Expand();
+
+        Int32 CellCount();
+
+        IXLRangeRow CopyTo(IXLCell cell);
+        IXLRangeRow CopyTo(IXLRangeBase range);
+        IXLRow CopyTo(IXLRow row);
+
+        IXLRow Sort();
+        IXLRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+
+        IXLRangeRow Row(Int32 start, Int32 end);
+        IXLRangeRow Row(IXLCell start, IXLCell end);
+        IXLRangeRows Rows(String columns);
+
+        /// <summary>
+        /// Adds a horizontal page break after this row.
+        /// </summary>
+        IXLRow AddHorizontalPageBreak();
+
+        IXLRow SetDataType(XLCellValues dataType);
+
+        IXLRow RowAbove();
+        IXLRow RowAbove(Int32 step);
+        IXLRow RowBelow();
+        IXLRow RowBelow(Int32 step);
+
+        /// <summary>
+        /// Clears the contents of this row.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        new IXLRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        IXLRangeRow RowUsed(Boolean includeFormats = false);
+    }
+}
diff --git a/ClosedXML/Excel/Rows/IXLRows.cs b/ClosedXML/Excel/Rows/IXLRows.cs
new file mode 100644
index 0000000..fd5a1ca
--- /dev/null
+++ b/ClosedXML/Excel/Rows/IXLRows.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLRows: IEnumerable<IXLRow>, IDisposable
+    {
+        /// <summary>
+        /// Sets the height of all rows.
+        /// </summary>
+        /// <value>
+        /// The height of all rows.
+        /// </value>
+        Double Height { set; }
+
+        /// <summary>
+        /// Deletes all rows and shifts the rows below them accordingly.
+        /// </summary>
+        void Delete();
+
+        /// <summary>
+        /// Adjusts the height of all rows based on its contents.
+        /// </summary>
+        IXLRows AdjustToContents();
+        /// <summary>
+        /// Adjusts the height of all rows based on its contents, starting from the startColumn.
+        /// </summary>
+        /// <param name="startColumn">The column to start calculating the row height.</param>
+        IXLRows AdjustToContents(Int32 startColumn);
+        /// <summary>
+        /// Adjusts the height of all rows based on its contents, starting from the startColumn and ending at endColumn.
+        /// </summary>
+        /// <param name="startColumn">The column to start calculating the row height.</param>
+        /// <param name="endColumn">The column to end calculating the row height.</param>
+        IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn);
+
+        IXLRows AdjustToContents(Double minHeight, Double maxHeight);
+        IXLRows AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight);
+        IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight);
+
+        /// <summary>
+        /// Hides all rows.
+        /// </summary>
+        void Hide();
+
+        /// <summary>Unhides all rows.</summary>
+        void Unhide();
+
+        /// <summary>
+        /// Increments the outline level of all rows by 1.
+        /// </summary>
+        void Group();
+
+        /// <summary>
+        /// Increments the outline level of all rows by 1.
+        /// </summary>
+        /// <param name="collapse">If set to <c>true</c> the rows will be shown collapsed.</param>
+        void Group(Boolean collapse);
+
+        /// <summary>
+        /// Sets outline level for all rows.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        void Group(Int32 outlineLevel);
+
+        /// <summary>
+        /// Sets outline level for all rows.
+        /// </summary>
+        /// <param name="outlineLevel">The outline level.</param>
+        /// <param name="collapse">If set to <c>true</c> the rows will be shown collapsed.</param>
+        void Group(Int32 outlineLevel, Boolean collapse);
+
+        /// <summary>
+        /// Decrements the outline level of all rows by 1.
+        /// </summary>
+        void Ungroup();
+
+        /// <summary>
+        /// Decrements the outline level of all rows by 1.
+        /// </summary>
+        /// <param name="fromAll">If set to <c>true</c> it will remove the rows from all outline levels.</param>
+        void Ungroup(Boolean fromAll);
+
+        /// <summary>
+        /// Show all rows as collapsed.
+        /// </summary>
+        void Collapse();
+
+        /// <summary>Expands all rows (if they're collapsed).</summary>
+        void Expand();
+
+        /// <summary>
+        /// Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+        
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        IXLStyle Style { get; set; }
+
+        /// <summary>
+        /// Adds a horizontal page break after these rows.
+        /// </summary>
+        IXLRows AddHorizontalPageBreaks();
+
+        IXLRows SetDataType(XLCellValues dataType);
+
+        /// <summary>
+        /// Clears the contents of these rows.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        void Select();
+    }
+}
diff --git a/ClosedXML/Excel/Rows/XLRow.cs b/ClosedXML/Excel/Rows/XLRow.cs
new file mode 100644
index 0000000..c431481
--- /dev/null
+++ b/ClosedXML/Excel/Rows/XLRow.cs
@@ -0,0 +1,712 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Drawing;
+
+
+namespace ClosedXML.Excel
+{
+    internal class XLRow : XLRangeBase, IXLRow
+    {
+        #region Private fields
+
+        private Boolean _collapsed;
+        private Double _height;
+        private Boolean _isHidden;
+        private Int32 _outlineLevel;
+
+        #endregion
+
+        #region Constructor
+
+        public XLRow(Int32 row, XLRowParameters xlRowParameters)
+            : base(new XLRangeAddress(new XLAddress(xlRowParameters.Worksheet, row, 1, false, false),
+                                      new XLAddress(xlRowParameters.Worksheet, row, XLHelper.MaxColumnNumber, false,
+                                                    false)))
+        {
+            SetRowNumber(row);
+
+            IsReference = xlRowParameters.IsReference;
+            if (IsReference)
+                SubscribeToShiftedRows((range, rowShifted) => this.WorksheetRangeShiftedRows(range, rowShifted));
+            else
+            {
+                SetStyle(xlRowParameters.DefaultStyleId);
+                _height = xlRowParameters.Worksheet.RowHeight;
+            }
+        }
+
+        public XLRow(XLRow row)
+            : base(new XLRangeAddress(new XLAddress(row.Worksheet, row.RowNumber(), 1, false, false),
+                                      new XLAddress(row.Worksheet, row.RowNumber(), XLHelper.MaxColumnNumber, false,
+                                                    false)))
+        {
+            _height = row._height;
+            IsReference = row.IsReference;
+            if (IsReference)
+				SubscribeToShiftedRows((range, rowShifted) => this.WorksheetRangeShiftedRows(range, rowShifted));
+
+            _collapsed = row._collapsed;
+            _isHidden = row._isHidden;
+            _outlineLevel = row._outlineLevel;
+            HeightChanged = row.HeightChanged;
+            SetStyle(row.GetStyleId());
+        }
+
+        #endregion
+
+        public Boolean IsReference { get; private set; }
+
+        public override IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+
+                yield return Style;
+
+                int row = RowNumber();
+
+                foreach (XLCell cell in Worksheet.Internals.CellsCollection.GetCellsInRow(row))
+                    yield return cell.Style;
+
+                UpdatingStyle = false;
+            }
+        }
+
+        public override Boolean UpdatingStyle { get; set; }
+
+        public override IXLStyle InnerStyle
+        {
+            get
+            {
+                return IsReference
+                           ? Worksheet.Internals.RowsCollection[RowNumber()].InnerStyle
+                           : GetStyle();
+            }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.RowsCollection[RowNumber()].InnerStyle = value;
+                else
+                    SetStyle(value);
+            }
+        }
+
+        public Boolean Collapsed
+        {
+            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Collapsed : _collapsed; }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.RowsCollection[RowNumber()].Collapsed = value;
+                else
+                    _collapsed = value;
+            }
+        }
+
+        #region IXLRow Members
+
+        private Boolean _loading;
+        public Boolean Loading
+        {
+            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Loading : _loading; }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.RowsCollection[RowNumber()].Loading = value;
+                else
+                    _loading = value;
+            }
+        }
+
+        public Boolean HeightChanged { get; private set; }
+        public Double Height
+        {
+            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Height : _height; }
+            set
+            {
+                if (!Loading)
+                    HeightChanged = true;
+
+                if (IsReference)
+                    Worksheet.Internals.RowsCollection[RowNumber()].Height = value;
+                else
+                    _height = value;
+            }
+        }
+
+        public void Delete()
+        {
+            int rowNumber = RowNumber();
+            using (var asRange = AsRange())
+                asRange.Delete(XLShiftDeletedCells.ShiftCellsUp);
+
+            Worksheet.Internals.RowsCollection.Remove(rowNumber);
+            var rowsToMove = new List<Int32>();
+            rowsToMove.AddRange(Worksheet.Internals.RowsCollection.Where(c => c.Key > rowNumber).Select(c => c.Key));
+            foreach (int row in rowsToMove.OrderBy(r => r))
+            {
+                Worksheet.Internals.RowsCollection.Add(row - 1, Worksheet.Internals.RowsCollection[row]);
+                Worksheet.Internals.RowsCollection.Remove(row);
+            }
+        }
+
+        public new IXLRows InsertRowsBelow(Int32 numberOfRows)
+        {
+            int rowNum = RowNumber();
+            Worksheet.Internals.RowsCollection.ShiftRowsDown(rowNum + 1, numberOfRows);
+            using (var row = Worksheet.Row(rowNum))
+            {
+                using (var asRange = row.AsRange())
+                {
+                    asRange.InsertRowsBelowVoid(true, numberOfRows);
+                }
+            }
+            var newRows = Worksheet.Rows(rowNum + 1, rowNum + numberOfRows);
+
+            CopyRows(newRows);
+
+            return newRows;
+        }
+
+        private void CopyRows(IXLRows newRows)
+        {
+            foreach (var newRow in newRows)
+            {
+                var internalRow = Worksheet.Internals.RowsCollection[newRow.RowNumber()];
+                internalRow._height = Height;
+                internalRow.SetStyle(Style);
+                internalRow._collapsed = Collapsed;
+                internalRow._isHidden = IsHidden;
+                internalRow._outlineLevel = OutlineLevel;
+            }
+        }
+
+        public new IXLRows InsertRowsAbove(Int32 numberOfRows)
+        {
+            int rowNum = RowNumber();
+            if (rowNum > 1)
+            {
+                using (var row = Worksheet.Row(rowNum - 1))
+                {
+                    return row.InsertRowsBelow(numberOfRows);
+                }
+            }
+
+            Worksheet.Internals.RowsCollection.ShiftRowsDown(rowNum, numberOfRows);
+            using (var row = Worksheet.Row(rowNum))
+            {
+                using (var asRange = row.AsRange())
+                {
+                    asRange.InsertRowsAboveVoid(true, numberOfRows);
+                }
+            }
+
+            return Worksheet.Rows(rowNum, rowNum + numberOfRows - 1);
+        }
+
+        public new IXLRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            base.Clear(clearOptions);
+            return this;
+        }
+
+        public IXLCell Cell(Int32 columnNumber)
+        {
+            return Cell(1, columnNumber);
+        }
+
+        public new IXLCell Cell(String columnLetter)
+        {
+            return Cell(1, columnLetter);
+        }
+
+        public new IXLCells Cells()
+        {
+            return CellsUsed(true);
+        }
+
+        public new IXLCells Cells(String cellsInRow)
+        {
+            var retVal = new XLCells(false, false);
+            var rangePairs = cellsInRow.Split(',');
+            foreach (string pair in rangePairs)
+                retVal.Add(Range(pair.Trim()).RangeAddress);
+            return retVal;
+        }
+
+        public IXLCells Cells(Int32 firstColumn, Int32 lastColumn)
+        {
+            return Cells(firstColumn + ":" + lastColumn);
+        }
+
+        public IXLCells Cells(String firstColumn, String lastColumn)
+        {
+            return Cells(XLHelper.GetColumnNumberFromLetter(firstColumn) + ":"
+                         + XLHelper.GetColumnNumberFromLetter(lastColumn));
+        }
+
+        public IXLRow AdjustToContents(Int32 startColumn)
+        {
+            return AdjustToContents(startColumn, XLHelper.MaxColumnNumber);
+        }
+
+        public IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn)
+        {
+            return AdjustToContents(startColumn, endColumn, 0, Double.MaxValue);
+        }
+
+        public IXLRow AdjustToContents(Double minHeight, Double maxHeight)
+        {
+            return AdjustToContents(1, XLHelper.MaxColumnNumber, minHeight, maxHeight);
+        }
+
+        public IXLRow AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight)
+        {
+            return AdjustToContents(startColumn, XLHelper.MaxColumnNumber, minHeight, maxHeight);
+        }
+
+        public IXLRow AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight)
+        {
+            var fontCache = new Dictionary<IXLFontBase, Font>();
+            Double rowMaxHeight = minHeight;
+            foreach (XLCell c in from XLCell c in Row(startColumn, endColumn).CellsUsed() where !c.IsMerged() select c)
+            {
+                Double thisHeight;
+                Int32 textRotation = c.Style.Alignment.TextRotation;
+                if (c.HasRichText || textRotation != 0 || c.InnerText.Contains(Environment.NewLine))
+                {
+                    var kpList = new List<KeyValuePair<IXLFontBase, string>>();
+                    if (c.HasRichText)
+                    {
+                        foreach (IXLRichString rt in c.RichText)
+                        {
+                            String formattedString = rt.Text;
+                            var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
+                            Int32 arrCount = arr.Count();
+                            for (Int32 i = 0; i < arrCount; i++)
+                            {
+                                String s = arr[i];
+                                if (i < arrCount - 1)
+                                    s += Environment.NewLine;
+                                kpList.Add(new KeyValuePair<IXLFontBase, String>(rt, s));
+                            }
+                        }
+                    }
+                    else
+                    {
+                        String formattedString = c.GetFormattedString();
+                        var arr = formattedString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
+                        Int32 arrCount = arr.Count();
+                        for (Int32 i = 0; i < arrCount; i++)
+                        {
+                            String s = arr[i];
+                            if (i < arrCount - 1)
+                                s += Environment.NewLine;
+                            kpList.Add(new KeyValuePair<IXLFontBase, String>(c.Style.Font, s));
+                        }
+                    }
+
+                    Double maxLongCol = kpList.Max(kp => kp.Value.Length);
+                    Double maxHeightCol = kpList.Max(kp => kp.Key.GetHeight(fontCache));
+                    Int32 lineCount = kpList.Count(kp => kp.Value.Contains(Environment.NewLine)) + 1;
+                    if (textRotation == 0)
+                        thisHeight = maxHeightCol * lineCount;
+                    else
+                    {
+                        if (textRotation == 255)
+                            thisHeight = maxLongCol * maxHeightCol;
+                        else
+                        {
+                            Double rotation;
+                            if (textRotation == 90 || textRotation == 180 || textRotation == 255)
+                                rotation = 90;
+                            else
+                                rotation = textRotation % 90;
+
+                            thisHeight = (rotation / 90.0) * maxHeightCol * maxLongCol * 0.5;
+                        }
+                    }
+                }
+                else
+                    thisHeight = c.Style.Font.GetHeight( fontCache);
+
+                if (thisHeight >= maxHeight)
+                {
+                    rowMaxHeight = maxHeight;
+                    break;
+                }
+                if (thisHeight > rowMaxHeight)
+                    rowMaxHeight = thisHeight;
+            }
+
+            if (rowMaxHeight <= 0)
+                rowMaxHeight = Worksheet.RowHeight;
+
+            Height = rowMaxHeight;
+
+            foreach (IDisposable font in fontCache.Values)
+            {
+                font.Dispose();
+            }
+            return this;
+        }
+
+        public IXLRow Hide()
+        {
+            IsHidden = true;
+            return this;
+        }
+
+        public IXLRow Unhide()
+        {
+            IsHidden = false;
+            return this;
+        }
+
+        public Boolean IsHidden
+        {
+            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].IsHidden : _isHidden; }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.RowsCollection[RowNumber()].IsHidden = value;
+                else
+                    _isHidden = value;
+            }
+        }
+
+        public override IXLStyle Style
+        {
+            get
+            {
+                return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].Style : GetStyle();
+            }
+            set
+            {
+                if (IsReference)
+                    Worksheet.Internals.RowsCollection[RowNumber()].Style = value;
+                else
+                {
+                    SetStyle(value);
+
+                    Int32 minColumn = 1;
+                    Int32 maxColumn = 0;
+                    int row = RowNumber();
+                    if (Worksheet.Internals.CellsCollection.RowsUsed.ContainsKey(row))
+                    {
+                        minColumn = Worksheet.Internals.CellsCollection.MinColumnInRow(row);
+                        maxColumn = Worksheet.Internals.CellsCollection.MaxColumnInRow(row);
+                    }
+
+                    if (Worksheet.Internals.ColumnsCollection.Count > 0)
+                    {
+                        Int32 minInCollection = Worksheet.Internals.ColumnsCollection.Keys.Min();
+                        Int32 maxInCollection = Worksheet.Internals.ColumnsCollection.Keys.Max();
+                        if (minInCollection < minColumn)
+                            minColumn = minInCollection;
+                        if (maxInCollection > maxColumn)
+                            maxColumn = maxInCollection;
+                    }
+                    if (minColumn > 0 && maxColumn > 0)
+                    {
+                        for (Int32 co = minColumn; co <= maxColumn; co++)
+                            Worksheet.Cell(row, co).Style = value;
+                    }
+                }
+            }
+        }
+
+        public Int32 OutlineLevel
+        {
+            get { return IsReference ? Worksheet.Internals.RowsCollection[RowNumber()].OutlineLevel : _outlineLevel; }
+            set
+            {
+                if (value < 0 || value > 8)
+                    throw new ArgumentOutOfRangeException("value", "Outline level must be between 0 and 8.");
+
+                if (IsReference)
+                    Worksheet.Internals.RowsCollection[RowNumber()].OutlineLevel = value;
+                else
+                {
+                    Worksheet.IncrementColumnOutline(value);
+                    Worksheet.DecrementColumnOutline(_outlineLevel);
+                    _outlineLevel = value;
+                }
+            }
+        }
+
+        public IXLRow Group()
+        {
+            return Group(false);
+        }
+
+        public IXLRow Group(Int32 outlineLevel)
+        {
+            return Group(outlineLevel, false);
+        }
+
+        public IXLRow Ungroup()
+        {
+            return Ungroup(false);
+        }
+
+        public IXLRow Group(Boolean collapse)
+        {
+            if (OutlineLevel < 8)
+                OutlineLevel += 1;
+
+            Collapsed = collapse;
+            return this;
+        }
+
+        public IXLRow Group(Int32 outlineLevel, Boolean collapse)
+        {
+            OutlineLevel = outlineLevel;
+            Collapsed = collapse;
+            return this;
+        }
+
+        public IXLRow Ungroup(Boolean ungroupFromAll)
+        {
+            if (ungroupFromAll)
+                OutlineLevel = 0;
+            else
+            {
+                if (OutlineLevel > 0)
+                    OutlineLevel -= 1;
+            }
+            return this;
+        }
+
+        public IXLRow Collapse()
+        {
+            Collapsed = true;
+            return Hide();
+        }
+
+        public IXLRow Expand()
+        {
+            Collapsed = false;
+            return Unhide();
+        }
+
+        public Int32 CellCount()
+        {
+            return RangeAddress.LastAddress.ColumnNumber - RangeAddress.FirstAddress.ColumnNumber + 1;
+        }
+
+        public new IXLRow Sort()
+        {
+            return SortLeftToRight();
+        }
+
+        public new IXLRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false,
+                                          Boolean ignoreBlanks = true)
+        {
+            base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
+            return this;
+        }
+
+        IXLRangeRow IXLRow.CopyTo(IXLCell target)
+        {
+            using (var asRange = AsRange())
+                using (var copy = asRange.CopyTo(target))
+                    return copy.Row(1);
+        }
+
+        IXLRangeRow IXLRow.CopyTo(IXLRangeBase target)
+        {
+            using (var asRange = AsRange())
+                using (var copy = asRange.CopyTo(target))
+                    return copy.Row(1);
+        }
+
+        public IXLRow CopyTo(IXLRow row)
+        {
+            row.Clear();
+            var newRow = (XLRow)row;
+            newRow._height = _height;
+            newRow.Style = GetStyle();
+
+            using (var asRange = AsRange())
+                asRange.CopyTo(row).Dispose();
+
+            return newRow;
+        }
+
+        public IXLRangeRow Row(Int32 start, Int32 end)
+        {
+            return Range(1, start, 1, end).Row(1);
+        }
+
+        public IXLRangeRow Row(IXLCell start, IXLCell end)
+        {
+            return Row(start.Address.ColumnNumber, end.Address.ColumnNumber);
+        }
+
+        public IXLRangeRows Rows(String rows)
+        {
+            var retVal = new XLRangeRows();
+            var rowPairs = rows.Split(',');
+            foreach (string pair in rowPairs)
+                using (var asRange = AsRange())
+                    asRange.Rows(pair.Trim()).ForEach(retVal.Add);
+            return retVal;
+        }
+
+        public IXLRow AddHorizontalPageBreak()
+        {
+            Worksheet.PageSetup.AddHorizontalPageBreak(RowNumber());
+            return this;
+        }
+
+        public IXLRow SetDataType(XLCellValues dataType)
+        {
+            DataType = dataType;
+            return this;
+        }
+
+        public IXLRangeRow RowUsed(Boolean includeFormats = false)
+        {
+            return Row(FirstCellUsed(includeFormats), LastCellUsed(includeFormats));
+        }
+
+        #endregion
+
+        public override XLRange AsRange()
+        {
+            return Range(1, 1, 1, XLHelper.MaxColumnNumber);
+        }
+
+        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
+        {
+            if (range.RangeAddress.FirstAddress.RowNumber <= RowNumber())
+                SetRowNumber(RowNumber() + rowsShifted);
+        }
+
+        private void SetRowNumber(Int32 row)
+        {
+            if (row <= 0)
+                RangeAddress.IsInvalid = false;
+            else
+            {
+                RangeAddress.FirstAddress = new XLAddress(Worksheet, row, 1, RangeAddress.FirstAddress.FixedRow,
+                                                          RangeAddress.FirstAddress.FixedColumn);
+                RangeAddress.LastAddress = new XLAddress(Worksheet,
+                                                         row,
+                                                         XLHelper.MaxColumnNumber,
+                                                         RangeAddress.LastAddress.FixedRow,
+                                                         RangeAddress.LastAddress.FixedColumn);
+            }
+        }
+
+        public override XLRange Range(String rangeAddressStr)
+        {
+            String rangeAddressToUse;
+            if (rangeAddressStr.Contains(':') || rangeAddressStr.Contains('-'))
+            {
+                if (rangeAddressStr.Contains('-'))
+                    rangeAddressStr = rangeAddressStr.Replace('-', ':');
+
+                var arrRange = rangeAddressStr.Split(':');
+                string firstPart = arrRange[0];
+                string secondPart = arrRange[1];
+                rangeAddressToUse = FixRowAddress(firstPart) + ":" + FixRowAddress(secondPart);
+            }
+            else
+                rangeAddressToUse = FixRowAddress(rangeAddressStr);
+
+            var rangeAddress = new XLRangeAddress(Worksheet, rangeAddressToUse);
+            return Range(rangeAddress);
+        }
+
+        public IXLRow AdjustToContents()
+        {
+            return AdjustToContents(1);
+        }
+
+        internal void SetStyleNoColumns(IXLStyle value)
+        {
+            if (IsReference)
+                Worksheet.Internals.RowsCollection[RowNumber()].SetStyleNoColumns(value);
+            else
+            {
+                SetStyle(value);
+
+                int row = RowNumber();
+                foreach (XLCell c in Worksheet.Internals.CellsCollection.GetCellsInRow(row))
+                    c.Style = value;
+            }
+        }
+
+        private XLRow RowShift(Int32 rowsToShift)
+        {
+            return Worksheet.Row(RowNumber() + rowsToShift);
+        }
+
+        #region XLRow Above
+
+        IXLRow IXLRow.RowAbove()
+        {
+            return RowAbove();
+        }
+
+        IXLRow IXLRow.RowAbove(Int32 step)
+        {
+            return RowAbove(step);
+        }
+
+        public XLRow RowAbove()
+        {
+            return RowAbove(1);
+        }
+
+        public XLRow RowAbove(Int32 step)
+        {
+            return RowShift(step * -1);
+        }
+
+        #endregion
+
+        #region XLRow Below
+
+        IXLRow IXLRow.RowBelow()
+        {
+            return RowBelow();
+        }
+
+        IXLRow IXLRow.RowBelow(Int32 step)
+        {
+            return RowBelow(step);
+        }
+
+        public XLRow RowBelow()
+        {
+            return RowBelow(1);
+        }
+
+        public XLRow RowBelow(Int32 step)
+        {
+            return RowShift(step);
+        }
+
+        #endregion
+
+        public new Boolean IsEmpty()
+        {
+            return IsEmpty(false);
+        }
+
+        public new Boolean IsEmpty(Boolean includeFormats)
+        {
+            if (includeFormats && !Style.Equals(Worksheet.Style))
+                return false;
+
+            return base.IsEmpty(includeFormats);
+        }
+
+        
+    }
+}
diff --git a/ClosedXML/Excel/Rows/XLRowCollection.cs b/ClosedXML/Excel/Rows/XLRowCollection.cs
new file mode 100644
index 0000000..96be962
--- /dev/null
+++ b/ClosedXML/Excel/Rows/XLRowCollection.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    internal class XLRowsCollection : IDictionary<Int32, XLRow>, IDisposable
+    {
+        private readonly Dictionary<Int32, XLRow> _deleted = new Dictionary<Int32, XLRow>();
+        private readonly Dictionary<Int32, XLRow> _dictionary = new Dictionary<Int32, XLRow>();
+
+        public Dictionary<Int32, XLRow> Deleted
+        {
+            get { return _deleted; }
+        }
+
+        public Int32 MaxRowUsed;
+
+        #region IDictionary<int,XLRow> Members
+
+        public void Add(int key, XLRow value)
+        {
+            if (key > MaxRowUsed) MaxRowUsed = key;
+
+            if (_deleted.ContainsKey(key))
+                _deleted.Remove(key);
+
+            _dictionary.Add(key, value);
+        }
+
+        public bool ContainsKey(int key)
+        {
+            return _dictionary.ContainsKey(key);
+        }
+
+        public ICollection<int> Keys
+        {
+            get { return _dictionary.Keys; }
+        }
+
+        public bool Remove(int key)
+        {
+            if (!_deleted.ContainsKey(key))
+                _deleted.Add(key, _dictionary[key]);
+
+            return _dictionary.Remove(key);
+        }
+
+        public bool TryGetValue(int key, out XLRow value)
+        {
+            return _dictionary.TryGetValue(key, out value);
+        }
+
+        public ICollection<XLRow> Values
+        {
+            get { return _dictionary.Values; }
+        }
+
+        public XLRow this[int key]
+        {
+            get { return _dictionary[key]; }
+            set { _dictionary[key] = value; }
+        }
+
+        public void Add(KeyValuePair<int, XLRow> item)
+        {
+            if (item.Key > MaxRowUsed) MaxRowUsed = item.Key;
+
+            if (_deleted.ContainsKey(item.Key))
+                _deleted.Remove(item.Key);
+
+            _dictionary.Add(item.Key, item.Value);
+        }
+
+        public void Clear()
+        {
+            foreach (KeyValuePair<int, XLRow> kp in _dictionary.Where(kp => !_deleted.ContainsKey(kp.Key)))
+            {
+                _deleted.Add(kp.Key, kp.Value);
+            }
+
+            _dictionary.Clear();
+        }
+
+        public bool Contains(KeyValuePair<int, XLRow> item)
+        {
+            return _dictionary.Contains(item);
+        }
+
+        public void CopyTo(KeyValuePair<int, XLRow>[] array, int arrayIndex)
+        {
+            throw new NotImplementedException();
+        }
+
+        public int Count
+        {
+            get { return _dictionary.Count; }
+        }
+
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        public bool Remove(KeyValuePair<int, XLRow> item)
+        {
+            if (!_deleted.ContainsKey(item.Key))
+                _deleted.Add(item.Key, _dictionary[item.Key]);
+
+            return _dictionary.Remove(item.Key);
+        }
+
+        public IEnumerator<KeyValuePair<int, XLRow>> GetEnumerator()
+        {
+            return _dictionary.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _dictionary.GetEnumerator();
+        }
+
+        #endregion
+
+        public void ShiftRowsDown(Int32 startingRow, Int32 rowsToShift)
+        {
+            foreach (int ro in _dictionary.Keys.Where(k => k >= startingRow).OrderByDescending(k => k))
+            {
+                var rowToMove = _dictionary[ro];
+                Int32 newRowNum = ro + rowsToShift;
+                if (newRowNum <= XLHelper.MaxRowNumber)
+                {
+                    var newRow = new XLRow(rowToMove)
+                                     {
+                                         RangeAddress =
+                                             {
+                                                 FirstAddress = new XLAddress(newRowNum, 1, false, false),
+                                                 LastAddress =
+                                                     new XLAddress(newRowNum, XLHelper.MaxColumnNumber, false, false)
+                                             }
+                                     };
+                    _dictionary.Add(newRowNum, newRow);
+                }
+                _dictionary.Remove(ro);
+            }
+        }
+
+        public void RemoveAll(Func<XLRow, Boolean> predicate)
+        {
+            foreach (XLRow kp in _dictionary.Values.Where(predicate).Select(c => c).Where(kp => !_deleted.ContainsKey(kp.RowNumber())))
+            {
+                _deleted.Add(kp.RowNumber(), kp);
+            }
+
+            _dictionary.RemoveAll(predicate);
+        }
+
+        public void Dispose()
+        {
+            _dictionary.Values.ForEach(r=>r.Dispose());
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Rows/XLRowParameters.cs b/ClosedXML/Excel/Rows/XLRowParameters.cs
new file mode 100644
index 0000000..99d1603
--- /dev/null
+++ b/ClosedXML/Excel/Rows/XLRowParameters.cs
@@ -0,0 +1,19 @@
+using System;
+
+
+namespace ClosedXML.Excel
+{
+    internal class XLRowParameters
+    {
+        public XLRowParameters(XLWorksheet worksheet, Int32 defaultStyleId, Boolean isReference = true)
+        {
+            Worksheet = worksheet;
+            DefaultStyleId = defaultStyleId;
+            IsReference = isReference;
+        }
+
+        public Int32 DefaultStyleId { get; set; }
+        public XLWorksheet Worksheet { get; private set; }
+        public Boolean IsReference { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Rows/XLRows.cs b/ClosedXML/Excel/Rows/XLRows.cs
new file mode 100644
index 0000000..728395c
--- /dev/null
+++ b/ClosedXML/Excel/Rows/XLRows.cs
@@ -0,0 +1,278 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    internal class XLRows : IXLRows, IXLStylized
+    {
+        public Boolean StyleChanged { get; set; }
+        private readonly List<XLRow> _rows = new List<XLRow>();
+        private readonly XLWorksheet _worksheet;
+        internal IXLStyle style;
+
+        public XLRows(XLWorksheet worksheet)
+        {
+            _worksheet = worksheet;
+            style = new XLStyle(this, XLWorkbook.DefaultStyle);
+        }
+
+        #region IXLRows Members
+
+        public IEnumerator<IXLRow> GetEnumerator()
+        {
+            return _rows.Cast<IXLRow>().OrderBy(r=>r.RowNumber()).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLStyle Style
+        {
+            get { return style; }
+            set
+            {
+                style = new XLStyle(this, value);
+
+                if (_worksheet != null)
+                    _worksheet.Style = value;
+                else
+                {
+                    foreach (XLRow row in _rows)
+                        row.Style = value;
+                }
+            }
+        }
+
+        public double Height
+        {
+            set
+            {
+                _rows.ForEach(c => c.Height = value);
+                if (_worksheet == null) return;
+                _worksheet.RowHeight = value;
+                _worksheet.Internals.RowsCollection.ForEach(r => r.Value.Height = value);
+            }
+        }
+
+        public void Delete()
+        {
+            if (_worksheet != null)
+            {
+                _worksheet.Internals.RowsCollection.Clear();
+                _worksheet.Internals.CellsCollection.Clear();
+            }
+            else
+            {
+                var toDelete = new Dictionary<IXLWorksheet, List<Int32>>();
+                foreach (XLRow r in _rows)
+                {
+                    if (!toDelete.ContainsKey(r.Worksheet))
+                        toDelete.Add(r.Worksheet, new List<Int32>());
+
+                    toDelete[r.Worksheet].Add(r.RowNumber());
+                }
+
+                foreach (KeyValuePair<IXLWorksheet, List<int>> kp in toDelete)
+                {
+                    foreach (int r in kp.Value.OrderByDescending(r => r))
+                        kp.Key.Row(r).Delete();
+                }
+            }
+        }
+
+        public IXLRows AdjustToContents()
+        {
+            _rows.ForEach(r => r.AdjustToContents());
+            return this;
+        }
+
+        public IXLRows AdjustToContents(Int32 startColumn)
+        {
+            _rows.ForEach(r => r.AdjustToContents(startColumn));
+            return this;
+        }
+
+        public IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn)
+        {
+            _rows.ForEach(r => r.AdjustToContents(startColumn, endColumn));
+            return this;
+        }
+
+        public IXLRows AdjustToContents(Double minHeight, Double maxHeight)
+        {
+            _rows.ForEach(r => r.AdjustToContents(minHeight, maxHeight));
+            return this;
+        }
+
+        public IXLRows AdjustToContents(Int32 startColumn, Double minHeight, Double maxHeight)
+        {
+            _rows.ForEach(r => r.AdjustToContents(startColumn, minHeight, maxHeight));
+            return this;
+        }
+
+        public IXLRows AdjustToContents(Int32 startColumn, Int32 endColumn, Double minHeight, Double maxHeight)
+        {
+            _rows.ForEach(r => r.AdjustToContents(startColumn, endColumn, minHeight, maxHeight));
+            return this;
+        }
+
+
+        public void Hide()
+        {
+            _rows.ForEach(r => r.Hide());
+        }
+
+        public void Unhide()
+        {
+            _rows.ForEach(r => r.Unhide());
+        }
+
+        public void Group()
+        {
+            Group(false);
+        }
+
+        public void Group(Int32 outlineLevel)
+        {
+            Group(outlineLevel, false);
+        }
+
+        public void Ungroup()
+        {
+            Ungroup(false);
+        }
+
+        public void Group(Boolean collapse)
+        {
+            _rows.ForEach(r => r.Group(collapse));
+        }
+
+        public void Group(Int32 outlineLevel, Boolean collapse)
+        {
+            _rows.ForEach(r => r.Group(outlineLevel, collapse));
+        }
+
+        public void Ungroup(Boolean ungroupFromAll)
+        {
+            _rows.ForEach(r => r.Ungroup(ungroupFromAll));
+        }
+
+        public void Collapse()
+        {
+            _rows.ForEach(r => r.Collapse());
+        }
+
+        public void Expand()
+        {
+            _rows.ForEach(r => r.Expand());
+        }
+
+        public IXLCells Cells()
+        {
+            var cells = new XLCells(false, false);
+            foreach (XLRow container in _rows)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed()
+        {
+            var cells = new XLCells(true, false);
+            foreach (XLRow container in _rows)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Boolean includeFormats)
+        {
+            var cells = new XLCells(true, includeFormats);
+            foreach (XLRow container in _rows)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLRows AddHorizontalPageBreaks()
+        {
+            foreach (XLRow row in _rows)
+                row.Worksheet.PageSetup.AddHorizontalPageBreak(row.RowNumber());
+            return this;
+        }
+
+        public IXLRows SetDataType(XLCellValues dataType)
+        {
+            _rows.ForEach(c => c.DataType = dataType);
+            return this;
+        }
+
+        #endregion
+
+        #region IXLStylized Members
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return style;
+                if (_worksheet != null)
+                    yield return _worksheet.Style;
+                else
+                {
+                    foreach (IXLStyle s in _rows.SelectMany(row => row.Styles))
+                    {
+                        yield return s;
+                    }
+                }
+                UpdatingStyle = false;
+            }
+        }
+
+        public Boolean UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return style; }
+            set { style = new XLStyle(this, value); }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges();
+                this.ForEach(c => retVal.Add(c.AsRange()));
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        public void Add(XLRow row)
+        {
+            _rows.Add(row);
+        }
+
+        public IXLRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            _rows.ForEach(c => c.Clear(clearOptions));
+            return this;
+        }
+
+        public void Dispose()
+        {
+            if (_rows != null)
+                _rows.ForEach(r => r.Dispose());
+        }
+
+        public void Select()
+        {
+            foreach (var range in this)
+                range.Select();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs b/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs
new file mode 100644
index 0000000..003742c
--- /dev/null
+++ b/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Drawing;
+
+namespace ClosedXML.Excel
+{
+    public partial class XLColor
+    {
+        private XLColor(XLColor defaultColor)
+        {
+            var dColor = defaultColor;
+            if (dColor._colorType == XLColorType.Color)
+                _color = dColor._color;
+            else if (dColor._colorType == XLColorType.Theme)
+            {
+                _themeColor = dColor._themeColor;
+                _themeTint = dColor._themeTint;
+            }
+            else
+            {
+                _indexed = dColor._indexed;
+            }
+
+            HasValue = true;
+            _hashCode = dColor._hashCode;
+            _colorType = dColor._colorType;
+        }
+
+        private XLColor()
+        {
+            HasValue = false;
+            _hashCode = 0;
+        }
+
+        private XLColor(Color color)
+        {
+            _color = color;
+            _hashCode = 13 ^ color.ToArgb();
+            HasValue = true;
+            _colorType = XLColorType.Color;
+        }
+
+        private XLColor(Int32 index)
+        {
+            _indexed = index;
+            _hashCode = 11 ^ _indexed;
+            HasValue = true;
+            _colorType = XLColorType.Indexed;
+        }
+
+        private XLColor(XLThemeColor themeColor)
+        {
+            _themeColor = themeColor;
+            _themeTint = 0;
+            _hashCode = 7 ^ _themeColor.GetHashCode() ^ _themeTint.GetHashCode();
+            HasValue = true;
+            _colorType = XLColorType.Theme;
+        }
+
+        private XLColor(XLThemeColor themeColor, Double themeTint)
+        {
+            _themeColor = themeColor;
+            _themeTint = themeTint;
+            _hashCode = 7 ^ _themeColor.GetHashCode() ^ _themeTint.GetHashCode();
+            HasValue = true;
+            _colorType = XLColorType.Theme;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/Colors/XLColor_Public.cs b/ClosedXML/Excel/Style/Colors/XLColor_Public.cs
new file mode 100644
index 0000000..d212e81
--- /dev/null
+++ b/ClosedXML/Excel/Style/Colors/XLColor_Public.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Drawing;
+
+namespace ClosedXML.Excel
+{
+    public enum XLColorType
+    {
+        Color,
+        Theme,
+        Indexed
+    }
+
+    public enum XLThemeColor
+    {
+        Background1,
+        Text1,
+        Background2,
+        Text2,
+        Accent1,
+        Accent2,
+        Accent3,
+        Accent4,
+        Accent5,
+        Accent6,
+        Hyperlink,
+        FollowedHyperlink
+    }
+
+    public partial class XLColor : IEquatable<XLColor>
+    {
+        private readonly XLColorType _colorType;
+        private int _hashCode;
+        private readonly Int32 _indexed;
+        private readonly XLThemeColor _themeColor;
+        private readonly Double _themeTint;
+
+        private Color _color;
+        public Boolean HasValue { get; private set; }
+
+        public XLColorType ColorType
+        {
+            get { return _colorType; }
+        }
+
+        public Color Color
+        {
+            get
+            {
+                if (_colorType == XLColorType.Theme)
+                    throw new Exception("Cannot convert theme color to Color.");
+
+                if (_colorType == XLColorType.Indexed)
+                    return IndexedColors[_indexed].Color;
+
+                return _color;
+            }
+        }
+
+        public Int32 Indexed
+        {
+            get
+            {
+                if (ColorType == XLColorType.Theme)
+                    throw new Exception("Cannot convert theme color to indexed color.");
+
+                if (ColorType == XLColorType.Indexed)
+                    return _indexed;
+
+                throw new Exception("Cannot convert Color to indexed color.");
+            }
+        }
+
+        public XLThemeColor ThemeColor
+        {
+            get
+            {
+                if (ColorType == XLColorType.Theme)
+                    return _themeColor;
+
+                if (ColorType == XLColorType.Indexed)
+                    throw new Exception("Cannot convert indexed color to theme color.");
+
+                throw new Exception("Cannot convert Color to theme color.");
+            }
+        }
+
+        public Double ThemeTint
+        {
+            get
+            {
+                if (ColorType == XLColorType.Theme)
+                    return _themeTint;
+
+                if (ColorType == XLColorType.Indexed)
+                    throw new Exception("Cannot extract theme tint from an indexed color.");
+
+                return _color.A/255.0;
+            }
+        }
+
+        #region IEquatable<XLColor> Members
+
+        public bool Equals(XLColor other)
+        {
+            if (_colorType == other._colorType)
+            {
+                if (_colorType == XLColorType.Color)
+                {
+                    return _color == other._color;
+                }
+                if (_colorType == XLColorType.Theme)
+                {
+                    return _themeColor == other._themeColor
+                           && Math.Abs(_themeTint - other._themeTint) < XLHelper.Epsilon;
+                }
+                return _indexed == other._indexed;
+            }
+
+            return false;
+        }
+
+        #endregion
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLColor) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            if (_hashCode == 0)
+            {
+                if (_colorType == XLColorType.Color)
+                    _hashCode = _color.GetHashCode();
+                else if (_colorType == XLColorType.Theme)
+                    _hashCode = _themeColor.GetHashCode() ^ _themeTint.GetHashCode();
+                else
+                    _hashCode = _indexed;
+            }
+
+            return _hashCode;
+        }
+
+        public override string ToString()
+        {
+            if (_colorType == XLColorType.Color)
+                return Color.ToHex();
+
+            if (_colorType == XLColorType.Theme)
+                return String.Format("Color Theme: {0}, Tint: {1}", _themeColor.ToString(), _themeTint.ToString());
+
+            return "Color Index: " + _indexed;
+        }
+
+        public static Boolean operator ==(XLColor left, XLColor right)
+        {
+            // If both are null, or both are same instance, return true.
+            if (ReferenceEquals(left, right)) return true;
+
+            // If one is null, but not both, return false.
+            if ((left as object) == null || (right as Object) == null) return false;
+
+            return left.Equals(right);
+        }
+
+        public static Boolean operator !=(XLColor left, XLColor right)
+        {
+            return !(left == right);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/Colors/XLColor_Static.cs b/ClosedXML/Excel/Style/Colors/XLColor_Static.cs
new file mode 100644
index 0000000..d66e191
--- /dev/null
+++ b/ClosedXML/Excel/Style/Colors/XLColor_Static.cs
@@ -0,0 +1,934 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using DocumentFormat.OpenXml.Presentation;
+
+namespace ClosedXML.Excel
+{
+    public partial class XLColor
+    {
+        private static readonly Dictionary<Color, XLColor> ByColor = new Dictionary<Color, XLColor>();
+        private static readonly Object ByColorLock = new Object();
+
+        public static XLColor FromColor(Color color)
+        {
+            XLColor ret;
+            lock (ByColorLock)
+            {
+                if (!ByColor.TryGetValue(color, out ret))
+                {
+                    ret = new XLColor(color);
+                    ByColor.Add(color, ret);
+                }
+            }
+            return ret;
+        }
+
+        public static XLColor FromArgb(Int32 argb)
+        {
+            return FromColor(Color.FromArgb(argb));
+        }
+        public static XLColor FromArgb(Int32 r, Int32 g, Int32 b)
+        {
+            return FromColor(Color.FromArgb(r, g, b));
+        }
+        public static XLColor FromArgb(Int32 a, Int32 r, Int32 g, Int32 b)
+        {
+            return FromColor(Color.FromArgb(a, r, g, b));
+        }
+        public static XLColor FromKnownColor(KnownColor color)
+        {
+            return FromColor(Color.FromKnownColor(color));
+        }
+        public static XLColor FromName(String name)
+        {
+            return FromColor(Color.FromName(name));
+        }
+        public static XLColor FromHtml(String htmlColor)
+        {
+            return FromColor(ColorTranslator.FromHtml(htmlColor));
+        }
+
+        private static readonly Dictionary<Int32, XLColor> ByIndex = new Dictionary<Int32, XLColor>();
+        private static readonly Object ByIndexLock = new Object();
+
+        public static XLColor FromIndex(Int32 index)
+        {
+            XLColor ret;
+            lock (ByIndexLock)
+            {
+                if (!ByIndex.TryGetValue(index, out ret))
+                {
+                    ret = new XLColor(index);
+                    ByIndex.Add(index, ret);
+                }
+            }
+            return ret;
+        }
+
+        private static readonly Dictionary<XLThemeColor, XLColor> ByTheme = new Dictionary<XLThemeColor, XLColor>();
+        private static readonly Object ByThemeLock = new Object();
+
+        public static XLColor FromTheme(XLThemeColor themeColor)
+        {
+            XLColor ret;
+            lock (ByThemeLock)
+            {
+                if (!ByTheme.TryGetValue(themeColor, out ret))
+                {
+                    ret = new XLColor(themeColor);
+                    ByTheme.Add(themeColor, ret);
+                }
+            }
+            return ret;
+        }
+
+        private static readonly Dictionary<XLThemeColor, Dictionary<Double, XLColor>> ByThemeTint = new Dictionary<XLThemeColor, Dictionary<double, XLColor>>();
+        private static readonly Object ByThemeTintLock = new Object();
+
+        public static XLColor FromTheme(XLThemeColor themeColor, Double themeTint)
+        {
+            XLColor ret;
+            lock (ByThemeTintLock)
+            {
+                Dictionary<Double, XLColor> themeTints;
+                if (ByThemeTint.TryGetValue(themeColor, out themeTints))
+                {
+                    if (!themeTints.TryGetValue(themeTint, out ret))
+                    {
+                        ret = new XLColor(themeColor, themeTint);
+                        themeTints.Add(themeTint, ret);
+                    }
+                }
+                else
+                {
+                    themeTints = new Dictionary<double, XLColor>();
+                    ret = new XLColor(themeColor, themeTint);
+                    themeTints.Add(themeTint, ret);
+
+                    ByThemeTint.Add(themeColor, themeTints);
+                }
+            }
+            return ret;
+        }
+
+        private static Dictionary<Int32, XLColor> _indexedColors;
+        public static Dictionary<Int32, XLColor> IndexedColors
+        {
+            get
+            {
+                if (_indexedColors == null)
+                {
+                    var retVal = new Dictionary<Int32, XLColor>
+                        {
+                            {0, FromHtml("#FF000000")},
+                            {1, FromHtml("#FFFFFFFF")},
+                            {2, FromHtml("#FFFF0000")},
+                            {3, FromHtml("#FF00FF00")},
+                            {4, FromHtml("#FF0000FF")},
+                            {5, FromHtml("#FFFFFF00")},
+                            {6, FromHtml("#FFFF00FF")},
+                            {7, FromHtml("#FF00FFFF")},
+                            {8, FromHtml("#FF000000")},
+                            {9, FromHtml("#FFFFFFFF")},
+                            {10, FromHtml("#FFFF0000")},
+                            {11, FromHtml("#FF00FF00")},
+                            {12, FromHtml("#FF0000FF")},
+                            {13, FromHtml("#FFFFFF00")},
+                            {14, FromHtml("#FFFF00FF")},
+                            {15, FromHtml("#FF00FFFF")},
+                            {16, FromHtml("#FF800000")},
+                            {17, FromHtml("#FF008000")},
+                            {18, FromHtml("#FF000080")},
+                            {19, FromHtml("#FF808000")},
+                            {20, FromHtml("#FF800080")},
+                            {21, FromHtml("#FF008080")},
+                            {22, FromHtml("#FFC0C0C0")},
+                            {23, FromHtml("#FF808080")},
+                            {24, FromHtml("#FF9999FF")},
+                            {25, FromHtml("#FF993366")},
+                            {26, FromHtml("#FFFFFFCC")},
+                            {27, FromHtml("#FFCCFFFF")},
+                            {28, FromHtml("#FF660066")},
+                            {29, FromHtml("#FFFF8080")},
+                            {30, FromHtml("#FF0066CC")},
+                            {31, FromHtml("#FFCCCCFF")},
+                            {32, FromHtml("#FF000080")},
+                            {33, FromHtml("#FFFF00FF")},
+                            {34, FromHtml("#FFFFFF00")},
+                            {35, FromHtml("#FF00FFFF")},
+                            {36, FromHtml("#FF800080")},
+                            {37, FromHtml("#FF800000")},
+                            {38, FromHtml("#FF008080")},
+                            {39, FromHtml("#FF0000FF")},
+                            {40, FromHtml("#FF00CCFF")},
+                            {41, FromHtml("#FFCCFFFF")},
+                            {42, FromHtml("#FFCCFFCC")},
+                            {43, FromHtml("#FFFFFF99")},
+                            {44, FromHtml("#FF99CCFF")},
+                            {45, FromHtml("#FFFF99CC")},
+                            {46, FromHtml("#FFCC99FF")},
+                            {47, FromHtml("#FFFFCC99")},
+                            {48, FromHtml("#FF3366FF")},
+                            {49, FromHtml("#FF33CCCC")},
+                            {50, FromHtml("#FF99CC00")},
+                            {51, FromHtml("#FFFFCC00")},
+                            {52, FromHtml("#FFFF9900")},
+                            {53, FromHtml("#FFFF6600")},
+                            {54, FromHtml("#FF666699")},
+                            {55, FromHtml("#FF969696")},
+                            {56, FromHtml("#FF003366")},
+                            {57, FromHtml("#FF339966")},
+                            {58, FromHtml("#FF003300")},
+                            {59, FromHtml("#FF333300")},
+                            {60, FromHtml("#FF993300")},
+                            {61, FromHtml("#FF993366")},
+                            {62, FromHtml("#FF333399")},
+                            {63, FromHtml("#FF333333")},
+                            {64, FromColor(Color.Transparent)}
+                        };
+                    _indexedColors = retVal;
+                }
+                return _indexedColors;
+            }
+        }
+
+        private static XLColor noColor = new XLColor();
+        public static XLColor NoColor { get { return noColor; } }
+
+        public static XLColor AliceBlue { get { return FromColor(Color.AliceBlue); } }
+        public static XLColor AntiqueWhite { get { return FromColor(Color.AntiqueWhite); } }
+        public static XLColor Aqua { get { return FromColor(Color.Aqua); } }
+        public static XLColor Aquamarine { get { return FromColor(Color.Aquamarine); } }
+        public static XLColor Azure { get { return FromColor(Color.Azure); } }
+        public static XLColor Beige { get { return FromColor(Color.Beige); } }
+        public static XLColor Bisque { get { return FromColor(Color.Bisque); } }
+        public static XLColor Black { get { return FromColor(Color.Black); } }
+        public static XLColor BlanchedAlmond { get { return FromColor(Color.BlanchedAlmond); } }
+        public static XLColor Blue { get { return FromColor(Color.Blue); } }
+        public static XLColor BlueViolet { get { return FromColor(Color.BlueViolet); } }
+        public static XLColor Brown { get { return FromColor(Color.Brown); } }
+        public static XLColor BurlyWood { get { return FromColor(Color.BurlyWood); } }
+        public static XLColor CadetBlue { get { return FromColor(Color.CadetBlue); } }
+        public static XLColor Chartreuse { get { return FromColor(Color.Chartreuse); } }
+        public static XLColor Chocolate { get { return FromColor(Color.Chocolate); } }
+        public static XLColor Coral { get { return FromColor(Color.Coral); } }
+        public static XLColor CornflowerBlue { get { return FromColor(Color.CornflowerBlue); } }
+        public static XLColor Cornsilk { get { return FromColor(Color.Cornsilk); } }
+        public static XLColor Crimson { get { return FromColor(Color.Crimson); } }
+        public static XLColor Cyan { get { return FromColor(Color.Cyan); } }
+        public static XLColor DarkBlue { get { return FromColor(Color.DarkBlue); } }
+        public static XLColor DarkCyan { get { return FromColor(Color.DarkCyan); } }
+        public static XLColor DarkGoldenrod { get { return FromColor(Color.DarkGoldenrod); } }
+        public static XLColor DarkGray { get { return FromColor(Color.DarkGray); } }
+        public static XLColor DarkGreen { get { return FromColor(Color.DarkGreen); } }
+        public static XLColor DarkKhaki { get { return FromColor(Color.DarkKhaki); } }
+        public static XLColor DarkMagenta { get { return FromColor(Color.DarkMagenta); } }
+        public static XLColor DarkOliveGreen { get { return FromColor(Color.DarkOliveGreen); } }
+        public static XLColor DarkOrange { get { return FromColor(Color.DarkOrange); } }
+        public static XLColor DarkOrchid { get { return FromColor(Color.DarkOrchid); } }
+        public static XLColor DarkRed { get { return FromColor(Color.DarkRed); } }
+        public static XLColor DarkSalmon { get { return FromColor(Color.DarkSalmon); } }
+        public static XLColor DarkSeaGreen { get { return FromColor(Color.DarkSeaGreen); } }
+        public static XLColor DarkSlateBlue { get { return FromColor(Color.DarkSlateBlue); } }
+        public static XLColor DarkSlateGray { get { return FromColor(Color.DarkSlateGray); } }
+        public static XLColor DarkTurquoise { get { return FromColor(Color.DarkTurquoise); } }
+        public static XLColor DarkViolet { get { return FromColor(Color.DarkViolet); } }
+        public static XLColor DeepPink { get { return FromColor(Color.DeepPink); } }
+        public static XLColor DeepSkyBlue { get { return FromColor(Color.DeepSkyBlue); } }
+        public static XLColor DimGray { get { return FromColor(Color.DimGray); } }
+        public static XLColor DodgerBlue { get { return FromColor(Color.DodgerBlue); } }
+        public static XLColor Firebrick { get { return FromColor(Color.Firebrick); } }
+        public static XLColor FloralWhite { get { return FromColor(Color.FloralWhite); } }
+        public static XLColor ForestGreen { get { return FromColor(Color.ForestGreen); } }
+        public static XLColor Fuchsia { get { return FromColor(Color.Fuchsia); } }
+        public static XLColor Gainsboro { get { return FromColor(Color.Gainsboro); } }
+        public static XLColor GhostWhite { get { return FromColor(Color.GhostWhite); } }
+        public static XLColor Gold { get { return FromColor(Color.Gold); } }
+        public static XLColor Goldenrod { get { return FromColor(Color.Goldenrod); } }
+        public static XLColor Gray { get { return FromColor(Color.Gray); } }
+        public static XLColor Green { get { return FromColor(Color.Green); } }
+        public static XLColor GreenYellow { get { return FromColor(Color.GreenYellow); } }
+        public static XLColor Honeydew { get { return FromColor(Color.Honeydew); } }
+        public static XLColor HotPink { get { return FromColor(Color.HotPink); } }
+        public static XLColor IndianRed { get { return FromColor(Color.IndianRed); } }
+        public static XLColor Indigo { get { return FromColor(Color.Indigo); } }
+        public static XLColor Ivory { get { return FromColor(Color.Ivory); } }
+        public static XLColor Khaki { get { return FromColor(Color.Khaki); } }
+        public static XLColor Lavender { get { return FromColor(Color.Lavender); } }
+        public static XLColor LavenderBlush { get { return FromColor(Color.LavenderBlush); } }
+        public static XLColor LawnGreen { get { return FromColor(Color.LawnGreen); } }
+        public static XLColor LemonChiffon { get { return FromColor(Color.LemonChiffon); } }
+        public static XLColor LightBlue { get { return FromColor(Color.LightBlue); } }
+        public static XLColor LightCoral { get { return FromColor(Color.LightCoral); } }
+        public static XLColor LightCyan { get { return FromColor(Color.LightCyan); } }
+        public static XLColor LightGoldenrodYellow { get { return FromColor(Color.LightGoldenrodYellow); } }
+        public static XLColor LightGray { get { return FromColor(Color.LightGray); } }
+        public static XLColor LightGreen { get { return FromColor(Color.LightGreen); } }
+        public static XLColor LightPink { get { return FromColor(Color.LightPink); } }
+        public static XLColor LightSalmon { get { return FromColor(Color.LightSalmon); } }
+        public static XLColor LightSeaGreen { get { return FromColor(Color.LightSeaGreen); } }
+        public static XLColor LightSkyBlue { get { return FromColor(Color.LightSkyBlue); } }
+        public static XLColor LightSlateGray { get { return FromColor(Color.LightSlateGray); } }
+        public static XLColor LightSteelBlue { get { return FromColor(Color.LightSteelBlue); } }
+        public static XLColor LightYellow { get { return FromColor(Color.LightYellow); } }
+        public static XLColor Lime { get { return FromColor(Color.Lime); } }
+        public static XLColor LimeGreen { get { return FromColor(Color.LimeGreen); } }
+        public static XLColor Linen { get { return FromColor(Color.Linen); } }
+        public static XLColor Magenta { get { return FromColor(Color.Magenta); } }
+        public static XLColor Maroon { get { return FromColor(Color.Maroon); } }
+        public static XLColor MediumAquamarine { get { return FromColor(Color.MediumAquamarine); } }
+        public static XLColor MediumBlue { get { return FromColor(Color.MediumBlue); } }
+        public static XLColor MediumOrchid { get { return FromColor(Color.MediumOrchid); } }
+        public static XLColor MediumPurple { get { return FromColor(Color.MediumPurple); } }
+        public static XLColor MediumSeaGreen { get { return FromColor(Color.MediumSeaGreen); } }
+        public static XLColor MediumSlateBlue { get { return FromColor(Color.MediumSlateBlue); } }
+        public static XLColor MediumSpringGreen { get { return FromColor(Color.MediumSpringGreen); } }
+        public static XLColor MediumTurquoise { get { return FromColor(Color.MediumTurquoise); } }
+        public static XLColor MediumVioletRed { get { return FromColor(Color.MediumVioletRed); } }
+        public static XLColor MidnightBlue { get { return FromColor(Color.MidnightBlue); } }
+        public static XLColor MintCream { get { return FromColor(Color.MintCream); } }
+        public static XLColor MistyRose { get { return FromColor(Color.MistyRose); } }
+        public static XLColor Moccasin { get { return FromColor(Color.Moccasin); } }
+        public static XLColor NavajoWhite { get { return FromColor(Color.NavajoWhite); } }
+        public static XLColor Navy { get { return FromColor(Color.Navy); } }
+        public static XLColor OldLace { get { return FromColor(Color.OldLace); } }
+        public static XLColor Olive { get { return FromColor(Color.Olive); } }
+        public static XLColor OliveDrab { get { return FromColor(Color.OliveDrab); } }
+        public static XLColor Orange { get { return FromColor(Color.Orange); } }
+        public static XLColor OrangeRed { get { return FromColor(Color.OrangeRed); } }
+        public static XLColor Orchid { get { return FromColor(Color.Orchid); } }
+        public static XLColor PaleGoldenrod { get { return FromColor(Color.PaleGoldenrod); } }
+        public static XLColor PaleGreen { get { return FromColor(Color.PaleGreen); } }
+        public static XLColor PaleTurquoise { get { return FromColor(Color.PaleTurquoise); } }
+        public static XLColor PaleVioletRed { get { return FromColor(Color.PaleVioletRed); } }
+        public static XLColor PapayaWhip { get { return FromColor(Color.PapayaWhip); } }
+        public static XLColor PeachPuff { get { return FromColor(Color.PeachPuff); } }
+        public static XLColor Peru { get { return FromColor(Color.Peru); } }
+        public static XLColor Pink { get { return FromColor(Color.Pink); } }
+        public static XLColor Plum { get { return FromColor(Color.Plum); } }
+        public static XLColor PowderBlue { get { return FromColor(Color.PowderBlue); } }
+        public static XLColor Purple { get { return FromColor(Color.Purple); } }
+        public static XLColor Red { get { return FromColor(Color.Red); } }
+        public static XLColor RosyBrown { get { return FromColor(Color.RosyBrown); } }
+        public static XLColor RoyalBlue { get { return FromColor(Color.RoyalBlue); } }
+        public static XLColor SaddleBrown { get { return FromColor(Color.SaddleBrown); } }
+        public static XLColor Salmon { get { return FromColor(Color.Salmon); } }
+        public static XLColor SandyBrown { get { return FromColor(Color.SandyBrown); } }
+        public static XLColor SeaGreen { get { return FromColor(Color.SeaGreen); } }
+        public static XLColor SeaShell { get { return FromColor(Color.SeaShell); } }
+        public static XLColor Sienna { get { return FromColor(Color.Sienna); } }
+        public static XLColor Silver { get { return FromColor(Color.Silver); } }
+        public static XLColor SkyBlue { get { return FromColor(Color.SkyBlue); } }
+        public static XLColor SlateBlue { get { return FromColor(Color.SlateBlue); } }
+        public static XLColor SlateGray { get { return FromColor(Color.SlateGray); } }
+        public static XLColor Snow { get { return FromColor(Color.Snow); } }
+        public static XLColor SpringGreen { get { return FromColor(Color.SpringGreen); } }
+        public static XLColor SteelBlue { get { return FromColor(Color.SteelBlue); } }
+        public static XLColor Tan { get { return FromColor(Color.Tan); } }
+        public static XLColor Teal { get { return FromColor(Color.Teal); } }
+        public static XLColor Thistle { get { return FromColor(Color.Thistle); } }
+        public static XLColor Tomato { get { return FromColor(Color.Tomato); } }
+        public static XLColor Turquoise { get { return FromColor(Color.Turquoise); } }
+        public static XLColor Violet { get { return FromColor(Color.Violet); } }
+        public static XLColor Wheat { get { return FromColor(Color.Wheat); } }
+        public static XLColor White { get { return FromColor(Color.White); } }
+        public static XLColor WhiteSmoke { get { return FromColor(Color.WhiteSmoke); } }
+        public static XLColor Yellow { get { return FromColor(Color.Yellow); } }
+        public static XLColor YellowGreen { get { return FromColor(Color.YellowGreen); } }
+        public static XLColor AirForceBlue { get { return FromHtml("#FF5D8AA8"); } }
+        public static XLColor Alizarin { get { return FromHtml("#FFE32636"); } }
+        public static XLColor Almond { get { return FromHtml("#FFEFDECD"); } }
+        public static XLColor Amaranth { get { return FromHtml("#FFE52B50"); } }
+        public static XLColor Amber { get { return FromHtml("#FFFFBF00"); } }
+        public static XLColor AmberSaeEce { get { return FromHtml("#FFFF7E00"); } }
+        public static XLColor AmericanRose { get { return FromHtml("#FFFF033E"); } }
+        public static XLColor Amethyst { get { return FromHtml("#FF9966CC"); } }
+        public static XLColor AntiFlashWhite { get { return FromHtml("#FFF2F3F4"); } }
+        public static XLColor AntiqueBrass { get { return FromHtml("#FFCD9575"); } }
+        public static XLColor AntiqueFuchsia { get { return FromHtml("#FF915C83"); } }
+        public static XLColor AppleGreen { get { return FromHtml("#FF8DB600"); } }
+        public static XLColor Apricot { get { return FromHtml("#FFFBCEB1"); } }
+        public static XLColor Aquamarine1 { get { return FromHtml("#FF7FFFD0"); } }
+        public static XLColor ArmyGreen { get { return FromHtml("#FF4B5320"); } }
+        public static XLColor Arsenic { get { return FromHtml("#FF3B444B"); } }
+        public static XLColor ArylideYellow { get { return FromHtml("#FFE9D66B"); } }
+        public static XLColor AshGrey { get { return FromHtml("#FFB2BEB5"); } }
+        public static XLColor Asparagus { get { return FromHtml("#FF87A96B"); } }
+        public static XLColor AtomicTangerine { get { return FromHtml("#FFFF9966"); } }
+        public static XLColor Auburn { get { return FromHtml("#FF6D351A"); } }
+        public static XLColor Aureolin { get { return FromHtml("#FFFDEE00"); } }
+        public static XLColor Aurometalsaurus { get { return FromHtml("#FF6E7F80"); } }
+        public static XLColor Awesome { get { return FromHtml("#FFFF2052"); } }
+        public static XLColor AzureColorWheel { get { return FromHtml("#FF007FFF"); } }
+        public static XLColor BabyBlue { get { return FromHtml("#FF89CFF0"); } }
+        public static XLColor BabyBlueEyes { get { return FromHtml("#FFA1CAF1"); } }
+        public static XLColor BabyPink { get { return FromHtml("#FFF4C2C2"); } }
+        public static XLColor BallBlue { get { return FromHtml("#FF21ABCD"); } }
+        public static XLColor BananaMania { get { return FromHtml("#FFFAE7B5"); } }
+        public static XLColor BattleshipGrey { get { return FromHtml("#FF848482"); } }
+        public static XLColor Bazaar { get { return FromHtml("#FF98777B"); } }
+        public static XLColor BeauBlue { get { return FromHtml("#FFBCD4E6"); } }
+        public static XLColor Beaver { get { return FromHtml("#FF9F8170"); } }
+        public static XLColor Bistre { get { return FromHtml("#FF3D2B1F"); } }
+        public static XLColor Bittersweet { get { return FromHtml("#FFFE6F5E"); } }
+        public static XLColor BleuDeFrance { get { return FromHtml("#FF318CE7"); } }
+        public static XLColor BlizzardBlue { get { return FromHtml("#FFACE5EE"); } }
+        public static XLColor Blond { get { return FromHtml("#FFFAF0BE"); } }
+        public static XLColor BlueBell { get { return FromHtml("#FFA2A2D0"); } }
+        public static XLColor BlueGray { get { return FromHtml("#FF6699CC"); } }
+        public static XLColor BlueGreen { get { return FromHtml("#FF00DDDD"); } }
+        public static XLColor BluePigment { get { return FromHtml("#FF333399"); } }
+        public static XLColor BlueRyb { get { return FromHtml("#FF0247FE"); } }
+        public static XLColor Blush { get { return FromHtml("#FFDE5D83"); } }
+        public static XLColor Bole { get { return FromHtml("#FF79443B"); } }
+        public static XLColor BondiBlue { get { return FromHtml("#FF0095B6"); } }
+        public static XLColor BostonUniversityRed { get { return FromHtml("#FFCC0000"); } }
+        public static XLColor BrandeisBlue { get { return FromHtml("#FF0070FF"); } }
+        public static XLColor Brass { get { return FromHtml("#FFB5A642"); } }
+        public static XLColor BrickRed { get { return FromHtml("#FFCB4154"); } }
+        public static XLColor BrightCerulean { get { return FromHtml("#FF1DACD6"); } }
+        public static XLColor BrightGreen { get { return FromHtml("#FF66FF00"); } }
+        public static XLColor BrightLavender { get { return FromHtml("#FFBF94E4"); } }
+        public static XLColor BrightMaroon { get { return FromHtml("#FFC32148"); } }
+        public static XLColor BrightPink { get { return FromHtml("#FFFF007F"); } }
+        public static XLColor BrightTurquoise { get { return FromHtml("#FF08E8DE"); } }
+        public static XLColor BrightUbe { get { return FromHtml("#FFD19FE8"); } }
+        public static XLColor BrilliantLavender { get { return FromHtml("#FFF4BBFF"); } }
+        public static XLColor BrilliantRose { get { return FromHtml("#FFFF55A3"); } }
+        public static XLColor BrinkPink { get { return FromHtml("#FFFB607F"); } }
+        public static XLColor BritishRacingGreen { get { return FromHtml("#FF004225"); } }
+        public static XLColor Bronze { get { return FromHtml("#FFCD7F32"); } }
+        public static XLColor BrownTraditional { get { return FromHtml("#FF964B00"); } }
+        public static XLColor BubbleGum { get { return FromHtml("#FFFFC1CC"); } }
+        public static XLColor Bubbles { get { return FromHtml("#FFE7FEFF"); } }
+        public static XLColor Buff { get { return FromHtml("#FFF0DC82"); } }
+        public static XLColor BulgarianRose { get { return FromHtml("#FF480607"); } }
+        public static XLColor Burgundy { get { return FromHtml("#FF800020"); } }
+        public static XLColor BurntOrange { get { return FromHtml("#FFCC5500"); } }
+        public static XLColor BurntSienna { get { return FromHtml("#FFE97451"); } }
+        public static XLColor BurntUmber { get { return FromHtml("#FF8A3324"); } }
+        public static XLColor Byzantine { get { return FromHtml("#FFBD33A4"); } }
+        public static XLColor Byzantium { get { return FromHtml("#FF702963"); } }
+        public static XLColor Cadet { get { return FromHtml("#FF536872"); } }
+        public static XLColor CadetGrey { get { return FromHtml("#FF91A3B0"); } }
+        public static XLColor CadmiumGreen { get { return FromHtml("#FF006B3C"); } }
+        public static XLColor CadmiumOrange { get { return FromHtml("#FFED872D"); } }
+        public static XLColor CadmiumRed { get { return FromHtml("#FFE30022"); } }
+        public static XLColor CadmiumYellow { get { return FromHtml("#FFFFF600"); } }
+        public static XLColor CalPolyPomonaGreen { get { return FromHtml("#FF1E4D2B"); } }
+        public static XLColor CambridgeBlue { get { return FromHtml("#FFA3C1AD"); } }
+        public static XLColor Camel { get { return FromHtml("#FFC19A6B"); } }
+        public static XLColor CamouflageGreen { get { return FromHtml("#FF78866B"); } }
+        public static XLColor CanaryYellow { get { return FromHtml("#FFFFEF00"); } }
+        public static XLColor CandyAppleRed { get { return FromHtml("#FFFF0800"); } }
+        public static XLColor CandyPink { get { return FromHtml("#FFE4717A"); } }
+        public static XLColor CaputMortuum { get { return FromHtml("#FF592720"); } }
+        public static XLColor Cardinal { get { return FromHtml("#FFC41E3A"); } }
+        public static XLColor CaribbeanGreen { get { return FromHtml("#FF00CC99"); } }
+        public static XLColor Carmine { get { return FromHtml("#FF960018"); } }
+        public static XLColor CarminePink { get { return FromHtml("#FFEB4C42"); } }
+        public static XLColor CarmineRed { get { return FromHtml("#FFFF0038"); } }
+        public static XLColor CarnationPink { get { return FromHtml("#FFFFA6C9"); } }
+        public static XLColor Carnelian { get { return FromHtml("#FFB31B1B"); } }
+        public static XLColor CarolinaBlue { get { return FromHtml("#FF99BADD"); } }
+        public static XLColor CarrotOrange { get { return FromHtml("#FFED9121"); } }
+        public static XLColor Ceil { get { return FromHtml("#FF92A1CF"); } }
+        public static XLColor Celadon { get { return FromHtml("#FFACE1AF"); } }
+        public static XLColor CelestialBlue { get { return FromHtml("#FF4997D0"); } }
+        public static XLColor Cerise { get { return FromHtml("#FFDE3163"); } }
+        public static XLColor CerisePink { get { return FromHtml("#FFEC3B83"); } }
+        public static XLColor Cerulean { get { return FromHtml("#FF007BA7"); } }
+        public static XLColor CeruleanBlue { get { return FromHtml("#FF2A52BE"); } }
+        public static XLColor Chamoisee { get { return FromHtml("#FFA0785A"); } }
+        public static XLColor Champagne { get { return FromHtml("#FFF7E7CE"); } }
+        public static XLColor Charcoal { get { return FromHtml("#FF36454F"); } }
+        public static XLColor ChartreuseTraditional { get { return FromHtml("#FFDFFF00"); } }
+        public static XLColor CherryBlossomPink { get { return FromHtml("#FFFFB7C5"); } }
+        public static XLColor Chocolate1 { get { return FromHtml("#FF7B3F00"); } }
+        public static XLColor ChromeYellow { get { return FromHtml("#FFFFA700"); } }
+        public static XLColor Cinereous { get { return FromHtml("#FF98817B"); } }
+        public static XLColor Cinnabar { get { return FromHtml("#FFE34234"); } }
+        public static XLColor Citrine { get { return FromHtml("#FFE4D00A"); } }
+        public static XLColor ClassicRose { get { return FromHtml("#FFFBCCE7"); } }
+        public static XLColor Cobalt { get { return FromHtml("#FF0047AB"); } }
+        public static XLColor ColumbiaBlue { get { return FromHtml("#FF9BDDFF"); } }
+        public static XLColor CoolBlack { get { return FromHtml("#FF002E63"); } }
+        public static XLColor CoolGrey { get { return FromHtml("#FF8C92AC"); } }
+        public static XLColor Copper { get { return FromHtml("#FFB87333"); } }
+        public static XLColor CopperRose { get { return FromHtml("#FF996666"); } }
+        public static XLColor Coquelicot { get { return FromHtml("#FFFF3800"); } }
+        public static XLColor CoralPink { get { return FromHtml("#FFF88379"); } }
+        public static XLColor CoralRed { get { return FromHtml("#FFFF4040"); } }
+        public static XLColor Cordovan { get { return FromHtml("#FF893F45"); } }
+        public static XLColor Corn { get { return FromHtml("#FFFBEC5D"); } }
+        public static XLColor CornellRed { get { return FromHtml("#FFB31B1B"); } }
+        public static XLColor CosmicLatte { get { return FromHtml("#FFFFF8E7"); } }
+        public static XLColor CottonCandy { get { return FromHtml("#FFFFBCD9"); } }
+        public static XLColor Cream { get { return FromHtml("#FFFFFDD0"); } }
+        public static XLColor CrimsonGlory { get { return FromHtml("#FFBE0032"); } }
+        public static XLColor CyanProcess { get { return FromHtml("#FF00B7EB"); } }
+        public static XLColor Daffodil { get { return FromHtml("#FFFFFF31"); } }
+        public static XLColor Dandelion { get { return FromHtml("#FFF0E130"); } }
+        public static XLColor DarkBrown { get { return FromHtml("#FF654321"); } }
+        public static XLColor DarkByzantium { get { return FromHtml("#FF5D3954"); } }
+        public static XLColor DarkCandyAppleRed { get { return FromHtml("#FFA40000"); } }
+        public static XLColor DarkCerulean { get { return FromHtml("#FF08457E"); } }
+        public static XLColor DarkChampagne { get { return FromHtml("#FFC2B280"); } }
+        public static XLColor DarkChestnut { get { return FromHtml("#FF986960"); } }
+        public static XLColor DarkCoral { get { return FromHtml("#FFCD5B45"); } }
+        public static XLColor DarkElectricBlue { get { return FromHtml("#FF536878"); } }
+        public static XLColor DarkGreen1 { get { return FromHtml("#FF013220"); } }
+        public static XLColor DarkJungleGreen { get { return FromHtml("#FF1A2421"); } }
+        public static XLColor DarkLava { get { return FromHtml("#FF483C32"); } }
+        public static XLColor DarkLavender { get { return FromHtml("#FF734F96"); } }
+        public static XLColor DarkMidnightBlue { get { return FromHtml("#FF003366"); } }
+        public static XLColor DarkPastelBlue { get { return FromHtml("#FF779ECB"); } }
+        public static XLColor DarkPastelGreen { get { return FromHtml("#FF03C03C"); } }
+        public static XLColor DarkPastelPurple { get { return FromHtml("#FF966FD6"); } }
+        public static XLColor DarkPastelRed { get { return FromHtml("#FFC23B22"); } }
+        public static XLColor DarkPink { get { return FromHtml("#FFE75480"); } }
+        public static XLColor DarkPowderBlue { get { return FromHtml("#FF003399"); } }
+        public static XLColor DarkRaspberry { get { return FromHtml("#FF872657"); } }
+        public static XLColor DarkScarlet { get { return FromHtml("#FF560319"); } }
+        public static XLColor DarkSienna { get { return FromHtml("#FF3C1414"); } }
+        public static XLColor DarkSpringGreen { get { return FromHtml("#FF177245"); } }
+        public static XLColor DarkTan { get { return FromHtml("#FF918151"); } }
+        public static XLColor DarkTangerine { get { return FromHtml("#FFFFA812"); } }
+        public static XLColor DarkTaupe { get { return FromHtml("#FF483C32"); } }
+        public static XLColor DarkTerraCotta { get { return FromHtml("#FFCC4E5C"); } }
+        public static XLColor DartmouthGreen { get { return FromHtml("#FF00693E"); } }
+        public static XLColor DavysGrey { get { return FromHtml("#FF555555"); } }
+        public static XLColor DebianRed { get { return FromHtml("#FFD70A53"); } }
+        public static XLColor DeepCarmine { get { return FromHtml("#FFA9203E"); } }
+        public static XLColor DeepCarminePink { get { return FromHtml("#FFEF3038"); } }
+        public static XLColor DeepCarrotOrange { get { return FromHtml("#FFE9692C"); } }
+        public static XLColor DeepCerise { get { return FromHtml("#FFDA3287"); } }
+        public static XLColor DeepChampagne { get { return FromHtml("#FFFAD6A5"); } }
+        public static XLColor DeepChestnut { get { return FromHtml("#FFB94E48"); } }
+        public static XLColor DeepFuchsia { get { return FromHtml("#FFC154C1"); } }
+        public static XLColor DeepJungleGreen { get { return FromHtml("#FF004B49"); } }
+        public static XLColor DeepLilac { get { return FromHtml("#FF9955BB"); } }
+        public static XLColor DeepMagenta { get { return FromHtml("#FFCC00CC"); } }
+        public static XLColor DeepPeach { get { return FromHtml("#FFFFCBA4"); } }
+        public static XLColor DeepSaffron { get { return FromHtml("#FFFF9933"); } }
+        public static XLColor Denim { get { return FromHtml("#FF1560BD"); } }
+        public static XLColor Desert { get { return FromHtml("#FFC19A6B"); } }
+        public static XLColor DesertSand { get { return FromHtml("#FFEDC9AF"); } }
+        public static XLColor DogwoodRose { get { return FromHtml("#FFD71868"); } }
+        public static XLColor DollarBill { get { return FromHtml("#FF85BB65"); } }
+        public static XLColor Drab { get { return FromHtml("#FF967117"); } }
+        public static XLColor DukeBlue { get { return FromHtml("#FF00009C"); } }
+        public static XLColor EarthYellow { get { return FromHtml("#FFE1A95F"); } }
+        public static XLColor Ecru { get { return FromHtml("#FFC2B280"); } }
+        public static XLColor Eggplant { get { return FromHtml("#FF614051"); } }
+        public static XLColor Eggshell { get { return FromHtml("#FFF0EAD6"); } }
+        public static XLColor EgyptianBlue { get { return FromHtml("#FF1034A6"); } }
+        public static XLColor ElectricBlue { get { return FromHtml("#FF7DF9FF"); } }
+        public static XLColor ElectricCrimson { get { return FromHtml("#FFFF003F"); } }
+        public static XLColor ElectricIndigo { get { return FromHtml("#FF6F00FF"); } }
+        public static XLColor ElectricLavender { get { return FromHtml("#FFF4BBFF"); } }
+        public static XLColor ElectricLime { get { return FromHtml("#FFCCFF00"); } }
+        public static XLColor ElectricPurple { get { return FromHtml("#FFBF00FF"); } }
+        public static XLColor ElectricUltramarine { get { return FromHtml("#FF3F00FF"); } }
+        public static XLColor ElectricViolet { get { return FromHtml("#FF8F00FF"); } }
+        public static XLColor Emerald { get { return FromHtml("#FF50C878"); } }
+        public static XLColor EtonBlue { get { return FromHtml("#FF96C8A2"); } }
+        public static XLColor Fallow { get { return FromHtml("#FFC19A6B"); } }
+        public static XLColor FaluRed { get { return FromHtml("#FF801818"); } }
+        public static XLColor Fandango { get { return FromHtml("#FFB53389"); } }
+        public static XLColor FashionFuchsia { get { return FromHtml("#FFF400A1"); } }
+        public static XLColor Fawn { get { return FromHtml("#FFE5AA70"); } }
+        public static XLColor Feldgrau { get { return FromHtml("#FF4D5D53"); } }
+        public static XLColor FernGreen { get { return FromHtml("#FF4F7942"); } }
+        public static XLColor FerrariRed { get { return FromHtml("#FFFF2800"); } }
+        public static XLColor FieldDrab { get { return FromHtml("#FF6C541E"); } }
+        public static XLColor FireEngineRed { get { return FromHtml("#FFCE2029"); } }
+        public static XLColor Flame { get { return FromHtml("#FFE25822"); } }
+        public static XLColor FlamingoPink { get { return FromHtml("#FFFC8EAC"); } }
+        public static XLColor Flavescent { get { return FromHtml("#FFF7E98E"); } }
+        public static XLColor Flax { get { return FromHtml("#FFEEDC82"); } }
+        public static XLColor FluorescentOrange { get { return FromHtml("#FFFFBF00"); } }
+        public static XLColor FluorescentYellow { get { return FromHtml("#FFCCFF00"); } }
+        public static XLColor Folly { get { return FromHtml("#FFFF004F"); } }
+        public static XLColor ForestGreenTraditional { get { return FromHtml("#FF014421"); } }
+        public static XLColor FrenchBeige { get { return FromHtml("#FFA67B5B"); } }
+        public static XLColor FrenchBlue { get { return FromHtml("#FF0072BB"); } }
+        public static XLColor FrenchLilac { get { return FromHtml("#FF86608E"); } }
+        public static XLColor FrenchRose { get { return FromHtml("#FFF64A8A"); } }
+        public static XLColor FuchsiaPink { get { return FromHtml("#FFFF77FF"); } }
+        public static XLColor Fulvous { get { return FromHtml("#FFE48400"); } }
+        public static XLColor FuzzyWuzzy { get { return FromHtml("#FFCC6666"); } }
+        public static XLColor Gamboge { get { return FromHtml("#FFE49B0F"); } }
+        public static XLColor Ginger { get { return FromHtml("#FFF9F9FF"); } }
+        public static XLColor Glaucous { get { return FromHtml("#FF6082B6"); } }
+        public static XLColor GoldenBrown { get { return FromHtml("#FF996515"); } }
+        public static XLColor GoldenPoppy { get { return FromHtml("#FFFCC200"); } }
+        public static XLColor GoldenYellow { get { return FromHtml("#FFFFDF00"); } }
+        public static XLColor GoldMetallic { get { return FromHtml("#FFD4AF37"); } }
+        public static XLColor GrannySmithApple { get { return FromHtml("#FFA8E4A0"); } }
+        public static XLColor GrayAsparagus { get { return FromHtml("#FF465945"); } }
+        public static XLColor GreenPigment { get { return FromHtml("#FF00A550"); } }
+        public static XLColor GreenRyb { get { return FromHtml("#FF66B032"); } }
+        public static XLColor Grullo { get { return FromHtml("#FFA99A86"); } }
+        public static XLColor HalayaUbe { get { return FromHtml("#FF663854"); } }
+        public static XLColor HanBlue { get { return FromHtml("#FF446CCF"); } }
+        public static XLColor HanPurple { get { return FromHtml("#FF5218FA"); } }
+        public static XLColor HansaYellow { get { return FromHtml("#FFE9D66B"); } }
+        public static XLColor Harlequin { get { return FromHtml("#FF3FFF00"); } }
+        public static XLColor HarvardCrimson { get { return FromHtml("#FFC90016"); } }
+        public static XLColor HarvestGold { get { return FromHtml("#FFDA9100"); } }
+        public static XLColor Heliotrope { get { return FromHtml("#FFDF73FF"); } }
+        public static XLColor HollywoodCerise { get { return FromHtml("#FFF400A1"); } }
+        public static XLColor HookersGreen { get { return FromHtml("#FF007000"); } }
+        public static XLColor HotMagenta { get { return FromHtml("#FFFF1DCE"); } }
+        public static XLColor HunterGreen { get { return FromHtml("#FF355E3B"); } }
+        public static XLColor Iceberg { get { return FromHtml("#FF71A6D2"); } }
+        public static XLColor Icterine { get { return FromHtml("#FFFCF75E"); } }
+        public static XLColor Inchworm { get { return FromHtml("#FFB2EC5D"); } }
+        public static XLColor IndiaGreen { get { return FromHtml("#FF138808"); } }
+        public static XLColor IndianYellow { get { return FromHtml("#FFE3A857"); } }
+        public static XLColor IndigoDye { get { return FromHtml("#FF00416A"); } }
+        public static XLColor InternationalKleinBlue { get { return FromHtml("#FF002FA7"); } }
+        public static XLColor InternationalOrange { get { return FromHtml("#FFFF4F00"); } }
+        public static XLColor Iris { get { return FromHtml("#FF5A4FCF"); } }
+        public static XLColor Isabelline { get { return FromHtml("#FFF4F0EC"); } }
+        public static XLColor IslamicGreen { get { return FromHtml("#FF009000"); } }
+        public static XLColor Jade { get { return FromHtml("#FF00A86B"); } }
+        public static XLColor Jasper { get { return FromHtml("#FFD73B3E"); } }
+        public static XLColor JazzberryJam { get { return FromHtml("#FFA50B5E"); } }
+        public static XLColor Jonquil { get { return FromHtml("#FFFADA5E"); } }
+        public static XLColor JuneBud { get { return FromHtml("#FFBDDA57"); } }
+        public static XLColor JungleGreen { get { return FromHtml("#FF29AB87"); } }
+        public static XLColor KellyGreen { get { return FromHtml("#FF4CBB17"); } }
+        public static XLColor KhakiHtmlCssKhaki { get { return FromHtml("#FFC3B091"); } }
+        public static XLColor LanguidLavender { get { return FromHtml("#FFD6CADD"); } }
+        public static XLColor LapisLazuli { get { return FromHtml("#FF26619C"); } }
+        public static XLColor LaSalleGreen { get { return FromHtml("#FF087830"); } }
+        public static XLColor LaserLemon { get { return FromHtml("#FFFEFE22"); } }
+        public static XLColor Lava { get { return FromHtml("#FFCF1020"); } }
+        public static XLColor LavenderBlue { get { return FromHtml("#FFCCCCFF"); } }
+        public static XLColor LavenderFloral { get { return FromHtml("#FFB57EDC"); } }
+        public static XLColor LavenderGray { get { return FromHtml("#FFC4C3D0"); } }
+        public static XLColor LavenderIndigo { get { return FromHtml("#FF9457EB"); } }
+        public static XLColor LavenderPink { get { return FromHtml("#FFFBAED2"); } }
+        public static XLColor LavenderPurple { get { return FromHtml("#FF967BB6"); } }
+        public static XLColor LavenderRose { get { return FromHtml("#FFFBA0E3"); } }
+        public static XLColor Lemon { get { return FromHtml("#FFFFF700"); } }
+        public static XLColor LightApricot { get { return FromHtml("#FFFDD5B1"); } }
+        public static XLColor LightBrown { get { return FromHtml("#FFB5651D"); } }
+        public static XLColor LightCarminePink { get { return FromHtml("#FFE66771"); } }
+        public static XLColor LightCornflowerBlue { get { return FromHtml("#FF93CCEA"); } }
+        public static XLColor LightFuchsiaPink { get { return FromHtml("#FFF984EF"); } }
+        public static XLColor LightMauve { get { return FromHtml("#FFDCD0FF"); } }
+        public static XLColor LightPastelPurple { get { return FromHtml("#FFB19CD9"); } }
+        public static XLColor LightSalmonPink { get { return FromHtml("#FFFF9999"); } }
+        public static XLColor LightTaupe { get { return FromHtml("#FFB38B6D"); } }
+        public static XLColor LightThulianPink { get { return FromHtml("#FFE68FAC"); } }
+        public static XLColor LightYellow1 { get { return FromHtml("#FFFFFFED"); } }
+        public static XLColor Lilac { get { return FromHtml("#FFC8A2C8"); } }
+        public static XLColor LimeColorWheel { get { return FromHtml("#FFBFFF00"); } }
+        public static XLColor LincolnGreen { get { return FromHtml("#FF195905"); } }
+        public static XLColor Liver { get { return FromHtml("#FF534B4F"); } }
+        public static XLColor Lust { get { return FromHtml("#FFE62020"); } }
+        public static XLColor MacaroniAndCheese { get { return FromHtml("#FFFFBD88"); } }
+        public static XLColor MagentaDye { get { return FromHtml("#FFCA1F7B"); } }
+        public static XLColor MagentaProcess { get { return FromHtml("#FFFF0090"); } }
+        public static XLColor MagicMint { get { return FromHtml("#FFAAF0D1"); } }
+        public static XLColor Magnolia { get { return FromHtml("#FFF8F4FF"); } }
+        public static XLColor Mahogany { get { return FromHtml("#FFC04000"); } }
+        public static XLColor Maize { get { return FromHtml("#FFFBEC5D"); } }
+        public static XLColor MajorelleBlue { get { return FromHtml("#FF6050DC"); } }
+        public static XLColor Malachite { get { return FromHtml("#FF0BDA51"); } }
+        public static XLColor Manatee { get { return FromHtml("#FF979AAA"); } }
+        public static XLColor MangoTango { get { return FromHtml("#FFFF8243"); } }
+        public static XLColor MaroonX11 { get { return FromHtml("#FFB03060"); } }
+        public static XLColor Mauve { get { return FromHtml("#FFE0B0FF"); } }
+        public static XLColor Mauvelous { get { return FromHtml("#FFEF98AA"); } }
+        public static XLColor MauveTaupe { get { return FromHtml("#FF915F6D"); } }
+        public static XLColor MayaBlue { get { return FromHtml("#FF73C2FB"); } }
+        public static XLColor MeatBrown { get { return FromHtml("#FFE5B73B"); } }
+        public static XLColor MediumAquamarine1 { get { return FromHtml("#FF66DDAA"); } }
+        public static XLColor MediumCandyAppleRed { get { return FromHtml("#FFE2062C"); } }
+        public static XLColor MediumCarmine { get { return FromHtml("#FFAF4035"); } }
+        public static XLColor MediumChampagne { get { return FromHtml("#FFF3E5AB"); } }
+        public static XLColor MediumElectricBlue { get { return FromHtml("#FF035096"); } }
+        public static XLColor MediumJungleGreen { get { return FromHtml("#FF1C352D"); } }
+        public static XLColor MediumPersianBlue { get { return FromHtml("#FF0067A5"); } }
+        public static XLColor MediumRedViolet { get { return FromHtml("#FFBB3385"); } }
+        public static XLColor MediumSpringBud { get { return FromHtml("#FFC9DC87"); } }
+        public static XLColor MediumTaupe { get { return FromHtml("#FF674C47"); } }
+        public static XLColor Melon { get { return FromHtml("#FFFDBCB4"); } }
+        public static XLColor MidnightGreenEagleGreen { get { return FromHtml("#FF004953"); } }
+        public static XLColor MikadoYellow { get { return FromHtml("#FFFFC40C"); } }
+        public static XLColor Mint { get { return FromHtml("#FF3EB489"); } }
+        public static XLColor MintGreen { get { return FromHtml("#FF98FF98"); } }
+        public static XLColor ModeBeige { get { return FromHtml("#FF967117"); } }
+        public static XLColor MoonstoneBlue { get { return FromHtml("#FF73A9C2"); } }
+        public static XLColor MordantRed19 { get { return FromHtml("#FFAE0C00"); } }
+        public static XLColor MossGreen { get { return FromHtml("#FFADDFAD"); } }
+        public static XLColor MountainMeadow { get { return FromHtml("#FF30BA8F"); } }
+        public static XLColor MountbattenPink { get { return FromHtml("#FF997A8D"); } }
+        public static XLColor MsuGreen { get { return FromHtml("#FF18453B"); } }
+        public static XLColor Mulberry { get { return FromHtml("#FFC54B8C"); } }
+        public static XLColor Mustard { get { return FromHtml("#FFFFDB58"); } }
+        public static XLColor Myrtle { get { return FromHtml("#FF21421E"); } }
+        public static XLColor NadeshikoPink { get { return FromHtml("#FFF6ADC6"); } }
+        public static XLColor NapierGreen { get { return FromHtml("#FF2A8000"); } }
+        public static XLColor NaplesYellow { get { return FromHtml("#FFFADA5E"); } }
+        public static XLColor NeonCarrot { get { return FromHtml("#FFFFA343"); } }
+        public static XLColor NeonFuchsia { get { return FromHtml("#FFFE59C2"); } }
+        public static XLColor NeonGreen { get { return FromHtml("#FF39FF14"); } }
+        public static XLColor NonPhotoBlue { get { return FromHtml("#FFA4DDED"); } }
+        public static XLColor OceanBoatBlue { get { return FromHtml("#FFCC7422"); } }
+        public static XLColor Ochre { get { return FromHtml("#FFCC7722"); } }
+        public static XLColor OldGold { get { return FromHtml("#FFCFB53B"); } }
+        public static XLColor OldLavender { get { return FromHtml("#FF796878"); } }
+        public static XLColor OldMauve { get { return FromHtml("#FF673147"); } }
+        public static XLColor OldRose { get { return FromHtml("#FFC08081"); } }
+        public static XLColor OliveDrab7 { get { return FromHtml("#FF3C341F"); } }
+        public static XLColor Olivine { get { return FromHtml("#FF9AB973"); } }
+        public static XLColor Onyx { get { return FromHtml("#FF0F0F0F"); } }
+        public static XLColor OperaMauve { get { return FromHtml("#FFB784A7"); } }
+        public static XLColor OrangeColorWheel { get { return FromHtml("#FFFF7F00"); } }
+        public static XLColor OrangePeel { get { return FromHtml("#FFFF9F00"); } }
+        public static XLColor OrangeRyb { get { return FromHtml("#FFFB9902"); } }
+        public static XLColor OtterBrown { get { return FromHtml("#FF654321"); } }
+        public static XLColor OuCrimsonRed { get { return FromHtml("#FF990000"); } }
+        public static XLColor OuterSpace { get { return FromHtml("#FF414A4C"); } }
+        public static XLColor OutrageousOrange { get { return FromHtml("#FFFF6E4A"); } }
+        public static XLColor OxfordBlue { get { return FromHtml("#FF002147"); } }
+        public static XLColor PakistanGreen { get { return FromHtml("#FF00421B"); } }
+        public static XLColor PalatinateBlue { get { return FromHtml("#FF273BE2"); } }
+        public static XLColor PalatinatePurple { get { return FromHtml("#FF682860"); } }
+        public static XLColor PaleAqua { get { return FromHtml("#FFBCD4E6"); } }
+        public static XLColor PaleBrown { get { return FromHtml("#FF987654"); } }
+        public static XLColor PaleCarmine { get { return FromHtml("#FFAF4035"); } }
+        public static XLColor PaleCerulean { get { return FromHtml("#FF9BC4E2"); } }
+        public static XLColor PaleChestnut { get { return FromHtml("#FFDDADAF"); } }
+        public static XLColor PaleCopper { get { return FromHtml("#FFDA8A67"); } }
+        public static XLColor PaleCornflowerBlue { get { return FromHtml("#FFABCDEF"); } }
+        public static XLColor PaleGold { get { return FromHtml("#FFE6BE8A"); } }
+        public static XLColor PaleMagenta { get { return FromHtml("#FFF984E5"); } }
+        public static XLColor PalePink { get { return FromHtml("#FFFADADD"); } }
+        public static XLColor PaleRobinEggBlue { get { return FromHtml("#FF96DED1"); } }
+        public static XLColor PaleSilver { get { return FromHtml("#FFC9C0BB"); } }
+        public static XLColor PaleSpringBud { get { return FromHtml("#FFECEBBD"); } }
+        public static XLColor PaleTaupe { get { return FromHtml("#FFBC987E"); } }
+        public static XLColor PansyPurple { get { return FromHtml("#FF78184A"); } }
+        public static XLColor ParisGreen { get { return FromHtml("#FF50C878"); } }
+        public static XLColor PastelBlue { get { return FromHtml("#FFAEC6CF"); } }
+        public static XLColor PastelBrown { get { return FromHtml("#FF836953"); } }
+        public static XLColor PastelGray { get { return FromHtml("#FFCFCFC4"); } }
+        public static XLColor PastelGreen { get { return FromHtml("#FF77DD77"); } }
+        public static XLColor PastelMagenta { get { return FromHtml("#FFF49AC2"); } }
+        public static XLColor PastelOrange { get { return FromHtml("#FFFFB347"); } }
+        public static XLColor PastelPink { get { return FromHtml("#FFFFD1DC"); } }
+        public static XLColor PastelPurple { get { return FromHtml("#FFB39EB5"); } }
+        public static XLColor PastelRed { get { return FromHtml("#FFFF6961"); } }
+        public static XLColor PastelViolet { get { return FromHtml("#FFCB99C9"); } }
+        public static XLColor PastelYellow { get { return FromHtml("#FFFDFD96"); } }
+        public static XLColor PaynesGrey { get { return FromHtml("#FF40404F"); } }
+        public static XLColor Peach { get { return FromHtml("#FFFFE5B4"); } }
+        public static XLColor PeachOrange { get { return FromHtml("#FFFFCC99"); } }
+        public static XLColor PeachYellow { get { return FromHtml("#FFFADFAD"); } }
+        public static XLColor Pear { get { return FromHtml("#FFD1E231"); } }
+        public static XLColor Pearl { get { return FromHtml("#FFF0EAD6"); } }
+        public static XLColor Peridot { get { return FromHtml("#FFE6E200"); } }
+        public static XLColor Periwinkle { get { return FromHtml("#FFCCCCFF"); } }
+        public static XLColor PersianBlue { get { return FromHtml("#FF1C39BB"); } }
+        public static XLColor PersianGreen { get { return FromHtml("#FF00A693"); } }
+        public static XLColor PersianIndigo { get { return FromHtml("#FF32127A"); } }
+        public static XLColor PersianOrange { get { return FromHtml("#FFD99058"); } }
+        public static XLColor PersianPink { get { return FromHtml("#FFF77FBE"); } }
+        public static XLColor PersianPlum { get { return FromHtml("#FF701C1C"); } }
+        public static XLColor PersianRed { get { return FromHtml("#FFCC3333"); } }
+        public static XLColor PersianRose { get { return FromHtml("#FFFE28A2"); } }
+        public static XLColor Persimmon { get { return FromHtml("#FFEC5800"); } }
+        public static XLColor Phlox { get { return FromHtml("#FFDF00FF"); } }
+        public static XLColor PhthaloBlue { get { return FromHtml("#FF000F89"); } }
+        public static XLColor PhthaloGreen { get { return FromHtml("#FF123524"); } }
+        public static XLColor PiggyPink { get { return FromHtml("#FFFDDDE6"); } }
+        public static XLColor PineGreen { get { return FromHtml("#FF01796F"); } }
+        public static XLColor PinkOrange { get { return FromHtml("#FFFF9966"); } }
+        public static XLColor PinkPearl { get { return FromHtml("#FFE7ACCF"); } }
+        public static XLColor PinkSherbet { get { return FromHtml("#FFF78FA7"); } }
+        public static XLColor Pistachio { get { return FromHtml("#FF93C572"); } }
+        public static XLColor Platinum { get { return FromHtml("#FFE5E4E2"); } }
+        public static XLColor PlumTraditional { get { return FromHtml("#FF8E4585"); } }
+        public static XLColor PortlandOrange { get { return FromHtml("#FFFF5A36"); } }
+        public static XLColor PrincetonOrange { get { return FromHtml("#FFFF8F00"); } }
+        public static XLColor Prune { get { return FromHtml("#FF701C1C"); } }
+        public static XLColor PrussianBlue { get { return FromHtml("#FF003153"); } }
+        public static XLColor PsychedelicPurple { get { return FromHtml("#FFDF00FF"); } }
+        public static XLColor Puce { get { return FromHtml("#FFCC8899"); } }
+        public static XLColor Pumpkin { get { return FromHtml("#FFFF7518"); } }
+        public static XLColor PurpleHeart { get { return FromHtml("#FF69359C"); } }
+        public static XLColor PurpleMountainMajesty { get { return FromHtml("#FF9678B6"); } }
+        public static XLColor PurpleMunsell { get { return FromHtml("#FF9F00C5"); } }
+        public static XLColor PurplePizzazz { get { return FromHtml("#FFFE4EDA"); } }
+        public static XLColor PurpleTaupe { get { return FromHtml("#FF50404D"); } }
+        public static XLColor PurpleX11 { get { return FromHtml("#FFA020F0"); } }
+        public static XLColor RadicalRed { get { return FromHtml("#FFFF355E"); } }
+        public static XLColor Raspberry { get { return FromHtml("#FFE30B5D"); } }
+        public static XLColor RaspberryGlace { get { return FromHtml("#FF915F6D"); } }
+        public static XLColor RaspberryPink { get { return FromHtml("#FFE25098"); } }
+        public static XLColor RaspberryRose { get { return FromHtml("#FFB3446C"); } }
+        public static XLColor RawUmber { get { return FromHtml("#FF826644"); } }
+        public static XLColor RazzleDazzleRose { get { return FromHtml("#FFFF33CC"); } }
+        public static XLColor Razzmatazz { get { return FromHtml("#FFE3256B"); } }
+        public static XLColor RedMunsell { get { return FromHtml("#FFF2003C"); } }
+        public static XLColor RedNcs { get { return FromHtml("#FFC40233"); } }
+        public static XLColor RedPigment { get { return FromHtml("#FFED1C24"); } }
+        public static XLColor RedRyb { get { return FromHtml("#FFFE2712"); } }
+        public static XLColor Redwood { get { return FromHtml("#FFAB4E52"); } }
+        public static XLColor Regalia { get { return FromHtml("#FF522D80"); } }
+        public static XLColor RichBlack { get { return FromHtml("#FF004040"); } }
+        public static XLColor RichBrilliantLavender { get { return FromHtml("#FFF1A7FE"); } }
+        public static XLColor RichCarmine { get { return FromHtml("#FFD70040"); } }
+        public static XLColor RichElectricBlue { get { return FromHtml("#FF0892D0"); } }
+        public static XLColor RichLavender { get { return FromHtml("#FFA76BCF"); } }
+        public static XLColor RichLilac { get { return FromHtml("#FFB666D2"); } }
+        public static XLColor RichMaroon { get { return FromHtml("#FFB03060"); } }
+        public static XLColor RifleGreen { get { return FromHtml("#FF414833"); } }
+        public static XLColor RobinEggBlue { get { return FromHtml("#FF00CCCC"); } }
+        public static XLColor Rose { get { return FromHtml("#FFFF007F"); } }
+        public static XLColor RoseBonbon { get { return FromHtml("#FFF9429E"); } }
+        public static XLColor RoseEbony { get { return FromHtml("#FF674846"); } }
+        public static XLColor RoseGold { get { return FromHtml("#FFB76E79"); } }
+        public static XLColor RoseMadder { get { return FromHtml("#FFE32636"); } }
+        public static XLColor RosePink { get { return FromHtml("#FFFF66CC"); } }
+        public static XLColor RoseQuartz { get { return FromHtml("#FFAA98A9"); } }
+        public static XLColor RoseTaupe { get { return FromHtml("#FF905D5D"); } }
+        public static XLColor RoseVale { get { return FromHtml("#FFAB4E52"); } }
+        public static XLColor Rosewood { get { return FromHtml("#FF65000B"); } }
+        public static XLColor RossoCorsa { get { return FromHtml("#FFD40000"); } }
+        public static XLColor RoyalAzure { get { return FromHtml("#FF0038A8"); } }
+        public static XLColor RoyalBlueTraditional { get { return FromHtml("#FF002366"); } }
+        public static XLColor RoyalFuchsia { get { return FromHtml("#FFCA2C92"); } }
+        public static XLColor RoyalPurple { get { return FromHtml("#FF7851A9"); } }
+        public static XLColor Ruby { get { return FromHtml("#FFE0115F"); } }
+        public static XLColor Ruddy { get { return FromHtml("#FFFF0028"); } }
+        public static XLColor RuddyBrown { get { return FromHtml("#FFBB6528"); } }
+        public static XLColor RuddyPink { get { return FromHtml("#FFE18E96"); } }
+        public static XLColor Rufous { get { return FromHtml("#FFA81C07"); } }
+        public static XLColor Russet { get { return FromHtml("#FF80461B"); } }
+        public static XLColor Rust { get { return FromHtml("#FFB7410E"); } }
+        public static XLColor SacramentoStateGreen { get { return FromHtml("#FF00563F"); } }
+        public static XLColor SafetyOrangeBlazeOrange { get { return FromHtml("#FFFF6700"); } }
+        public static XLColor Saffron { get { return FromHtml("#FFF4C430"); } }
+        public static XLColor Salmon1 { get { return FromHtml("#FFFF8C69"); } }
+        public static XLColor SalmonPink { get { return FromHtml("#FFFF91A4"); } }
+        public static XLColor Sand { get { return FromHtml("#FFC2B280"); } }
+        public static XLColor SandDune { get { return FromHtml("#FF967117"); } }
+        public static XLColor Sandstorm { get { return FromHtml("#FFECD540"); } }
+        public static XLColor SandyTaupe { get { return FromHtml("#FF967117"); } }
+        public static XLColor Sangria { get { return FromHtml("#FF92000A"); } }
+        public static XLColor SapGreen { get { return FromHtml("#FF507D2A"); } }
+        public static XLColor Sapphire { get { return FromHtml("#FF082567"); } }
+        public static XLColor SatinSheenGold { get { return FromHtml("#FFCBA135"); } }
+        public static XLColor Scarlet { get { return FromHtml("#FFFF2000"); } }
+        public static XLColor SchoolBusYellow { get { return FromHtml("#FFFFD800"); } }
+        public static XLColor ScreaminGreen { get { return FromHtml("#FF76FF7A"); } }
+        public static XLColor SealBrown { get { return FromHtml("#FF321414"); } }
+        public static XLColor SelectiveYellow { get { return FromHtml("#FFFFBA00"); } }
+        public static XLColor Sepia { get { return FromHtml("#FF704214"); } }
+        public static XLColor Shadow { get { return FromHtml("#FF8A795D"); } }
+        public static XLColor ShamrockGreen { get { return FromHtml("#FF009E60"); } }
+        public static XLColor ShockingPink { get { return FromHtml("#FFFC0FC0"); } }
+        public static XLColor Sienna1 { get { return FromHtml("#FF882D17"); } }
+        public static XLColor Sinopia { get { return FromHtml("#FFCB410B"); } }
+        public static XLColor Skobeloff { get { return FromHtml("#FF007474"); } }
+        public static XLColor SkyMagenta { get { return FromHtml("#FFCF71AF"); } }
+        public static XLColor SmaltDarkPowderBlue { get { return FromHtml("#FF003399"); } }
+        public static XLColor SmokeyTopaz { get { return FromHtml("#FF933D41"); } }
+        public static XLColor SmokyBlack { get { return FromHtml("#FF100C08"); } }
+        public static XLColor SpiroDiscoBall { get { return FromHtml("#FF0FC0FC"); } }
+        public static XLColor SplashedWhite { get { return FromHtml("#FFFEFDFF"); } }
+        public static XLColor SpringBud { get { return FromHtml("#FFA7FC00"); } }
+        public static XLColor StPatricksBlue { get { return FromHtml("#FF23297A"); } }
+        public static XLColor StilDeGrainYellow { get { return FromHtml("#FFFADA5E"); } }
+        public static XLColor Straw { get { return FromHtml("#FFE4D96F"); } }
+        public static XLColor Sunglow { get { return FromHtml("#FFFFCC33"); } }
+        public static XLColor Sunset { get { return FromHtml("#FFFAD6A5"); } }
+        public static XLColor Tangelo { get { return FromHtml("#FFF94D00"); } }
+        public static XLColor Tangerine { get { return FromHtml("#FFF28500"); } }
+        public static XLColor TangerineYellow { get { return FromHtml("#FFFFCC00"); } }
+        public static XLColor Taupe { get { return FromHtml("#FF483C32"); } }
+        public static XLColor TaupeGray { get { return FromHtml("#FF8B8589"); } }
+        public static XLColor TeaGreen { get { return FromHtml("#FFD0F0C0"); } }
+        public static XLColor TealBlue { get { return FromHtml("#FF367588"); } }
+        public static XLColor TealGreen { get { return FromHtml("#FF006D5B"); } }
+        public static XLColor TeaRoseOrange { get { return FromHtml("#FFF88379"); } }
+        public static XLColor TeaRoseRose { get { return FromHtml("#FFF4C2C2"); } }
+        public static XLColor TennéTawny { get { return FromHtml("#FFCD5700"); } }
+        public static XLColor TerraCotta { get { return FromHtml("#FFE2725B"); } }
+        public static XLColor ThulianPink { get { return FromHtml("#FFDE6FA1"); } }
+        public static XLColor TickleMePink { get { return FromHtml("#FFFC89AC"); } }
+        public static XLColor TiffanyBlue { get { return FromHtml("#FF0ABAB5"); } }
+        public static XLColor TigersEye { get { return FromHtml("#FFE08D3C"); } }
+        public static XLColor Timberwolf { get { return FromHtml("#FFDBD7D2"); } }
+        public static XLColor TitaniumYellow { get { return FromHtml("#FFEEE600"); } }
+        public static XLColor Toolbox { get { return FromHtml("#FF746CC0"); } }
+        public static XLColor TractorRed { get { return FromHtml("#FFFD0E35"); } }
+        public static XLColor TropicalRainForest { get { return FromHtml("#FF00755E"); } }
+        public static XLColor TuftsBlue { get { return FromHtml("#FF417DC1"); } }
+        public static XLColor Tumbleweed { get { return FromHtml("#FFDEAA88"); } }
+        public static XLColor TurkishRose { get { return FromHtml("#FFB57281"); } }
+        public static XLColor Turquoise1 { get { return FromHtml("#FF30D5C8"); } }
+        public static XLColor TurquoiseBlue { get { return FromHtml("#FF00FFEF"); } }
+        public static XLColor TurquoiseGreen { get { return FromHtml("#FFA0D6B4"); } }
+        public static XLColor TuscanRed { get { return FromHtml("#FF823535"); } }
+        public static XLColor TwilightLavender { get { return FromHtml("#FF8A496B"); } }
+        public static XLColor TyrianPurple { get { return FromHtml("#FF66023C"); } }
+        public static XLColor UaBlue { get { return FromHtml("#FF0033AA"); } }
+        public static XLColor UaRed { get { return FromHtml("#FFD9004C"); } }
+        public static XLColor Ube { get { return FromHtml("#FF8878C3"); } }
+        public static XLColor UclaBlue { get { return FromHtml("#FF536895"); } }
+        public static XLColor UclaGold { get { return FromHtml("#FFFFB300"); } }
+        public static XLColor UfoGreen { get { return FromHtml("#FF3CD070"); } }
+        public static XLColor Ultramarine { get { return FromHtml("#FF120A8F"); } }
+        public static XLColor UltramarineBlue { get { return FromHtml("#FF4166F5"); } }
+        public static XLColor UltraPink { get { return FromHtml("#FFFF6FFF"); } }
+        public static XLColor Umber { get { return FromHtml("#FF635147"); } }
+        public static XLColor UnitedNationsBlue { get { return FromHtml("#FF5B92E5"); } }
+        public static XLColor UnmellowYellow { get { return FromHtml("#FFFFFF66"); } }
+        public static XLColor UpForestGreen { get { return FromHtml("#FF014421"); } }
+        public static XLColor UpMaroon { get { return FromHtml("#FF7B1113"); } }
+        public static XLColor UpsdellRed { get { return FromHtml("#FFAE2029"); } }
+        public static XLColor Urobilin { get { return FromHtml("#FFE1AD21"); } }
+        public static XLColor UscCardinal { get { return FromHtml("#FF990000"); } }
+        public static XLColor UscGold { get { return FromHtml("#FFFFCC00"); } }
+        public static XLColor UtahCrimson { get { return FromHtml("#FFD3003F"); } }
+        public static XLColor Vanilla { get { return FromHtml("#FFF3E5AB"); } }
+        public static XLColor VegasGold { get { return FromHtml("#FFC5B358"); } }
+        public static XLColor VenetianRed { get { return FromHtml("#FFC80815"); } }
+        public static XLColor Verdigris { get { return FromHtml("#FF43B3AE"); } }
+        public static XLColor Vermilion { get { return FromHtml("#FFE34234"); } }
+        public static XLColor Veronica { get { return FromHtml("#FFA020F0"); } }
+        public static XLColor Violet1 { get { return FromHtml("#FF8F00FF"); } }
+        public static XLColor VioletColorWheel { get { return FromHtml("#FF7F00FF"); } }
+        public static XLColor VioletRyb { get { return FromHtml("#FF8601AF"); } }
+        public static XLColor Viridian { get { return FromHtml("#FF40826D"); } }
+        public static XLColor VividAuburn { get { return FromHtml("#FF922724"); } }
+        public static XLColor VividBurgundy { get { return FromHtml("#FF9F1D35"); } }
+        public static XLColor VividCerise { get { return FromHtml("#FFDA1D81"); } }
+        public static XLColor VividTangerine { get { return FromHtml("#FFFFA089"); } }
+        public static XLColor VividViolet { get { return FromHtml("#FF9F00FF"); } }
+        public static XLColor WarmBlack { get { return FromHtml("#FF004242"); } }
+        public static XLColor Wenge { get { return FromHtml("#FF645452"); } }
+        public static XLColor WildBlueYonder { get { return FromHtml("#FFA2ADD0"); } }
+        public static XLColor WildStrawberry { get { return FromHtml("#FFFF43A4"); } }
+        public static XLColor WildWatermelon { get { return FromHtml("#FFFC6C85"); } }
+        public static XLColor Wisteria { get { return FromHtml("#FFC9A0DC"); } }
+        public static XLColor Xanadu { get { return FromHtml("#FF738678"); } }
+        public static XLColor YaleBlue { get { return FromHtml("#FF0F4D92"); } }
+        public static XLColor YellowMunsell { get { return FromHtml("#FFEFCC00"); } }
+        public static XLColor YellowNcs { get { return FromHtml("#FFFFD300"); } }
+        public static XLColor YellowProcess { get { return FromHtml("#FFFFEF00"); } }
+        public static XLColor YellowRyb { get { return FromHtml("#FFFEFE33"); } }
+        public static XLColor Zaffre { get { return FromHtml("#FF0014A8"); } }
+        public static XLColor ZinnwalditeBrown { get { return FromHtml("#FF2C1608"); } }
+        public static XLColor Transparent { get { return FromColor(Color.Transparent); } }
+    }
+}
diff --git a/ClosedXML/Excel/Style/Dictionary.cs b/ClosedXML/Excel/Style/Dictionary.cs
new file mode 100644
index 0000000..b866775
--- /dev/null
+++ b/ClosedXML/Excel/Style/Dictionary.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel.Style
+{
+    class Dictionary
+    {
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLAlignment.cs b/ClosedXML/Excel/Style/IXLAlignment.cs
new file mode 100644
index 0000000..9298ada
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLAlignment.cs
@@ -0,0 +1,91 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLAlignmentReadingOrderValues
+    {
+        ContextDependent,
+        LeftToRight,
+        RightToLeft
+    }
+
+    public enum XLAlignmentHorizontalValues
+    {
+        Center,
+        CenterContinuous,
+        Distributed,
+        Fill,
+        General,
+        Justify,
+        Left,
+        Right
+    }
+
+    public enum XLAlignmentVerticalValues
+    {
+        Bottom,
+        Center,
+        Distributed,
+        Justify,
+        Top
+    }
+
+    public interface IXLAlignment: IEquatable<IXLAlignment>
+    {
+        /// <summary>
+        /// Gets or sets the cell's horizontal alignment.
+        /// </summary>
+        XLAlignmentHorizontalValues Horizontal { get; set; }
+
+        /// <summary>
+        /// Gets or sets the cell's vertical alignment.
+        /// </summary>
+        XLAlignmentVerticalValues Vertical { get; set; }
+
+        /// <summary>
+        /// Gets or sets the cell's text indentation.
+        /// </summary>
+        Int32 Indent { get; set; }
+        /// <summary>
+        /// Gets or sets whether the cell's last line is justified or not.
+        /// </summary>
+        Boolean JustifyLastLine { get; set; }
+        /// <summary>
+        /// Gets or sets the cell's reading order.
+        /// </summary>
+        XLAlignmentReadingOrderValues ReadingOrder { get; set; }
+        /// <summary>
+        /// Gets or sets the cell's relative indent.
+        /// </summary>
+        Int32 RelativeIndent { get; set; }
+        /// <summary>
+        /// Gets or sets whether the cell's font size should decrease to fit the contents.
+        /// </summary>
+        Boolean ShrinkToFit { get; set; }
+        /// <summary>
+        /// Gets or sets the cell's text rotation.
+        /// </summary>
+        Int32 TextRotation { get; set; }
+        /// <summary>
+        /// Gets or sets whether the cell's text should wrap if it doesn't fit.
+        /// </summary>
+        Boolean WrapText { get; set; }
+        /// <summary>
+        /// Gets or sets wheter the cell's text should be displayed from to to bottom
+        /// <para>(as opposed to the normal left to right).</para>
+        /// </summary>
+        Boolean TopToBottom { get; set; }
+
+        IXLStyle SetHorizontal(XLAlignmentHorizontalValues value);
+        IXLStyle SetVertical(XLAlignmentVerticalValues value);
+        IXLStyle SetIndent(Int32 value);
+        IXLStyle SetJustifyLastLine(); IXLStyle SetJustifyLastLine(Boolean value);
+        IXLStyle SetReadingOrder(XLAlignmentReadingOrderValues value);
+        IXLStyle SetRelativeIndent(Int32 value);
+        IXLStyle SetShrinkToFit(); IXLStyle SetShrinkToFit(Boolean value);
+        IXLStyle SetTextRotation(Int32 value);
+        IXLStyle SetWrapText(); IXLStyle SetWrapText(Boolean value);
+        IXLStyle SetTopToBottom(); IXLStyle SetTopToBottom(Boolean value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLBorder.cs b/ClosedXML/Excel/Style/IXLBorder.cs
new file mode 100644
index 0000000..ed98ffe
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLBorder.cs
@@ -0,0 +1,61 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLBorderStyleValues
+    {
+        DashDot,
+        DashDotDot,
+        Dashed,
+        Dotted,
+        Double,
+        Hair,
+        Medium,
+        MediumDashDot,
+        MediumDashDotDot,
+        MediumDashed,
+        None,
+        SlantDashDot,
+        Thick,
+        Thin
+    }
+    public interface IXLBorder: IEquatable<IXLBorder>
+    {
+        XLBorderStyleValues OutsideBorder { set; }
+        XLColor OutsideBorderColor { set; }
+        XLBorderStyleValues InsideBorder { set; }
+        XLColor InsideBorderColor { set; }
+
+        XLBorderStyleValues LeftBorder { get; set; }
+        XLColor LeftBorderColor { get; set; }
+        XLBorderStyleValues RightBorder { get; set; }
+        XLColor RightBorderColor { get; set; }
+        XLBorderStyleValues TopBorder { get; set; }
+        XLColor TopBorderColor { get; set; }
+        XLBorderStyleValues BottomBorder { get; set; }
+        XLColor BottomBorderColor { get; set; }
+        Boolean DiagonalUp { get; set; }
+        Boolean DiagonalDown { get; set; }
+        XLBorderStyleValues DiagonalBorder { get; set; }
+        XLColor DiagonalBorderColor { get; set; }
+
+        IXLStyle SetOutsideBorder(XLBorderStyleValues value);
+        IXLStyle SetOutsideBorderColor(XLColor value);
+        IXLStyle SetInsideBorder(XLBorderStyleValues value);
+        IXLStyle SetInsideBorderColor(XLColor value);
+
+        IXLStyle SetLeftBorder(XLBorderStyleValues value);
+        IXLStyle SetLeftBorderColor(XLColor value);
+        IXLStyle SetRightBorder(XLBorderStyleValues value);
+        IXLStyle SetRightBorderColor(XLColor value);
+        IXLStyle SetTopBorder(XLBorderStyleValues value);
+        IXLStyle SetTopBorderColor(XLColor value);
+        IXLStyle SetBottomBorder(XLBorderStyleValues value);
+        IXLStyle SetBottomBorderColor(XLColor value);
+        IXLStyle SetDiagonalUp(); IXLStyle SetDiagonalUp(Boolean value);
+        IXLStyle SetDiagonalDown(); IXLStyle SetDiagonalDown(Boolean value);
+        IXLStyle SetDiagonalBorder(XLBorderStyleValues value);
+        IXLStyle SetDiagonalBorderColor(XLColor value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLFill.cs b/ClosedXML/Excel/Style/IXLFill.cs
new file mode 100644
index 0000000..79e495c
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLFill.cs
@@ -0,0 +1,41 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLFillPatternValues
+    {
+        DarkDown,
+        DarkGray,
+        DarkGrid,
+        DarkHorizontal,
+        DarkTrellis,
+        DarkUp,
+        DarkVertical,
+        Gray0625,
+        Gray125,
+        LightDown,
+        LightGray,
+        LightGrid,
+        LightHorizontal,
+        LightTrellis,
+        LightUp,
+        LightVertical,
+        MediumGray,
+        None,
+        Solid
+    }
+
+    public interface IXLFill:IEquatable<IXLFill>
+    {
+        XLColor BackgroundColor { get; set; }
+        XLColor PatternColor { get; set; }
+        XLColor PatternBackgroundColor { get; set; }
+        XLFillPatternValues PatternType { get; set; }
+
+        IXLStyle SetBackgroundColor(XLColor value);
+        IXLStyle SetPatternColor(XLColor value);
+        IXLStyle SetPatternBackgroundColor(XLColor value);
+        IXLStyle SetPatternType(XLFillPatternValues value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLFont.cs b/ClosedXML/Excel/Style/IXLFont.cs
new file mode 100644
index 0000000..3364a58
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLFont.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLFontUnderlineValues
+    {
+        Double,
+        DoubleAccounting,
+        None,
+        Single,
+        SingleAccounting
+    }
+
+    public enum XLFontVerticalTextAlignmentValues
+    {
+        Baseline,
+        Subscript,
+        Superscript
+    }
+
+    public enum XLFontFamilyNumberingValues
+    { 
+        NotApplicable = 0,
+        Roman = 1,
+        Swiss = 2,
+        Modern = 3,
+        Script = 4,
+        Decorative = 5
+    }
+
+    public interface IXLFont : IXLFontBase, IEquatable<IXLFont>
+    {
+        IXLStyle SetBold(); IXLStyle SetBold(Boolean value);
+        IXLStyle SetItalic(); IXLStyle SetItalic(Boolean value);
+        IXLStyle SetUnderline(); IXLStyle SetUnderline(XLFontUnderlineValues value);
+        IXLStyle SetStrikethrough(); IXLStyle SetStrikethrough(Boolean value);
+        IXLStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value);
+        IXLStyle SetShadow(); IXLStyle SetShadow(Boolean value);
+        IXLStyle SetFontSize(Double value);
+        IXLStyle SetFontColor(XLColor value);
+        IXLStyle SetFontName(String value);
+        IXLStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLFontBase.cs b/ClosedXML/Excel/Style/IXLFontBase.cs
new file mode 100644
index 0000000..1e5b6cf
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLFontBase.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+   
+
+    public interface IXLFontBase
+    {
+        Boolean Bold { get; set; }
+        Boolean Italic { get; set; }
+        XLFontUnderlineValues Underline { get; set; }
+        Boolean Strikethrough { get; set; }
+        XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; }
+        Boolean Shadow { get; set; }
+        Double FontSize { get; set; }
+        XLColor FontColor { get; set; }
+        String FontName { get; set; }
+        XLFontFamilyNumberingValues FontFamilyNumbering { get; set; }
+
+
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLNumberFormat.cs b/ClosedXML/Excel/Style/IXLNumberFormat.cs
new file mode 100644
index 0000000..1490413
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLNumberFormat.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLNumberFormat: IXLNumberFormatBase, IEquatable<IXLNumberFormat>
+    {
+        IXLStyle SetNumberFormatId(Int32 value);
+        IXLStyle SetFormat(String value);
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLNumberFormatBase.cs b/ClosedXML/Excel/Style/IXLNumberFormatBase.cs
new file mode 100644
index 0000000..d162a90
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLNumberFormatBase.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLNumberFormatBase
+    {
+        Int32 NumberFormatId { get; set; }
+        String Format { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLProtection.cs b/ClosedXML/Excel/Style/IXLProtection.cs
new file mode 100644
index 0000000..fd4578d
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLProtection.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLProtection : IEquatable<IXLProtection>
+    {
+        Boolean Locked { get; set; }
+        Boolean Hidden { get; set; }
+
+        IXLStyle SetLocked(); IXLStyle SetLocked(Boolean value);
+        IXLStyle SetHidden(); IXLStyle SetHidden(Boolean value);
+
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLStyle.cs b/ClosedXML/Excel/Style/IXLStyle.cs
new file mode 100644
index 0000000..8472baf
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLStyle.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLStyle: IEquatable<IXLStyle>
+    {
+        IXLAlignment Alignment { get; set; }
+        IXLBorder Border { get; set; }
+        IXLFill Fill { get; set; }
+        IXLFont Font { get; set; }
+        IXLNumberFormat NumberFormat { get; set; }
+        IXLNumberFormat DateFormat { get; }
+        IXLProtection Protection { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Style/IXLStylized.cs b/ClosedXML/Excel/Style/IXLStylized.cs
new file mode 100644
index 0000000..45d1287
--- /dev/null
+++ b/ClosedXML/Excel/Style/IXLStylized.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    internal interface IXLStylized
+    {
+        IXLStyle Style { get; set; }
+        IEnumerable<IXLStyle> Styles { get; }
+        Boolean UpdatingStyle { get; set; }
+        IXLStyle InnerStyle { get; set; }
+        IXLRanges RangesUsed { get; }
+        Boolean StyleChanged { get; set; }
+        //Boolean IsDefault { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Style/XLAlignment.cs b/ClosedXML/Excel/Style/XLAlignment.cs
new file mode 100644
index 0000000..2efb995
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLAlignment.cs
@@ -0,0 +1,373 @@
+#region
+
+using System;
+using System.Text;
+
+#endregion
+
+namespace ClosedXML.Excel
+{
+    internal class XLAlignment : IXLAlignment
+    {
+        private readonly IXLStylized _container;
+        private XLAlignmentHorizontalValues _horizontal;
+        private Int32 _indent;
+        private Boolean _justifyLastLine;
+        private XLAlignmentReadingOrderValues _readingOrder;
+        private Int32 _relativeIndent;
+        private Boolean _shrinkToFit;
+        private Int32 _textRotation;
+        private XLAlignmentVerticalValues _vertical;
+        private Boolean _wrapText;
+
+        public XLAlignment() : this(null, XLWorkbook.DefaultStyle.Alignment)
+        {
+        }
+
+        public XLAlignment(IXLStylized container, IXLAlignment d = null)
+        {
+            _container = container;
+            if (d == null) return;
+
+            _horizontal = d.Horizontal;
+            _vertical = d.Vertical;
+            _indent = d.Indent;
+            _justifyLastLine = d.JustifyLastLine;
+            _readingOrder = d.ReadingOrder;
+            _relativeIndent = d.RelativeIndent;
+            _shrinkToFit = d.ShrinkToFit;
+            _textRotation = d.TextRotation;
+            _wrapText = d.WrapText;
+        }
+
+        #region IXLAlignment Members
+
+        public XLAlignmentHorizontalValues Horizontal
+        {
+            get { return _horizontal; }
+            set
+            {
+                SetStyleChanged();
+                Boolean updateIndent = !(
+                                            value == XLAlignmentHorizontalValues.Left
+                                            || value == XLAlignmentHorizontalValues.Right
+                                            || value == XLAlignmentHorizontalValues.Distributed
+                                        );
+
+                if (_container != null && !_container.UpdatingStyle)
+                {
+                    _container.Styles.ForEach(s =>
+                                                  {
+                                                      s.Alignment.Horizontal = value;
+                                                      if (updateIndent) s.Alignment.Indent = 0;
+                                                  });
+                }
+                else
+                {
+                    _horizontal = value;
+                    if (updateIndent)
+                        _indent = 0;
+                }
+            }
+        }
+
+        public XLAlignmentVerticalValues Vertical
+        {
+            get { return _vertical; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.Vertical = value);
+                else
+                    _vertical = value;
+            }
+        }
+
+        public Int32 Indent
+        {
+            get { return _indent; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.Indent = value);
+                else
+                {
+                    if (_indent != value)
+                    {
+                        if (_horizontal == XLAlignmentHorizontalValues.General)
+                            _horizontal = XLAlignmentHorizontalValues.Left;
+
+                        if (value > 0 && !(
+                                              _horizontal == XLAlignmentHorizontalValues.Left
+                                              || _horizontal == XLAlignmentHorizontalValues.Right
+                                              || _horizontal == XLAlignmentHorizontalValues.Distributed
+                                          ))
+                        {
+                            throw new ArgumentException(
+                                "For indents, only left, right, and distributed horizontal alignments are supported.");
+                        }
+
+                        _indent = value;
+                    }
+                }
+            }
+        }
+
+        public Boolean JustifyLastLine
+        {
+            get { return _justifyLastLine; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.JustifyLastLine = value);
+                else
+                    _justifyLastLine = value;
+            }
+        }
+
+        public XLAlignmentReadingOrderValues ReadingOrder
+        {
+            get { return _readingOrder; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.ReadingOrder = value);
+                else
+                    _readingOrder = value;
+            }
+        }
+
+        public Int32 RelativeIndent
+        {
+            get { return _relativeIndent; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.RelativeIndent = value);
+                else
+                    _relativeIndent = value;
+            }
+        }
+
+        public Boolean ShrinkToFit
+        {
+            get { return _shrinkToFit; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.ShrinkToFit = value);
+                else
+                    _shrinkToFit = value;
+            }
+        }
+
+        public Int32 TextRotation
+        {
+            get { return _textRotation; }
+            set
+            {
+                SetStyleChanged();
+                Int32 rotation = value;
+
+                if (rotation != 255 && (rotation < -90 || rotation > 180))
+                    throw new ArgumentException("TextRotation must be between -90 and 180 degrees, or 255.");
+
+                if (rotation < 0)
+                    rotation = 90 + (rotation * -1);
+
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.TextRotation = rotation);
+                else
+                    _textRotation = rotation;
+            }
+        }
+
+        public Boolean WrapText
+        {
+            get { return _wrapText; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.WrapText = value);
+                else
+                    _wrapText = value;
+            }
+        }
+
+        public Boolean TopToBottom
+        {
+            get { return _textRotation == 255; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Alignment.TextRotation = value ? 255 : 0);
+                else
+                    _textRotation = value ? 255 : 0;
+            }
+        }
+
+
+        public bool Equals(IXLAlignment other)
+        {
+            if (other == null)
+                return false;
+
+            var otherA = other as XLAlignment;
+            if (otherA == null)
+                return false;
+
+            return
+                _horizontal == otherA._horizontal
+                && _vertical == otherA._vertical
+                && _indent == otherA._indent
+                && _justifyLastLine == otherA._justifyLastLine
+                && _readingOrder == otherA._readingOrder
+                && _relativeIndent == otherA._relativeIndent
+                && _shrinkToFit == otherA._shrinkToFit
+                && _textRotation == otherA._textRotation
+                && _wrapText == otherA._wrapText
+                ;
+        }
+
+        public IXLStyle SetHorizontal(XLAlignmentHorizontalValues value)
+        {
+            Horizontal = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetVertical(XLAlignmentVerticalValues value)
+        {
+            Vertical = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetIndent(Int32 value)
+        {
+            Indent = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetJustifyLastLine()
+        {
+            JustifyLastLine = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetJustifyLastLine(Boolean value)
+        {
+            JustifyLastLine = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetReadingOrder(XLAlignmentReadingOrderValues value)
+        {
+            ReadingOrder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetRelativeIndent(Int32 value)
+        {
+            RelativeIndent = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetShrinkToFit()
+        {
+            ShrinkToFit = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetShrinkToFit(Boolean value)
+        {
+            ShrinkToFit = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetTextRotation(Int32 value)
+        {
+            TextRotation = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetWrapText()
+        {
+            WrapText = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetWrapText(Boolean value)
+        {
+            WrapText = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetTopToBottom()
+        {
+            TopToBottom = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetTopToBottom(Boolean value)
+        {
+            TopToBottom = value;
+            return _container.Style;
+        }
+
+        #endregion
+
+        private void SetStyleChanged()
+        {
+            if (_container != null) _container.StyleChanged = true;
+        }
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append(Horizontal);
+            sb.Append("-");
+            sb.Append(Vertical);
+            sb.Append("-");
+            sb.Append(Indent);
+            sb.Append("-");
+            sb.Append(JustifyLastLine);
+            sb.Append("-");
+            sb.Append(ReadingOrder);
+            sb.Append("-");
+            sb.Append(RelativeIndent);
+            sb.Append("-");
+            sb.Append(ShrinkToFit);
+            sb.Append("-");
+            sb.Append(TextRotation);
+            sb.Append("-");
+            sb.Append(WrapText);
+            sb.Append("-");
+            return sb.ToString();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLAlignment)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return (Int32)Horizontal
+                   ^ (Int32)Vertical
+                   ^ Indent
+                   ^ JustifyLastLine.GetHashCode()
+                   ^ (Int32)ReadingOrder
+                   ^ RelativeIndent
+                   ^ ShrinkToFit.GetHashCode()
+                   ^ TextRotation
+                   ^ WrapText.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/XLBorder.cs b/ClosedXML/Excel/Style/XLBorder.cs
new file mode 100644
index 0000000..387e431
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLBorder.cs
@@ -0,0 +1,628 @@
+using System;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections.Generic;
+
+    internal class XLBorder : IXLBorder
+    {
+        private readonly IXLStylized _container;
+        private XLBorderStyleValues _bottomBorder;
+        private XLColor _bottomBorderColor;
+        private XLBorderStyleValues _diagonalBorder;
+        private XLColor _diagonalBorderColor;
+        private Boolean _diagonalDown;
+        private Boolean _diagonalUp;
+        private XLBorderStyleValues _leftBorder;
+        private XLColor _leftBorderColor;
+        private XLBorderStyleValues _rightBorder;
+        private XLColor _rightBorderColor;
+        private XLBorderStyleValues _topBorder;
+        private XLColor _topBorderColor;
+
+        public XLBorder() : this(null, XLWorkbook.DefaultStyle.Border)
+        {
+        }
+
+        public XLBorder(IXLStylized container, IXLBorder defaultBorder, Boolean useDefaultModify = true)
+        {
+            _container = container;
+            if (defaultBorder == null) return;
+
+            _leftBorder = defaultBorder.LeftBorder;
+            _leftBorderColor = defaultBorder.LeftBorderColor;
+            _rightBorder = defaultBorder.RightBorder;
+            _rightBorderColor = defaultBorder.RightBorderColor;
+            _topBorder = defaultBorder.TopBorder;
+            _topBorderColor = defaultBorder.TopBorderColor;
+            _bottomBorder = defaultBorder.BottomBorder;
+            _bottomBorderColor = defaultBorder.BottomBorderColor;
+            _diagonalBorder = defaultBorder.DiagonalBorder;
+            _diagonalBorderColor = defaultBorder.DiagonalBorderColor;
+            _diagonalUp = defaultBorder.DiagonalUp;
+            _diagonalDown = defaultBorder.DiagonalDown;
+
+            if (useDefaultModify)
+            {
+                var d = defaultBorder as XLBorder;
+                BottomBorderColorModified = d.BottomBorderColorModified;
+                BottomBorderModified = d.BottomBorderModified;
+                DiagonalBorderColorModified = d.DiagonalBorderColorModified;
+                DiagonalBorderModified = d.DiagonalBorderModified;
+                DiagonalDownModified = d.DiagonalDownModified;
+                DiagonalUpModified = d.DiagonalUpModified;
+                LeftBorderColorModified = d.LeftBorderColorModified;
+                LeftBorderModified = d.LeftBorderModified;
+                RightBorderColorModified = d.RightBorderColorModified;
+                RightBorderModified = d.RightBorderModified;
+                TopBorderColorModified = d.TopBorderColorModified;
+                TopBorderModified = d.TopBorderModified;
+            }
+        }
+
+        #region IXLBorder Members
+
+        public XLBorderStyleValues OutsideBorder
+        {
+            set
+            {
+                if (_container == null || _container.UpdatingStyle) return;
+
+                if (_container is XLWorksheet || _container is XLConditionalFormat)
+                {
+                    _container.Style.Border.SetTopBorder(value);
+                    _container.Style.Border.SetBottomBorder(value);
+                    _container.Style.Border.SetLeftBorder(value);
+                    _container.Style.Border.SetRightBorder(value);
+                }
+                else
+                {
+                    foreach (IXLRange r in _container.RangesUsed)
+                    {
+                        r.FirstColumn().Style.Border.LeftBorder = value;
+                        r.LastColumn().Style.Border.RightBorder = value;
+                        r.FirstRow().Style.Border.TopBorder = value;
+                        r.LastRow().Style.Border.BottomBorder = value;
+                    }
+                }
+            }
+        }
+
+
+        public XLColor OutsideBorderColor
+        {
+            set
+            {
+                if (_container == null || _container.UpdatingStyle) return;
+
+                if (_container is XLWorksheet || _container is XLConditionalFormat)
+                {
+                    _container.Style.Border.SetTopBorderColor(value);
+                    _container.Style.Border.SetBottomBorderColor(value);
+                    _container.Style.Border.SetLeftBorderColor(value);
+                    _container.Style.Border.SetRightBorderColor(value);
+                }
+                else
+                {
+                    foreach (IXLRange r in _container.RangesUsed)
+                    {
+                        r.FirstColumn().Style.Border.LeftBorderColor = value;
+                        r.LastColumn().Style.Border.RightBorderColor = value;
+                        r.FirstRow().Style.Border.TopBorderColor = value;
+                        r.LastRow().Style.Border.BottomBorderColor = value;
+                    }
+                }
+            }
+        }
+
+        public XLBorderStyleValues InsideBorder
+        {
+            set
+            {
+                if (_container == null || _container.UpdatingStyle) return;
+
+                var wsContainer = _container as XLWorksheet;
+                if (wsContainer != null)
+                {
+                    //wsContainer.CellsUsed().Style.Border.SetOutsideBorder(value);
+                    //wsContainer.UpdatingStyle = true;
+                    wsContainer.Style.Border.SetTopBorder(value);
+                    wsContainer.Style.Border.SetBottomBorder(value);
+                    wsContainer.Style.Border.SetLeftBorder(value);
+                    wsContainer.Style.Border.SetRightBorder(value);
+                    //wsContainer.UpdatingStyle = false;
+                }
+                else
+                {
+                    foreach (IXLRange r in _container.RangesUsed)
+                    {
+                        Dictionary<Int32, XLBorderStyleValues> topBorders = new Dictionary<int, XLBorderStyleValues>();
+                        r.FirstRow().Cells().ForEach(
+                            c =>
+                            topBorders.Add(c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
+                                           c.Style.Border.TopBorder));
+
+                        Dictionary<Int32, XLBorderStyleValues> bottomBorders =
+                            new Dictionary<int, XLBorderStyleValues>();
+                        r.LastRow().Cells().ForEach(
+                            c =>
+                            bottomBorders.Add(c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
+                                              c.Style.Border.BottomBorder));
+
+                        Dictionary<Int32, XLBorderStyleValues> leftBorders = new Dictionary<int, XLBorderStyleValues>();
+                        r.FirstColumn().Cells().ForEach(
+                            c =>
+                            leftBorders.Add(c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
+                                            c.Style.Border.LeftBorder));
+
+                        Dictionary<Int32, XLBorderStyleValues> rightBorders = new Dictionary<int, XLBorderStyleValues>();
+                        r.LastColumn().Cells().ForEach(
+                            c =>
+                            rightBorders.Add(c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
+                                             c.Style.Border.RightBorder));
+
+                        r.Cells().Style.Border.OutsideBorder = value;
+
+                        topBorders.ForEach(kp => r.FirstRow().Cell(kp.Key).Style.Border.TopBorder = kp.Value);
+                        bottomBorders.ForEach(kp => r.LastRow().Cell(kp.Key).Style.Border.BottomBorder = kp.Value);
+                        leftBorders.ForEach(kp => r.FirstColumn().Cell(kp.Key).Style.Border.LeftBorder = kp.Value);
+                        rightBorders.ForEach(kp => r.LastColumn().Cell(kp.Key).Style.Border.RightBorder = kp.Value);
+                    }
+                }
+            }
+        }
+
+        public XLColor InsideBorderColor
+        {
+            set
+            {
+                if (_container == null || _container.UpdatingStyle) return;
+
+                var wsContainer = _container as XLWorksheet;
+                if (wsContainer != null)
+                {
+                    //wsContainer.CellsUsed().Style.Border.SetOutsideBorderColor(value);
+                    //wsContainer.UpdatingStyle = true;
+                    wsContainer.Style.Border.SetTopBorderColor(value);
+                    wsContainer.Style.Border.SetBottomBorderColor(value);
+                    wsContainer.Style.Border.SetLeftBorderColor(value);
+                    wsContainer.Style.Border.SetRightBorderColor(value);
+                    //wsContainer.UpdatingStyle = false;
+                }
+                else
+                {
+                    foreach (IXLRange r in _container.RangesUsed)
+                    {
+                        Dictionary<Int32, XLColor> topBorders = new Dictionary<int, XLColor>();
+                        r.FirstRow().Cells().ForEach(
+                            c =>
+                            topBorders.Add(
+                                c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
+                                c.Style.Border.TopBorderColor));
+
+                        Dictionary<Int32, XLColor> bottomBorders = new Dictionary<int, XLColor>();
+                        r.LastRow().Cells().ForEach(
+                            c =>
+                            bottomBorders.Add(
+                                c.Address.ColumnNumber - r.RangeAddress.FirstAddress.ColumnNumber + 1,
+                                c.Style.Border.BottomBorderColor));
+
+                        Dictionary<Int32, XLColor> leftBorders = new Dictionary<int, XLColor>();
+                        r.FirstColumn().Cells().ForEach(
+                            c =>
+                            leftBorders.Add(
+                                c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
+                                c.Style.Border.LeftBorderColor));
+
+                        Dictionary<Int32, XLColor> rightBorders = new Dictionary<int, XLColor>();
+                        r.LastColumn().Cells().ForEach(
+                            c =>
+                            rightBorders.Add(
+                                c.Address.RowNumber - r.RangeAddress.FirstAddress.RowNumber + 1,
+                                c.Style.Border.RightBorderColor));
+
+                        r.Cells().Style.Border.OutsideBorderColor = value;
+
+                        topBorders.ForEach(
+                            kp => r.FirstRow().Cell(kp.Key).Style.Border.TopBorderColor = kp.Value);
+                        bottomBorders.ForEach(
+                            kp => r.LastRow().Cell(kp.Key).Style.Border.BottomBorderColor = kp.Value);
+                        leftBorders.ForEach(
+                            kp => r.FirstColumn().Cell(kp.Key).Style.Border.LeftBorderColor = kp.Value);
+                        rightBorders.ForEach(
+                            kp => r.LastColumn().Cell(kp.Key).Style.Border.RightBorderColor = kp.Value);
+                    }
+                }
+            }
+        }
+
+        public Boolean LeftBorderModified;
+        public XLBorderStyleValues LeftBorder
+        {
+            get { return _leftBorder; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.LeftBorder = value);
+                else
+                {
+                    _leftBorder = value;
+                    LeftBorderModified = true;
+                }
+            }
+        }
+
+        public Boolean LeftBorderColorModified;
+        public XLColor LeftBorderColor
+        {
+            get { return _leftBorderColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.LeftBorderColor = value);
+                else
+                {
+                    _leftBorderColor = value;
+                    LeftBorderColorModified = true;
+                }
+            }
+        }
+
+        public Boolean RightBorderModified;
+        public XLBorderStyleValues RightBorder
+        {
+            get { return _rightBorder; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.RightBorder = value);
+                else
+                {
+                    _rightBorder = value;
+                    RightBorderModified = true;
+                }
+            }
+        }
+
+        public Boolean RightBorderColorModified;
+        public XLColor RightBorderColor
+        {
+            get { return _rightBorderColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.RightBorderColor = value);
+                else
+                {
+                    _rightBorderColor = value;
+                    RightBorderColorModified = true;
+                }
+            }
+        }
+
+        public Boolean TopBorderModified;
+        public XLBorderStyleValues TopBorder
+        {
+            get { return _topBorder; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.TopBorder = value);
+                else
+                {
+                    _topBorder = value;
+                    TopBorderModified = true;
+                }
+            }
+        }
+
+        public Boolean TopBorderColorModified;
+        public XLColor TopBorderColor
+        {
+            get { return _topBorderColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.TopBorderColor = value);
+                else
+                {
+                    _topBorderColor = value;
+                    TopBorderColorModified = true;
+                }
+            }
+        }
+
+        public Boolean BottomBorderModified;
+        public XLBorderStyleValues BottomBorder
+        {
+            get { return _bottomBorder; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.BottomBorder = value);
+                else
+                {
+                    _bottomBorder = value;
+                    BottomBorderModified = true;
+                }
+            }
+        }
+
+        public Boolean BottomBorderColorModified;
+        public XLColor BottomBorderColor
+        {
+            get { return _bottomBorderColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.BottomBorderColor = value);
+                else
+                {
+                    _bottomBorderColor = value;
+                    BottomBorderColorModified = true;
+                }
+            }
+        }
+
+        public Boolean DiagonalBorderModified;
+        public XLBorderStyleValues DiagonalBorder
+        {
+            get { return _diagonalBorder; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.DiagonalBorder = value);
+                else
+                {
+                    _diagonalBorder = value;
+                    DiagonalBorderModified = true;
+                }
+            }
+        }
+
+        public Boolean DiagonalBorderColorModified;
+        public XLColor DiagonalBorderColor
+        {
+            get { return _diagonalBorderColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.DiagonalBorderColor = value);
+                else
+                {
+                    _diagonalBorderColor = value;
+                    DiagonalBorderColorModified = true;
+                }
+            }
+        }
+
+        public Boolean DiagonalUpModified;
+        public Boolean DiagonalUp
+        {
+            get { return _diagonalUp; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.DiagonalUp = value);
+                else
+                {
+                    _diagonalUp = value;
+                    DiagonalUpModified = true;
+                }
+            }
+        }
+
+        public Boolean DiagonalDownModified;
+        public Boolean DiagonalDown
+        {
+            get { return _diagonalDown; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Border.DiagonalDown = value);
+                else
+                {
+                    _diagonalDown = value;
+                    DiagonalDownModified = true;
+                }
+            }
+        }
+
+        public bool Equals(IXLBorder other)
+        {
+            var otherB = other as XLBorder;
+            return
+                _leftBorder == otherB._leftBorder
+                && _leftBorderColor.Equals(otherB._leftBorderColor)
+                && _rightBorder == otherB._rightBorder
+                && _rightBorderColor.Equals(otherB._rightBorderColor)
+                && _topBorder == otherB._topBorder
+                && _topBorderColor.Equals(otherB._topBorderColor)
+                && _bottomBorder == otherB._bottomBorder
+                && _bottomBorderColor.Equals(otherB._bottomBorderColor)
+                && _diagonalBorder == otherB._diagonalBorder
+                && _diagonalBorderColor.Equals(otherB._diagonalBorderColor)
+                && _diagonalUp == otherB._diagonalUp
+                && _diagonalDown == otherB._diagonalDown
+                ;
+        }
+
+        public IXLStyle SetOutsideBorder(XLBorderStyleValues value)
+        {
+            OutsideBorder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetOutsideBorderColor(XLColor value)
+        {
+            OutsideBorderColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetInsideBorder(XLBorderStyleValues value)
+        {
+            InsideBorder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetInsideBorderColor(XLColor value)
+        {
+            InsideBorderColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetLeftBorder(XLBorderStyleValues value)
+        {
+            LeftBorder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetLeftBorderColor(XLColor value)
+        {
+            LeftBorderColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetRightBorder(XLBorderStyleValues value)
+        {
+            RightBorder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetRightBorderColor(XLColor value)
+        {
+            RightBorderColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetTopBorder(XLBorderStyleValues value)
+        {
+            TopBorder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetTopBorderColor(XLColor value)
+        {
+            TopBorderColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetBottomBorder(XLBorderStyleValues value)
+        {
+            BottomBorder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetBottomBorderColor(XLColor value)
+        {
+            BottomBorderColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetDiagonalUp()
+        {
+            DiagonalUp = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetDiagonalUp(Boolean value)
+        {
+            DiagonalUp = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetDiagonalDown()
+        {
+            DiagonalDown = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetDiagonalDown(Boolean value)
+        {
+            DiagonalDown = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetDiagonalBorder(XLBorderStyleValues value)
+        {
+            DiagonalBorder = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetDiagonalBorderColor(XLColor value)
+        {
+            DiagonalBorderColor = value;
+            return _container.Style;
+        }
+
+        #endregion
+
+        private void SetStyleChanged()
+        {
+            if (_container != null) _container.StyleChanged = true;
+        }
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append(LeftBorder.ToString());
+            sb.Append("-");
+            sb.Append(LeftBorderColor);
+            sb.Append("-");
+            sb.Append(RightBorder.ToString());
+            sb.Append("-");
+            sb.Append(RightBorderColor);
+            sb.Append("-");
+            sb.Append(TopBorder.ToString());
+            sb.Append("-");
+            sb.Append(TopBorderColor);
+            sb.Append("-");
+            sb.Append(BottomBorder.ToString());
+            sb.Append("-");
+            sb.Append(BottomBorderColor);
+            sb.Append("-");
+            sb.Append(DiagonalBorder.ToString());
+            sb.Append("-");
+            sb.Append(DiagonalBorderColor);
+            sb.Append("-");
+            sb.Append(DiagonalUp.ToString());
+            sb.Append("-");
+            sb.Append(DiagonalDown.ToString());
+            return sb.ToString();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLBorder)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return (Int32)LeftBorder
+                   ^ LeftBorderColor.GetHashCode()
+                   ^ (Int32)RightBorder
+                   ^ RightBorderColor.GetHashCode()
+                   ^ (Int32)TopBorder
+                   ^ TopBorderColor.GetHashCode()
+                   ^ (Int32)BottomBorder
+                   ^ BottomBorderColor.GetHashCode()
+                   ^ (Int32)DiagonalBorder
+                   ^ DiagonalBorderColor.GetHashCode()
+                   ^ DiagonalUp.GetHashCode()
+                   ^ DiagonalDown.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/XLFill.cs b/ClosedXML/Excel/Style/XLFill.cs
new file mode 100644
index 0000000..0a1c0d7
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLFill.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLFill : IXLFill
+    {
+        #region IXLFill Members
+
+        public bool Equals(IXLFill other)
+        {
+            return
+                _patternType == other.PatternType
+                && _patternColor.Equals(other.PatternColor)
+                && _patternBackgroundColor.Equals(other.PatternBackgroundColor)
+                ;
+        }
+
+        #endregion
+
+        private void SetStyleChanged()
+        {
+            if (_container != null) _container.StyleChanged = true;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLFill)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return BackgroundColor.GetHashCode()
+                   ^ (Int32)PatternType
+                   ^ PatternColor.GetHashCode();
+        }
+
+        #region Properties
+
+        private XLColor _patternBackgroundColor;
+        private XLColor _patternColor;
+        private XLFillPatternValues _patternType;
+
+        public XLColor BackgroundColor
+        {
+            get { return _patternColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Fill.BackgroundColor = value);
+                else
+                {
+                    _patternType = value.HasValue ? XLFillPatternValues.Solid : XLFillPatternValues.None;
+                    _patternColor = value;
+                    _patternBackgroundColor = value;
+
+                    PatternTypeModified = true;
+                    PatternColorModified = true;
+                    PatternBackgroundColorModified = true;
+                }
+            }
+        }
+
+        public Boolean PatternColorModified;
+        public XLColor PatternColor
+        {
+            get { return _patternColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Fill.PatternColor = value);
+                else
+                {
+                    _patternColor = value;
+                    PatternColorModified = true;
+                }
+            }
+        }
+
+        public Boolean PatternBackgroundColorModified;
+        public XLColor PatternBackgroundColor
+        {
+            get { return _patternBackgroundColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Fill.PatternBackgroundColor = value);
+                else
+                {
+                    _patternBackgroundColor = value;
+                    PatternBackgroundColorModified = true;
+                }
+            }
+        }
+
+        public Boolean PatternTypeModified;
+        public XLFillPatternValues PatternType
+        {
+            get { return _patternType; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Fill.PatternType = value);
+                else
+                {
+                    _patternType = value;
+                    PatternTypeModified = true;
+                }
+            }
+        }
+
+        public IXLStyle SetBackgroundColor(XLColor value)
+        {
+            BackgroundColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetPatternColor(XLColor value)
+        {
+            PatternColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetPatternBackgroundColor(XLColor value)
+        {
+            PatternBackgroundColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetPatternType(XLFillPatternValues value)
+        {
+            PatternType = value;
+            return _container.Style;
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private readonly IXLStylized _container;
+
+        public XLFill() : this(null, XLWorkbook.DefaultStyle.Fill)
+        {
+        }
+
+        public XLFill(IXLStylized container, IXLFill defaultFill = null, Boolean useDefaultModify = true)
+        {
+            _container = container;
+            if (defaultFill == null) return;
+            _patternType = defaultFill.PatternType;
+            _patternColor = defaultFill.PatternColor;
+            _patternBackgroundColor = defaultFill.PatternBackgroundColor;
+
+            if (useDefaultModify)
+            {
+                var d = defaultFill as XLFill;
+                PatternBackgroundColorModified = d.PatternBackgroundColorModified;
+                PatternColorModified = d.PatternColorModified;
+                PatternTypeModified = d.PatternTypeModified;
+            }
+        }
+
+        #endregion
+
+        #region Overridden
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append(BackgroundColor);
+            sb.Append("-");
+            sb.Append(PatternType.ToString());
+            sb.Append("-");
+            sb.Append(PatternColor);
+            return sb.ToString();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/XLFont.cs b/ClosedXML/Excel/Style/XLFont.cs
new file mode 100644
index 0000000..8338ceb
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLFont.cs
@@ -0,0 +1,400 @@
+using System;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLFont : IXLFont
+    {
+        private readonly IXLStylized _container;
+        private Boolean _bold;
+        private XLColor _fontColor;
+        private XLFontFamilyNumberingValues _fontFamilyNumbering;
+        private String _fontName;
+        private Double _fontSize;
+        private Boolean _italic;
+        private Boolean _shadow;
+        private Boolean _strikethrough;
+        private XLFontUnderlineValues _underline;
+        private XLFontVerticalTextAlignmentValues _verticalAlignment;
+
+        public XLFont()
+            : this(null, XLWorkbook.DefaultStyle.Font)
+        {
+        }
+
+        public XLFont(IXLStylized container, IXLFontBase defaultFont, Boolean useDefaultModify = true)
+        {
+            _container = container;
+            if (defaultFont == null) return;
+
+            _bold = defaultFont.Bold;
+            _italic = defaultFont.Italic;
+            _underline = defaultFont.Underline;
+            _strikethrough = defaultFont.Strikethrough;
+            _verticalAlignment = defaultFont.VerticalAlignment;
+            _shadow = defaultFont.Shadow;
+            _fontSize = defaultFont.FontSize;
+            _fontColor = defaultFont.FontColor;
+            _fontName = defaultFont.FontName;
+            _fontFamilyNumbering = defaultFont.FontFamilyNumbering;
+
+            if (useDefaultModify)
+            {
+                var d = defaultFont as XLFont;
+                if (d == null) return;
+                BoldModified = d.BoldModified;
+                ItalicModified = d.ItalicModified;
+                UnderlineModified = d.UnderlineModified;
+                StrikethroughModified = d.StrikethroughModified;
+                VerticalAlignmentModified = d.VerticalAlignmentModified;
+                ShadowModified = d.ShadowModified;
+                FontSizeModified = d.FontSizeModified;
+                FontColorModified = d.FontColorModified;
+                FontNameModified = d.FontNameModified;
+                FontFamilyNumberingModified = d.FontFamilyNumberingModified;
+            }
+        }
+
+        #region IXLFont Members
+
+        public Boolean BoldModified { get; set; }
+        public Boolean Bold
+        {
+            get { return _bold; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.Bold = value);
+                else
+                {
+                    _bold = value;
+                    BoldModified = true;
+                }
+            }
+        }
+
+        public Boolean ItalicModified { get; set; }
+        public Boolean Italic
+        {
+            get { return _italic; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.Italic = value);
+                else
+                {
+                    _italic = value;
+                    ItalicModified = true;
+                }
+            }
+        }
+
+        public Boolean UnderlineModified { get; set; }
+        public XLFontUnderlineValues Underline
+        {
+            get { return _underline; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.Underline = value);
+                else
+                {
+                    _underline = value;
+                    UnderlineModified = true;
+                }
+                    
+            }
+        }
+
+        public Boolean StrikethroughModified { get; set; }
+        public Boolean Strikethrough
+        {
+            get { return _strikethrough; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.Strikethrough = value);
+                else
+                {
+                    _strikethrough = value;
+                    StrikethroughModified = true;
+                }
+            }
+        }
+
+        public Boolean VerticalAlignmentModified { get; set; }
+        public XLFontVerticalTextAlignmentValues VerticalAlignment
+        {
+            get { return _verticalAlignment; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.VerticalAlignment = value);
+                else
+                {
+                    _verticalAlignment = value;
+                    VerticalAlignmentModified = true;
+                }
+            }
+        }
+
+        public Boolean ShadowModified { get; set; }
+        public Boolean Shadow
+        {
+            get { return _shadow; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.Shadow = value);
+                else
+                {
+                    _shadow = value;
+                    ShadowModified = true;
+                }
+            }
+        }
+
+        public Boolean FontSizeModified { get; set; }
+        public Double FontSize
+        {
+            get { return _fontSize; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.FontSize = value);
+                else
+                {
+                    _fontSize = value;
+                    FontSizeModified = true;
+                }
+            }
+        }
+
+        private Boolean _fontColorModified;
+        public Boolean FontColorModified
+        {
+            get { return _fontColorModified; }
+            set
+            {
+                _fontColorModified = value;
+            }
+        }
+        public XLColor FontColor
+        {
+            get { return _fontColor; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.FontColor = value);
+                else
+                {
+                    _fontColor = value;
+                    FontColorModified = true;
+                }
+            }
+        }
+
+        public Boolean FontNameModified { get; set; }
+        public String FontName
+        {
+            get { return _fontName; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.FontName = value);
+                else
+                {
+                    _fontName = value;
+                    FontNameModified = true;
+                }
+            }
+        }
+
+        public Boolean FontFamilyNumberingModified { get; set; }
+        public XLFontFamilyNumberingValues FontFamilyNumbering
+        {
+            get { return _fontFamilyNumbering; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Font.FontFamilyNumbering = value);
+                else
+                {
+                    _fontFamilyNumbering = value;
+                    FontFamilyNumberingModified = true;
+                }
+            }
+        }
+
+        public IXLStyle SetBold()
+        {
+            Bold = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetBold(Boolean value)
+        {
+            Bold = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetItalic()
+        {
+            Italic = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetItalic(Boolean value)
+        {
+            Italic = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetUnderline()
+        {
+            Underline = XLFontUnderlineValues.Single;
+            return _container.Style;
+        }
+
+        public IXLStyle SetUnderline(XLFontUnderlineValues value)
+        {
+            Underline = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetStrikethrough()
+        {
+            Strikethrough = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetStrikethrough(Boolean value)
+        {
+            Strikethrough = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetVerticalAlignment(XLFontVerticalTextAlignmentValues value)
+        {
+            VerticalAlignment = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetShadow()
+        {
+            Shadow = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetShadow(Boolean value)
+        {
+            Shadow = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetFontSize(Double value)
+        {
+            FontSize = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetFontColor(XLColor value)
+        {
+            FontColor = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetFontName(String value)
+        {
+            FontName = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetFontFamilyNumbering(XLFontFamilyNumberingValues value)
+        {
+            FontFamilyNumbering = value;
+            return _container.Style;
+        }
+
+        public Boolean Equals(IXLFont other)
+        {
+            var otherF = other as XLFont;
+            if (otherF == null)
+                return false;
+
+            return
+                _bold == otherF._bold
+                && _italic == otherF._italic
+                && _underline == otherF._underline
+                && _strikethrough == otherF._strikethrough
+                && _verticalAlignment == otherF._verticalAlignment
+                && _shadow == otherF._shadow
+                && _fontSize == otherF._fontSize
+                && _fontColor.Equals(otherF._fontColor)
+                && _fontName == otherF._fontName
+                && _fontFamilyNumbering == otherF._fontFamilyNumbering
+                ;
+        }
+
+        #endregion
+
+        private void SetStyleChanged()
+        {
+            if (_container != null) _container.StyleChanged = true;
+        }
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append(Bold.ToString());
+            sb.Append("-");
+            sb.Append(Italic.ToString());
+            sb.Append("-");
+            sb.Append(Underline.ToString());
+            sb.Append("-");
+            sb.Append(Strikethrough.ToString());
+            sb.Append("-");
+            sb.Append(VerticalAlignment.ToString());
+            sb.Append("-");
+            sb.Append(Shadow.ToString());
+            sb.Append("-");
+            sb.Append(FontSize.ToString());
+            sb.Append("-");
+            sb.Append(FontColor);
+            sb.Append("-");
+            sb.Append(FontName);
+            sb.Append("-");
+            sb.Append(FontFamilyNumbering.ToString());
+            return sb.ToString();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLFont)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Bold.GetHashCode()
+                   ^ Italic.GetHashCode()
+                   ^ (Int32)Underline
+                   ^ Strikethrough.GetHashCode()
+                   ^ (Int32)VerticalAlignment
+                   ^ Shadow.GetHashCode()
+                   ^ FontSize.GetHashCode()
+                   ^ FontColor.GetHashCode()
+                   ^ FontName.GetHashCode()
+                   ^ (Int32)FontFamilyNumbering;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/XLNumberFormat.cs b/ClosedXML/Excel/Style/XLNumberFormat.cs
new file mode 100644
index 0000000..1b6620a
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLNumberFormat.cs
@@ -0,0 +1,117 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLNumberFormat : IXLNumberFormat
+    {
+        #region IXLNumberFormat Members
+
+        public bool Equals(IXLNumberFormat other)
+        {
+            var otherNf = other as XLNumberFormat;
+
+            return
+                _numberFormatId == otherNf._numberFormatId
+                && _format == otherNf._format
+                ;
+        }
+
+        #endregion
+
+        private void SetStyleChanged()
+        {
+            if (_container != null) _container.StyleChanged = true;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLNumberFormat)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return NumberFormatId
+                   ^ Format.GetHashCode();
+        }
+
+        #region Properties
+
+        private readonly IXLStylized _container;
+        private String _format = String.Empty;
+
+        private Int32 _numberFormatId;
+
+        public Int32 NumberFormatId
+        {
+            get { return _numberFormatId; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.NumberFormat.NumberFormatId = value);
+                else
+                {
+                    _numberFormatId = value;
+                    _format = String.Empty;
+                }
+            }
+        }
+
+        public String Format
+        {
+            get { return _format; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.NumberFormat.Format = value);
+                else
+                {
+                    _format = value;
+                    _numberFormatId = -1;
+                }
+            }
+        }
+
+        public IXLStyle SetNumberFormatId(Int32 value)
+        {
+            NumberFormatId = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetFormat(String value)
+        {
+            Format = value;
+            return _container.Style;
+        }
+
+        #endregion
+
+        #region Constructors
+
+        public XLNumberFormat()
+            : this(null, XLWorkbook.DefaultStyle.NumberFormat)
+        {
+        }
+
+
+        public XLNumberFormat(IXLStylized container, IXLNumberFormat defaultNumberFormat)
+        {
+            _container = container;
+            if (defaultNumberFormat == null) return;
+            _numberFormatId = defaultNumberFormat.NumberFormatId;
+            _format = defaultNumberFormat.Format;
+        }
+
+        #endregion
+
+        #region Overridden
+
+        public override string ToString()
+        {
+            return _numberFormatId + "-" + _format;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/XLProtection.cs b/ClosedXML/Excel/Style/XLProtection.cs
new file mode 100644
index 0000000..7d0c2ef
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLProtection.cs
@@ -0,0 +1,120 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLProtection : IXLProtection
+    {
+        private readonly IXLStylized _container;
+        private Boolean _hidden;
+
+        private Boolean _locked;
+
+        #region IXLProtection Members
+
+        public Boolean Locked
+        {
+            get { return _locked; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Protection.Locked = value);
+                else
+                    _locked = value;
+            }
+        }
+
+        public Boolean Hidden
+        {
+            get { return _hidden; }
+            set
+            {
+                SetStyleChanged();
+                if (_container != null && !_container.UpdatingStyle)
+                    _container.Styles.ForEach(s => s.Protection.Hidden = value);
+                else
+                    _hidden = value;
+            }
+        }
+
+        public bool Equals(IXLProtection other)
+        {
+            var otherP = other as XLProtection;
+            if (otherP == null)
+                return false;
+
+            return _locked == otherP._locked
+                   && _hidden == otherP._hidden;
+        }
+
+        public IXLStyle SetLocked()
+        {
+            Locked = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetLocked(Boolean value)
+        {
+            Locked = value;
+            return _container.Style;
+        }
+
+        public IXLStyle SetHidden()
+        {
+            Hidden = true;
+            return _container.Style;
+        }
+
+        public IXLStyle SetHidden(Boolean value)
+        {
+            Hidden = value;
+            return _container.Style;
+        }
+
+        #endregion
+
+        #region Constructors
+
+        public XLProtection()
+            : this(null, XLWorkbook.DefaultStyle.Protection)
+        {
+        }
+
+        public XLProtection(IXLStylized container, IXLProtection defaultProtection = null)
+        {
+            _container = container;
+            if (defaultProtection == null) return;
+
+            _locked = defaultProtection.Locked;
+            _hidden = defaultProtection.Hidden;
+        }
+
+        #endregion
+
+        private void SetStyleChanged()
+        {
+            if (_container != null) _container.StyleChanged = true;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((IXLProtection)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            if (Locked)
+                return Hidden ? 11 : 10;
+
+            return Hidden ? 1 : 0;
+        }
+
+        public override string ToString()
+        {
+            if (Locked)
+                return Hidden ? "Locked-Hidden" : "Locked";
+
+            return Hidden ? "Hidden" : "None";
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Style/XLStyle.cs b/ClosedXML/Excel/Style/XLStyle.cs
new file mode 100644
index 0000000..5f67dd7
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLStyle.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLStyle : IXLStyle
+    {
+        public XLStyle(IXLStylized container, IXLStyle initialStyle = null, Boolean useDefaultModify = true)
+        {
+            if (initialStyle != null)
+            {
+                Font = new XLFont(container, initialStyle.Font, useDefaultModify);
+                Alignment = new XLAlignment(container, initialStyle.Alignment);
+                Border = new XLBorder(container, initialStyle.Border, useDefaultModify);
+                Fill = new XLFill(container, initialStyle.Fill, useDefaultModify);
+                NumberFormat = new XLNumberFormat(container, initialStyle.NumberFormat);
+                Protection = new XLProtection(container, initialStyle.Protection);
+            }
+            else
+            {
+                Font = new XLFont(container, null);
+                Alignment = new XLAlignment(container);
+                Border = new XLBorder(container, null);
+                Fill = new XLFill(container);
+                NumberFormat = new XLNumberFormat(container, null);
+                Protection = new XLProtection(container);
+            }
+
+            DateFormat = NumberFormat;
+        }
+
+        public IXLFont Font { get; set; }
+
+        public IXLAlignment Alignment { get; set; }
+
+        public IXLBorder Border { get; set; }
+
+        public IXLFill Fill { get; set; }
+
+        private IXLNumberFormat numberFormat;
+        public IXLNumberFormat NumberFormat 
+        {
+            get
+            {
+                return numberFormat;
+            }
+            set
+            {
+                numberFormat = value;
+                DateFormat = numberFormat;
+            }
+        }
+
+        public IXLProtection Protection { get; set; }
+
+        public IXLNumberFormat DateFormat { get; private set; }
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("Font:");
+            sb.Append(Font);
+            sb.Append(" Fill:");
+            sb.Append(Fill);
+            sb.Append(" Border:");
+            sb.Append(Border);
+            sb.Append(" NumberFormat: ");
+            sb.Append(NumberFormat);
+            sb.Append(" Alignment: ");
+            sb.Append(Alignment);
+            sb.Append(" Protection: ");
+            sb.Append(Protection);
+            return sb.ToString();
+        }
+
+        public bool Equals(IXLStyle other)
+        {
+            return
+                Font.Equals(other.Font)
+            &&  Fill.Equals(other.Fill)
+            &&  Border.Equals(other.Border)
+            &&  NumberFormat.Equals(other.NumberFormat)
+            &&  Alignment.Equals(other.Alignment)
+            &&  Protection.Equals(other.Protection)
+            ;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((XLStyle)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Font.GetHashCode()
+                ^ Fill.GetHashCode()
+                ^ Border.GetHashCode()
+                ^ NumberFormat.GetHashCode()
+                ^ Alignment.GetHashCode()
+                ^ Protection.GetHashCode();
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Style/XLStylizedContainer.cs b/ClosedXML/Excel/Style/XLStylizedContainer.cs
new file mode 100644
index 0000000..a404485
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLStylizedContainer.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    using System;
+
+    internal class XLStylizedContainer: IXLStylized
+    {
+        public Boolean StyleChanged { get; set; }
+        readonly IXLStylized _container;
+        public XLStylizedContainer(IXLStyle style, IXLStylized container)
+        {
+            Style = style;
+            _container = container;
+            RangesUsed = container.RangesUsed;
+        }
+
+        public IXLStyle Style { get; set; }
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get 
+            {
+                _container.UpdatingStyle = true;
+                yield return Style;
+                _container.UpdatingStyle = false;
+            }
+        }
+
+        public bool UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle { get; set; }
+
+        public IXLRanges RangesUsed { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Style/XLStylizedEmpty.cs b/ClosedXML/Excel/Style/XLStylizedEmpty.cs
new file mode 100644
index 0000000..10aff35
--- /dev/null
+++ b/ClosedXML/Excel/Style/XLStylizedEmpty.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLStylizedEmpty: IXLStylized
+    {
+        public XLStylizedEmpty(IXLStyle defaultStyle)
+        {
+            Style = new XLStyle(this, defaultStyle);
+        }
+        public IXLStyle Style { get; set; }
+        
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return Style;
+                UpdatingStyle = false;
+            }
+        }
+
+        public bool UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle { get; set; }
+
+        public IXLRanges RangesUsed
+        {
+            get { return new XLRanges(); }
+        }
+
+        public bool StyleChanged { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Tables/IXLTable.cs b/ClosedXML/Excel/Tables/IXLTable.cs
new file mode 100644
index 0000000..ded04e3
--- /dev/null
+++ b/ClosedXML/Excel/Tables/IXLTable.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+namespace ClosedXML.Excel
+{
+    public enum XLTableTheme
+    {
+        TableStyleMedium28, 
+        TableStyleMedium27, 
+        TableStyleMedium26, 
+        TableStyleMedium25, 
+        TableStyleMedium24, 
+        TableStyleMedium23, 
+        TableStyleMedium22, 
+        TableStyleMedium21, 
+        TableStyleMedium20, 
+        TableStyleMedium19, 
+        TableStyleMedium18, 
+        TableStyleMedium17, 
+        TableStyleMedium16, 
+        TableStyleMedium15, 
+        TableStyleMedium14, 
+        TableStyleMedium13, 
+        TableStyleMedium12, 
+        TableStyleMedium11, 
+        TableStyleMedium10, 
+        TableStyleMedium9, 
+        TableStyleMedium8, 
+        TableStyleMedium7, 
+        TableStyleMedium6, 
+        TableStyleMedium5, 
+        TableStyleMedium4, 
+        TableStyleMedium3, 
+        TableStyleMedium2, 
+        TableStyleMedium1, 
+        TableStyleLight21, 
+        TableStyleLight20, 
+        TableStyleLight19, 
+        TableStyleLight18, 
+        TableStyleLight17, 
+        TableStyleLight16, 
+        TableStyleLight15, 
+        TableStyleLight14, 
+        TableStyleLight13, 
+        TableStyleLight12, 
+        TableStyleLight11, 
+        TableStyleLight10, 
+        TableStyleLight9, 
+        TableStyleLight8, 
+        TableStyleLight7, 
+        TableStyleLight6, 
+        TableStyleLight5, 
+        TableStyleLight4, 
+        TableStyleLight3, 
+        TableStyleLight2, 
+        TableStyleLight1, 
+        TableStyleDark11, 
+        TableStyleDark10, 
+        TableStyleDark9, 
+        TableStyleDark8, 
+        TableStyleDark7, 
+        TableStyleDark6, 
+        TableStyleDark5, 
+        TableStyleDark4, 
+        TableStyleDark3, 
+        TableStyleDark2, 
+        TableStyleDark1,
+        None
+    }
+
+    public interface IXLTable : IXLRange
+    {
+        string Name { get; set; }
+        Boolean EmphasizeFirstColumn { get; set; }
+        Boolean EmphasizeLastColumn { get; set; }
+        Boolean ShowRowStripes { get; set; }
+        Boolean ShowColumnStripes { get; set; }
+        Boolean ShowTotalsRow { get; set; }
+        Boolean ShowAutoFilter { get; set; }
+        XLTableTheme Theme { get; set; }
+        IXLRangeRow HeadersRow();
+        IXLRangeRow TotalsRow();
+        IXLTableField Field(string fieldName);
+        IXLTableField Field(int fieldIndex);
+        IEnumerable<IXLTableField> Fields { get; }
+
+       
+
+        IXLTable SetEmphasizeFirstColumn(); IXLTable SetEmphasizeFirstColumn(Boolean value);
+        IXLTable SetEmphasizeLastColumn(); IXLTable SetEmphasizeLastColumn(Boolean value);
+        IXLTable SetShowRowStripes(); IXLTable SetShowRowStripes(Boolean value);
+        IXLTable SetShowColumnStripes(); IXLTable SetShowColumnStripes(Boolean value);
+        IXLTable SetShowTotalsRow(); IXLTable SetShowTotalsRow(Boolean value);
+        IXLTable SetShowAutoFilter(); IXLTable SetShowAutoFilter(Boolean value);
+
+        /// <summary>
+        /// Clears the contents of this table.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        new IXLTable Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        IXLBaseAutoFilter AutoFilter { get; }
+
+        new IXLBaseAutoFilter SetAutoFilter();
+
+        Boolean ShowHeaderRow { get; set; }
+        IXLTable SetShowHeaderRow(); IXLTable SetShowHeaderRow(Boolean value);
+
+        IXLTableRange DataRange { get; }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Tables/IXLTableField.cs b/ClosedXML/Excel/Tables/IXLTableField.cs
new file mode 100644
index 0000000..5898961
--- /dev/null
+++ b/ClosedXML/Excel/Tables/IXLTableField.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public enum XLTotalsRowFunction
+    {
+        None,
+        Sum,
+        Minimum,
+        Maximum,
+        Average,
+        Count,
+        CountNumbers,
+        StandardDeviation,
+        Variance,
+        Custom
+    }
+
+    public interface IXLTableField
+    {
+        Int32 Index { get; }
+        String Name { get; set; }
+        String TotalsRowLabel { get; set; }
+        String TotalsRowFormulaA1 { get; set; }
+        String TotalsRowFormulaR1C1 { get; set; }
+        XLTotalsRowFunction TotalsRowFunction { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/Tables/IXLTableRange.cs b/ClosedXML/Excel/Tables/IXLTableRange.cs
new file mode 100644
index 0000000..4c21627
--- /dev/null
+++ b/ClosedXML/Excel/Tables/IXLTableRange.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+namespace ClosedXML.Excel
+{
+
+    public interface IXLTableRange : IXLRange
+    {
+        IXLTableRow FirstRow(Func<IXLTableRow, Boolean> predicate = null);
+        IXLTableRow FirstRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null);
+        IXLTableRow FirstRowUsed(Func<IXLTableRow, Boolean> predicate = null);
+        IXLTableRow LastRow(Func<IXLTableRow, Boolean> predicate = null);
+        IXLTableRow LastRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null);
+        IXLTableRow LastRowUsed(Func<IXLTableRow, Boolean> predicate = null);
+
+        new IXLTableRow Row(int row);
+        IXLTableRows Rows(Func<IXLTableRow, Boolean> predicate = null);
+        new IXLTableRows Rows(int firstRow, int lastRow);
+        new IXLTableRows Rows(string rows);
+        IXLTableRows RowsUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null);
+        IXLTableRows RowsUsed(Func<IXLTableRow, Boolean> predicate = null);
+
+        IXLTable Table { get; }
+
+        new IXLTableRows InsertRowsAbove(int numberOfRows);
+        new IXLTableRows InsertRowsBelow(int numberOfRows);
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Tables/IXLTableRow.cs b/ClosedXML/Excel/Tables/IXLTableRow.cs
new file mode 100644
index 0000000..ac3ce9c
--- /dev/null
+++ b/ClosedXML/Excel/Tables/IXLTableRow.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLTableRow: IXLRangeRow
+    {
+        IXLCell Field(Int32 index);
+        IXLCell Field(String name);
+
+        new IXLTableRow Sort();
+        new IXLTableRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true);
+
+        new IXLTableRow RowAbove();
+        new IXLTableRow RowAbove(Int32 step);
+        new IXLTableRow RowBelow();
+        new IXLTableRow RowBelow(Int32 step);
+
+        /// <summary>
+        /// Clears the contents of this row.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        new IXLTableRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        new IXLTableRows InsertRowsAbove(int numberOfRows);
+        new IXLTableRows InsertRowsBelow(int numberOfRows);
+    }
+}
diff --git a/ClosedXML/Excel/Tables/IXLTableRows.cs b/ClosedXML/Excel/Tables/IXLTableRows.cs
new file mode 100644
index 0000000..fea7075
--- /dev/null
+++ b/ClosedXML/Excel/Tables/IXLTableRows.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLTableRows: IEnumerable<IXLTableRow>
+    {
+        /// <summary>
+        /// Adds a table row to this group.
+        /// </summary>
+        /// <param name="tableRow">The row table to add.</param>
+        void Add(IXLTableRow tableRow);
+
+        /// <summary>
+        /// Returns the collection of cells.
+        /// </summary>
+        IXLCells Cells();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        IXLCells CellsUsed();
+
+        /// <summary>
+        /// Returns the collection of cells that have a value.
+        /// </summary>
+        /// <param name="includeFormats">if set to <c>true</c> will return all cells with a value or a style different than the default.</param>
+        IXLCells CellsUsed(Boolean includeFormats);
+
+        IXLStyle Style { get; set; }
+
+        /// <summary>
+        /// Clears the contents of these rows.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLTableRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        void Select();
+    }
+}
diff --git a/ClosedXML/Excel/Tables/IXLTables.cs b/ClosedXML/Excel/Tables/IXLTables.cs
new file mode 100644
index 0000000..8411ce1
--- /dev/null
+++ b/ClosedXML/Excel/Tables/IXLTables.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    public interface IXLTables: IEnumerable<IXLTable>
+    {
+        void Add(IXLTable table);
+        IXLTable Table(Int32 index);
+        IXLTable Table(String name);
+
+        /// <summary>
+        /// Clears the contents of these tables.
+        /// </summary>
+        /// <param name="clearOptions">Specify what you want to clear.</param>
+        IXLTables Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats);
+
+        void Remove(Int32 index);
+        void Remove(String name);
+    }
+}
diff --git a/ClosedXML/Excel/Tables/XLTable.cs b/ClosedXML/Excel/Tables/XLTable.cs
new file mode 100644
index 0000000..a090dfc
--- /dev/null
+++ b/ClosedXML/Excel/Tables/XLTable.cs
@@ -0,0 +1,532 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLTable : XLRange, IXLTable
+    {
+        #region Private fields
+
+        private string _name;
+        internal bool _showTotalsRow;
+        internal HashSet<String> _uniqueNames;
+
+        #endregion
+
+        #region Constructor
+
+        public XLTable(XLRange range, Boolean addToTables, Boolean setAutofilter = true)
+            : base(new XLRangeParameters(range.RangeAddress, range.Style ))
+        {
+            InitializeValues(setAutofilter);
+
+            Int32 id = 1;
+            while (true)
+            {
+                string tableName = String.Format("Table{0}", id);
+                if (!Worksheet.Tables.Any(t => t.Name == tableName))
+                {
+                    Name = tableName;
+                    AddToTables(range, addToTables);
+                    break;
+                }
+                id++;
+            }
+        }
+
+        public XLTable(XLRange range, String name, Boolean addToTables, Boolean setAutofilter = true)
+            : base(new XLRangeParameters(range.RangeAddress, range.Style))
+        {
+            InitializeValues(setAutofilter);
+
+            Name = name;
+            AddToTables(range, addToTables);
+        }
+
+        #endregion
+
+        private IXLRangeAddress _lastRangeAddress;
+        private Dictionary<String, IXLTableField> _fieldNames = null;
+        public Dictionary<String, IXLTableField> FieldNames
+        {
+            get
+            {
+                if (_fieldNames != null && _lastRangeAddress != null && _lastRangeAddress.Equals(RangeAddress)) return _fieldNames;
+
+                _fieldNames = new Dictionary<String, IXLTableField>();
+                _lastRangeAddress = RangeAddress;
+
+                if (ShowHeaderRow)
+                {
+                    var headersRow = HeadersRow();
+                    Int32 cellPos = 0;
+                    foreach (var cell in headersRow.Cells())
+                    {
+                        var name = cell.GetString();
+                        if (XLHelper.IsNullOrWhiteSpace(name)) 
+                        {
+                            name = "Column" + (cellPos + 1);
+                            cell.SetValue(name);
+                        }
+                        if (_fieldNames.ContainsKey(name))
+                            throw new ArgumentException("The header row contains more than one field name '" + name + "'.");
+
+                        _fieldNames.Add(name, new XLTableField(this) {Index = cellPos++ });
+                    }
+                }
+                else
+                {
+                    if (_fieldNames == null) _fieldNames = new Dictionary<String, IXLTableField>();
+
+                    Int32 colCount = ColumnCount();
+                    for (Int32 i = 1; i <= colCount; i++)
+                    {
+                        if (!_fieldNames.Values.Any(f => f.Index == i - 1))
+                        {
+                            var name = "Column" + i;
+
+                            _fieldNames.Add(name, new XLTableField(this) {Index = i - 1 });
+                        }
+                    }
+                }
+                return _fieldNames;
+            }
+        }
+
+        internal void AddFields(IEnumerable<String> fieldNames)
+        {
+            _fieldNames = new Dictionary<String, IXLTableField>();
+
+            Int32 cellPos = 0;
+            foreach(var name in fieldNames)
+            {
+                _fieldNames.Add(name, new XLTableField(this) { Index = cellPos++, Name = name });
+            }
+        }
+
+
+        public String RelId { get; set; }
+
+        public IXLTableRange DataRange
+        {
+            get
+            {
+                XLRange range;
+                //var ws = Worksheet;
+                //var tracking = ws.EventTrackingEnabled;
+                //ws.EventTrackingEnabled = false;
+
+                if (_showHeaderRow)
+                {
+                    range = _showTotalsRow
+                                ? Range(2, 1,RowCount() - 1,ColumnCount())
+                                : Range(2, 1, RowCount(), ColumnCount());
+                }
+                else
+                {
+                    range = _showTotalsRow
+                                ? Range(1, 1, RowCount() - 1, ColumnCount())
+                                : Range(1, 1, RowCount(), ColumnCount());
+                }
+                //ws.EventTrackingEnabled = tracking;
+                return new XLTableRange(range, this);
+            }
+        }
+
+        private XLAutoFilter _autoFilter;
+        public XLAutoFilter AutoFilter
+        {
+            get
+            {
+                using (var asRange = ShowTotalsRow ? Range(1, 1, RowCount() - 1, ColumnCount()) : AsRange())
+                {
+                    if (_autoFilter == null)
+                        _autoFilter = new XLAutoFilter();
+
+                    _autoFilter.Range = asRange;
+                }
+                return _autoFilter;
+            }
+        }
+
+        public new IXLBaseAutoFilter SetAutoFilter()
+        {
+            return AutoFilter;
+        }
+
+        #region IXLTable Members
+
+        public Boolean EmphasizeFirstColumn { get; set; }
+        public Boolean EmphasizeLastColumn { get; set; }
+        public Boolean ShowRowStripes { get; set; }
+        public Boolean ShowColumnStripes { get; set; }
+
+        private Boolean _showAutoFilter;
+        public Boolean ShowAutoFilter { 
+            get { return _showHeaderRow && _showAutoFilter; } 
+            set { _showAutoFilter = value; }
+            }
+        public XLTableTheme Theme { get; set; }
+
+        public String Name
+        {
+            get { return _name; }
+            set
+            {
+                if (Worksheet.Tables.Any(t => t.Name == value))
+                {
+                    throw new ArgumentException(String.Format("This worksheet already contains a table named '{0}'",
+                                                              value));
+                }
+
+                _name = value;
+            }
+        }
+
+        public Boolean ShowTotalsRow
+        {
+            get { return _showTotalsRow; }
+            set
+            {
+                if (value && !_showTotalsRow)
+                    InsertRowsBelow(1);
+                else if (!value && _showTotalsRow)
+                    TotalsRow().Delete();
+
+                _showTotalsRow = value;
+
+                if (_showTotalsRow)
+                {
+                    AutoFilter.Range = Worksheet.Range(
+                        RangeAddress.FirstAddress.RowNumber, RangeAddress.FirstAddress.ColumnNumber,
+                        RangeAddress.LastAddress.RowNumber - 1, RangeAddress.LastAddress.ColumnNumber);
+                }
+                else
+                    AutoFilter.Range = Worksheet.Range(RangeAddress);
+            }
+        }
+
+        public IXLRangeRow HeadersRow()
+        {
+            if (!ShowHeaderRow) return null;
+
+            var m = FieldNames;
+            return FirstRow();
+        }
+
+        public IXLRangeRow TotalsRow()
+        {
+            return ShowTotalsRow ? LastRow() : null;
+        }
+
+        public IXLTableField Field(String fieldName)
+        {
+            return Field(GetFieldIndex(fieldName));
+        }
+
+        public IXLTableField Field(Int32 fieldIndex)
+        {
+            return FieldNames.Values.First(f => f.Index == fieldIndex);
+        }
+
+        public IEnumerable<IXLTableField> Fields
+        {
+            get
+            {
+                Int32 columnCount = ColumnCount();
+                for (int co = 0; co < columnCount; co++)
+                    yield return Field(co);
+            }
+        }
+
+        public IXLTable SetEmphasizeFirstColumn()
+        {
+            EmphasizeFirstColumn = true;
+            return this;
+        }
+
+        public IXLTable SetEmphasizeFirstColumn(Boolean value)
+        {
+            EmphasizeFirstColumn = value;
+            return this;
+        }
+
+        public IXLTable SetEmphasizeLastColumn()
+        {
+            EmphasizeLastColumn = true;
+            return this;
+        }
+
+        public IXLTable SetEmphasizeLastColumn(Boolean value)
+        {
+            EmphasizeLastColumn = value;
+            return this;
+        }
+
+        public IXLTable SetShowRowStripes()
+        {
+            ShowRowStripes = true;
+            return this;
+        }
+
+        public IXLTable SetShowRowStripes(Boolean value)
+        {
+            ShowRowStripes = value;
+            return this;
+        }
+
+        public IXLTable SetShowColumnStripes()
+        {
+            ShowColumnStripes = true;
+            return this;
+        }
+
+        public IXLTable SetShowColumnStripes(Boolean value)
+        {
+            ShowColumnStripes = value;
+            return this;
+        }
+
+        public IXLTable SetShowTotalsRow()
+        {
+            ShowTotalsRow = true;
+            return this;
+        }
+
+        public IXLTable SetShowTotalsRow(Boolean value)
+        {
+            ShowTotalsRow = value;
+            return this;
+        }
+
+        public IXLTable SetShowAutoFilter()
+        {
+            ShowAutoFilter = true;
+            return this;
+        }
+
+        public IXLTable SetShowAutoFilter(Boolean value)
+        {
+            ShowAutoFilter = value;
+            return this;
+        }
+
+        public new IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending,
+                                 Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            var toSortBy = new StringBuilder();
+            foreach (string coPairTrimmed in columnsToSortBy.Split(',').Select(coPair => coPair.Trim()))
+            {
+                String coString;
+                String order;
+                if (coPairTrimmed.Contains(' '))
+                {
+                    var pair = coPairTrimmed.Split(' ');
+                    coString = pair[0];
+                    order = pair[1];
+                }
+                else
+                {
+                    coString = coPairTrimmed;
+                    order = "ASC";
+                }
+
+                Int32 co;
+                if (!Int32.TryParse(coString, out co))
+                    co = Field(coString).Index + 1;
+
+                toSortBy.Append(co);
+                toSortBy.Append(" ");
+                toSortBy.Append(order);
+                toSortBy.Append(",");
+            }
+            return DataRange.Sort(toSortBy.ToString(0, toSortBy.Length - 1), sortOrder, matchCase, ignoreBlanks);
+        }
+
+        public new IXLTable Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            base.Clear(clearOptions);
+            return this;
+        }
+
+        IXLBaseAutoFilter IXLTable.AutoFilter
+        {
+            get { return AutoFilter; }
+        }
+
+        public new void Dispose()
+        {
+            if (AutoFilter != null)
+                AutoFilter.Dispose();
+
+            base.Dispose();
+        }
+
+        #endregion
+
+
+
+        private void InitializeValues(Boolean setAutofilter)
+        {
+            ShowRowStripes = true;
+            _showHeaderRow = true;
+            Theme = XLTableTheme.TableStyleLight9;
+            if (setAutofilter)
+                InitializeAutoFilter();
+
+            HeadersRow().DataType = XLCellValues.Text;
+
+            if (RowCount() == 1)
+                InsertRowsBelow(1);
+        }
+
+        public void InitializeAutoFilter()
+        {
+            ShowAutoFilter = true;
+        }
+
+        private void AddToTables(XLRange range, Boolean addToTables)
+        {
+            if (!addToTables) return;
+
+            _uniqueNames = new HashSet<string>();
+            Int32 co = 1;
+            foreach (IXLCell c in range.Row(1).Cells())
+            {
+                if (XLHelper.IsNullOrWhiteSpace(((XLCell)c).InnerText))
+                    c.Value = GetUniqueName("Column" + co.ToInvariantString());
+                _uniqueNames.Add(c.GetString());
+                co++;
+            }
+            Worksheet.Tables.Add(this);
+        }
+
+
+        private String GetUniqueName(String originalName)
+        {
+            String name = originalName;
+            if (_uniqueNames.Contains(name))
+            {
+                Int32 i = 1;
+                name = originalName + i.ToInvariantString();
+                while (_uniqueNames.Contains(name))
+                {
+                    i++;
+                    name = originalName + i.ToInvariantString();
+                }
+            }
+
+            _uniqueNames.Add(name);
+            return name;
+        }
+
+        public Int32 GetFieldIndex(String name)
+        {
+            if (FieldNames.ContainsKey(name))
+                return FieldNames[name].Index;
+
+            throw new ArgumentOutOfRangeException("The header row doesn't contain field name '" + name + "'.");
+        }
+
+        internal Boolean _showHeaderRow;
+        public Boolean ShowHeaderRow
+        {
+            get { return _showHeaderRow; }
+            set
+            {
+                if (_showHeaderRow == value) return;
+
+                if (_showHeaderRow)
+                {
+                    var headersRow = HeadersRow();
+                    _uniqueNames = new HashSet<string>();
+                    Int32 co = 1;
+                    foreach (IXLCell c in headersRow.Cells())
+                    {
+                        if (XLHelper.IsNullOrWhiteSpace(((XLCell)c).InnerText))
+                            c.Value = GetUniqueName("Column" + co.ToInvariantString());
+                        _uniqueNames.Add(c.GetString());
+                        co++;
+                    }
+                    
+                    headersRow.Clear();
+                    RangeAddress.FirstAddress = new XLAddress(Worksheet, RangeAddress.FirstAddress.RowNumber + 1,
+                                          RangeAddress.FirstAddress.ColumnNumber,
+                                          RangeAddress.FirstAddress.FixedRow,
+                                          RangeAddress.FirstAddress.FixedColumn);
+
+                    HeadersRow().DataType = XLCellValues.Text;
+                }
+                else
+                {
+                    using(var asRange = Worksheet.Range(
+                        RangeAddress.FirstAddress.RowNumber - 1 , 
+                        RangeAddress.FirstAddress.ColumnNumber,
+                        RangeAddress.LastAddress.RowNumber,
+                        RangeAddress.LastAddress.ColumnNumber
+                        ))
+                        using (var firstRow = asRange.FirstRow())
+                            {
+                                IXLRangeRow rangeRow;
+                                if (firstRow.IsEmpty(true))
+                                {
+                                    rangeRow = firstRow;
+                                    RangeAddress.FirstAddress = new XLAddress(Worksheet, 
+                                          RangeAddress.FirstAddress.RowNumber - 1,
+                                          RangeAddress.FirstAddress.ColumnNumber,
+                                          RangeAddress.FirstAddress.FixedRow,
+                                          RangeAddress.FirstAddress.FixedColumn);
+                                }
+                                else
+                                {
+                                    var fAddress = RangeAddress.FirstAddress;
+                                    var lAddress = RangeAddress.LastAddress;
+
+                                    rangeRow = firstRow.InsertRowsBelow(1, false).First();
+
+
+                                    RangeAddress.FirstAddress = new XLAddress(Worksheet, fAddress.RowNumber,
+                                                                              fAddress.ColumnNumber,
+                                                                              fAddress.FixedRow,
+                                                                              fAddress.FixedColumn);
+
+                                    RangeAddress.LastAddress = new XLAddress(Worksheet, lAddress.RowNumber + 1,
+                                                                             lAddress.ColumnNumber,
+                                                                             lAddress.FixedRow,
+                                                                             lAddress.FixedColumn);
+                                }
+
+                                Int32 co = 1;
+                                foreach (var name in FieldNames.Keys)
+                                {
+                                    rangeRow.Cell(co).SetValue(name);
+                                    co++;
+                                }
+
+                            }
+                }
+                _showHeaderRow = value;
+            }
+        }
+        public IXLTable SetShowHeaderRow()
+        {
+            return SetShowHeaderRow(true);
+        } 
+        public IXLTable SetShowHeaderRow(Boolean value)
+        {
+            ShowHeaderRow = value;
+            return this;
+        }
+
+        public void ExpandTableRows(Int32 rows)
+        {
+            RangeAddress.LastAddress = new XLAddress(Worksheet, RangeAddress.LastAddress.RowNumber + rows,
+                                                     RangeAddress.LastAddress.ColumnNumber,
+                                                     RangeAddress.LastAddress.FixedRow,
+                                                     RangeAddress.LastAddress.FixedColumn);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Tables/XLTableField.cs b/ClosedXML/Excel/Tables/XLTableField.cs
new file mode 100644
index 0000000..0f98646
--- /dev/null
+++ b/ClosedXML/Excel/Tables/XLTableField.cs
@@ -0,0 +1,92 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLTableField: IXLTableField
+    {
+        private XLTable table;
+        public XLTableField(XLTable table)
+        {
+            this.table = table;
+        }
+
+        public Int32 Index { get; internal set; }
+
+        public String Name 
+        {
+            get
+            {
+                return table.HeadersRow().Cell(Index + 1).GetString();
+            }
+            set
+            {
+                table.HeadersRow().Cell(Index + 1).SetValue(value);
+            }
+        }
+
+        internal String totalsRowLabel;
+        public String TotalsRowLabel
+        {
+            get { return totalsRowLabel; }
+            set 
+            {
+                totalsRowFunction = XLTotalsRowFunction.None;
+                table.TotalsRow().Cell(Index + 1).SetValue(value);
+                totalsRowLabel = value; 
+            }
+        }
+
+        public String TotalsRowFormulaA1
+        {
+            get { return table.TotalsRow().Cell(Index + 1).FormulaA1; }
+            set 
+            {
+                totalsRowFunction = XLTotalsRowFunction.Custom;
+                table.TotalsRow().Cell(Index + 1).FormulaA1 = value;
+            }
+        }
+        public String TotalsRowFormulaR1C1
+        {
+            get { return table.TotalsRow().Cell(Index + 1).FormulaR1C1; }
+            set
+            {
+                totalsRowFunction = XLTotalsRowFunction.Custom;
+                table.TotalsRow().Cell(Index + 1).FormulaR1C1 = value;
+            }
+        }
+
+        internal XLTotalsRowFunction totalsRowFunction;
+        public XLTotalsRowFunction TotalsRowFunction
+        {
+            get { return totalsRowFunction; }
+            set 
+            {
+                if (value != XLTotalsRowFunction.None && value != XLTotalsRowFunction.Custom)
+                {
+                    var cell = table.TotalsRow().Cell(Index + 1);
+                    String formula = String.Empty;
+                    switch (value)
+                    {
+                        case XLTotalsRowFunction.Sum: formula = "109"; break;
+                        case XLTotalsRowFunction.Minimum: formula = "105"; break;
+                        case XLTotalsRowFunction.Maximum: formula = "104"; break;
+                        case XLTotalsRowFunction.Average: formula = "101"; break;
+                        case XLTotalsRowFunction.Count: formula = "103"; break;
+                        case XLTotalsRowFunction.CountNumbers: formula = "102"; break;
+                        case XLTotalsRowFunction.StandardDeviation: formula = "107"; break;
+                        case XLTotalsRowFunction.Variance: formula = "110"; break;
+                    }
+
+                    cell.FormulaA1 = "SUBTOTAL(" + formula + ",[" + Name + "])";
+                    var lastCell = table.LastRow().Cell(Index + 1);
+                    if (lastCell.DataType != XLCellValues.Text)
+                    {
+                        cell.DataType = lastCell.DataType;
+                        cell.Style.NumberFormat = lastCell.Style.NumberFormat;
+                    }
+                }
+                totalsRowFunction = value; 
+            }
+        }
+    }
+}
diff --git a/ClosedXML/Excel/Tables/XLTableRange.cs b/ClosedXML/Excel/Tables/XLTableRange.cs
new file mode 100644
index 0000000..39d5289
--- /dev/null
+++ b/ClosedXML/Excel/Tables/XLTableRange.cs
@@ -0,0 +1,245 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    using System.Linq;
+
+    internal class XLTableRange : XLRange, IXLTableRange
+    {
+        private readonly XLTable _table;
+        private readonly XLRange _range;
+        public XLTableRange(XLRange range, XLTable table):base(range.RangeParameters)
+        {
+            _table = table;
+            _range = range;
+        }
+
+        IXLTableRow IXLTableRange.FirstRow(Func<IXLTableRow, Boolean> predicate)
+        {
+            return FirstRow(predicate);
+        }
+        public XLTableRow FirstRow(Func<IXLTableRow, Boolean> predicate = null)
+        {
+            if (predicate == null)
+                return new XLTableRow(this, (_range.FirstRow()));
+
+            Int32 rowCount = _range.RowCount();
+
+            for (Int32 ro = 1; ro <= rowCount; ro++)
+            {
+                var row = new XLTableRow(this, (_range.Row(ro)));
+                if (predicate(row)) return row;
+
+                row.Dispose();
+            }
+
+            return null;
+        }
+
+        IXLTableRow IXLTableRange.FirstRowUsed(Func<IXLTableRow, Boolean> predicate)
+        {
+            return FirstRowUsed(false, predicate);
+        }
+        public XLTableRow FirstRowUsed(Func<IXLTableRow, Boolean> predicate = null)
+        {
+            return FirstRowUsed(false, predicate);
+        }
+
+        IXLTableRow IXLTableRange.FirstRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate)
+        {
+            return FirstRowUsed(includeFormats, predicate);
+        }
+        public XLTableRow FirstRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null)
+        {
+            if (predicate == null)
+                return new XLTableRow(this, (_range.FirstRowUsed(includeFormats)));
+
+            Int32 rowCount = _range.RowCount();
+
+            for (Int32 ro = 1; ro <= rowCount; ro++)
+            {
+                var row = new XLTableRow(this, (_range.Row(ro)));
+
+                if (!row.IsEmpty(includeFormats) && predicate(row))
+                    return row;
+                row.Dispose();
+            }
+
+            return null;
+        }
+
+
+        IXLTableRow IXLTableRange.LastRow(Func<IXLTableRow, Boolean> predicate)
+        {
+            return LastRow(predicate);
+        }
+        public XLTableRow LastRow(Func<IXLTableRow, Boolean> predicate = null)
+        {
+            if (predicate == null)
+                return new XLTableRow(this, (_range.LastRow()));
+
+            Int32 rowCount = _range.RowCount();
+
+            for (Int32 ro = rowCount; ro >= 1; ro--)
+            {
+                var row = new XLTableRow(this, (_range.Row(ro)));
+                if (predicate(row)) return row;
+
+                row.Dispose();
+            }
+            return null;
+        }
+
+        IXLTableRow IXLTableRange.LastRowUsed(Func<IXLTableRow, Boolean> predicate)
+        {
+            return LastRowUsed(false, predicate);
+        }
+        public XLTableRow LastRowUsed(Func<IXLTableRow, Boolean> predicate = null)
+        {
+            return LastRowUsed(false, predicate);
+        }
+
+        IXLTableRow IXLTableRange.LastRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate)
+        {
+            return LastRowUsed(includeFormats, predicate);
+        }
+        public XLTableRow LastRowUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null)
+        {
+            if (predicate == null)
+                return new XLTableRow(this, (_range.LastRowUsed(includeFormats)));
+
+            Int32 rowCount = _range.RowCount();
+
+            for (Int32 ro = rowCount; ro >= 1; ro--)
+            {
+                var row = new XLTableRow(this, (_range.Row(ro)));
+
+                if (!row.IsEmpty(includeFormats) && predicate(row))
+                    return row;
+                row.Dispose();
+            }
+
+            return null;
+        }
+
+        IXLTableRow IXLTableRange.Row(int row)
+        {
+            return Row(row);
+        }
+        public new XLTableRow Row(int row)
+        {
+            if (row <= 0 || row > XLHelper.MaxRowNumber)
+            {
+                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}",
+                                                                 XLHelper.MaxRowNumber));
+            }
+
+            return new XLTableRow(this, base.Row(row));
+        }
+
+        public IXLTableRows Rows(Func<IXLTableRow, Boolean> predicate = null)
+        {
+            var retVal = new XLTableRows(Worksheet.Style);
+            Int32 rowCount = _range.RowCount();
+
+            for (int r = 1; r <= rowCount; r++)
+            {
+                var row = Row(r);
+                if (predicate == null || predicate(row))
+                    retVal.Add(row);
+                else
+                    row.Dispose();
+            }
+            return retVal;
+        }
+
+        public new IXLTableRows Rows(int firstRow, int lastRow)
+        {
+            var retVal = new XLTableRows(Worksheet.Style);
+
+            for (int ro = firstRow; ro <= lastRow; ro++)
+                retVal.Add(Row(ro));
+            return retVal;
+        }
+
+        public new IXLTableRows Rows(string rows)
+        {
+            var retVal = new XLTableRows(Worksheet.Style);
+            var rowPairs = rows.Split(',');
+            foreach (string tPair in rowPairs.Select(pair => pair.Trim()))
+            {
+                String firstRow;
+                String lastRow;
+                if (tPair.Contains(':') || tPair.Contains('-'))
+                {
+                    var rowRange = XLHelper.SplitRange(tPair);
+
+                    firstRow = rowRange[0];
+                    lastRow = rowRange[1];
+                }
+                else
+                {
+                    firstRow = tPair;
+                    lastRow = tPair;
+                }
+                foreach (IXLTableRow row in Rows(Int32.Parse(firstRow), Int32.Parse(lastRow)))
+                    retVal.Add(row);
+            }
+            return retVal;
+        }
+
+        IXLTableRows IXLTableRange.RowsUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate)
+        {
+            return RowsUsed(includeFormats, predicate);
+        }
+        public IXLTableRows RowsUsed(Boolean includeFormats, Func<IXLTableRow, Boolean> predicate = null)
+        {
+            var rows = new XLTableRows(Worksheet.Style);
+            Int32 rowCount = RowCount();
+
+            for (Int32 ro = 1; ro <= rowCount; ro++)
+            {
+                var row = Row(ro);
+
+                if (!row.IsEmpty(includeFormats) && (predicate == null || predicate(row)))
+                    rows.Add(row);
+                else
+                    row.Dispose();
+            }
+            return rows;
+        }
+
+        IXLTableRows IXLTableRange.RowsUsed(Func<IXLTableRow, Boolean> predicate)
+        {
+            return RowsUsed(predicate);
+        }
+        public IXLTableRows RowsUsed(Func<IXLTableRow, Boolean> predicate = null)
+        {
+            return RowsUsed(false, predicate);
+        }
+
+        IXLTable IXLTableRange.Table { get { return _table; } }
+        public XLTable Table { get { return _table; } }
+
+        public new IXLTableRows InsertRowsAbove(int numberOfRows)
+        {
+            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsAbove, this, numberOfRows, !Table.ShowTotalsRow );
+        }
+        public new IXLTableRows InsertRowsBelow(int numberOfRows)
+        {
+            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsBelow, this, numberOfRows, !Table.ShowTotalsRow);
+        }
+
+
+        public new IXLRangeColumn Column(String column)
+        {
+            if (XLHelper.IsValidColumn(column))
+            {
+                Int32 coNum = XLHelper.GetColumnNumberFromLetter(column);
+                return coNum > ColumnCount() ? Column(_table.GetFieldIndex(column) + 1) : Column(coNum);
+            }
+
+            return Column(_table.GetFieldIndex(column) + 1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Tables/XLTableRow.cs b/ClosedXML/Excel/Tables/XLTableRow.cs
new file mode 100644
index 0000000..9fbd73c
--- /dev/null
+++ b/ClosedXML/Excel/Tables/XLTableRow.cs
@@ -0,0 +1,115 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLTableRow : XLRangeRow, IXLTableRow
+    {
+        private readonly XLTableRange _tableRange;
+
+        public XLTableRow(XLTableRange tableRange, XLRangeRow rangeRow)
+            : base(rangeRow.RangeParameters, false)
+        {
+            _tableRange = tableRange;
+        }
+
+        #region IXLTableRow Members
+
+        public IXLCell Field(Int32 index)
+        {
+            return Cell(index + 1);
+        }
+
+        public IXLCell Field(String name)
+        {
+            Int32 fieldIndex = _tableRange.Table.GetFieldIndex(name);
+            return Cell(fieldIndex + 1);
+        }
+
+        public new IXLTableRow Sort()
+        {
+            return SortLeftToRight();
+        }
+
+        public new IXLTableRow SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            base.SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
+            return this;
+        }
+
+        #endregion
+
+        private XLTableRow RowShift(Int32 rowsToShift)
+        {
+            return _tableRange.Row(RowNumber() + rowsToShift);
+        }
+
+        #region XLTableRow Above
+
+        IXLTableRow IXLTableRow.RowAbove()
+        {
+            return RowAbove();
+        }
+
+        IXLTableRow IXLTableRow.RowAbove(Int32 step)
+        {
+            return RowAbove(step);
+        }
+
+        public new XLTableRow RowAbove()
+        {
+            return RowAbove(1);
+        }
+
+        public new XLTableRow RowAbove(Int32 step)
+        {
+            return RowShift(step * -1);
+        }
+
+        #endregion
+
+        #region XLTableRow Below
+
+        IXLTableRow IXLTableRow.RowBelow()
+        {
+            return RowBelow();
+        }
+
+        IXLTableRow IXLTableRow.RowBelow(Int32 step)
+        {
+            return RowBelow(step);
+        }
+
+        public new XLTableRow RowBelow()
+        {
+            return RowBelow(1);
+        }
+
+        public new XLTableRow RowBelow(Int32 step)
+        {
+            return RowShift(step);
+        }
+
+        #endregion
+
+        public new IXLTableRow Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            base.Clear(clearOptions);
+            return this;
+        }
+
+        public new IXLTableRows InsertRowsAbove(int numberOfRows)
+        {
+            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsAbove, _tableRange, numberOfRows, !_tableRange.Table.ShowTotalsRow);
+        }
+        public new IXLTableRows InsertRowsBelow(int numberOfRows)
+        {
+            return XLHelper.InsertRowsWithoutEvents(base.InsertRowsBelow, _tableRange, numberOfRows, !_tableRange.Table.ShowTotalsRow);
+        }
+
+        public new void Delete()
+        {
+            Delete(XLShiftDeletedCells.ShiftCellsUp);
+            _tableRange.Table.ExpandTableRows(-1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Tables/XLTableRows.cs b/ClosedXML/Excel/Tables/XLTableRows.cs
new file mode 100644
index 0000000..e5905c4
--- /dev/null
+++ b/ClosedXML/Excel/Tables/XLTableRows.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    internal class XLTableRows : IXLTableRows, IXLStylized
+    {
+        public Boolean StyleChanged { get; set; }
+        private readonly List<XLTableRow> _ranges = new List<XLTableRow>();
+        private IXLStyle _style;
+        
+
+        public XLTableRows(IXLStyle defaultStyle)
+        {
+            _style = new XLStyle(this, defaultStyle);
+        }
+
+        #region IXLStylized Members
+
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return _style;
+                foreach (XLTableRow rng in _ranges)
+                {
+                    yield return rng.Style;
+                    foreach (XLCell r in rng.Worksheet.Internals.CellsCollection.GetCells(
+                        rng.RangeAddress.FirstAddress.RowNumber,
+                        rng.RangeAddress.FirstAddress.ColumnNumber,
+                        rng.RangeAddress.LastAddress.RowNumber,
+                        rng.RangeAddress.LastAddress.ColumnNumber))
+                        yield return r.Style;
+                }
+                UpdatingStyle = false;
+            }
+        }
+
+        public Boolean UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle
+        {
+            get { return _style; }
+            set { _style = new XLStyle(this, value); }
+        }
+
+        public IXLRanges RangesUsed
+        {
+            get
+            {
+                var retVal = new XLRanges();
+                this.ForEach(c => retVal.Add(c.AsRange()));
+                return retVal;
+            }
+        }
+
+        #endregion
+
+        #region IXLTableRows Members
+
+        public IXLTableRows Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            _ranges.ForEach(r => r.Clear(clearOptions));
+            return this;
+        }
+
+        public void Add(IXLTableRow range)
+        {
+            _ranges.Add((XLTableRow)range);
+        }
+
+        public IEnumerator<IXLTableRow> GetEnumerator()
+        {
+            var retList = new List<IXLTableRow>();
+            _ranges.ForEach(retList.Add);
+            return retList.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLStyle Style
+        {
+            get { return _style; }
+            set
+            {
+                _style = new XLStyle(this, value);
+                _ranges.ForEach(r => r.Style = value);
+            }
+        }
+
+        public IXLCells Cells()
+        {
+            var cells = new XLCells(false, false);
+            foreach (XLTableRow container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed()
+        {
+            var cells = new XLCells(true, false);
+            foreach (XLTableRow container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        public IXLCells CellsUsed(Boolean includeFormats)
+        {
+            var cells = new XLCells(false, includeFormats);
+            foreach (XLTableRow container in _ranges)
+                cells.Add(container.RangeAddress);
+            return cells;
+        }
+
+        #endregion
+
+        public void Select()
+        {
+            foreach (var range in this)
+                range.Select();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/Tables/XLTables.cs b/ClosedXML/Excel/Tables/XLTables.cs
new file mode 100644
index 0000000..e301539
--- /dev/null
+++ b/ClosedXML/Excel/Tables/XLTables.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    using System.Collections;
+
+    public class XLTables : IXLTables
+    {
+        private readonly Dictionary<String, IXLTable> _tables = new Dictionary<String, IXLTable>();
+
+        #region IXLTables Members
+
+        public IEnumerator<IXLTable> GetEnumerator()
+        {
+            return _tables.Values.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public void Add(IXLTable table)
+        {
+            _tables.Add(table.Name, table);
+        }
+
+        public IXLTable Table(Int32 index)
+        {
+            return _tables.ElementAt(index).Value;
+        }
+
+        public IXLTable Table(String name)
+        {
+            return _tables[name];
+        }
+
+        #endregion
+
+        public IXLTables Clear(XLClearOptions clearOptions = XLClearOptions.ContentsAndFormats)
+        {
+            _tables.Values.ForEach(t => t.Clear(clearOptions));
+            return this;
+        }
+
+        public void Remove(Int32 index)
+        {
+            _tables.Remove(_tables.ElementAt(index).Key);
+        }
+        public void Remove(String name)
+        {
+            _tables.Remove(name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/XLAddressLight.cs b/ClosedXML/Excel/XLAddressLight.cs
new file mode 100644
index 0000000..68c2fd0
--- /dev/null
+++ b/ClosedXML/Excel/XLAddressLight.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal struct XLAddressLight
+    {
+        public XLAddressLight(Int32 rowNumber, Int32 columnNumber)
+        {
+            RowNumber = rowNumber;
+            ColumnNumber = columnNumber;
+        }
+        public Int32 RowNumber;
+        public Int32 ColumnNumber;
+    }
+}
diff --git a/ClosedXML/Excel/XLConstants.cs b/ClosedXML/Excel/XLConstants.cs
new file mode 100644
index 0000000..f01f06e
--- /dev/null
+++ b/ClosedXML/Excel/XLConstants.cs
@@ -0,0 +1,13 @@
+
+namespace ClosedXML.Excel
+{
+    //Use the class to store magic strings or variables.
+    internal static class XLConstants
+    {
+        internal static class Comment
+        {
+            internal const string ShapeTypeId = "#_x0000_t202";
+            internal const string AlternateShapeTypeId = "#_xssf_cell_comment";
+        }
+    }
+}
diff --git a/ClosedXML/Excel/XLOutline.cs b/ClosedXML/Excel/XLOutline.cs
new file mode 100644
index 0000000..f86e0b5
--- /dev/null
+++ b/ClosedXML/Excel/XLOutline.cs
@@ -0,0 +1,17 @@
+
+namespace ClosedXML.Excel
+{
+    internal class XLOutline:IXLOutline
+    {
+        public XLOutline(IXLOutline outline)
+        {
+            if (outline != null)
+            {
+                SummaryHLocation = outline.SummaryHLocation;
+                SummaryVLocation = outline.SummaryVLocation;
+            }
+        }
+        public XLOutlineSummaryVLocation SummaryVLocation { get; set; }
+        public XLOutlineSummaryHLocation SummaryHLocation { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/XLSheetProtection.cs b/ClosedXML/Excel/XLSheetProtection.cs
new file mode 100644
index 0000000..a9cfc61
--- /dev/null
+++ b/ClosedXML/Excel/XLSheetProtection.cs
@@ -0,0 +1,112 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLSheetProtection: IXLSheetProtection
+    {
+        public XLSheetProtection()
+        {
+            SelectLockedCells = true;
+            SelectUnlockedCells = true;
+        }
+
+        public Boolean Protected { get; set; }
+        internal String PasswordHash { get; set; }
+        public String Password 
+        {
+            set
+            {
+                PasswordHash = GetPasswordHash(value);
+            }
+        }
+
+        public Boolean AutoFilter { get; set; }
+        public Boolean DeleteColumns { get; set; }
+        public Boolean DeleteRows { get; set; }
+        public Boolean FormatCells { get; set; }
+        public Boolean FormatColumns { get; set; }
+        public Boolean FormatRows { get; set; }
+        public Boolean InsertColumns { get; set; }
+        public Boolean InsertHyperlinks { get; set; }
+        public Boolean InsertRows { get; set; }
+        public Boolean Objects { get; set; }
+        public Boolean PivotTables { get; set; }
+        public Boolean Scenarios { get; set; }
+        public Boolean SelectLockedCells { get; set; }
+        public Boolean SelectUnlockedCells { get; set; }
+        public Boolean Sort { get; set; }
+
+        public IXLSheetProtection SetAutoFilter() { AutoFilter = true; return this; }	public IXLSheetProtection SetAutoFilter(Boolean value) { AutoFilter = value; return this; }
+        public IXLSheetProtection SetDeleteColumns() { DeleteColumns = true; return this; }	public IXLSheetProtection SetDeleteColumns(Boolean value) { DeleteColumns = value; return this; }
+        public IXLSheetProtection SetDeleteRows() { DeleteRows = true; return this; }	public IXLSheetProtection SetDeleteRows(Boolean value) { DeleteRows = value; return this; }
+        public IXLSheetProtection SetFormatCells() { FormatCells = true; return this; }	public IXLSheetProtection SetFormatCells(Boolean value) { FormatCells = value; return this; }
+        public IXLSheetProtection SetFormatColumns() { FormatColumns = true; return this; }	public IXLSheetProtection SetFormatColumns(Boolean value) { FormatColumns = value; return this; }
+        public IXLSheetProtection SetFormatRows() { FormatRows = true; return this; }	public IXLSheetProtection SetFormatRows(Boolean value) { FormatRows = value; return this; }
+        public IXLSheetProtection SetInsertColumns() { InsertColumns = true; return this; }	public IXLSheetProtection SetInsertColumns(Boolean value) { InsertColumns = value; return this; }
+        public IXLSheetProtection SetInsertHyperlinks() { InsertHyperlinks = true; return this; }	public IXLSheetProtection SetInsertHyperlinks(Boolean value) { InsertHyperlinks = value; return this; }
+        public IXLSheetProtection SetInsertRows() { InsertRows = true; return this; }	public IXLSheetProtection SetInsertRows(Boolean value) { InsertRows = value; return this; }
+        public IXLSheetProtection SetObjects() { Objects = true; return this; }	public IXLSheetProtection SetObjects(Boolean value) { Objects = value; return this; }
+        public IXLSheetProtection SetPivotTables() { PivotTables = true; return this; }	public IXLSheetProtection SetPivotTables(Boolean value) { PivotTables = value; return this; }
+        public IXLSheetProtection SetScenarios() { Scenarios = true; return this; }	public IXLSheetProtection SetScenarios(Boolean value) { Scenarios = value; return this; }
+        public IXLSheetProtection SetSelectLockedCells() { SelectLockedCells = true; return this; }	public IXLSheetProtection SetSelectLockedCells(Boolean value) { SelectLockedCells = value; return this; }
+        public IXLSheetProtection SetSelectUnlockedCells() { SelectUnlockedCells = true; return this; }	public IXLSheetProtection SetSelectUnlockedCells(Boolean value) { SelectUnlockedCells = value; return this; }
+        public IXLSheetProtection SetSort() { Sort = true; return this; }	public IXLSheetProtection SetSort(Boolean value) { Sort = value; return this; }
+
+        public IXLSheetProtection Protect()
+        {
+            return Protect(String.Empty);
+        }
+
+        public IXLSheetProtection Protect(String password)
+        {
+            if (Protected)
+            {
+                throw new InvalidOperationException("The worksheet is already protected");
+            }
+            else
+            {
+                Protected = true;
+                PasswordHash = GetPasswordHash(password);
+            }
+            return this;
+        }
+
+        public IXLSheetProtection Unprotect()
+        {
+            return Unprotect(String.Empty);
+        }
+
+        public IXLSheetProtection Unprotect(String password)
+        {
+            if (Protected)
+            {
+                String hash = GetPasswordHash(password);
+                if (hash != PasswordHash)
+                    throw new ArgumentException("Invalid password");
+                else
+                {
+                    Protected = false;
+                    PasswordHash = String.Empty;
+                }
+            }
+
+            return this;
+        }
+
+        private String GetPasswordHash(String password)
+        {
+            Int32 pLength = password.Length;
+            Int32 hash = 0;
+            if (pLength == 0) return String.Empty;
+
+            for (Int32 i = pLength - 1; i >= 0; i--)
+            {
+                hash ^= password[i];
+                hash = hash >> 14 & 0x01 | hash << 1 & 0x7fff;
+            }
+            hash ^= 0x8000 | 'N' << 8 | 'K';
+            hash ^= pLength;
+            return hash.ToString("X");
+        }
+    }
+}
diff --git a/ClosedXML/Excel/XLSheetView.cs b/ClosedXML/Excel/XLSheetView.cs
new file mode 100644
index 0000000..2d7b22d
--- /dev/null
+++ b/ClosedXML/Excel/XLSheetView.cs
@@ -0,0 +1,46 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    internal class XLSheetView: IXLSheetView
+    {
+        public XLSheetView() {
+            View = XLSheetViewOptions.Normal;
+        }
+        public XLSheetView(IXLSheetView sheetView):this()
+        {
+            this.SplitRow = sheetView.SplitRow;
+            this.SplitColumn = sheetView.SplitColumn;
+            this.FreezePanes = ((XLSheetView)sheetView).FreezePanes;
+        }
+
+        public Int32 SplitRow { get; set; }
+        public Int32 SplitColumn { get; set; }
+        public Boolean FreezePanes { get; set; }
+        public void FreezeRows(Int32 rows)
+        {
+            SplitRow = rows;
+            FreezePanes = true;
+        }
+        public void FreezeColumns(Int32 columns)
+        {
+            SplitColumn = columns;
+            FreezePanes = true;
+        }
+        public void Freeze(Int32 rows, Int32 columns)
+        {
+            SplitRow = rows;
+            SplitColumn = columns;
+            FreezePanes = true;
+        }
+
+
+        public XLSheetViewOptions View { get; set; }
+
+        public IXLSheetView SetView(XLSheetViewOptions value)
+        {
+            View = value;
+            return this;
+        }
+    }
+}
diff --git a/ClosedXML/Excel/XLTheme.cs b/ClosedXML/Excel/XLTheme.cs
new file mode 100644
index 0000000..288b063
--- /dev/null
+++ b/ClosedXML/Excel/XLTheme.cs
@@ -0,0 +1,19 @@
+
+namespace ClosedXML.Excel
+{
+    internal class XLTheme: IXLTheme
+    {
+        public XLColor Background1 { get; set; }
+        public XLColor Text1 { get; set; }
+        public XLColor Background2 { get; set; }
+        public XLColor Text2 { get; set; }
+        public XLColor Accent1 { get; set; }
+        public XLColor Accent2 { get; set; }
+        public XLColor Accent3 { get; set; }
+        public XLColor Accent4 { get; set; }
+        public XLColor Accent5 { get; set; }
+        public XLColor Accent6 { get; set; }
+        public XLColor Hyperlink { get; set; }
+        public XLColor FollowedHyperlink { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/XLWSContentManager.cs b/ClosedXML/Excel/XLWSContentManager.cs
new file mode 100644
index 0000000..9b2f7ee
--- /dev/null
+++ b/ClosedXML/Excel/XLWSContentManager.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace ClosedXML.Excel
+{
+    internal class XLWSContentManager
+    {
+        public enum XLWSContents
+        {
+            SheetProperties = 1,
+            SheetDimension = 2,
+            SheetViews = 3,
+            SheetFormatProperties = 4,
+            Columns = 5,
+            SheetData = 6,
+            SheetCalculationProperties = 7,
+            SheetProtection = 8,
+            ProtectedRanges = 9,
+            Scenarios = 10,
+            AutoFilter = 11,
+            SortState = 12,
+            DataConsolidate = 13,
+            CustomSheetViews = 14,
+            MergeCells = 15,
+            PhoneticProperties = 16,
+            ConditionalFormatting = 17,
+            DataValidations = 18,
+            Hyperlinks = 19,
+            PrintOptions = 20,
+            PageMargins = 21,
+            PageSetup = 22,
+            HeaderFooter = 23,
+            RowBreaks = 24,
+            ColumnBreaks = 25,
+            CustomProperties = 26,
+            CellWatches = 27,
+            IgnoredErrors = 28,
+            SmartTags = 29,
+            Drawing = 30,
+            LegacyDrawing = 31,
+            LegacyDrawingHeaderFooter = 32,
+            DrawingHeaderFooter = 33,
+            Picture = 34,
+            OleObjects = 35,
+            Controls = 36,
+            AlternateContent = 37,
+            WebPublishItems = 38,
+            TableParts = 39,
+            WorksheetExtensionList = 40
+        }
+        private Dictionary<XLWSContents, OpenXmlElement> contents = new Dictionary<XLWSContents, OpenXmlElement>();
+
+        public XLWSContentManager(Worksheet opWorksheet)
+        {
+            contents.Add(XLWSContents.SheetProperties, opWorksheet.Elements<SheetProperties>().LastOrDefault());
+            contents.Add(XLWSContents.SheetDimension, opWorksheet.Elements<SheetDimension>().LastOrDefault());
+            contents.Add(XLWSContents.SheetViews, opWorksheet.Elements<SheetViews>().LastOrDefault());
+            contents.Add(XLWSContents.SheetFormatProperties, opWorksheet.Elements<SheetFormatProperties>().LastOrDefault());
+            contents.Add(XLWSContents.Columns, opWorksheet.Elements<Columns>().LastOrDefault());
+            contents.Add(XLWSContents.SheetData, opWorksheet.Elements<SheetData>().LastOrDefault());
+            contents.Add(XLWSContents.SheetCalculationProperties, opWorksheet.Elements<SheetCalculationProperties>().LastOrDefault());
+            contents.Add(XLWSContents.SheetProtection, opWorksheet.Elements<SheetProtection>().LastOrDefault());
+            contents.Add(XLWSContents.ProtectedRanges, opWorksheet.Elements<ProtectedRanges>().LastOrDefault());
+            contents.Add(XLWSContents.Scenarios, opWorksheet.Elements<Scenarios>().LastOrDefault());
+            contents.Add(XLWSContents.AutoFilter, opWorksheet.Elements<AutoFilter>().LastOrDefault());
+            contents.Add(XLWSContents.SortState, opWorksheet.Elements<SortState>().LastOrDefault());
+            contents.Add(XLWSContents.DataConsolidate, opWorksheet.Elements<DataConsolidate>().LastOrDefault());
+            contents.Add(XLWSContents.CustomSheetViews, opWorksheet.Elements<CustomSheetViews>().LastOrDefault());
+            contents.Add(XLWSContents.MergeCells, opWorksheet.Elements<MergeCells>().LastOrDefault());
+            contents.Add(XLWSContents.PhoneticProperties, opWorksheet.Elements<PhoneticProperties>().LastOrDefault());
+            contents.Add(XLWSContents.ConditionalFormatting, opWorksheet.Elements<ConditionalFormatting>().LastOrDefault());
+            contents.Add(XLWSContents.DataValidations, opWorksheet.Elements<DataValidations>().LastOrDefault());
+            contents.Add(XLWSContents.Hyperlinks, opWorksheet.Elements<Hyperlinks>().LastOrDefault());
+            contents.Add(XLWSContents.PrintOptions, opWorksheet.Elements<PrintOptions>().LastOrDefault());
+            contents.Add(XLWSContents.PageMargins, opWorksheet.Elements<PageMargins>().LastOrDefault());
+            contents.Add(XLWSContents.PageSetup, opWorksheet.Elements<PageSetup>().LastOrDefault());
+            contents.Add(XLWSContents.HeaderFooter, opWorksheet.Elements<HeaderFooter>().LastOrDefault());
+            contents.Add(XLWSContents.RowBreaks, opWorksheet.Elements<RowBreaks>().LastOrDefault());
+            contents.Add(XLWSContents.ColumnBreaks, opWorksheet.Elements<ColumnBreaks>().LastOrDefault());
+            contents.Add(XLWSContents.CustomProperties, opWorksheet.Elements<CustomProperties>().LastOrDefault());
+            contents.Add(XLWSContents.CellWatches, opWorksheet.Elements<CellWatches>().LastOrDefault());
+            contents.Add(XLWSContents.IgnoredErrors, opWorksheet.Elements<IgnoredErrors>().LastOrDefault());
+            //contents.Add(XLWSContents.SmartTags, opWorksheet.Elements<SmartTags>().LastOrDefault());
+            contents.Add(XLWSContents.Drawing, opWorksheet.Elements<Drawing>().LastOrDefault());
+            contents.Add(XLWSContents.LegacyDrawing, opWorksheet.Elements<LegacyDrawing>().LastOrDefault());
+            contents.Add(XLWSContents.LegacyDrawingHeaderFooter, opWorksheet.Elements<LegacyDrawingHeaderFooter>().LastOrDefault());
+            contents.Add(XLWSContents.DrawingHeaderFooter, opWorksheet.Elements<DrawingHeaderFooter>().LastOrDefault());
+            contents.Add(XLWSContents.Picture, opWorksheet.Elements<Picture>().LastOrDefault());
+            contents.Add(XLWSContents.OleObjects, opWorksheet.Elements<OleObjects>().LastOrDefault());
+            contents.Add(XLWSContents.Controls, opWorksheet.Elements<Controls>().LastOrDefault());
+            contents.Add(XLWSContents.AlternateContent, opWorksheet.Elements<AlternateContent>().LastOrDefault());
+            contents.Add(XLWSContents.WebPublishItems, opWorksheet.Elements<WebPublishItems>().LastOrDefault());
+            contents.Add(XLWSContents.TableParts, opWorksheet.Elements<TableParts>().LastOrDefault());
+            contents.Add(XLWSContents.WorksheetExtensionList, opWorksheet.Elements<WorksheetExtensionList>().LastOrDefault());
+        }
+
+        public void SetElement(XLWSContents content, OpenXmlElement element)
+        {
+            contents[content] = element;
+        }
+
+        public OpenXmlElement GetPreviousElementFor(XLWSContents content)
+        {
+            var max = contents.Where(kp => (Int32)kp.Key < (Int32)content && kp.Value != null).Max(kp => kp.Key);
+            return contents[max];
+        }
+    }
+}
diff --git a/ClosedXML/Excel/XLWorkbook.cs b/ClosedXML/Excel/XLWorkbook.cs
new file mode 100644
index 0000000..405623a
--- /dev/null
+++ b/ClosedXML/Excel/XLWorkbook.cs
@@ -0,0 +1,811 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Security.AccessControl;
+using ClosedXML.Excel.CalcEngine;
+using DocumentFormat.OpenXml;
+
+namespace ClosedXML.Excel
+{
+    using System.Linq;
+    using System.Data;
+
+    public enum XLEventTracking { Enabled, Disabled }
+    public enum XLCalculateMode
+    {
+        Auto,
+        AutoNoTable,
+        Manual,
+        Default
+    };
+
+    public enum XLReferenceStyle
+    {
+        R1C1,
+        A1,
+        Default
+    };
+
+    public enum XLCellSetValueBehavior
+    {
+        /// <summary>
+        ///   Analyze input string and convert value. For avoid analyzing use escape symbol '
+        /// </summary>
+        Smart = 0,
+
+        /// <summary>
+        ///   Direct set value. If value has unsupported type - value will be stored as string returned by <see
+        ///    cref = "object.ToString()" />
+        /// </summary>
+        Simple = 1,
+    }
+
+    public partial class XLWorkbook: IDisposable
+    {
+        #region Static
+
+        private static IXLStyle _defaultStyle;
+
+        public static IXLStyle DefaultStyle
+        {
+            get
+            {
+                return _defaultStyle ?? (_defaultStyle = new XLStyle(null)
+                                                             {
+                                                                 Font = new XLFont(null, null)
+                                                                            {
+                                                                                Bold = false,
+                                                                                Italic = false,
+                                                                                Underline = XLFontUnderlineValues.None,
+                                                                                Strikethrough = false,
+                                                                                VerticalAlignment =
+                                                                                    XLFontVerticalTextAlignmentValues.
+                                                                                    Baseline,
+                                                                                FontSize = 11,
+                                                                                FontColor = XLColor.FromArgb(0, 0, 0),
+                                                                                FontName = "Calibri",
+                                                                                FontFamilyNumbering =
+                                                                                    XLFontFamilyNumberingValues.Swiss
+                                                                            },
+                                                                 Fill = new XLFill(null)
+                                                                            {
+                                                                                BackgroundColor = XLColor.FromIndex(64),
+                                                                                PatternType = XLFillPatternValues.None,
+                                                                                PatternColor = XLColor.FromIndex(64)
+                                                                            },
+                                                                 Border = new XLBorder(null, null)
+                                                                              {
+                                                                                  BottomBorder =
+                                                                                      XLBorderStyleValues.None,
+                                                                                  DiagonalBorder =
+                                                                                      XLBorderStyleValues.None,
+                                                                                  DiagonalDown = false,
+                                                                                  DiagonalUp = false,
+                                                                                  LeftBorder = XLBorderStyleValues.None,
+                                                                                  RightBorder = XLBorderStyleValues.None,
+                                                                                  TopBorder = XLBorderStyleValues.None,
+                                                                                  BottomBorderColor = XLColor.Black,
+                                                                                  DiagonalBorderColor = XLColor.Black,
+                                                                                  LeftBorderColor = XLColor.Black,
+                                                                                  RightBorderColor = XLColor.Black,
+                                                                                  TopBorderColor = XLColor.Black
+                                                                              },
+                                                                 NumberFormat =
+                                                                     new XLNumberFormat(null, null) {NumberFormatId = 0},
+                                                                 Alignment = new XLAlignment(null)
+                                                                                 {
+                                                                                     Indent = 0,
+                                                                                     Horizontal =
+                                                                                         XLAlignmentHorizontalValues.
+                                                                                         General,
+                                                                                     JustifyLastLine = false,
+                                                                                     ReadingOrder =
+                                                                                         XLAlignmentReadingOrderValues.
+                                                                                         ContextDependent,
+                                                                                     RelativeIndent = 0,
+                                                                                     ShrinkToFit = false,
+                                                                                     TextRotation = 0,
+                                                                                     Vertical =
+                                                                                         XLAlignmentVerticalValues.
+                                                                                         Bottom,
+                                                                                     WrapText = false
+                                                                                 },
+                                                                 Protection = new XLProtection(null)
+                                                                                  {
+                                                                                      Locked = true,
+                                                                                      Hidden = false
+                                                                                  }
+                                                             });
+            }
+        }
+
+        public static Double DefaultRowHeight { get; private set; }
+        public static Double DefaultColumnWidth { get; private set; }
+
+        public static IXLPageSetup DefaultPageOptions
+        {
+            get
+            {
+                var defaultPageOptions = new XLPageSetup(null, null)
+                                             {
+                                                 PageOrientation = XLPageOrientation.Default,
+                                                 Scale = 100,
+                                                 PaperSize = XLPaperSize.LetterPaper,
+                                                 Margins = new XLMargins
+                                                               {
+                                                                   Top = 0.75,
+                                                                   Bottom = 0.5,
+                                                                   Left = 0.75,
+                                                                   Right = 0.75,
+                                                                   Header = 0.5,
+                                                                   Footer = 0.75
+                                                               },
+                                                 ScaleHFWithDocument = true,
+                                                 AlignHFWithMargins = true,
+                                                 PrintErrorValue = XLPrintErrorValues.Displayed,
+                                                 ShowComments = XLShowCommentsValues.None
+                                             };
+                return defaultPageOptions;
+            }
+        }
+
+        public static IXLOutline DefaultOutline
+        {
+            get
+            {
+                return new XLOutline(null)
+                           {
+                               SummaryHLocation = XLOutlineSummaryHLocation.Right,
+                               SummaryVLocation = XLOutlineSummaryVLocation.Bottom
+                           };
+            }
+        }
+
+        /// <summary>
+        ///   Behavior for <see cref = "IXLCell.set_Value" />
+        /// </summary>
+        public static XLCellSetValueBehavior CellSetValueBehavior { get; set; }
+
+        #endregion
+
+        internal readonly List<UnsupportedSheet> UnsupportedSheets =
+            new List<UnsupportedSheet>();
+
+        private readonly Dictionary<Int32, IXLStyle> _stylesById = new Dictionary<int, IXLStyle>();
+        private readonly Dictionary<IXLStyle, Int32> _stylesByStyle = new Dictionary<IXLStyle, Int32>();
+
+        public XLEventTracking EventTracking { get; set; }
+       
+        internal Int32 GetStyleId(IXLStyle style)
+        {
+            Int32 cached;
+            if (_stylesByStyle.TryGetValue(style, out cached))
+                return cached;
+
+            var count = _stylesByStyle.Count;
+            var styleToUse = new XLStyle(null, style);
+            _stylesByStyle.Add(styleToUse, count);
+            _stylesById.Add(count, styleToUse);
+            return count;
+        }
+
+        internal IXLStyle GetStyleById(Int32 id)
+        {
+            return _stylesById[id];
+        }
+
+        #region  Nested Type: XLLoadSource
+
+        private enum XLLoadSource
+        {
+            New,
+            File,
+            Stream
+        };
+
+        #endregion
+
+        internal XLWorksheets WorksheetsInternal { get; private set; }
+
+        /// <summary>
+        ///   Gets an object to manipulate the worksheets.
+        /// </summary>
+        public IXLWorksheets Worksheets
+        {
+            get { return WorksheetsInternal; }
+        }
+
+        /// <summary>
+        ///   Gets an object to manipulate this workbook's named ranges.
+        /// </summary>
+        public IXLNamedRanges NamedRanges { get; private set; }
+
+        /// <summary>
+        ///   Gets an object to manipulate this workbook's theme.
+        /// </summary>
+        public IXLTheme Theme { get; private set; }
+
+        /// <summary>
+        ///   Gets or sets the default style for the workbook.
+        ///   <para>All new worksheets will use this style.</para>
+        /// </summary>
+        public IXLStyle Style { get; set; }
+
+        /// <summary>
+        ///   Gets or sets the default row height for the workbook.
+        ///   <para>All new worksheets will use this row height.</para>
+        /// </summary>
+        public Double RowHeight { get; set; }
+
+        /// <summary>
+        ///   Gets or sets the default column width for the workbook.
+        ///   <para>All new worksheets will use this column width.</para>
+        /// </summary>
+        public Double ColumnWidth { get; set; }
+
+        /// <summary>
+        ///   Gets or sets the default page options for the workbook.
+        ///   <para>All new worksheets will use these page options.</para>
+        /// </summary>
+        public IXLPageSetup PageOptions { get; set; }
+
+        /// <summary>
+        ///   Gets or sets the default outline options for the workbook.
+        ///   <para>All new worksheets will use these outline options.</para>
+        /// </summary>
+        public IXLOutline Outline { get; set; }
+
+        /// <summary>
+        ///   Gets or sets the workbook's properties.
+        /// </summary>
+        public XLWorkbookProperties Properties { get; set; }
+
+        /// <summary>
+        ///   Gets or sets the workbook's calculation mode.
+        /// </summary>
+        public XLCalculateMode CalculateMode { get; set; }
+
+        /// <summary>
+        ///   Gets or sets the workbook's reference style.
+        /// </summary>
+        public XLReferenceStyle ReferenceStyle { get; set; }
+
+        public IXLCustomProperties CustomProperties { get; private set; }
+
+        public Boolean ShowFormulas { get; set; }
+        public Boolean ShowGridLines { get; set; }
+        public Boolean ShowOutlineSymbols { get; set; }
+        public Boolean ShowRowColHeaders { get; set; }
+        public Boolean ShowRuler { get; set; }
+        public Boolean ShowWhiteSpace { get; set; }
+        public Boolean ShowZeros { get; set; }
+        public Boolean RightToLeft { get; set; }
+
+        public Boolean DefaultShowFormulas
+        {
+            get { return false; }
+        }
+
+        public Boolean DefaultShowGridLines
+        {
+            get { return true; }
+        }
+
+        public Boolean DefaultShowOutlineSymbols
+        {
+            get { return true; }
+        }
+
+        public Boolean DefaultShowRowColHeaders
+        {
+            get { return true; }
+        }
+
+        public Boolean DefaultShowRuler
+        {
+            get { return true; }
+        }
+
+        public Boolean DefaultShowWhiteSpace
+        {
+            get { return true; }
+        }
+
+        public Boolean DefaultShowZeros
+        {
+            get { return true; }
+        }
+
+        public Boolean DefaultRightToLeft
+        {
+            get { return false; }
+        }
+
+        private void InitializeTheme()
+        {
+            Theme = new XLTheme
+                        {
+                            Text1 = XLColor.FromHtml("#FF000000"),
+                            Background1 = XLColor.FromHtml("#FFFFFFFF"),
+                            Text2 = XLColor.FromHtml("#FF1F497D"),
+                            Background2 = XLColor.FromHtml("#FFEEECE1"),
+                            Accent1 = XLColor.FromHtml("#FF4F81BD"),
+                            Accent2 = XLColor.FromHtml("#FFC0504D"),
+                            Accent3 = XLColor.FromHtml("#FF9BBB59"),
+                            Accent4 = XLColor.FromHtml("#FF8064A2"),
+                            Accent5 = XLColor.FromHtml("#FF4BACC6"),
+                            Accent6 = XLColor.FromHtml("#FFF79646"),
+                            Hyperlink = XLColor.FromHtml("#FF0000FF"),
+                            FollowedHyperlink = XLColor.FromHtml("#FF800080")
+                        };
+        }
+
+        internal XLColor GetXLColor(XLThemeColor themeColor)
+        {
+            switch (themeColor)
+            {
+                case XLThemeColor.Text1:
+                    return Theme.Text1;
+                case XLThemeColor.Background1:
+                    return Theme.Background1;
+                case XLThemeColor.Text2:
+                    return Theme.Text2;
+                case XLThemeColor.Background2:
+                    return Theme.Background2;
+                case XLThemeColor.Accent1:
+                    return Theme.Accent1;
+                case XLThemeColor.Accent2:
+                    return Theme.Accent2;
+                case XLThemeColor.Accent3:
+                    return Theme.Accent3;
+                case XLThemeColor.Accent4:
+                    return Theme.Accent4;
+                case XLThemeColor.Accent5:
+                    return Theme.Accent5;
+                case XLThemeColor.Accent6:
+                    return Theme.Accent6;
+                default:
+                    throw new ArgumentException("Invalid theme color");
+            }
+        }
+
+        public IXLNamedRange NamedRange(String rangeName)
+        {
+            if (rangeName.Contains("!"))
+            {
+                var split = rangeName.Split('!');
+                var first = split[0];
+                var wsName = first.StartsWith("'") ? first.Substring(1, first.Length - 2) : first;
+                var name = split[1];
+                IXLWorksheet ws;
+                if (TryGetWorksheet(wsName, out ws))
+                {
+                    var range = ws.NamedRange(name);
+                    return range ?? NamedRange(name);
+                }
+                return null;
+            }
+            return NamedRanges.NamedRange(rangeName);
+        }
+
+        public Boolean TryGetWorksheet(String name, out IXLWorksheet worksheet)
+        {
+            if (Worksheets.Any(w => w.Name.ToLower().Equals(name.ToLower())))
+            {
+                worksheet = Worksheet(name);
+                return true;
+            }
+
+            worksheet = null;
+            return false;
+        }
+
+        /// <summary>
+        ///   Saves the current workbook.
+        /// </summary>
+        public void Save()
+        {
+            checkForWorksheetsPresent();
+            if (_loadSource == XLLoadSource.New)
+                throw new Exception("This is a new file, please use one of the SaveAs methods.");
+
+            if (_loadSource == XLLoadSource.Stream)
+            {
+                CreatePackage(_originalStream, false, _spreadsheetDocumentType);
+            }
+            else
+                CreatePackage(_originalFile, _spreadsheetDocumentType);
+        }
+
+        /// <summary>
+        ///   Saves the current workbook to a file.
+        /// </summary>
+        public void SaveAs(String file)
+        {
+            checkForWorksheetsPresent();
+            PathHelper.CreateDirectory(Path.GetDirectoryName(file));
+            if (_loadSource == XLLoadSource.New)
+            {
+                if (File.Exists(file))
+                    File.Delete(file);
+
+                CreatePackage(file, GetSpreadsheetDocumentType(file));
+            }
+            else if (_loadSource == XLLoadSource.File)
+            {
+                if (String.Compare(_originalFile.Trim(), file.Trim(), true) != 0)
+                    File.Copy(_originalFile, file, true);
+
+                CreatePackage(file, GetSpreadsheetDocumentType(file));
+            }
+            else if (_loadSource == XLLoadSource.Stream)
+            {
+                _originalStream.Position = 0;
+
+                using (var fileStream = File.Create(file))
+                {
+                    CopyStream(_originalStream, fileStream);
+                    //fileStream.Position = 0;
+                    CreatePackage(fileStream, false, _spreadsheetDocumentType);
+                    fileStream.Close();
+                }
+            }
+        }
+
+        private static SpreadsheetDocumentType GetSpreadsheetDocumentType(string filePath)
+        {
+            var extension = Path.GetExtension(filePath);
+
+            if (extension == null) throw new Exception("Empty extension is not supported.");
+
+            if (extension.ToLowerInvariant().Equals(".xlsm")) return SpreadsheetDocumentType.MacroEnabledWorkbook;
+
+            if (extension.ToLowerInvariant().Equals(".xlsx")) return SpreadsheetDocumentType.Workbook;
+
+            throw new Exception(String.Format("Extension '{0}' is not supported. Supported extensions are '.xlsx' and '.xslm'.", extension));
+        }
+        private void checkForWorksheetsPresent()
+        {
+            if (Worksheets.Count() == 0)
+                throw new Exception("Workbooks need at least one worksheet.");
+        }
+
+        /// <summary>
+        ///   Saves the current workbook to a stream.
+        /// </summary>
+        public void SaveAs(Stream stream)
+        {
+            checkForWorksheetsPresent();
+            if (_loadSource == XLLoadSource.New)
+            {
+                // dm 20130422, this method or better the method SpreadsheetDocument.Create which is called
+                // inside of 'CreatePackage' need a stream which CanSeek & CanRead
+                // and an ordinary Response stream of a webserver can't do this
+                // so we have to ask and provide a way around this
+                if (stream.CanRead && stream.CanSeek && stream.CanWrite)
+                {
+                    // all is fine the package can be created in a direct way
+                    CreatePackage(stream, true, _spreadsheetDocumentType);
+                }
+                else
+                {
+                    // the harder way
+                    MemoryStream ms = new MemoryStream();
+                    CreatePackage(ms, true, _spreadsheetDocumentType);
+                    // not really nessesary, because I changed CopyStream too.
+                    // but for better understanding and if somebody in the future
+                    // provide an changed version of CopyStream
+                    ms.Position = 0;
+                    CopyStream(ms, stream);
+                }
+            }
+            else if (_loadSource == XLLoadSource.File)
+            {
+                using (var fileStream = new FileStream(_originalFile, FileMode.Open, FileAccess.Read))
+                {
+                    CopyStream(fileStream, stream);
+                    fileStream.Close();
+                }
+                CreatePackage(stream, false, _spreadsheetDocumentType);
+            }
+            else if (_loadSource == XLLoadSource.Stream)
+            {
+                _originalStream.Position = 0;
+                if (_originalStream != stream)
+                    CopyStream(_originalStream, stream);
+
+                CreatePackage(stream, false, _spreadsheetDocumentType);
+            }
+        }
+
+        internal static void CopyStream(Stream input, Stream output)
+        {
+            var buffer = new byte[8 * 1024];
+            int len;
+            // dm 20130422, it is always a good idea to rewind the input stream, or not?
+            if (input.CanSeek)
+                input.Seek(0, SeekOrigin.Begin);
+            while ((len = input.Read(buffer, 0, buffer.Length)) > 0)
+                output.Write(buffer, 0, len);
+            // dm 20130422, and flushing the output after write
+            output.Flush();
+
+        }
+
+        public IXLWorksheet Worksheet(String name)
+        {
+            return WorksheetsInternal.Worksheet(name);
+        }
+
+        public IXLWorksheet Worksheet(Int32 position)
+        {
+            return WorksheetsInternal.Worksheet(position);
+        }
+
+        public IXLCustomProperty CustomProperty(String name)
+        {
+            return CustomProperties.CustomProperty(name);
+        }
+
+        public IXLCells FindCells(Func<IXLCell, Boolean> predicate)
+        {
+            var cells = new XLCells(false, false);
+            foreach (XLWorksheet ws in WorksheetsInternal)
+            {
+                foreach (XLCell cell in ws.CellsUsed(true))
+                {
+                    if (predicate(cell))
+                        cells.Add(cell);
+                }
+            }
+            return cells;
+        }
+
+        public IXLRows FindRows(Func<IXLRow, Boolean> predicate)
+        {
+            var rows = new XLRows(null);
+            foreach (XLWorksheet ws in WorksheetsInternal)
+            {
+                foreach (IXLRow row in ws.Rows().Where(predicate))
+                    rows.Add(row as XLRow);
+            }
+            return rows;
+        }
+
+        public IXLColumns FindColumns(Func<IXLColumn, Boolean> predicate)
+        {
+            var columns = new XLColumns(null);
+            foreach (XLWorksheet ws in WorksheetsInternal)
+            {
+                foreach (IXLColumn column in ws.Columns().Where(predicate))
+                    columns.Add(column as XLColumn);
+            }
+            return columns;
+        }
+
+        #region Fields
+
+        private readonly XLLoadSource _loadSource = XLLoadSource.New;
+        private readonly String _originalFile;
+        private readonly Stream _originalStream;
+
+        #endregion
+
+        #region Constructor
+
+        
+        /// <summary>
+        ///   Creates a new Excel workbook.
+        /// </summary>
+        public XLWorkbook()
+            :this(XLEventTracking.Enabled)
+        {
+            
+        }
+
+        public XLWorkbook(XLEventTracking eventTracking)
+        {
+            EventTracking = eventTracking;
+            DefaultRowHeight = 15;
+            DefaultColumnWidth = 8.43;
+            Style = new XLStyle(null, DefaultStyle);
+            RowHeight = DefaultRowHeight;
+            ColumnWidth = DefaultColumnWidth;
+            PageOptions = DefaultPageOptions;
+            Outline = DefaultOutline;
+            Properties = new XLWorkbookProperties();
+            CalculateMode = XLCalculateMode.Default;
+            ReferenceStyle = XLReferenceStyle.Default;
+            InitializeTheme();
+            ShowFormulas = DefaultShowFormulas;
+            ShowGridLines = DefaultShowGridLines;
+            ShowOutlineSymbols = DefaultShowOutlineSymbols;
+            ShowRowColHeaders = DefaultShowRowColHeaders;
+            ShowRuler = DefaultShowRuler;
+            ShowWhiteSpace = DefaultShowWhiteSpace;
+            ShowZeros = DefaultShowZeros;
+            RightToLeft = DefaultRightToLeft;
+            WorksheetsInternal = new XLWorksheets(this);
+            NamedRanges = new XLNamedRanges(this);
+            CustomProperties = new XLCustomProperties(this);
+            ShapeIdManager = new XLIdManager();
+            Author = Environment.UserName;
+        }
+
+        /// <summary>
+        ///   Opens an existing workbook from a file.
+        /// </summary>
+        /// <param name = "file">The file to open.</param>
+        public XLWorkbook(String file)
+            : this(file, XLEventTracking.Enabled)
+        {
+
+        }
+
+        public XLWorkbook(String file, XLEventTracking eventTracking)
+            : this(eventTracking)
+        {
+            _loadSource = XLLoadSource.File;
+            _originalFile = file;
+            _spreadsheetDocumentType = GetSpreadsheetDocumentType(_originalFile);
+            Load(file);
+        }
+
+
+
+        /// <summary>
+        ///   Opens an existing workbook from a stream.
+        /// </summary>
+        /// <param name = "stream">The stream to open.</param>
+        public XLWorkbook(Stream stream):this(stream, XLEventTracking.Enabled)
+        {
+            
+        }
+
+        public XLWorkbook(Stream stream, XLEventTracking eventTracking)
+            : this(eventTracking)
+        {
+            _loadSource = XLLoadSource.Stream;
+            _originalStream = stream;
+            Load(stream);
+        }
+
+        #endregion
+
+        #region Nested type: UnsupportedSheet
+
+        internal sealed class UnsupportedSheet
+        {
+            public Boolean IsActive;
+            public UInt32 SheetId;
+            public Int32 Position;
+        }
+
+        #endregion
+
+        public IXLCell Cell(String namedCell)
+        {
+            var namedRange = NamedRange(namedCell);
+            if (namedRange == null) return null;
+            var range = namedRange.Ranges.FirstOrDefault();
+            if (range == null) return null;
+            return range.FirstCell();
+        }
+
+        public IXLCells Cells(String namedCells)
+        {
+            return Ranges(namedCells).Cells();
+        }
+
+        public IXLRange Range(String namedRange)
+        {
+            var range = NamedRange(namedRange);
+            if (range == null) return null;
+            return range.Ranges.FirstOrDefault();
+        }
+
+        public IXLRanges Ranges(String namedRanges)
+        {
+            var retVal = new XLRanges();
+            var rangePairs = namedRanges.Split(',');
+            foreach (var range in rangePairs.Select(r => Range(r.Trim())).Where(range => range != null))
+            {
+                retVal.Add(range);
+            }
+            return retVal;
+        }
+
+        internal XLIdManager ShapeIdManager { get; private set; }
+
+
+        public void Dispose()
+        {
+            Worksheets.ForEach(w => w.Dispose());
+        }
+
+        public Boolean Use1904DateSystem { get; set; }
+        public XLWorkbook SetUse1904DateSystem()
+        {
+            return SetUse1904DateSystem(true);
+        }
+
+        public XLWorkbook SetUse1904DateSystem(Boolean value)
+        {
+            Use1904DateSystem = value;
+            return this;
+        }
+
+        public IXLWorksheet AddWorksheet(String sheetName)
+        {
+            return Worksheets.Add(sheetName);
+        }
+
+        public IXLWorksheet AddWorksheet(String sheetName, Int32 position)
+        {
+            return Worksheets.Add(sheetName, position);
+        }
+        public IXLWorksheet AddWorksheet(DataTable dataTable)
+        {
+            return Worksheets.Add(dataTable);
+        }
+        public void AddWorksheet(DataSet dataSet)
+        {
+            Worksheets.Add(dataSet);
+        }
+
+        public void AddWorksheet(IXLWorksheet worksheet)
+        {
+            worksheet.CopyTo(this, worksheet.Name);
+        }
+
+        public IXLWorksheet AddWorksheet(DataTable dataTable, String sheetName)
+        {
+            return Worksheets.Add(dataTable, sheetName);
+        }
+
+        private XLCalcEngine _calcEngine;
+        private XLCalcEngine CalcEngine
+        {
+            get { return _calcEngine ?? (_calcEngine = new XLCalcEngine(this)); }
+        }
+        public Object Evaluate(String expression)
+        {
+            return CalcEngine.Evaluate(expression);
+        }
+
+        private static XLCalcEngine _calcEngineExpr;
+        private SpreadsheetDocumentType _spreadsheetDocumentType;
+
+        private static XLCalcEngine CalcEngineExpr
+        {
+            get { return _calcEngineExpr ?? (_calcEngineExpr = new XLCalcEngine()); }
+        }
+        public static Object EvaluateExpr(String expression)
+        {
+            return CalcEngineExpr.Evaluate(expression);
+        }
+
+        public String Author { get; set; }
+
+        public Boolean LockStructure { get; set; }
+        public XLWorkbook SetLockStructure(Boolean value) { LockStructure = value; return this; }
+        public Boolean LockWindows { get; set; }
+        public XLWorkbook SetLockWindows(Boolean value) { LockWindows = value; return this; }
+
+        public void Protect()
+        {
+            Protect(true);
+        }
+
+        public void Protect(Boolean lockStructure)
+        {
+            Protect(lockStructure, false);
+        }
+
+        public void Protect(Boolean lockStructure, Boolean lockWindows)
+        {
+            LockStructure = lockStructure;
+            LockWindows = LockWindows;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/XLWorkbookProperties.cs b/ClosedXML/Excel/XLWorkbookProperties.cs
new file mode 100644
index 0000000..b35f4b6
--- /dev/null
+++ b/ClosedXML/Excel/XLWorkbookProperties.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace ClosedXML.Excel
+{
+    public class XLWorkbookProperties
+    {
+        public XLWorkbookProperties()
+        { 
+            Company = null;
+            Manager = null;
+        }
+        public String Author { get; set; }
+        public String Title { get; set; }
+        public String Subject { get; set; }
+        public String Category { get; set; }
+        public String Keywords { get; set; }
+        public String Comments { get; set; }
+        public String Status { get; set; }
+        public DateTime Created { get; set; }
+        public DateTime Modified { get; set; }
+        public String LastModifiedBy { get; set; }
+        public String Company { get; set; }
+        public String Manager { get; set; }
+    }
+}
diff --git a/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/Excel/XLWorkbook_Load.cs
new file mode 100644
index 0000000..f0f0c40
--- /dev/null
+++ b/ClosedXML/Excel/XLWorkbook_Load.cs
@@ -0,0 +1,2004 @@
+#region
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using Ap = DocumentFormat.OpenXml.ExtendedProperties;
+using Op = DocumentFormat.OpenXml.CustomProperties;
+using Vml = DocumentFormat.OpenXml.Vml;
+using Ss = DocumentFormat.OpenXml.Vml.Spreadsheet;
+
+#endregion
+
+namespace ClosedXML.Excel
+{
+    #region
+
+    using System.Drawing;
+    using Ap;
+    using Op;
+    using System.Xml.Linq;
+    using System.Text.RegularExpressions;
+
+    #endregion
+
+    public partial class XLWorkbook
+    {
+        private readonly Dictionary<String, Color> _colorList = new Dictionary<string, Color>();
+
+        private void Load(String file)
+        {
+            LoadSheets(file);
+        }
+
+        private void Load(Stream stream)
+        {
+            LoadSheets(stream);
+        }
+
+        private void LoadSheets(String fileName)
+        {
+            using (var dSpreadsheet = SpreadsheetDocument.Open(fileName, false))
+                LoadSpreadsheetDocument(dSpreadsheet);
+        }
+
+        private void LoadSheets(Stream stream)
+        {
+            using (var dSpreadsheet = SpreadsheetDocument.Open(stream, false))
+                LoadSpreadsheetDocument(dSpreadsheet);
+        }
+
+        private void LoadSpreadsheetDocument(SpreadsheetDocument dSpreadsheet)
+        {
+            ShapeIdManager = new XLIdManager();
+            SetProperties(dSpreadsheet);
+            //var sharedStrings = dSpreadsheet.WorkbookPart.SharedStringTablePart.SharedStringTable.Elements<SharedStringItem>();
+            SharedStringItem[] sharedStrings = null;
+            if (dSpreadsheet.WorkbookPart.GetPartsOfType<SharedStringTablePart>().Count() > 0)
+            {
+                var shareStringPart = dSpreadsheet.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First();
+                sharedStrings = shareStringPart.SharedStringTable.Elements<SharedStringItem>().ToArray();
+            }
+
+            if (dSpreadsheet.CustomFilePropertiesPart != null)
+            {
+                foreach (var m in dSpreadsheet.CustomFilePropertiesPart.Properties.Elements<CustomDocumentProperty>())
+                {
+                    String name = m.Name.Value;
+                    if (m.VTLPWSTR != null)
+                        CustomProperties.Add(name, m.VTLPWSTR.Text);
+                    else if (m.VTFileTime != null)
+                    {
+                        CustomProperties.Add(name,
+                                             DateTime.ParseExact(m.VTFileTime.Text, "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'",
+                                                                 CultureInfo.InvariantCulture));
+                    }
+                    else if (m.VTDouble != null)
+                        CustomProperties.Add(name, Double.Parse(m.VTDouble.Text, CultureInfo.InvariantCulture));
+                    else if (m.VTBool != null)
+                        CustomProperties.Add(name, m.VTBool.Text == "true");
+                }
+            }
+
+            var wbProps = dSpreadsheet.WorkbookPart.Workbook.WorkbookProperties;
+            Use1904DateSystem = wbProps != null && wbProps.Date1904 != null && wbProps.Date1904.Value;
+
+            var wbProtection = dSpreadsheet.WorkbookPart.Workbook.WorkbookProtection;
+            if (wbProtection != null)
+            {
+                if (wbProtection.LockStructure != null)
+                    LockStructure = wbProtection.LockStructure.Value;
+                if (wbProtection.LockWindows != null)
+                    LockWindows = wbProtection.LockWindows.Value;
+            }
+
+            var calculationProperties = dSpreadsheet.WorkbookPart.Workbook.CalculationProperties;
+            if (calculationProperties != null)
+            {
+                var referenceMode = calculationProperties.ReferenceMode;
+                if (referenceMode != null)
+                    ReferenceStyle = referenceMode.Value.ToClosedXml();
+
+                var calculateMode = calculationProperties.CalculationMode;
+                if (calculateMode != null)
+                    CalculateMode = calculateMode.Value.ToClosedXml();
+            }
+
+            var efp = dSpreadsheet.ExtendedFilePropertiesPart;
+            if (efp != null && efp.Properties != null)
+            {
+                if (efp.Properties.Elements<Company>().Any())
+                    Properties.Company = efp.Properties.GetFirstChild<Company>().Text;
+
+                if (efp.Properties.Elements<Manager>().Any())
+                    Properties.Manager = efp.Properties.GetFirstChild<Manager>().Text;
+            }
+
+            Stylesheet s = null;
+            if (dSpreadsheet.WorkbookPart.WorkbookStylesPart != null &&
+                dSpreadsheet.WorkbookPart.WorkbookStylesPart.Stylesheet != null)
+            {
+                s = dSpreadsheet.WorkbookPart.WorkbookStylesPart.Stylesheet;
+            }
+
+            NumberingFormats numberingFormats = s == null ? null : s.NumberingFormats;
+            Fills fills = s == null ? null : s.Fills;
+            Borders borders = s == null ? null : s.Borders;
+            Fonts fonts = s == null ? null : s.Fonts;
+            Int32 dfCount = 0;
+            Dictionary<Int32, DifferentialFormat> differentialFormats;
+            if (s != null &&s.DifferentialFormats != null)
+                differentialFormats = s.DifferentialFormats.Elements<DifferentialFormat>().ToDictionary(k => dfCount++);
+            else
+                differentialFormats = new Dictionary<Int32, DifferentialFormat>();
+                
+            var sheets = dSpreadsheet.WorkbookPart.Workbook.Sheets;
+            Int32 position = 0;
+            foreach (Sheet dSheet in sheets.OfType<Sheet>())
+            {
+                position++;
+                var sharedFormulasR1C1 = new Dictionary<UInt32, String>();
+
+                var wsPart = dSpreadsheet.WorkbookPart.GetPartById(dSheet.Id) as WorksheetPart;
+
+                if (wsPart == null)
+                {
+                    UnsupportedSheets.Add(new UnsupportedSheet {SheetId = dSheet.SheetId.Value, Position = position});
+                    continue;
+                }
+
+                var sheetName = dSheet.Name;
+
+                var ws = (XLWorksheet) WorksheetsInternal.Add(sheetName, position);
+                ws.RelId = dSheet.Id;
+                ws.SheetId = (Int32) dSheet.SheetId.Value;
+
+
+                if (dSheet.State != null)
+                    ws.Visibility = dSheet.State.Value.ToClosedXml();
+
+                var styleList = new Dictionary<int, IXLStyle>();// {{0, ws.Style}};
+
+                using (var reader = OpenXmlReader.Create(wsPart))
+                {
+                    while (reader.Read())
+                    {
+                        if (reader.ElementType == typeof(SheetFormatProperties))
+                        {
+                            var sheetFormatProperties = (SheetFormatProperties)reader.LoadCurrentElement();
+                            if (sheetFormatProperties != null)
+                            {
+                                if (sheetFormatProperties.DefaultRowHeight != null)
+                                    ws.RowHeight = sheetFormatProperties.DefaultRowHeight;
+
+                                ws.RowHeightChanged = (sheetFormatProperties.CustomHeight != null &&
+                                                       sheetFormatProperties.CustomHeight.Value);
+
+                                if (sheetFormatProperties.DefaultColumnWidth != null)
+                                {
+                                    ws.ColumnWidth = sheetFormatProperties.DefaultColumnWidth;
+                                }
+                            }
+                        }
+                        else if (reader.ElementType == typeof(SheetViews))
+                            LoadSheetViews((SheetViews)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(MergeCells))
+                        {
+                            var mergedCells = (MergeCells)reader.LoadCurrentElement();
+                            if (mergedCells != null)
+                            {
+                                foreach (MergeCell mergeCell in mergedCells.Elements<MergeCell>())
+                                    ws.Range(mergeCell.Reference).Merge(false);
+                            }
+                        }
+                        else if (reader.ElementType == typeof(Columns))
+                            LoadColumns(s, numberingFormats, fills, borders, fonts, ws,
+                                        (Columns)reader.LoadCurrentElement());
+                        else if (reader.ElementType == typeof(Row))
+                        {
+                            lastRow = 0;
+                            LoadRows(s, numberingFormats, fills, borders, fonts, ws, sharedStrings, sharedFormulasR1C1,
+                                     styleList, (Row)reader.LoadCurrentElement());
+                        }
+                        else if (reader.ElementType == typeof(AutoFilter))
+                            LoadAutoFilter((AutoFilter)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(SheetProtection))
+                            LoadSheetProtection((SheetProtection)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(DataValidations))
+                            LoadDataValidations((DataValidations)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(ConditionalFormatting))
+                            LoadConditionalFormatting((ConditionalFormatting)reader.LoadCurrentElement(), ws, differentialFormats);
+                        else if (reader.ElementType == typeof(Hyperlinks))
+                            LoadHyperlinks((Hyperlinks)reader.LoadCurrentElement(), wsPart, ws);
+                        else if (reader.ElementType == typeof(PrintOptions))
+                            LoadPrintOptions((PrintOptions)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(PageMargins))
+                            LoadPageMargins((PageMargins)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(PageSetup))
+                            LoadPageSetup((PageSetup)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(HeaderFooter))
+                            LoadHeaderFooter((HeaderFooter)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(SheetProperties))
+                            LoadSheetProperties((SheetProperties)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(RowBreaks))
+                            LoadRowBreaks((RowBreaks)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(ColumnBreaks))
+                            LoadColumnBreaks((ColumnBreaks)reader.LoadCurrentElement(), ws);
+                        else if (reader.ElementType == typeof(LegacyDrawing))
+                            ws.LegacyDrawingId = (reader.LoadCurrentElement() as LegacyDrawing).Id.Value;
+
+                    }
+                    reader.Close();
+                }
+
+                #region LoadTables
+
+                foreach (TableDefinitionPart tablePart in wsPart.TableDefinitionParts)
+                {
+                    var dTable = tablePart.Table;
+                    string reference = dTable.Reference.Value;
+                    XLTable xlTable = ws.Range(reference).CreateTable(dTable.Name, false) as XLTable;
+                    if (dTable.HeaderRowCount != null && dTable.HeaderRowCount == 0)
+                    {
+                        xlTable._showHeaderRow = false;
+                        //foreach (var tableColumn in dTable.TableColumns.Cast<TableColumn>())
+                        xlTable.AddFields(dTable.TableColumns.Cast<TableColumn>().Select(t=>GetTableColumnName(t.Name.Value)));
+                    }
+                    else
+                    {
+                        xlTable.InitializeAutoFilter();
+                    }
+
+                    if (dTable.TotalsRowCount != null && dTable.TotalsRowCount.Value > 0)
+                        ((XLTable) xlTable)._showTotalsRow = true;
+
+                    if (dTable.TableStyleInfo != null)
+                    {
+                        if (dTable.TableStyleInfo.ShowFirstColumn != null)
+                            xlTable.EmphasizeFirstColumn = dTable.TableStyleInfo.ShowFirstColumn.Value;
+                        if (dTable.TableStyleInfo.ShowLastColumn != null)
+                            xlTable.EmphasizeLastColumn = dTable.TableStyleInfo.ShowLastColumn.Value;
+                        if (dTable.TableStyleInfo.ShowRowStripes != null)
+                            xlTable.ShowRowStripes = dTable.TableStyleInfo.ShowRowStripes.Value;
+                        if (dTable.TableStyleInfo.ShowColumnStripes != null)
+                            xlTable.ShowColumnStripes = dTable.TableStyleInfo.ShowColumnStripes.Value;
+                        if (dTable.TableStyleInfo.Name != null)
+                            xlTable.Theme = (XLTableTheme) Enum.Parse(typeof (XLTableTheme), dTable.TableStyleInfo.Name.Value);
+                        else
+                            xlTable.Theme = XLTableTheme.None;
+                    }
+
+
+                    if (dTable.AutoFilter != null)
+                    {
+                        xlTable.ShowAutoFilter = true;
+                        LoadAutoFilterColumns( dTable.AutoFilter, (xlTable as XLTable).AutoFilter);
+                    }
+                    else
+                        xlTable.ShowAutoFilter = false;
+                    
+
+                    if (xlTable.ShowTotalsRow)
+                    {
+                        foreach (var tableColumn in dTable.TableColumns.Cast<TableColumn>())
+                        {
+                            var tableColumnName = GetTableColumnName(tableColumn.Name.Value);
+                            if (tableColumn.TotalsRowFunction != null)
+                                xlTable.Field(tableColumnName).TotalsRowFunction =
+                                    tableColumn.TotalsRowFunction.Value.ToClosedXml();
+
+                            if (tableColumn.TotalsRowFormula != null)
+                                xlTable.Field(tableColumnName).TotalsRowFormulaA1 =
+                                    tableColumn.TotalsRowFormula.Text;
+
+                            if (tableColumn.TotalsRowLabel != null)
+                                xlTable.Field(tableColumnName).TotalsRowLabel = tableColumn.TotalsRowLabel.Value;
+                        }
+                        if (xlTable.AutoFilter != null)
+                            xlTable.AutoFilter.Range = xlTable.Worksheet.Range(
+                                                    xlTable.RangeAddress.FirstAddress.RowNumber, xlTable.RangeAddress.FirstAddress.ColumnNumber,
+                                                    xlTable.RangeAddress.LastAddress.RowNumber - 1, xlTable.RangeAddress.LastAddress.ColumnNumber);
+                    }
+                    else if (xlTable.AutoFilter != null)
+                            xlTable.AutoFilter.Range = xlTable.Worksheet.Range(xlTable.RangeAddress);
+                }
+
+                #endregion
+
+                #region LoadComments
+
+                if (wsPart.WorksheetCommentsPart != null) {
+                    var root = wsPart.WorksheetCommentsPart.Comments;
+                    var authors = root.GetFirstChild<Authors>().ChildElements;
+                    var comments = root.GetFirstChild<CommentList>().ChildElements;
+
+                    // **** MAYBE FUTURE SHAPE SIZE SUPPORT
+                    XDocument xdoc = GetCommentVmlFile(wsPart);
+                    
+                    foreach (Comment c in comments) {
+                        // find cell by reference
+                        var cell = ws.Cell(c.Reference);
+                        
+                        XLComment xlComment = cell.Comment as XLComment;
+                        xlComment.Author = authors[(int)c.AuthorId.Value].InnerText;
+                        //xlComment.ShapeId = (Int32)c.ShapeId.Value;
+                        //ShapeIdManager.Add(xlComment.ShapeId);
+
+                        var runs = c.GetFirstChild<CommentText>().Elements<Run>();
+                        foreach (Run run in runs) {
+                            var runProperties = run.RunProperties;
+                            String text = run.Text.InnerText.FixNewLines();
+                            var rt = cell.Comment.AddText(text);
+                            LoadFont(runProperties, rt);
+                        }
+
+                      
+                        XElement shape = GetCommentShape(xdoc);
+                       
+                        LoadShapeProperties<IXLComment>(xlComment, shape);
+
+                        var clientData = shape.Elements().First(e => e.Name.LocalName == "ClientData");
+                        LoadClientData<IXLComment>(xlComment, clientData);
+
+                        var textBox = shape.Elements().First(e=>e.Name.LocalName == "textbox");
+                        LoadTextBox<IXLComment>(xlComment, textBox);
+
+                        var alt = shape.Attribute("alt");
+                        if (alt != null) xlComment.Style.Web.SetAlternateText(alt.Value);
+
+                        LoadColorsAndLines<IXLComment>(xlComment, shape);
+
+                        //var insetmode = (string)shape.Attributes().First(a=> a.Name.LocalName == "insetmode");
+                        //xlComment.Style.Margins.Automatic = insetmode != null && insetmode.Equals("auto");
+                        
+                        shape.Remove();
+                    }
+                }
+
+                #endregion
+            }
+
+            var workbook = dSpreadsheet.WorkbookPart.Workbook;
+
+            var bookViews = workbook.BookViews;
+            if (bookViews != null && bookViews.Any())
+            {
+                var workbookView = bookViews.First() as WorkbookView;
+                if (workbookView != null && workbookView.ActiveTab != null)
+                {
+                    UnsupportedSheet unsupportedSheet =
+                        UnsupportedSheets.FirstOrDefault(us => us.Position == (Int32) (workbookView.ActiveTab.Value + 1));
+                    if (unsupportedSheet != null)
+                        unsupportedSheet.IsActive = true;
+                    else
+                    {
+                        Worksheet((Int32) (workbookView.ActiveTab.Value + 1)).SetTabActive();
+                    }
+                }
+            }
+            LoadDefinedNames(workbook);
+        }
+
+        #region Comment Helpers
+
+        private XDocument GetCommentVmlFile(WorksheetPart wsPart)
+        {
+            XDocument xdoc = null;
+
+            foreach (var vmlPart in wsPart.VmlDrawingParts)
+            {
+                xdoc = XDocumentExtensions.Load(vmlPart.GetStream(FileMode.Open));
+
+                //Probe for comments
+                if (xdoc.Root == null) continue;
+                var shape = GetCommentShape(xdoc);
+                if (shape != null) break;
+            }
+
+            if (xdoc == null) throw new Exception("Could not load comments file");
+            return xdoc;
+        }
+
+        private static XElement GetCommentShape(XDocument xdoc)
+        {
+            var xml = xdoc.Root.Element("xml");
+
+            XElement shape;
+            if (xml != null)
+                shape =
+                    xml.Elements().FirstOrDefault(e => (string) e.Attribute("type") == XLConstants.Comment.ShapeTypeId);
+            else
+                shape = xdoc.Root.Elements().FirstOrDefault(e =>
+                                                            (string) e.Attribute("type") ==
+                                                            XLConstants.Comment.ShapeTypeId ||
+                                                            (string) e.Attribute("type") ==
+                                                            XLConstants.Comment.AlternateShapeTypeId);
+            return shape;
+        }
+
+        #endregion
+
+
+        private String GetTableColumnName(string name)
+        {
+            return name.Replace("_x000a_", Environment.NewLine).Replace("_x005f_x000a_", "_x000a_");
+        }
+
+        // This may be part of XLHelper or XLColor
+        // Leaving it here for now. Can't decide what to call it and where to put it.
+        private XLColor ExtractColor(String color)
+        {
+            if (color.IndexOf("[") >= 0)
+            {
+                int start = color.IndexOf("[") + 1;
+                int end = color.IndexOf("]", start);
+                return XLColor.FromIndex(Int32.Parse(color.Substring(start, end - start)));
+            }
+            else
+            {
+                return XLColor.FromHtml(color);
+            }
+            
+        }
+
+        private void LoadColorsAndLines<T>(IXLDrawing<T> drawing, XElement shape)
+        {
+            var strokeColor = shape.Attribute("strokecolor");
+            if (strokeColor != null) drawing.Style.ColorsAndLines.LineColor = ExtractColor(strokeColor.Value);
+
+            var strokeWeight = shape.Attribute("strokeweight");
+            if (strokeWeight != null)
+                drawing.Style.ColorsAndLines.LineWeight = GetPtValue(strokeWeight.Value);
+
+            var fillColor = shape.Attribute("fillcolor");
+            if (fillColor != null && !fillColor.Value.ToLower().Contains("infobackground")) drawing.Style.ColorsAndLines.FillColor = ExtractColor(fillColor.Value);
+
+            var fill = shape.Elements().FirstOrDefault(e => e.Name.LocalName == "fill");
+            if (fill != null)
+            {
+                var opacity = fill.Attribute("opacity");
+                if (opacity != null)
+                {
+                    String opacityVal = opacity.Value;
+                    if (opacityVal.EndsWith("f"))
+                        drawing.Style.ColorsAndLines.FillTransparency = 
+                            Double.Parse(opacityVal.Substring(0, opacityVal.Length - 1), CultureInfo.InvariantCulture) / 65536.0;
+                    else
+                        drawing.Style.ColorsAndLines.FillTransparency = Double.Parse(opacityVal, CultureInfo.InvariantCulture);
+                }
+            }
+
+            var stroke = shape.Elements().FirstOrDefault(e=>e.Name.LocalName == "stroke");
+            if (stroke != null)
+            {
+                var opacity = stroke.Attribute("opacity");
+                if (opacity != null)
+                {
+                    String opacityVal = opacity.Value;
+                    if (opacityVal.EndsWith("f"))
+                        drawing.Style.ColorsAndLines.LineTransparency = 
+                            Double.Parse(opacityVal.Substring(0, opacityVal.Length - 1), CultureInfo.InvariantCulture) / 65536.0;
+                    else
+                        drawing.Style.ColorsAndLines.LineTransparency = Double.Parse(opacityVal, CultureInfo.InvariantCulture);
+                }
+
+                var dashStyle = stroke.Attribute("dashstyle");
+                if (dashStyle != null)
+                {
+                    String dashStyleVal = dashStyle.Value.ToLower();
+                    if (dashStyleVal == "1 1" || dashStyleVal == "shortdot")
+                    {
+                        var endCap = stroke.Attribute("endcap");
+                        if (endCap != null && endCap.Value == "round")
+                            drawing.Style.ColorsAndLines.LineDash = XLDashStyle.RoundDot;
+                        else
+                            drawing.Style.ColorsAndLines.LineDash = XLDashStyle.SquareDot;
+                    }
+                    else 
+                    {
+                        switch (dashStyleVal)
+                        {
+                            case "dash": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.Dash; break;
+                            case "dashdot": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.DashDot; break;
+                            case "longdash": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.LongDash; break;
+                            case "longdashdot": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.LongDashDot; break;
+                            case "longdashdotdot": drawing.Style.ColorsAndLines.LineDash = XLDashStyle.LongDashDotDot; break;
+                        }
+                    }
+                }
+
+                var lineStyle = stroke.Attribute("linestyle");
+                if (lineStyle != null)
+                {
+                    String lineStyleVal = lineStyle.Value.ToLower();
+                    switch (lineStyleVal)
+                    {
+                        case "single": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.Single ; break;
+                        case "thickbetweenthin": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThickBetweenThin; break;
+                        case "thickthin": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThickThin; break;
+                        case "thinthick": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThinThick; break;
+                        case "thinthin": drawing.Style.ColorsAndLines.LineStyle = XLLineStyle.ThinThin; break;
+                    }
+                }
+            }
+        }
+
+        private void LoadTextBox<T>(IXLDrawing<T> xlDrawing, XElement textBox)
+        {
+            var attStyle = textBox.Attribute("style");
+            if (attStyle != null) LoadTextBoxStyle<T>(xlDrawing, attStyle);
+
+            var attInset = textBox.Attribute("inset");
+            if (attInset != null) LoadTextBoxInset<T>(xlDrawing, attInset);
+        }
+
+        private void LoadTextBoxInset<T>(IXLDrawing<T> xlDrawing, XAttribute attInset)
+        {
+            var split = attInset.Value.Split(',');
+            xlDrawing.Style.Margins.Left = GetInsetValue(split[0]);
+            xlDrawing.Style.Margins.Top = GetInsetValue(split[1]);
+            xlDrawing.Style.Margins.Right = GetInsetValue(split[2]);
+            xlDrawing.Style.Margins.Bottom = GetInsetValue(split[3]);
+        }
+
+        private double GetInsetValue(string value)
+        {
+            String v = value.Trim();
+            if (v.EndsWith("pt"))
+                return Double.Parse(v.Substring(0, v.Length - 2), CultureInfo.InvariantCulture) / 72.0;
+            else
+                return Double.Parse(v.Substring(0, v.Length - 2), CultureInfo.InvariantCulture);
+        }
+
+        private static void LoadTextBoxStyle<T>(IXLDrawing<T> xlDrawing, XAttribute attStyle)
+        {
+            var style = attStyle.Value;
+            var attributes = style.Split(';');
+            foreach (String pair in attributes)
+            {
+                var split = pair.Split(':');
+                if (split.Length != 2) continue;
+
+                var attribute = split[0].Trim().ToLower();
+                var value = split[1].Trim();
+                Boolean isVertical = false;
+                switch (attribute)
+                {
+                    case "mso-fit-shape-to-text": xlDrawing.Style.Size.SetAutomaticSize(value.Equals("t")); break;
+                    case "mso-layout-flow-alt":
+                        if (value.Equals("bottom-to-top")) xlDrawing.Style.Alignment.SetOrientation(XLDrawingTextOrientation.BottomToTop);
+                        else if (value.Equals("top-to-bottom")) xlDrawing.Style.Alignment.SetOrientation(XLDrawingTextOrientation.Vertical);
+                        break;
+                    case "layout-flow": isVertical = value.Equals("vertical"); break;
+                    case "mso-direction-alt": if (value == "auto") xlDrawing.Style.Alignment.Direction = XLDrawingTextDirection.Context; break;
+                    case "direction": if (value == "RTL") xlDrawing.Style.Alignment.Direction = XLDrawingTextDirection.RightToLeft; break;
+                }
+                if (isVertical && xlDrawing.Style.Alignment.Orientation == XLDrawingTextOrientation.LeftToRight)
+                    xlDrawing.Style.Alignment.Orientation = XLDrawingTextOrientation.TopToBottom;
+            }
+        }
+
+        private void LoadClientData<T>(IXLDrawing<T> drawing, XElement clientData)
+        {
+            var anchor = clientData.Elements().FirstOrDefault(e=>e.Name.LocalName == "Anchor");
+            if (anchor != null) LoadClientDataAnchor<T>(drawing, anchor);
+
+            LoadDrawingPositioning<T>(drawing, clientData);
+            LoadDrawingProtection<T>(drawing, clientData);
+
+            var visible = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "Visible");
+            drawing.Visible = visible != null && visible.Value.ToLower().StartsWith("t");
+
+            LoadDrawingHAlignment<T>(drawing, clientData);
+            LoadDrawingVAlignment<T>(drawing, clientData);
+        }
+
+        private void LoadDrawingHAlignment<T>(IXLDrawing<T> drawing, XElement clientData)
+        {
+            var textHAlign = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "TextHAlign");
+            if (textHAlign != null)
+                drawing.Style.Alignment.Horizontal = (XLDrawingHorizontalAlignment)Enum.Parse(typeof(XLDrawingHorizontalAlignment), textHAlign.Value.ToProper());
+        }
+
+        private void LoadDrawingVAlignment<T>(IXLDrawing<T> drawing, XElement clientData)
+        {
+            var textVAlign = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "TextVAlign");
+            if (textVAlign != null)
+                drawing.Style.Alignment.Vertical = (XLDrawingVerticalAlignment)Enum.Parse(typeof(XLDrawingVerticalAlignment), textVAlign.Value.ToProper());
+        }
+
+        private void LoadDrawingProtection<T>(IXLDrawing<T> drawing, XElement clientData)
+        {
+            var lockedElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "Locked");
+            var lockTextElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "LockText");
+            Boolean locked = lockedElement != null && lockedElement.Value.ToLower() == "true";
+            Boolean lockText = lockTextElement != null && lockTextElement.Value.ToLower() == "true";
+            drawing.Style.Protection.Locked = locked;
+            drawing.Style.Protection.LockText = lockText;
+
+        }
+
+        private static void LoadDrawingPositioning<T>(IXLDrawing<T> drawing, XElement clientData)
+        {
+            var moveWithCellsElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "MoveWithCells");
+            var sizeWithCellsElement = clientData.Elements().FirstOrDefault(e => e.Name.LocalName == "SizeWithCells");
+            Boolean moveWithCells = !(moveWithCellsElement != null && moveWithCellsElement.Value.ToLower() == "true");
+            Boolean sizeWithCells = !(sizeWithCellsElement != null && sizeWithCellsElement.Value.ToLower() == "true");
+            if (moveWithCells && !sizeWithCells)
+                drawing.Style.Properties.Positioning = XLDrawingAnchor.MoveWithCells;
+            else if (moveWithCells && sizeWithCells)
+                drawing.Style.Properties.Positioning = XLDrawingAnchor.MoveAndSizeWithCells;
+            else
+                drawing.Style.Properties.Positioning = XLDrawingAnchor.Absolute;
+        }
+
+        private static void LoadClientDataAnchor<T>(IXLDrawing<T> drawing, XElement anchor)
+        {
+            var location = anchor.Value.Split(',');
+            drawing.Position.Column = int.Parse(location[0]) + 1;
+            drawing.Position.ColumnOffset = Double.Parse(location[1], CultureInfo.InvariantCulture) / 7.2;
+            drawing.Position.Row = int.Parse(location[2]) + 1;
+            drawing.Position.RowOffset = Double.Parse(location[3], CultureInfo.InvariantCulture);
+        }
+
+        private void LoadShapeProperties<T>(IXLDrawing<T> xlDrawing, XElement shape)
+        {
+            var attStyle = shape.Attribute("style");
+            if (attStyle == null) return;
+
+            var style = attStyle.Value;
+            var attributes = style.Split(';');
+            foreach (String pair in attributes)
+            {
+                var split = pair.Split(':');
+                if (split.Length != 2) continue;
+
+                var attribute = split[0].Trim().ToLower();
+                var value = split[1].Trim();
+
+                switch (attribute)
+                {
+                    case "visibility": xlDrawing.Visible = value.ToLower().Equals("visible"); break;
+                    case "width": xlDrawing.Style.Size.Width = GetPtValue(value) / 7.5; break;
+                    case "height": xlDrawing.Style.Size.Height = GetPtValue(value); break;
+                    case "z-index": xlDrawing.ZOrder = Int32.Parse(value); break;
+                }
+            }
+
+        }
+
+        private readonly Dictionary<string, double> knownUnits = new Dictionary<string, double>
+        {
+            {"pt", 1.0},
+            {"in", 72.0},
+            {"mm", 72.0/25.4}
+        };
+
+        private double GetPtValue(string value)
+        {
+            var knownUnit = knownUnits.FirstOrDefault(ku => value.Contains(ku.Key));
+
+            if (knownUnit.Key == null)
+                return Double.Parse(value);
+
+            return Double.Parse(value.Replace(knownUnit.Key, String.Empty), CultureInfo.InvariantCulture) * knownUnit.Value;
+        }
+        
+
+        private void LoadDefinedNames(Workbook workbook)
+        {
+            if (workbook.DefinedNames == null) return;
+
+            foreach (DefinedName definedName in workbook.DefinedNames)
+            {
+                var name = definedName.Name;
+                if (name == "_xlnm.Print_Area")
+                {
+                    foreach (string area in definedName.Text.Split(','))
+                    {
+                        if (area.Contains("["))
+                        {
+                            String tableName = area.Substring(0, area.IndexOf("["));
+                            var ws = Worksheets.FirstOrDefault(w => (w as XLWorksheet).SheetId == definedName.LocalSheetId + 1);
+                            if (ws != null)
+                            {
+                                ws.PageSetup.PrintAreas.Add(area);
+                            }
+                        }
+                        else
+                        {
+                            string sheetName, sheetArea;
+                            ParseReference(area, out sheetName, out sheetArea);
+                            if (!(sheetArea.Equals("#REF") || sheetArea.EndsWith("#REF!") || sheetArea.Length == 0))
+                                WorksheetsInternal.Worksheet(sheetName).PageSetup.PrintAreas.Add(sheetArea);
+                        }
+                    }
+                }
+                else if (name == "_xlnm.Print_Titles")
+                {
+                    LoadPrintTitles(definedName);
+                }
+                else
+                {
+                    string text = definedName.Text;
+
+                    if (!(text.Equals("#REF") || text.EndsWith("#REF!")))
+                    {
+                        var localSheetId = definedName.LocalSheetId;
+                        var comment = definedName.Comment;
+                        if (localSheetId == null)
+                        {
+                            if (!NamedRanges.Any(nr => nr.Name == name))
+                                NamedRanges.Add(name, text, comment);
+                        }
+                        else
+                        {
+                            if (!Worksheet(Int32.Parse(localSheetId) + 1).NamedRanges.Any(nr => nr.Name == name))
+                                Worksheet(Int32.Parse(localSheetId) + 1).NamedRanges.Add(name, text, comment);
+                        }
+                    }
+                }
+            }
+        }
+
+        private void LoadPrintTitles(DefinedName definedName)
+        {
+            var areas = definedName.Text.Split(',');
+            if (areas.Length > 0)
+            {
+                foreach (var item in areas)
+                {
+                    SetColumnsOrRowsToRepeat(item);
+                }
+                return;
+            }
+
+            SetColumnsOrRowsToRepeat(definedName.Text);
+        }
+
+        private void SetColumnsOrRowsToRepeat(string area)
+        {
+            string sheetName, sheetArea;
+            ParseReference(area, out sheetName, out sheetArea);
+            if (sheetArea.Equals("#REF")) return;
+            if (IsColReference(sheetArea))
+                WorksheetsInternal.Worksheet(sheetName).PageSetup.SetColumnsToRepeatAtLeft(sheetArea);
+            if (IsRowReference(sheetArea))
+                WorksheetsInternal.Worksheet(sheetName).PageSetup.SetRowsToRepeatAtTop(sheetArea);
+        }
+
+        // either $A:$X => true or $1:$99 => false
+        private static bool IsColReference(string sheetArea)
+        {
+            char c = sheetArea[0] == '$' ? sheetArea[1] : sheetArea[0];
+            return char.IsLetter(c);
+        }
+
+        private static bool IsRowReference(string sheetArea)
+        {
+            char c = sheetArea[0] == '$' ? sheetArea[1] : sheetArea[0];
+            return char.IsNumber(c);
+        }
+
+        private static void ParseReference(string item, out string sheetName, out string sheetArea)
+        {
+            var sections = item.Trim().Split('!');
+            sheetName = sections[0].Replace("\'", "");
+            sheetArea = sections[1];
+        }
+
+        private Int32 lastCell;
+        private void LoadCells(SharedStringItem[] sharedStrings, Stylesheet s, NumberingFormats numberingFormats,
+                               Fills fills, Borders borders, Fonts fonts, Dictionary<uint, string> sharedFormulasR1C1,
+                               XLWorksheet ws, Dictionary<Int32, IXLStyle> styleList, Cell cell, Int32 rowIndex)
+        {
+            Int32 styleIndex = cell.StyleIndex != null ? Int32.Parse(cell.StyleIndex.InnerText) : 0;
+
+            String cellReference = cell.CellReference == null
+                                       ? XLHelper.GetColumnLetterFromNumber(++lastCell) + rowIndex
+                                       : cell.CellReference.Value;
+            var xlCell = ws.CellFast(cellReference);
+
+            if (styleList.ContainsKey(styleIndex))
+            {
+                xlCell.Style = styleList[styleIndex];
+            }
+            else
+            {
+                ApplyStyle(xlCell, styleIndex, s, fills, borders, fonts, numberingFormats);
+                styleList.Add(styleIndex, xlCell.Style);
+            }
+
+
+            if (cell.CellFormula != null && cell.CellFormula.SharedIndex != null && cell.CellFormula.Reference != null)
+            {
+                String formula;
+                if (cell.CellFormula.FormulaType != null && cell.CellFormula.FormulaType == CellFormulaValues.Array)
+                    formula = "{" + cell.CellFormula.Text + "}";
+                else
+                    formula = cell.CellFormula.Text;
+
+                if (cell.CellFormula.Reference != null)
+                    xlCell.FormulaReference = ws.Range(cell.CellFormula.Reference.Value).RangeAddress;
+
+                xlCell.FormulaA1 = formula;
+                sharedFormulasR1C1.Add(cell.CellFormula.SharedIndex.Value, xlCell.FormulaR1C1);
+
+                if (cell.CellValue != null)
+                    xlCell.ValueCached = cell.CellValue.Text;
+            }
+            else if (cell.CellFormula != null)
+            {
+                if (cell.CellFormula.SharedIndex != null)
+                    xlCell.FormulaR1C1 = sharedFormulasR1C1[cell.CellFormula.SharedIndex.Value];
+                else
+                {
+                    String formula;
+                    if (cell.CellFormula.FormulaType != null && cell.CellFormula.FormulaType == CellFormulaValues.Array)
+                        formula = "{" + cell.CellFormula.Text + "}";
+                    else
+                        formula = cell.CellFormula.Text;
+
+                    xlCell.FormulaA1 = formula;
+                }
+
+                if (cell.CellFormula.Reference != null)
+                    xlCell.FormulaReference = ws.Range(cell.CellFormula.Reference.Value).RangeAddress;
+
+                if (cell.CellValue != null)
+                    xlCell.ValueCached = cell.CellValue.Text;
+            }
+            else if (cell.DataType != null)
+            {
+                if (cell.DataType == CellValues.InlineString)
+                {
+                    xlCell._cellValue = cell.InlineString != null && cell.InlineString.Text != null ? cell.InlineString.Text.Text.FixNewLines() : String.Empty;
+                    xlCell._dataType = XLCellValues.Text;
+                    xlCell.ShareString = false;
+                }
+                else if (cell.DataType == CellValues.SharedString)
+                {
+                    if (cell.CellValue != null)
+                    {
+                        if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
+                        {
+                            var sharedString = sharedStrings[Int32.Parse(cell.CellValue.Text)];
+
+                            var runs = sharedString.Elements<Run>();
+                            var phoneticRuns = sharedString.Elements<PhoneticRun>();
+                            var phoneticProperties = sharedString.Elements<PhoneticProperties>();
+                            Boolean hasRuns = false;
+                            foreach (Run run in runs)
+                            {
+                                var runProperties = run.RunProperties;
+                                String text = run.Text.InnerText.FixNewLines();
+
+                                if (runProperties == null)
+                                    xlCell.RichText.AddText(text, xlCell.Style.Font);
+                                else
+                                {
+                                    var rt = xlCell.RichText.AddText(text);
+                                    LoadFont(runProperties, rt);
+                                }
+                                if (!hasRuns)
+                                    hasRuns = true;
+                            }
+                        
+                            if(!hasRuns)
+                                xlCell._cellValue = sharedString.Text.InnerText;
+
+                            #region Load PhoneticProperties
+
+                            var pp = phoneticProperties.FirstOrDefault();
+                            if (pp != null)
+                            {
+                                if (pp.Alignment != null)
+                                    xlCell.RichText.Phonetics.Alignment = pp.Alignment.Value.ToClosedXml();
+                                if (pp.Type != null)
+                                    xlCell.RichText.Phonetics.Type = pp.Type.Value.ToClosedXml();
+
+                                LoadFont(pp, xlCell.RichText.Phonetics);
+                            }
+
+                            #endregion
+
+                            #region Load Phonetic Runs
+
+                            foreach (PhoneticRun pr in phoneticRuns)
+                            {
+                                xlCell.RichText.Phonetics.Add(pr.Text.InnerText.FixNewLines(), (Int32)pr.BaseTextStartIndex.Value,
+                                                              (Int32) pr.EndingBaseIndex.Value);
+                            }
+
+                            #endregion
+                        }
+                        else
+                            xlCell._cellValue = cell.CellValue.Text.FixNewLines();
+                    }
+                    else
+                        xlCell._cellValue = String.Empty;
+                    xlCell._dataType = XLCellValues.Text;
+                }
+                else if (cell.DataType == CellValues.Date)
+                {
+                    if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
+                        xlCell._cellValue = Double.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture).ToString();
+                    xlCell._dataType = XLCellValues.DateTime;
+                }
+                else if (cell.DataType == CellValues.Boolean)
+                {
+                    xlCell._cellValue = cell.CellValue.Text;
+                    xlCell._dataType = XLCellValues.Boolean;
+                }
+                else if (cell.DataType == CellValues.Number)
+                {
+                    if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
+                        xlCell._cellValue = Double.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture).ToString();
+                    if (s == null)
+                    {
+                        xlCell._dataType = XLCellValues.Number;
+                    }
+                    else
+                    {
+                        var numberFormatId = ((CellFormat)(s.CellFormats).ElementAt(styleIndex)).NumberFormatId;
+                        if (numberFormatId == 46U)
+                            xlCell.DataType = XLCellValues.TimeSpan;
+                        else
+                            xlCell._dataType = XLCellValues.Number;
+                    }
+                    
+                }
+            }
+            else if (cell.CellValue != null)
+            {
+                if (s == null)
+                {
+                    xlCell._dataType = XLCellValues.Number;
+                }
+                else
+                {
+                    var numberFormatId = ((CellFormat) (s.CellFormats).ElementAt(styleIndex)).NumberFormatId;
+                    if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text))
+                        xlCell._cellValue = Double.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture).ToString();
+                    if (s.NumberingFormats != null &&
+                        s.NumberingFormats.Any(nf => ((NumberingFormat) nf).NumberFormatId.Value == numberFormatId))
+                    {
+                        xlCell.Style.NumberFormat.Format =
+                            ((NumberingFormat) s.NumberingFormats
+                                                .First(
+                                                    nf => ((NumberingFormat) nf).NumberFormatId.Value == numberFormatId)
+                            ).FormatCode.Value;
+                    }
+                    else
+                        xlCell.Style.NumberFormat.NumberFormatId = Int32.Parse(numberFormatId);
+
+
+                    if (!XLHelper.IsNullOrWhiteSpace(xlCell.Style.NumberFormat.Format))
+                        xlCell._dataType = GetDataTypeFromFormat(xlCell.Style.NumberFormat.Format);
+                    else if ((numberFormatId >= 14 && numberFormatId <= 22) ||
+                             (numberFormatId >= 45 && numberFormatId <= 47))
+                        xlCell._dataType = XLCellValues.DateTime;
+                    else if (numberFormatId == 49)
+                        xlCell._dataType = XLCellValues.Text;
+                    else
+                        xlCell._dataType = XLCellValues.Number;
+                }
+            }
+        }
+
+        private void LoadNumberFormat(NumberingFormat nfSource, IXLNumberFormat nf)
+        {
+            if (nfSource == null) return;
+
+            if (nfSource.FormatCode != null)
+                nf.Format = nfSource.FormatCode.Value;
+            //if (nfSource.NumberFormatId != null)
+            //    nf.NumberFormatId = (Int32)nfSource.NumberFormatId.Value;
+        }
+
+        private void LoadBorder(Border borderSource, IXLBorder border)
+        {
+            if (borderSource == null) return;
+
+            LoadBorderValues(borderSource.DiagonalBorder, border.SetDiagonalBorder, border.SetDiagonalBorderColor);
+
+            if (borderSource.DiagonalUp != null )
+                border.DiagonalUp = borderSource.DiagonalUp.Value;
+            if (borderSource.DiagonalDown != null)
+                border.DiagonalDown = borderSource.DiagonalDown.Value;
+
+            LoadBorderValues(borderSource.LeftBorder, border.SetLeftBorder, border.SetLeftBorderColor);
+            LoadBorderValues(borderSource.RightBorder, border.SetRightBorder, border.SetRightBorderColor);
+            LoadBorderValues(borderSource.TopBorder, border.SetTopBorder, border.SetTopBorderColor);
+            LoadBorderValues(borderSource.BottomBorder, border.SetBottomBorder, border.SetBottomBorderColor);
+            
+        }
+
+        private void LoadBorderValues(BorderPropertiesType source, Func<XLBorderStyleValues, IXLStyle> setBorder, Func<XLColor, IXLStyle> setColor )
+        {
+            if (source != null)
+            {
+                if (source.Style != null)
+                    setBorder(source.Style.Value.ToClosedXml());
+                if (source.Color != null)
+                    setColor(GetColor(source.Color));
+            }
+        }
+
+        
+
+        private void LoadFill(Fill fillSource, IXLFill fill)
+        {
+            if (fillSource == null) return;
+
+            if(fillSource.PatternFill != null)
+            {
+                if (fillSource.PatternFill.PatternType != null)
+                    fill.PatternType = fillSource.PatternFill.PatternType.Value.ToClosedXml();
+                else
+                    fill.PatternType = XLFillPatternValues.Solid;
+
+                if (fillSource.PatternFill.ForegroundColor != null)
+                    fill.PatternColor = GetColor(fillSource.PatternFill.ForegroundColor);
+                if (fillSource.PatternFill.BackgroundColor != null)
+                    fill.PatternBackgroundColor = GetColor(fillSource.PatternFill.BackgroundColor);
+            }
+        }
+
+        private void LoadFont(OpenXmlElement fontSource, IXLFontBase fontBase)
+        {
+            if (fontSource == null) return;
+
+            fontBase.Bold = GetBoolean(fontSource.Elements<Bold>().FirstOrDefault());
+            var fontColor = GetColor(fontSource.Elements<DocumentFormat.OpenXml.Spreadsheet.Color>().FirstOrDefault());
+            if (fontColor.HasValue)
+                fontBase.FontColor = fontColor;
+
+            var fontFamilyNumbering =
+                fontSource.Elements<DocumentFormat.OpenXml.Spreadsheet.FontFamily>().FirstOrDefault();
+            if (fontFamilyNumbering != null && fontFamilyNumbering.Val != null)
+                fontBase.FontFamilyNumbering =
+                    (XLFontFamilyNumberingValues) Int32.Parse(fontFamilyNumbering.Val.ToString());
+            var runFont = fontSource.Elements<RunFont>().FirstOrDefault();
+            if (runFont != null)
+            {
+                if (runFont.Val != null)
+                    fontBase.FontName = runFont.Val;
+            }
+            var fontSize = fontSource.Elements<FontSize>().FirstOrDefault();
+            if (fontSize != null)
+            {
+                if ((fontSize).Val != null)
+                    fontBase.FontSize = (fontSize).Val;
+            }
+
+            fontBase.Italic = GetBoolean(fontSource.Elements<Italic>().FirstOrDefault());
+            fontBase.Shadow = GetBoolean(fontSource.Elements<Shadow>().FirstOrDefault());
+            fontBase.Strikethrough = GetBoolean(fontSource.Elements<Strike>().FirstOrDefault());
+
+            var underline = fontSource.Elements<Underline>().FirstOrDefault();
+            if (underline != null)
+            {
+                fontBase.Underline = underline.Val != null ? underline.Val.Value.ToClosedXml() : XLFontUnderlineValues.Single;
+            }
+
+            var verticalTextAlignment = fontSource.Elements<VerticalTextAlignment>().FirstOrDefault();
+            
+            if (verticalTextAlignment == null) return;
+
+            fontBase.VerticalAlignment = verticalTextAlignment.Val != null ? verticalTextAlignment.Val.Value.ToClosedXml() : XLFontVerticalTextAlignmentValues.Baseline;
+        }
+
+        private Int32 lastRow;
+        private void LoadRows(Stylesheet s, NumberingFormats numberingFormats, Fills fills, Borders borders, Fonts fonts,
+                              XLWorksheet ws, SharedStringItem[] sharedStrings,
+                              Dictionary<uint, string> sharedFormulasR1C1, Dictionary<Int32, IXLStyle> styleList,
+                              Row row)
+        {
+            Int32 rowIndex = row.RowIndex == null ? ++lastRow : (Int32) row.RowIndex.Value;
+            var xlRow = ws.Row(rowIndex, false);
+            
+            if (row.Height != null)
+                xlRow.Height = row.Height;
+            else
+            {
+                xlRow.Loading = true;
+                xlRow.Height = ws.RowHeight;
+                xlRow.Loading = false;
+            }
+
+            if (row.Hidden != null && row.Hidden)
+                xlRow.Hide();
+
+            if (row.Collapsed != null && row.Collapsed)
+                xlRow.Collapsed = true;
+
+            if (row.OutlineLevel != null && row.OutlineLevel > 0)
+                xlRow.OutlineLevel = row.OutlineLevel;
+
+            if (row.CustomFormat != null)
+            {
+                Int32 styleIndex = row.StyleIndex != null ? Int32.Parse(row.StyleIndex.InnerText) : -1;
+                if (styleIndex > 0)
+                {
+                        ApplyStyle(xlRow, styleIndex, s, fills, borders, fonts, numberingFormats);
+                }
+                else
+                {
+                    xlRow.Style = DefaultStyle;
+                }
+            }
+
+            lastCell = 0;
+            foreach (Cell cell in row.Elements<Cell>())
+                LoadCells(sharedStrings, s, numberingFormats, fills, borders, fonts, sharedFormulasR1C1, ws, styleList,
+                          cell, rowIndex);
+        }
+
+        private void LoadColumns(Stylesheet s, NumberingFormats numberingFormats, Fills fills, Borders borders,
+                                 Fonts fonts, XLWorksheet ws, Columns columns)
+        {
+            if (columns == null) return;
+
+            var wsDefaultColumn =
+                columns.Elements<Column>().Where(c => c.Max == XLHelper.MaxColumnNumber).FirstOrDefault();
+
+            if (wsDefaultColumn != null && wsDefaultColumn.Width != null)
+                ws.ColumnWidth = wsDefaultColumn.Width - ColumnWidthOffset;
+
+            Int32 styleIndexDefault = wsDefaultColumn != null && wsDefaultColumn.Style != null
+                                          ? Int32.Parse(wsDefaultColumn.Style.InnerText)
+                                          : -1;
+            if (styleIndexDefault >= 0)
+                ApplyStyle(ws, styleIndexDefault, s, fills, borders, fonts, numberingFormats);
+
+            foreach (Column col in columns.Elements<Column>())
+            {
+                //IXLStylized toApply;
+                if (col.Max == XLHelper.MaxColumnNumber) continue;
+
+                var xlColumns = (XLColumns) ws.Columns(col.Min, col.Max);
+                if (col.Width != null)
+                {
+                    Double width = col.Width - ColumnWidthOffset;
+                    //if (width < 0) width = 0;
+                    xlColumns.Width = width;
+                }
+                else
+                    xlColumns.Width = ws.ColumnWidth;
+
+                if (col.Hidden != null && col.Hidden)
+                    xlColumns.Hide();
+
+                if (col.Collapsed != null && col.Collapsed)
+                    xlColumns.CollapseOnly();
+
+                if (col.OutlineLevel != null)
+                {
+                    var outlineLevel = col.OutlineLevel;
+                    xlColumns.ForEach(c => c.OutlineLevel = outlineLevel);
+                }
+
+                Int32 styleIndex = col.Style != null ? Int32.Parse(col.Style.InnerText) : -1;
+                if (styleIndex > 0)
+                {
+                    ApplyStyle(xlColumns, styleIndex, s, fills, borders, fonts, numberingFormats);
+                }
+                else
+                {
+                    xlColumns.Style = DefaultStyle;
+                }
+            }
+        }
+
+        private static XLCellValues GetDataTypeFromFormat(String format)
+        {
+            int length = format.Length;
+            String f = format.ToLower();
+            for (Int32 i = 0; i < length; i++)
+            {
+                Char c = f[i];
+                if (c == '"')
+                    i = f.IndexOf('"', i + 1);
+                else if (c == '0' || c == '#' || c == '?')
+                    return XLCellValues.Number;
+                else if (c == 'y' || c == 'm' || c == 'd' || c == 'h' || c == 's')
+                    return XLCellValues.DateTime;
+            }
+            return XLCellValues.Text;
+        }
+
+        private static void LoadAutoFilter(AutoFilter af, XLWorksheet ws)
+        {
+            if (af != null)
+            {
+                ws.Range(af.Reference.Value).SetAutoFilter();
+                var autoFilter = ws.AutoFilter;
+                LoadAutoFilterSort(af, ws, autoFilter);
+                LoadAutoFilterColumns(af, autoFilter);
+            }
+        }
+
+        private static void LoadAutoFilterColumns(AutoFilter af, XLAutoFilter autoFilter)
+        {
+            foreach (var filterColumn in af.Elements<FilterColumn>())
+            {
+                Int32 column = (int)filterColumn.ColumnId.Value + 1;
+                if (filterColumn.CustomFilters != null)
+                {
+                    var filterList = new List<XLFilter>();
+                    autoFilter.Column(column).FilterType = XLFilterType.Custom;
+                    autoFilter.Filters.Add(column, filterList);
+                    XLConnector connector = filterColumn.CustomFilters.And != null && filterColumn.CustomFilters.And.Value ? XLConnector.And : XLConnector.Or;
+
+                    Boolean isText = false;
+                    foreach (CustomFilter filter in filterColumn.CustomFilters)
+                    {
+                        Double dTest;
+                        String val = filter.Val.Value;
+                        if (!Double.TryParse(val, out dTest))
+                        {
+                            isText = true;
+                            break;
+                        }
+                    }
+
+                    foreach (CustomFilter filter in filterColumn.CustomFilters)
+                    {
+                        var xlFilter = new XLFilter { Value = filter.Val.Value, Connector = connector };
+                        if (isText)
+                            xlFilter.Value = filter.Val.Value;
+                        else
+                            xlFilter.Value = Double.Parse(filter.Val.Value, CultureInfo.InvariantCulture);
+
+                        if (filter.Operator != null)
+                            xlFilter.Operator = filter.Operator.Value.ToClosedXml();
+                        else
+                            xlFilter.Operator = XLFilterOperator.Equal;
+
+                        Func<Object, Boolean> condition = null;
+                        switch (xlFilter.Operator)
+                        {
+                            case XLFilterOperator.Equal:
+                                if (isText)
+                                    condition = o => o.ToString().Equals(xlFilter.Value.ToString(), StringComparison.InvariantCultureIgnoreCase);
+                                else
+                                    condition = o => (o as IComparable).CompareTo(xlFilter.Value) == 0;
+                                break;
+                            case XLFilterOperator.EqualOrGreaterThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) >= 0; break;
+                            case XLFilterOperator.EqualOrLessThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) <= 0; break;
+                            case XLFilterOperator.GreaterThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) > 0; break;
+                            case XLFilterOperator.LessThan: condition = o => (o as IComparable).CompareTo(xlFilter.Value) < 0; break;
+                            case XLFilterOperator.NotEqual:
+                                if (isText)
+                                    condition = o => !o.ToString().Equals(xlFilter.Value.ToString(), StringComparison.InvariantCultureIgnoreCase);
+                                else
+                                    condition = o => (o as IComparable).CompareTo(xlFilter.Value) != 0;
+                                break;
+                        }
+
+                        xlFilter.Condition = condition;
+                        filterList.Add(xlFilter);
+                    }
+                }
+                else if (filterColumn.Filters != null)
+                {
+                    var filterList = new List<XLFilter>();
+                    autoFilter.Column(column).FilterType = XLFilterType.Regular;
+                    autoFilter.Filters.Add((int)filterColumn.ColumnId.Value + 1, filterList);
+
+                    Boolean isText = false;
+                    foreach (Filter filter in filterColumn.Filters.OfType<Filter>())
+                    {
+                        Double dTest;
+                        String val = filter.Val.Value;
+                        if (!Double.TryParse(val, out dTest))
+                        {
+                            isText = true;
+                            break;
+                        }
+                    }
+
+                    foreach (Filter filter in filterColumn.Filters.OfType<Filter>())
+                    {
+                        var xlFilter = new XLFilter { Connector = XLConnector.Or, Operator = XLFilterOperator.Equal };
+
+                        Func<Object, Boolean> condition;
+                        if (isText)
+                        {
+                            xlFilter.Value = filter.Val.Value;
+                            condition = o => o.ToString().Equals(xlFilter.Value.ToString(), StringComparison.InvariantCultureIgnoreCase);
+                        }
+                        else
+                        {
+                            xlFilter.Value = Double.Parse(filter.Val.Value, CultureInfo.InvariantCulture);
+                            condition = o => (o as IComparable).CompareTo(xlFilter.Value) == 0;
+                        }
+
+                        xlFilter.Condition = condition;
+                        filterList.Add(xlFilter);
+                    }
+
+                }
+                else if (filterColumn.Top10 != null)
+                {
+                    var xlFilterColumn = autoFilter.Column(column);
+                    autoFilter.Filters.Add(column, null);
+                    xlFilterColumn.FilterType = XLFilterType.TopBottom;
+                    if (filterColumn.Top10.Percent != null && filterColumn.Top10.Percent.Value)
+                        xlFilterColumn.TopBottomType = XLTopBottomType.Percent;
+                    else
+                        xlFilterColumn.TopBottomType = XLTopBottomType.Items;
+
+                    if (filterColumn.Top10.Top != null && !filterColumn.Top10.Top.Value)
+                        xlFilterColumn.TopBottomPart = XLTopBottomPart.Bottom;
+                    else
+                        xlFilterColumn.TopBottomPart = XLTopBottomPart.Top;
+
+                    xlFilterColumn.TopBottomValue = (int)filterColumn.Top10.Val.Value;
+                }
+                else if (filterColumn.DynamicFilter != null)
+                {
+                    autoFilter.Filters.Add(column, null);
+                    var xlFilterColumn = autoFilter.Column(column);
+                    xlFilterColumn.FilterType = XLFilterType.Dynamic;
+                    if (filterColumn.DynamicFilter.Type != null)
+                        xlFilterColumn.DynamicType = filterColumn.DynamicFilter.Type.Value.ToClosedXml();
+                    else
+                        xlFilterColumn.DynamicType = XLFilterDynamicType.AboveAverage;
+
+                    xlFilterColumn.DynamicValue = filterColumn.DynamicFilter.Val.Value;
+                }
+            }
+        }
+
+        private static void LoadAutoFilterSort(AutoFilter af, XLWorksheet ws, IXLBaseAutoFilter autoFilter)
+        {
+            var sort = af.Elements<SortState>().FirstOrDefault();
+            if (sort != null)
+            {
+                var condition = sort.Elements<SortCondition>().FirstOrDefault();
+                if (condition != null)
+                {
+                    Int32 column = ws.Range(condition.Reference.Value).FirstCell().Address.ColumnNumber - autoFilter.Range.FirstCell().Address.ColumnNumber + 1 ;
+                    autoFilter.SortColumn = column;
+                    autoFilter.Sorted = true;
+                    autoFilter.SortOrder = condition.Descending != null && condition.Descending.Value ? XLSortOrder.Descending : XLSortOrder.Ascending;
+                }
+            }
+        }
+
+        private static void LoadSheetProtection(SheetProtection sp, XLWorksheet ws)
+        {
+            if (sp == null) return;
+
+            if (sp.Sheet != null) ws.Protection.Protected = sp.Sheet.Value;
+            if (sp.Password != null) ws.Protection.PasswordHash = sp.Password.Value;
+            if (sp.FormatCells != null) ws.Protection.FormatCells = !sp.FormatCells.Value;
+            if (sp.FormatColumns != null) ws.Protection.FormatColumns = !sp.FormatColumns.Value;
+            if (sp.FormatRows != null) ws.Protection.FormatRows = !sp.FormatRows.Value;
+            if (sp.InsertColumns != null) ws.Protection.InsertColumns = !sp.InsertColumns.Value;
+            if (sp.InsertHyperlinks != null) ws.Protection.InsertHyperlinks = !sp.InsertHyperlinks.Value;
+            if (sp.InsertRows != null) ws.Protection.InsertRows = !sp.InsertRows.Value;
+            if (sp.DeleteColumns != null) ws.Protection.DeleteColumns = !sp.DeleteColumns.Value;
+            if (sp.DeleteRows != null) ws.Protection.DeleteRows = !sp.DeleteRows.Value;
+            if (sp.AutoFilter != null) ws.Protection.AutoFilter = !sp.AutoFilter.Value;
+            if (sp.PivotTables != null) ws.Protection.PivotTables = !sp.PivotTables.Value;
+            if (sp.Sort != null) ws.Protection.Sort = !sp.Sort.Value;
+            if (sp.SelectLockedCells != null) ws.Protection.SelectLockedCells = sp.SelectLockedCells.Value;
+            if (sp.SelectUnlockedCells != null) ws.Protection.SelectUnlockedCells = sp.SelectUnlockedCells.Value;
+        }
+
+        private static void LoadDataValidations(DataValidations dataValidations, XLWorksheet ws)
+        {
+            if (dataValidations == null) return;
+
+            foreach (DataValidation dvs in dataValidations.Elements<DataValidation>())
+            {
+                String txt = dvs.SequenceOfReferences.InnerText;
+                if (XLHelper.IsNullOrWhiteSpace(txt)) continue;
+                foreach (var dvt in txt.Split(' ').Select(rangeAddress => ws.Range(rangeAddress).DataValidation))
+                {
+                    if (dvs.AllowBlank != null) dvt.IgnoreBlanks = dvs.AllowBlank;
+                    if (dvs.ShowDropDown != null) dvt.InCellDropdown = !dvs.ShowDropDown.Value;
+                    if (dvs.ShowErrorMessage != null) dvt.ShowErrorMessage = dvs.ShowErrorMessage;
+                    if (dvs.ShowInputMessage != null) dvt.ShowInputMessage = dvs.ShowInputMessage;
+                    if (dvs.PromptTitle != null) dvt.InputTitle = dvs.PromptTitle;
+                    if (dvs.Prompt != null) dvt.InputMessage = dvs.Prompt;
+                    if (dvs.ErrorTitle != null) dvt.ErrorTitle = dvs.ErrorTitle;
+                    if (dvs.Error != null) dvt.ErrorMessage = dvs.Error;
+                    if (dvs.ErrorStyle != null) dvt.ErrorStyle = dvs.ErrorStyle.Value.ToClosedXml();
+                    if (dvs.Type != null) dvt.AllowedValues = dvs.Type.Value.ToClosedXml();
+                    if (dvs.Operator != null) dvt.Operator = dvs.Operator.Value.ToClosedXml();
+                    if (dvs.Formula1 != null) dvt.MinValue = dvs.Formula1.Text;
+                    if (dvs.Formula2 != null) dvt.MaxValue = dvs.Formula2.Text;
+                }
+            }
+        }
+
+        private void LoadConditionalFormatting(ConditionalFormatting conditionalFormatting, XLWorksheet ws, Dictionary<Int32, DifferentialFormat> differentialFormats)
+        {
+            if (conditionalFormatting == null) return;
+
+            foreach (var sor in conditionalFormatting.SequenceOfReferences.Items)
+            {
+                foreach (var fr in conditionalFormatting.Elements<ConditionalFormattingRule>())
+                {
+                    var conditionalFormat = new XLConditionalFormat(ws.Range(sor.Value));
+                    if (fr.FormatId != null)
+                    {
+                        LoadFont(differentialFormats[(Int32) fr.FormatId.Value].Font, conditionalFormat.Style.Font);
+                        LoadFill(differentialFormats[(Int32) fr.FormatId.Value].Fill, conditionalFormat.Style.Fill);
+                        LoadBorder(differentialFormats[(Int32) fr.FormatId.Value].Border, conditionalFormat.Style.Border);
+                        LoadNumberFormat(differentialFormats[(Int32) fr.FormatId.Value].NumberingFormat, conditionalFormat.Style.NumberFormat);
+                    }
+                    if (fr.Operator != null)
+                        conditionalFormat.Operator = fr.Operator.Value.ToClosedXml();
+                    if (fr.Type != null)
+                        conditionalFormat.ConditionalFormatType = fr.Type.Value.ToClosedXml();
+                    if (fr.Text != null)
+                        conditionalFormat.Values.Add(GetFormula(fr.Text.Value));
+                    if (fr.Percent != null)
+                        conditionalFormat.Percent = fr.Percent.Value;
+                    if (fr.Bottom != null)
+                        conditionalFormat.Bottom = fr.Bottom.Value;
+                    if (fr.Rank != null)
+                        conditionalFormat.Values.Add(GetFormula(fr.Rank.Value.ToString()));
+
+                    if (fr.Elements<ColorScale>().Any())
+                    {
+                        var colorScale = fr.Elements<ColorScale>().First();
+                        ExtractConditionalFormatValueObjects(conditionalFormat, colorScale);
+                    }
+                    else if (fr.Elements<DataBar>().Any())
+                    {
+                        var dataBar = fr.Elements<DataBar>().First();
+                        if (dataBar.ShowValue != null)
+                            conditionalFormat.ShowBarOnly = !dataBar.ShowValue.Value;
+                        ExtractConditionalFormatValueObjects(conditionalFormat, dataBar);
+                    }
+                    else if (fr.Elements<IconSet>().Any())
+                    {
+                        var iconSet = fr.Elements<IconSet>().First();
+                        if (iconSet.ShowValue != null)
+                            conditionalFormat.ShowIconOnly = !iconSet.ShowValue.Value;
+                        if (iconSet.Reverse != null)
+                            conditionalFormat.ReverseIconOrder = iconSet.Reverse.Value;
+                        
+                        if (iconSet.IconSetValue != null)
+                            conditionalFormat.IconSetStyle = iconSet.IconSetValue.Value.ToClosedXml();
+                        else
+                            conditionalFormat.IconSetStyle = XLIconSetStyle.ThreeTrafficLights1;
+
+                        ExtractConditionalFormatValueObjects(conditionalFormat, iconSet);
+                    }
+                    else
+                    {
+                        foreach (var formula in fr.Elements<Formula>())
+                        {
+                            if (formula.Text != null 
+                                && (conditionalFormat.ConditionalFormatType == XLConditionalFormatType.CellIs
+                                || conditionalFormat.ConditionalFormatType == XLConditionalFormatType.Expression))
+                            {
+                                conditionalFormat.Values.Add(GetFormula(formula.Text));
+                            }
+                        }
+                    }
+                    ws.ConditionalFormats.Add(conditionalFormat);
+                }
+            }
+            
+        }
+
+        private static XLFormula GetFormula(String value)
+        {
+            var formula = new XLFormula();
+            formula._value = value;
+            formula.IsFormula = !(value[0] == '"' && value.EndsWith("\""));
+            return formula;    
+        }
+
+        private void ExtractConditionalFormatValueObjects(XLConditionalFormat conditionalFormat, OpenXmlElement element)
+        {
+            foreach (var c in element.Elements<ConditionalFormatValueObject>())
+            {
+                if (c.Type != null)
+                    conditionalFormat.ContentTypes.Add(c.Type.Value.ToClosedXml());
+                if (c.Val != null)
+                    conditionalFormat.Values.Add(new XLFormula { Value = c.Val.Value });
+
+                if (c.GreaterThanOrEqual != null)
+                    conditionalFormat.IconSetOperators.Add(c.GreaterThanOrEqual.Value ? XLCFIconSetOperator.EqualOrGreaterThan : XLCFIconSetOperator.GreaterThan);
+                else
+                    conditionalFormat.IconSetOperators.Add(XLCFIconSetOperator.EqualOrGreaterThan);
+            }
+            foreach (var c in element.Elements<DocumentFormat.OpenXml.Spreadsheet.Color>())
+            {
+                conditionalFormat.Colors.Add(GetColor(c));
+            }
+        }
+
+        private static void LoadHyperlinks(Hyperlinks hyperlinks, WorksheetPart worksheetPart, XLWorksheet ws)
+        {
+            var hyperlinkDictionary = new Dictionary<String, Uri>();
+            if (worksheetPart.HyperlinkRelationships != null)
+                hyperlinkDictionary = worksheetPart.HyperlinkRelationships.ToDictionary(hr => hr.Id, hr => hr.Uri);
+
+            if (hyperlinks == null) return;
+
+            foreach (Hyperlink hl in hyperlinks.Elements<Hyperlink>())
+            {
+                if (hl.Reference.Value.Equals("#REF")) continue;
+                String tooltip = hl.Tooltip != null ? hl.Tooltip.Value : String.Empty;
+                var xlRange = ws.Range(hl.Reference.Value);
+                foreach (XLCell xlCell in xlRange.Cells())
+                {
+                    xlCell.SettingHyperlink = true;
+
+                    if (hl.Id != null)
+                        xlCell.Hyperlink = new XLHyperlink(hyperlinkDictionary[hl.Id], tooltip);
+                    else if (hl.Location != null)
+                        xlCell.Hyperlink = new XLHyperlink(hl.Location.Value, tooltip);
+                    else
+                        xlCell.Hyperlink = new XLHyperlink(hl.Reference.Value, tooltip);
+
+                    xlCell.SettingHyperlink = false;
+                }
+            }
+        }
+
+        private static void LoadColumnBreaks(ColumnBreaks columnBreaks, XLWorksheet ws)
+        {
+            if (columnBreaks == null) return;
+
+            foreach (Break columnBreak in columnBreaks.Elements<Break>().Where(columnBreak => columnBreak.Id != null))
+            {
+                ws.PageSetup.ColumnBreaks.Add(Int32.Parse(columnBreak.Id.InnerText));
+            }
+        }
+
+        private static void LoadRowBreaks(RowBreaks rowBreaks, XLWorksheet ws)
+        {
+            if (rowBreaks == null) return;
+
+            foreach (Break rowBreak in rowBreaks.Elements<Break>())
+                ws.PageSetup.RowBreaks.Add(Int32.Parse(rowBreak.Id.InnerText));
+        }
+
+        private void LoadSheetProperties(SheetProperties sheetProperty, XLWorksheet ws)
+        {
+            if (sheetProperty == null) return;
+
+            if (sheetProperty.TabColor != null)
+                ws.TabColor = GetColor(sheetProperty.TabColor);
+
+            if (sheetProperty.OutlineProperties == null) return;
+
+            if (sheetProperty.OutlineProperties.SummaryBelow != null)
+            {
+                ws.Outline.SummaryVLocation = sheetProperty.OutlineProperties.SummaryBelow
+                                                  ? XLOutlineSummaryVLocation.Bottom
+                                                  : XLOutlineSummaryVLocation.Top;
+            }
+
+            if (sheetProperty.OutlineProperties.SummaryRight != null)
+            {
+                ws.Outline.SummaryHLocation = sheetProperty.OutlineProperties.SummaryRight
+                                                  ? XLOutlineSummaryHLocation.Right
+                                                  : XLOutlineSummaryHLocation.Left;
+            }
+        }
+
+        private static void LoadHeaderFooter(HeaderFooter headerFooter, XLWorksheet ws)
+        {
+            if (headerFooter == null) return;
+
+            if (headerFooter.AlignWithMargins != null)
+                ws.PageSetup.AlignHFWithMargins = headerFooter.AlignWithMargins;
+            if (headerFooter.ScaleWithDoc != null)
+                ws.PageSetup.ScaleHFWithDocument = headerFooter.ScaleWithDoc;
+
+            if (headerFooter.DifferentFirst != null)
+                ws.PageSetup.DifferentFirstPageOnHF = headerFooter.DifferentFirst;
+            if (headerFooter.DifferentOddEven != null)
+                ws.PageSetup.DifferentOddEvenPagesOnHF = headerFooter.DifferentOddEven;
+
+            // Footers
+            var xlFooter = (XLHeaderFooter) ws.PageSetup.Footer;
+            var evenFooter = headerFooter.EvenFooter;
+            if (evenFooter != null)
+                xlFooter.SetInnerText(XLHFOccurrence.EvenPages, evenFooter.Text);
+            var oddFooter = headerFooter.OddFooter;
+            if (oddFooter != null)
+                xlFooter.SetInnerText(XLHFOccurrence.OddPages, oddFooter.Text);
+            var firstFooter = headerFooter.FirstFooter;
+            if (firstFooter != null)
+                xlFooter.SetInnerText(XLHFOccurrence.FirstPage, firstFooter.Text);
+            // Headers
+            var xlHeader = (XLHeaderFooter) ws.PageSetup.Header;
+            var evenHeader = headerFooter.EvenHeader;
+            if (evenHeader != null)
+                xlHeader.SetInnerText(XLHFOccurrence.EvenPages, evenHeader.Text);
+            var oddHeader = headerFooter.OddHeader;
+            if (oddHeader != null)
+                xlHeader.SetInnerText(XLHFOccurrence.OddPages, oddHeader.Text);
+            var firstHeader = headerFooter.FirstHeader;
+            if (firstHeader != null)
+                xlHeader.SetInnerText(XLHFOccurrence.FirstPage, firstHeader.Text);
+
+            ((XLHeaderFooter)ws.PageSetup.Header).SetAsInitial();
+            ((XLHeaderFooter)ws.PageSetup.Footer).SetAsInitial();
+        }
+
+        private static void LoadPageSetup(PageSetup pageSetup, XLWorksheet ws)
+        {
+            if (pageSetup == null) return;
+
+            if (pageSetup.PaperSize != null)
+                ws.PageSetup.PaperSize = (XLPaperSize) Int32.Parse(pageSetup.PaperSize.InnerText);
+            if (pageSetup.Scale != null)
+                ws.PageSetup.Scale = Int32.Parse(pageSetup.Scale.InnerText);
+            else
+            {
+                if (pageSetup.FitToWidth != null)
+                    ws.PageSetup.PagesWide = Int32.Parse(pageSetup.FitToWidth.InnerText);
+                if (pageSetup.FitToHeight != null)
+                    ws.PageSetup.PagesTall = Int32.Parse(pageSetup.FitToHeight.InnerText);
+            }
+            if (pageSetup.PageOrder != null)
+                ws.PageSetup.PageOrder = pageSetup.PageOrder.Value.ToClosedXml();
+            if (pageSetup.Orientation != null)
+                ws.PageSetup.PageOrientation = pageSetup.Orientation.Value.ToClosedXml();
+            if (pageSetup.BlackAndWhite != null)
+                ws.PageSetup.BlackAndWhite = pageSetup.BlackAndWhite;
+            if (pageSetup.Draft != null)
+                ws.PageSetup.DraftQuality = pageSetup.Draft;
+            if (pageSetup.CellComments != null)
+                ws.PageSetup.ShowComments = pageSetup.CellComments.Value.ToClosedXml();
+            if (pageSetup.Errors != null)
+                ws.PageSetup.PrintErrorValue = pageSetup.Errors.Value.ToClosedXml();
+            if (pageSetup.HorizontalDpi != null) ws.PageSetup.HorizontalDpi = (Int32) pageSetup.HorizontalDpi.Value;
+            if (pageSetup.VerticalDpi != null) ws.PageSetup.VerticalDpi = (Int32) pageSetup.VerticalDpi.Value;
+            if (pageSetup.FirstPageNumber != null)
+                ws.PageSetup.FirstPageNumber = UInt32.Parse(pageSetup.FirstPageNumber.InnerText);
+        }
+
+        private static void LoadPageMargins(PageMargins pageMargins, XLWorksheet ws)
+        {
+            if (pageMargins == null) return;
+
+            if (pageMargins.Bottom != null)
+                ws.PageSetup.Margins.Bottom = pageMargins.Bottom;
+            if (pageMargins.Footer != null)
+                ws.PageSetup.Margins.Footer = pageMargins.Footer;
+            if (pageMargins.Header != null)
+                ws.PageSetup.Margins.Header = pageMargins.Header;
+            if (pageMargins.Left != null)
+                ws.PageSetup.Margins.Left = pageMargins.Left;
+            if (pageMargins.Right != null)
+                ws.PageSetup.Margins.Right = pageMargins.Right;
+            if (pageMargins.Top != null)
+                ws.PageSetup.Margins.Top = pageMargins.Top;
+        }
+
+        private static void LoadPrintOptions(PrintOptions printOptions, XLWorksheet ws)
+        {
+            if (printOptions == null) return;
+
+            if (printOptions.GridLines != null)
+                ws.PageSetup.ShowGridlines = printOptions.GridLines;
+            if (printOptions.HorizontalCentered != null)
+                ws.PageSetup.CenterHorizontally = printOptions.HorizontalCentered;
+            if (printOptions.VerticalCentered != null)
+                ws.PageSetup.CenterVertically = printOptions.VerticalCentered;
+            if (printOptions.Headings != null)
+                ws.PageSetup.ShowRowAndColumnHeadings = printOptions.Headings;
+        }
+
+        private static void LoadSheetViews(SheetViews sheetViews, XLWorksheet ws)
+        {
+            if (sheetViews == null) return;
+
+            var sheetView = sheetViews.Elements<SheetView>().FirstOrDefault();
+
+            if (sheetView == null) return;
+
+            if (sheetView.ShowFormulas != null) ws.ShowFormulas = sheetView.ShowFormulas.Value;
+            if (sheetView.ShowGridLines != null) ws.ShowGridLines = sheetView.ShowGridLines.Value;
+            if (sheetView.ShowOutlineSymbols != null)
+                ws.ShowOutlineSymbols = sheetView.ShowOutlineSymbols.Value;
+            if (sheetView.ShowRowColHeaders != null) ws.ShowRowColHeaders = sheetView.ShowRowColHeaders.Value;
+            if (sheetView.ShowRuler != null) ws.ShowRuler = sheetView.ShowRuler.Value;
+            if (sheetView.ShowWhiteSpace != null) ws.ShowWhiteSpace = sheetView.ShowWhiteSpace.Value;
+            if (sheetView.ShowZeros != null) ws.ShowZeros = sheetView.ShowZeros.Value;
+            if (sheetView.TabSelected != null) ws.TabSelected = sheetView.TabSelected.Value;
+
+            var selection = sheetView.Elements<Selection>().FirstOrDefault();
+            if (selection != null)
+            {
+                if (selection.SequenceOfReferences != null)
+                    ws.Ranges(selection.SequenceOfReferences.InnerText.Replace(" ", ",")).Select();
+
+                if (selection.ActiveCell != null)
+                    ws.Cell(selection.ActiveCell).SetActive();
+            }
+
+            var pane = sheetView.Elements<Pane>().FirstOrDefault();
+
+            if (pane == null) return;
+
+            if (pane.State == null ||
+                (pane.State != PaneStateValues.FrozenSplit && pane.State != PaneStateValues.Frozen)) return;
+
+            if (pane.HorizontalSplit != null)
+                ws.SheetView.SplitColumn = (Int32) pane.HorizontalSplit.Value;
+            if (pane.VerticalSplit != null)
+                ws.SheetView.SplitRow = (Int32) pane.VerticalSplit.Value;
+
+        }
+
+        private void SetProperties(SpreadsheetDocument dSpreadsheet)
+        {
+            var p = dSpreadsheet.PackageProperties;
+            Properties.Author = p.Creator;
+            Properties.Category = p.Category;
+            Properties.Comments = p.Description;
+            if (p.Created != null)
+                Properties.Created = p.Created.Value;
+            Properties.Keywords = p.Keywords;
+            Properties.LastModifiedBy = p.LastModifiedBy;
+            Properties.Status = p.ContentStatus;
+            Properties.Subject = p.Subject;
+            Properties.Title = p.Title;
+        }
+
+        private XLColor GetColor(ColorType color)
+        {
+            XLColor retVal = null;
+            if (color != null)
+            {
+                if (color.Rgb != null)
+                {
+                    String htmlColor = "#" + color.Rgb.Value;
+                    Color thisColor;
+                    if (!_colorList.ContainsKey(htmlColor))
+                    {
+                        thisColor = ColorTranslator.FromHtml(htmlColor);
+                        _colorList.Add(htmlColor, thisColor);
+                    }
+                    else
+                        thisColor = _colorList[htmlColor];
+                    retVal = XLColor.FromColor(thisColor);
+                }
+                else if (color.Indexed != null && color.Indexed < 64)
+                    retVal = XLColor.FromIndex((Int32) color.Indexed.Value);
+                else if (color.Theme != null)
+                {
+                    retVal = color.Tint != null ? XLColor.FromTheme((XLThemeColor) color.Theme.Value, color.Tint.Value) : XLColor.FromTheme((XLThemeColor) color.Theme.Value);
+                }
+            }
+            return retVal ?? XLColor.NoColor;
+        }
+
+        private void ApplyStyle(IXLStylized xlStylized, Int32 styleIndex, Stylesheet s, Fills fills, Borders borders,
+                                Fonts fonts, NumberingFormats numberingFormats)
+        {
+            if (s == null) return; //No Stylesheet, no Styles
+
+            var cellFormat = (CellFormat) s.CellFormats.ElementAt(styleIndex);
+
+            if (cellFormat.ApplyProtection != null)
+            {
+                var protection = cellFormat.Protection;
+
+                if (protection == null)
+                    xlStylized.InnerStyle.Protection = new XLProtection(null, DefaultStyle.Protection);
+                else
+                {
+                    xlStylized.InnerStyle.Protection.Hidden = protection.Hidden != null && protection.Hidden.HasValue &&
+                                                              protection.Hidden.Value;
+                    xlStylized.InnerStyle.Protection.Locked = protection.Locked == null ||
+                                                              (protection.Locked.HasValue && protection.Locked.Value);
+                }
+            }
+
+            if (UInt32HasValue(cellFormat.FillId))
+            {
+                var fill = (Fill)fills.ElementAt((Int32)cellFormat.FillId.Value);
+                if (fill.PatternFill != null)
+                {
+                    if (fill.PatternFill.PatternType != null)
+                        xlStylized.InnerStyle.Fill.PatternType = fill.PatternFill.PatternType.Value.ToClosedXml();
+
+                    var fgColor = GetColor(fill.PatternFill.ForegroundColor);
+                    if (fgColor.HasValue) xlStylized.InnerStyle.Fill.PatternColor = fgColor;
+
+                    var bgColor = GetColor(fill.PatternFill.BackgroundColor);
+                    if (bgColor.HasValue)
+                        xlStylized.InnerStyle.Fill.PatternBackgroundColor = bgColor;
+                }
+            }
+
+
+            var alignment = cellFormat.Alignment;
+            if (alignment != null)
+            {
+                if (alignment.Horizontal != null)
+                    xlStylized.InnerStyle.Alignment.Horizontal = alignment.Horizontal.Value.ToClosedXml();
+                if (alignment.Indent != null && alignment.Indent != 0)
+                    xlStylized.InnerStyle.Alignment.Indent = Int32.Parse(alignment.Indent.ToString());
+                if (alignment.JustifyLastLine != null)
+                    xlStylized.InnerStyle.Alignment.JustifyLastLine = alignment.JustifyLastLine;
+                if (alignment.ReadingOrder != null)
+                {
+                    xlStylized.InnerStyle.Alignment.ReadingOrder =
+                        (XLAlignmentReadingOrderValues) Int32.Parse(alignment.ReadingOrder.ToString());
+                }
+                if (alignment.RelativeIndent != null)
+                    xlStylized.InnerStyle.Alignment.RelativeIndent = alignment.RelativeIndent;
+                if (alignment.ShrinkToFit != null)
+                    xlStylized.InnerStyle.Alignment.ShrinkToFit = alignment.ShrinkToFit;
+                if (alignment.TextRotation != null)
+                    xlStylized.InnerStyle.Alignment.TextRotation = (Int32) alignment.TextRotation.Value;
+                if (alignment.Vertical != null)
+                    xlStylized.InnerStyle.Alignment.Vertical = alignment.Vertical.Value.ToClosedXml();
+                if (alignment.WrapText != null)
+                    xlStylized.InnerStyle.Alignment.WrapText = alignment.WrapText;
+            }
+
+
+            if (UInt32HasValue(cellFormat.BorderId))
+            {
+                uint borderId = cellFormat.BorderId.Value;
+                var border = (Border)borders.ElementAt((Int32)borderId);
+                if (border != null)
+                {
+                    var bottomBorder = border.BottomBorder;
+                    if (bottomBorder != null)
+                    {
+                        if (bottomBorder.Style != null)
+                            xlStylized.InnerStyle.Border.BottomBorder = bottomBorder.Style.Value.ToClosedXml();
+
+                        var bottomBorderColor = GetColor(bottomBorder.Color);
+                        if (bottomBorderColor.HasValue)
+                            xlStylized.InnerStyle.Border.BottomBorderColor = bottomBorderColor;
+                    }
+                    var topBorder = border.TopBorder;
+                    if (topBorder != null)
+                    {
+                        if (topBorder.Style != null)
+                            xlStylized.InnerStyle.Border.TopBorder = topBorder.Style.Value.ToClosedXml();
+                        var topBorderColor = GetColor(topBorder.Color);
+                        if (topBorderColor.HasValue)
+                            xlStylized.InnerStyle.Border.TopBorderColor = topBorderColor;
+                    }
+                    var leftBorder = border.LeftBorder;
+                    if (leftBorder != null)
+                    {
+                        if (leftBorder.Style != null)
+                            xlStylized.InnerStyle.Border.LeftBorder = leftBorder.Style.Value.ToClosedXml();
+                        var leftBorderColor = GetColor(leftBorder.Color);
+                        if (leftBorderColor.HasValue)
+                            xlStylized.InnerStyle.Border.LeftBorderColor = leftBorderColor;
+                    }
+                    var rightBorder = border.RightBorder;
+                    if (rightBorder != null)
+                    {
+                        if (rightBorder.Style != null)
+                            xlStylized.InnerStyle.Border.RightBorder = rightBorder.Style.Value.ToClosedXml();
+                        var rightBorderColor = GetColor(rightBorder.Color);
+                        if (rightBorderColor.HasValue)
+                            xlStylized.InnerStyle.Border.RightBorderColor = rightBorderColor;
+                    }
+                    var diagonalBorder = border.DiagonalBorder;
+                    if (diagonalBorder != null)
+                    {
+                        if (diagonalBorder.Style != null)
+                            xlStylized.InnerStyle.Border.DiagonalBorder = diagonalBorder.Style.Value.ToClosedXml();
+                        var diagonalBorderColor = GetColor(diagonalBorder.Color);
+                        if (diagonalBorderColor.HasValue)
+                            xlStylized.InnerStyle.Border.DiagonalBorderColor = diagonalBorderColor;
+                        if (border.DiagonalDown != null)
+                            xlStylized.InnerStyle.Border.DiagonalDown = border.DiagonalDown;
+                        if (border.DiagonalUp != null)
+                            xlStylized.InnerStyle.Border.DiagonalUp = border.DiagonalUp;
+                    }
+                }
+            }
+
+            if (UInt32HasValue(cellFormat.FontId))
+            {
+                var fontId = cellFormat.FontId;
+                var font = (DocumentFormat.OpenXml.Spreadsheet.Font)fonts.ElementAt((Int32)fontId.Value);
+                if (font != null)
+                {
+                    xlStylized.InnerStyle.Font.Bold = GetBoolean(font.Bold);
+
+                    var fontColor = GetColor(font.Color);
+                    if (fontColor.HasValue)
+                        xlStylized.InnerStyle.Font.FontColor = fontColor;
+
+                    if (font.FontFamilyNumbering != null && (font.FontFamilyNumbering).Val != null)
+                    {
+                        xlStylized.InnerStyle.Font.FontFamilyNumbering =
+                            (XLFontFamilyNumberingValues)Int32.Parse((font.FontFamilyNumbering).Val.ToString());
+                    }
+                    if (font.FontName != null)
+                    {
+                        if ((font.FontName).Val != null)
+                            xlStylized.InnerStyle.Font.FontName = (font.FontName).Val;
+                    }
+                    if (font.FontSize != null)
+                    {
+                        if ((font.FontSize).Val != null)
+                            xlStylized.InnerStyle.Font.FontSize = (font.FontSize).Val;
+                    }
+
+                    xlStylized.InnerStyle.Font.Italic = GetBoolean(font.Italic);
+                    xlStylized.InnerStyle.Font.Shadow = GetBoolean(font.Shadow);
+                    xlStylized.InnerStyle.Font.Strikethrough = GetBoolean(font.Strike);
+
+                    if (font.Underline != null)
+                    {
+                        xlStylized.InnerStyle.Font.Underline = font.Underline.Val != null
+                                                                   ? (font.Underline).Val.Value.ToClosedXml()
+                                                                   : XLFontUnderlineValues.Single;
+                    }
+
+                    if (font.VerticalTextAlignment != null)
+                    {
+                        xlStylized.InnerStyle.Font.VerticalAlignment = font.VerticalTextAlignment.Val != null
+                                                                           ? (font.VerticalTextAlignment).Val.Value.
+                                                                                 ToClosedXml()
+                                                                           : XLFontVerticalTextAlignmentValues.Baseline;
+                    }
+                }
+            }
+
+            
+
+            if (!UInt32HasValue(cellFormat.NumberFormatId)) return;
+            
+            var numberFormatId = cellFormat.NumberFormatId;
+
+            string formatCode = String.Empty;
+            if (numberingFormats != null)
+            {
+                var numberingFormat =
+                    numberingFormats.FirstOrDefault(
+                        nf =>
+                        ((NumberingFormat) nf).NumberFormatId != null &&
+                        ((NumberingFormat) nf).NumberFormatId.Value == numberFormatId) as NumberingFormat;
+
+                if (numberingFormat != null && numberingFormat.FormatCode != null)
+                    formatCode = numberingFormat.FormatCode.Value;
+            }
+            if (formatCode.Length > 0)
+                xlStylized.InnerStyle.NumberFormat.Format = formatCode;
+            else
+                xlStylized.InnerStyle.NumberFormat.NumberFormatId = (Int32) numberFormatId.Value;
+        }
+
+        private static Boolean UInt32HasValue(UInt32Value value)
+        {
+            return value != null && value.HasValue;
+        }
+
+        private static Boolean GetBoolean(BooleanPropertyType property)
+        {
+            if (property != null)
+            {
+                if (property.Val != null)
+                    return property.Val;
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/XLWorkbook_Save.NestedTypes.cs b/ClosedXML/Excel/XLWorkbook_Save.NestedTypes.cs
new file mode 100644
index 0000000..0f1c4ca
--- /dev/null
+++ b/ClosedXML/Excel/XLWorkbook_Save.NestedTypes.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    public partial class XLWorkbook
+    {
+        #region Nested type: SaveContext
+        internal sealed class SaveContext
+        {
+            #region Private fields
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly RelIdGenerator _relIdGenerator;
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly Dictionary<Int32, StyleInfo> _sharedStyles;
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly Dictionary<IXLFont, FontInfo> _sharedFonts;
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly HashSet<string> _tableNames;
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private uint _tableId;
+            #endregion
+            #region Constructor
+            public SaveContext()
+            {
+                _relIdGenerator = new RelIdGenerator();
+                _sharedStyles = new Dictionary<Int32, StyleInfo>();
+                _sharedFonts = new Dictionary<IXLFont, FontInfo>();
+                _tableNames = new HashSet<String>();
+                _tableId = 0;
+            }
+            #endregion
+            #region Public properties
+            public RelIdGenerator RelIdGenerator
+            {
+                [DebuggerStepThrough]
+                get { return _relIdGenerator; }
+            }
+            public Dictionary<Int32, StyleInfo> SharedStyles
+            {
+                [DebuggerStepThrough]
+                get { return _sharedStyles; }
+            }
+            public Dictionary<IXLFont, FontInfo> SharedFonts
+            {
+                [DebuggerStepThrough]
+                get { return _sharedFonts; }
+            }
+            public HashSet<string> TableNames
+            {
+                [DebuggerStepThrough]
+                get { return _tableNames; }
+            }
+            public uint TableId
+            {
+                [DebuggerStepThrough]
+                get { return _tableId; }
+                [DebuggerStepThrough]
+                set { _tableId = value; }
+            }
+            public Dictionary<IXLStyle, Int32> DifferentialFormats = new Dictionary<IXLStyle, int>();
+            #endregion
+        }
+        #endregion
+        #region Nested type: RelType
+        internal enum RelType
+        {
+            Workbook//, Worksheet
+        }
+        #endregion
+        #region Nested type: RelIdGenerator
+        internal sealed class RelIdGenerator
+        {
+            private readonly Dictionary<RelType, List<String>> _relIds = new Dictionary<RelType, List<String>>();
+            public String GetNext(RelType relType)
+            {
+                if (!_relIds.ContainsKey(relType))
+                {
+                    _relIds.Add(relType, new List<String>());
+                }
+
+                Int32 id = _relIds[relType].Count + 1;
+                while (true)
+                {
+                    String relId = String.Format("rId{0}", id);
+                    if (!_relIds[relType].Contains(relId))
+                    {
+                        _relIds[relType].Add(relId);
+                        return relId;
+                    }
+                    id++;
+                }
+            }
+            public void AddValues(List<String> values, RelType relType)
+            {
+                if (!_relIds.ContainsKey(relType))
+                {
+                    _relIds.Add(relType, new List<String>());
+                }
+                _relIds[relType].AddRange(values);
+            }
+            public void Reset(RelType relType)
+            {
+                if (_relIds.ContainsKey(relType))
+                    _relIds.Remove(relType);
+            }
+        }
+        #endregion
+        #region Nested type: FontInfo
+        internal struct FontInfo
+        {
+            public UInt32 FontId;
+            public XLFont Font;
+        };
+        #endregion
+        #region Nested type: FillInfo
+        internal struct FillInfo
+        {
+            public UInt32 FillId;
+            public XLFill Fill;
+        }
+        #endregion
+        #region Nested type: BorderInfo
+        internal struct BorderInfo
+        {
+            public UInt32 BorderId;
+            public XLBorder Border;
+        }
+        #endregion
+        #region Nested type: NumberFormatInfo
+        internal struct NumberFormatInfo
+        {
+            public Int32 NumberFormatId;
+            public IXLNumberFormat NumberFormat;
+        }
+        #endregion
+        #region Nested type: StyleInfo
+        internal struct StyleInfo
+        {
+            public UInt32 StyleId;
+            public UInt32 FontId;
+            public UInt32 FillId;
+            public UInt32 BorderId;
+            public Int32 NumberFormatId;
+            public IXLStyle Style;
+        }
+        #endregion
+
+        
+        
+       
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/Excel/XLWorkbook_Save.cs
new file mode 100644
index 0000000..0bfa65c
--- /dev/null
+++ b/ClosedXML/Excel/XLWorkbook_Save.cs
@@ -0,0 +1,4635 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.CustomProperties;
+using DocumentFormat.OpenXml.Drawing;
+using DocumentFormat.OpenXml.ExtendedProperties;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml.VariantTypes;
+using DocumentFormat.OpenXml.Vml.Office;
+using DocumentFormat.OpenXml.Vml.Spreadsheet;
+using Vml = DocumentFormat.OpenXml.Vml;
+using BackgroundColor = DocumentFormat.OpenXml.Spreadsheet.BackgroundColor;
+using BottomBorder = DocumentFormat.OpenXml.Spreadsheet.BottomBorder;
+using Break = DocumentFormat.OpenXml.Spreadsheet.Break;
+using Fill = DocumentFormat.OpenXml.Spreadsheet.Fill;
+using FontScheme = DocumentFormat.OpenXml.Drawing.FontScheme;
+using Fonts = DocumentFormat.OpenXml.Spreadsheet.Fonts;
+using ForegroundColor = DocumentFormat.OpenXml.Spreadsheet.ForegroundColor;
+using GradientFill = DocumentFormat.OpenXml.Drawing.GradientFill;
+using GradientStop = DocumentFormat.OpenXml.Drawing.GradientStop;
+using Hyperlink = DocumentFormat.OpenXml.Spreadsheet.Hyperlink;
+using LeftBorder = DocumentFormat.OpenXml.Spreadsheet.LeftBorder;
+using Outline = DocumentFormat.OpenXml.Drawing.Outline;
+using Path = System.IO.Path;
+using PatternFill = DocumentFormat.OpenXml.Spreadsheet.PatternFill;
+using Properties = DocumentFormat.OpenXml.ExtendedProperties.Properties;
+using RightBorder = DocumentFormat.OpenXml.Spreadsheet.RightBorder;
+using Table = DocumentFormat.OpenXml.Spreadsheet.Table;
+using Text = DocumentFormat.OpenXml.Spreadsheet.Text;
+using TopBorder = DocumentFormat.OpenXml.Spreadsheet.TopBorder;
+using Underline = DocumentFormat.OpenXml.Spreadsheet.Underline;
+using System.Xml;
+using System.Xml.Linq;
+using System.Text;
+using Anchor = DocumentFormat.OpenXml.Vml.Spreadsheet.Anchor;
+using Field = DocumentFormat.OpenXml.Spreadsheet.Field;
+using Run = DocumentFormat.OpenXml.Spreadsheet.Run;
+using RunProperties = DocumentFormat.OpenXml.Spreadsheet.RunProperties;
+using VerticalTextAlignment = DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment;
+
+
+namespace ClosedXML.Excel
+{
+    public partial class XLWorkbook
+    {
+        private const Double ColumnWidthOffset = 0.710625;
+
+        //private Dictionary<String, UInt32> sharedStrings;
+        //private Dictionary<IXLStyle, StyleInfo> context.SharedStyles;
+
+        private static readonly EnumValue<CellValues> CvSharedString = new EnumValue<CellValues>(CellValues.SharedString);
+        private static readonly EnumValue<CellValues> CvInlineString = new EnumValue<CellValues>(CellValues.InlineString);
+        private static readonly EnumValue<CellValues> CvNumber = new EnumValue<CellValues>(CellValues.Number);
+        private static readonly EnumValue<CellValues> CvDate = new EnumValue<CellValues>(CellValues.Date);
+        private static readonly EnumValue<CellValues> CvBoolean = new EnumValue<CellValues>(CellValues.Boolean);
+
+        private static EnumValue<CellValues> GetCellValue(XLCell xlCell)
+        {
+            switch (xlCell.DataType)
+            {
+                case XLCellValues.Text:
+                {
+                    return xlCell.ShareString ? CvSharedString : CvInlineString;
+                }
+                case XLCellValues.Number:
+                    return CvNumber;
+                case XLCellValues.DateTime:
+                    return CvDate;
+                case XLCellValues.Boolean:
+                    return CvBoolean;
+                case XLCellValues.TimeSpan:
+                    return CvNumber;
+                default:
+                    throw new NotImplementedException();
+            }
+        }
+
+        private void CreatePackage(String filePath, SpreadsheetDocumentType spreadsheetDocumentType)
+        {
+            PathHelper.CreateDirectory(Path.GetDirectoryName(filePath));
+            var package = File.Exists(filePath)
+                ? SpreadsheetDocument.Open(filePath, true)
+                : SpreadsheetDocument.Create(filePath, spreadsheetDocumentType);
+
+            using (package)
+            {
+                CreateParts(package);
+                //package.Close();
+            }
+        }
+
+        private void CreatePackage(Stream stream, bool newStream, SpreadsheetDocumentType spreadsheetDocumentType)
+        {
+            var package = newStream
+                ? SpreadsheetDocument.Create(stream, spreadsheetDocumentType)
+                : SpreadsheetDocument.Open(stream, true);
+
+            using (package)
+            {
+                CreateParts(package);
+                //package.Close();
+            }
+        }
+
+        // http://blogs.msdn.com/b/vsod/archive/2010/02/05/how-to-delete-a-worksheet-from-excel-using-open-xml-sdk-2-0.aspx
+        private void DeleteSheetAndDependencies(WorkbookPart wbPart, string sheetId)
+        {
+            //Get the SheetToDelete from workbook.xml
+            Sheet worksheet = wbPart.Workbook.Descendants<Sheet>().Where(s => s.Id == sheetId).FirstOrDefault();
+            if (worksheet == null)
+            { }
+
+            string sheetName = worksheet.Name;
+            // Get the pivot Table Parts
+            IEnumerable<PivotTableCacheDefinitionPart> pvtTableCacheParts = wbPart.PivotTableCacheDefinitionParts;
+            Dictionary<PivotTableCacheDefinitionPart, string> pvtTableCacheDefinationPart = new Dictionary<PivotTableCacheDefinitionPart, string>();
+            foreach (PivotTableCacheDefinitionPart Item in pvtTableCacheParts)
+            {
+                PivotCacheDefinition pvtCacheDef = Item.PivotCacheDefinition;
+                //Check if this CacheSource is linked to SheetToDelete
+                var pvtCahce = pvtCacheDef.Descendants<CacheSource>().Where(s => s.WorksheetSource.Sheet == sheetName);
+                if (pvtCahce.Count() > 0)
+                {
+                    pvtTableCacheDefinationPart.Add(Item, Item.ToString());
+                }
+            }
+            foreach (var Item in pvtTableCacheDefinationPart)
+            {
+                wbPart.DeletePart(Item.Key);
+            }
+
+            // Remove the sheet reference from the workbook.
+            WorksheetPart worksheetPart = (WorksheetPart)(wbPart.GetPartById(sheetId));
+            worksheet.Remove();
+
+            // Delete the worksheet part.
+            wbPart.DeletePart(worksheetPart);
+
+            //Get the DefinedNames
+            var definedNames = wbPart.Workbook.Descendants<DefinedNames>().FirstOrDefault();
+            if (definedNames != null)
+            {
+                List<DefinedName> defNamesToDelete = new List<DefinedName>();
+
+                foreach (DefinedName Item in definedNames)
+                {
+                    // This condition checks to delete only those names which are part of Sheet in question
+                    if (Item.Text.Contains(worksheet.Name + "!"))
+                        defNamesToDelete.Add(Item);
+                }
+
+                foreach (DefinedName Item in defNamesToDelete)
+                {
+                    Item.Remove();
+                }
+
+            }
+            // Get the CalculationChainPart 
+            //Note: An instance of this part type contains an ordered set of references to all cells in all worksheets in the 
+            //workbook whose value is calculated from any formula
+
+            CalculationChainPart calChainPart;
+            calChainPart = wbPart.CalculationChainPart;
+            if (calChainPart != null)
+            {
+                var calChainEntries = calChainPart.CalculationChain.Descendants<CalculationCell>().Where(c => c.SheetId == sheetId);
+                List<CalculationCell> calcsToDelete = new List<CalculationCell>();
+                foreach (CalculationCell Item in calChainEntries)
+                {
+                    calcsToDelete.Add(Item);
+                }
+
+                foreach (CalculationCell Item in calcsToDelete)
+                {
+                    Item.Remove();
+                }
+
+                if (calChainPart.CalculationChain.Count() == 0)
+                {
+                    wbPart.DeletePart(calChainPart);
+                }
+            }
+        }
+
+        // Adds child parts and generates content of the specified part.
+        private void CreateParts(SpreadsheetDocument document)
+        {
+            var context = new SaveContext();
+
+            var workbookPart = document.WorkbookPart ?? document.AddWorkbookPart();
+
+            var worksheets = WorksheetsInternal;
+            
+
+            var partsToRemove = workbookPart.Parts.Where(s => worksheets.Deleted.Contains(s.RelationshipId)).ToList();
+
+            var pivotCacheDefinitionsToRemove = partsToRemove.SelectMany(s => ((WorksheetPart)s.OpenXmlPart).PivotTableParts.Select(pt => pt.PivotTableCacheDefinitionPart)).Distinct().ToList();
+            pivotCacheDefinitionsToRemove.ForEach(c => workbookPart.DeletePart(c));
+
+            if (workbookPart.Workbook != null && workbookPart.Workbook.PivotCaches != null)
+            {
+                var pivotCachesToRemove = workbookPart.Workbook.PivotCaches.Where(pc => pivotCacheDefinitionsToRemove.Select(pcd => workbookPart.GetIdOfPart(pcd)).ToList().Contains(((PivotCache)pc).Id)).Distinct().ToList();
+                pivotCachesToRemove.ForEach(c => workbookPart.Workbook.PivotCaches.RemoveChild(c));
+            }
+
+            worksheets.Deleted.ToList().ForEach(ws => DeleteSheetAndDependencies(workbookPart, ws));
+
+            context.RelIdGenerator.AddValues(workbookPart.Parts.Select(p => p.RelationshipId).ToList(), RelType.Workbook);
+
+            var extendedFilePropertiesPart = document.ExtendedFilePropertiesPart ??
+                                             document.AddNewPart<ExtendedFilePropertiesPart>(
+                                                 context.RelIdGenerator.GetNext(RelType.Workbook));
+
+            GenerateExtendedFilePropertiesPartContent(extendedFilePropertiesPart);
+
+            GenerateWorkbookPartContent(workbookPart, context);
+
+            var sharedStringTablePart = workbookPart.SharedStringTablePart ??
+                                        workbookPart.AddNewPart<SharedStringTablePart>(
+                                            context.RelIdGenerator.GetNext(RelType.Workbook));
+
+            GenerateSharedStringTablePartContent(sharedStringTablePart, context);
+
+            var workbookStylesPart = workbookPart.WorkbookStylesPart ??
+                                     workbookPart.AddNewPart<WorkbookStylesPart>(
+                                         context.RelIdGenerator.GetNext(RelType.Workbook));
+
+            GenerateWorkbookStylesPartContent(workbookStylesPart, context);
+
+            foreach (var worksheet in WorksheetsInternal.Cast<XLWorksheet>().OrderBy(w => w.Position))
+            {
+                //context.RelIdGenerator.Reset(RelType.);
+                WorksheetPart worksheetPart;
+                var wsRelId = worksheet.RelId;
+                if (workbookPart.Parts.Any(p => p.RelationshipId == wsRelId))
+                {
+                    worksheetPart = (WorksheetPart)workbookPart.GetPartById(wsRelId);
+                    var wsPartsToRemove = worksheetPart.TableDefinitionParts.ToList();
+                    wsPartsToRemove.ForEach(tdp => worksheetPart.DeletePart(tdp));
+                }
+                else
+                    worksheetPart = workbookPart.AddNewPart<WorksheetPart>(wsRelId);
+
+
+                context.RelIdGenerator.AddValues(worksheetPart.HyperlinkRelationships.Select(hr => hr.Id).ToList(),
+                    RelType.Workbook);
+                context.RelIdGenerator.AddValues(worksheetPart.Parts.Select(p => p.RelationshipId).ToList(),
+                    RelType.Workbook);
+                if (worksheetPart.DrawingsPart != null)
+                    context.RelIdGenerator.AddValues(
+                        worksheetPart.DrawingsPart.Parts.Select(p => p.RelationshipId).ToList(), RelType.Workbook);
+
+                // delete comment related parts (todo: review)
+                DeleteComments(worksheetPart, worksheet, context);
+
+                if (worksheet.Internals.CellsCollection.GetCells(c => c.HasComment).Any())
+                {
+                    var worksheetCommentsPart =
+                        worksheetPart.AddNewPart<WorksheetCommentsPart>(context.RelIdGenerator.GetNext(RelType.Workbook));
+
+                    GenerateWorksheetCommentsPartContent(worksheetCommentsPart, worksheet);
+
+                    //VmlDrawingPart vmlDrawingPart = worksheetPart.AddNewPart<VmlDrawingPart>(worksheet.LegacyDrawingId);
+                    var vmlDrawingPart = worksheetPart.VmlDrawingParts.FirstOrDefault();
+                    if (vmlDrawingPart == null)
+                    {
+                        if (XLHelper.IsNullOrWhiteSpace(worksheet.LegacyDrawingId))
+                        {
+                            worksheet.LegacyDrawingId = context.RelIdGenerator.GetNext(RelType.Workbook);
+                            worksheet.LegacyDrawingIsNew = true;
+                        }
+
+                        vmlDrawingPart = worksheetPart.AddNewPart<VmlDrawingPart>(worksheet.LegacyDrawingId);
+                    }
+                    GenerateVmlDrawingPartContent(vmlDrawingPart, worksheet, context);
+                }
+
+                GenerateWorksheetPartContent(worksheetPart, worksheet, context);
+
+                if (worksheet.PivotTables.Any())
+                {
+                    GeneratePivotTables(workbookPart, worksheetPart, worksheet, context);
+                }
+            }
+
+            GenerateCalculationChainPartContent(workbookPart, context);
+
+            if (workbookPart.ThemePart == null)
+            {
+                var themePart = workbookPart.AddNewPart<ThemePart>(context.RelIdGenerator.GetNext(RelType.Workbook));
+                GenerateThemePartContent(themePart);
+            }
+
+            if (CustomProperties.Any())
+            {
+                document.GetPartsOfType<CustomFilePropertiesPart>().ToList().ForEach(p => document.DeletePart(p));
+                var customFilePropertiesPart =
+                    document.AddNewPart<CustomFilePropertiesPart>(context.RelIdGenerator.GetNext(RelType.Workbook));
+
+                GenerateCustomFilePropertiesPartContent(customFilePropertiesPart);
+            }
+            SetPackageProperties(document);
+        }
+
+        private void DeleteComments(WorksheetPart worksheetPart, XLWorksheet worksheet, SaveContext context)
+        {
+            // We have the comments so we can delete the comments part
+            worksheetPart.DeletePart(worksheetPart.WorksheetCommentsPart);
+            var vmlDrawingPart = worksheetPart.VmlDrawingParts.FirstOrDefault();
+
+            // Only delete the VmlDrawingParts for comments.
+            if (vmlDrawingPart != null)
+            {
+                var xdoc = XDocumentExtensions.Load(vmlDrawingPart.GetStream(FileMode.Open));
+                //xdoc.Root.Elements().Where(e => e.Name.LocalName == "shapelayout").Remove();
+                xdoc.Root.Elements().Where(
+                    e => e.Name.LocalName == "shapetype" && (string)e.Attribute("id") == @"_x0000_t202").Remove();
+                xdoc.Root.Elements().Where(
+                    e => e.Name.LocalName == "shape" && (string)e.Attribute("type") == @"#_x0000_t202").Remove();
+                var imageParts = vmlDrawingPart.ImageParts.ToList();
+                var legacyParts = vmlDrawingPart.LegacyDiagramTextParts.ToList();
+                var rId = worksheetPart.GetIdOfPart(vmlDrawingPart);
+                worksheet.LegacyDrawingId = rId;
+                worksheetPart.ChangeIdOfPart(vmlDrawingPart, "xxRRxx"); // Anything will do for the new relationship id
+                // we just want it alive enough to create the copy
+
+                var hasShapes = xdoc.Root.Elements().Any(e => e.Name.LocalName == "shape" || e.Name.LocalName == "group");
+
+                VmlDrawingPart vmlDrawingPartNew = null;
+                var hasNewPart = (imageParts.Count > 0 || legacyParts.Count > 0 || hasShapes);
+                if (hasNewPart)
+                {
+                    vmlDrawingPartNew = worksheetPart.AddNewPart<VmlDrawingPart>(rId);
+
+                    using (var writer = new XmlTextWriter(vmlDrawingPartNew.GetStream(FileMode.Create), Encoding.UTF8))
+                    {
+                        writer.WriteRaw(xdoc.ToString());
+                    }
+
+                    imageParts.ForEach(p => vmlDrawingPartNew.AddPart(p, vmlDrawingPart.GetIdOfPart(p)));
+                    legacyParts.ForEach(p => vmlDrawingPartNew.AddPart(p, vmlDrawingPart.GetIdOfPart(p)));
+                }
+
+                worksheetPart.DeletePart(vmlDrawingPart);
+
+                if (hasNewPart && rId != worksheetPart.GetIdOfPart(vmlDrawingPartNew))
+                    worksheetPart.ChangeIdOfPart(vmlDrawingPartNew, rId);
+            }
+        }
+
+        private static void GenerateTables(XLWorksheet worksheet, WorksheetPart worksheetPart, SaveContext context)
+        {
+            worksheetPart.Worksheet.RemoveAllChildren<TablePart>();
+
+            if (!worksheet.Tables.Any()) return;
+
+            foreach (var table in worksheet.Tables)
+            {
+                var tableRelId = context.RelIdGenerator.GetNext(RelType.Workbook);
+
+                var xlTable = (XLTable)table;
+                xlTable.RelId = tableRelId;
+
+                var tableDefinitionPart = worksheetPart.AddNewPart<TableDefinitionPart>(tableRelId);
+                GenerateTableDefinitionPartContent(tableDefinitionPart, xlTable, context);
+            }
+        }
+
+        private void GenerateExtendedFilePropertiesPartContent(ExtendedFilePropertiesPart extendedFilePropertiesPart)
+        {
+            if (extendedFilePropertiesPart.Properties == null)
+                extendedFilePropertiesPart.Properties = new Properties();
+
+            var properties = extendedFilePropertiesPart.Properties;
+            if (
+                !properties.NamespaceDeclarations.Contains(new KeyValuePair<string, string>("vt",
+                    "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes")))
+            {
+                properties.AddNamespaceDeclaration("vt",
+                    "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
+            }
+
+            if (properties.Application == null)
+                properties.AppendChild(new Application {Text = "Microsoft Excel"});
+
+            if (properties.DocumentSecurity == null)
+                properties.AppendChild(new DocumentSecurity {Text = "0"});
+
+            if (properties.ScaleCrop == null)
+                properties.AppendChild(new ScaleCrop {Text = "false"});
+
+            if (properties.HeadingPairs == null)
+                properties.HeadingPairs = new HeadingPairs();
+
+            if (properties.TitlesOfParts == null)
+                properties.TitlesOfParts = new TitlesOfParts();
+
+            properties.HeadingPairs.VTVector = new VTVector {BaseType = VectorBaseValues.Variant};
+
+            properties.TitlesOfParts.VTVector = new VTVector {BaseType = VectorBaseValues.Lpstr};
+
+            var vTVectorOne = properties.HeadingPairs.VTVector;
+
+            var vTVectorTwo = properties.TitlesOfParts.VTVector;
+
+            var modifiedWorksheets =
+                ((IEnumerable<XLWorksheet>)WorksheetsInternal).Select(w => new {w.Name, Order = w.Position}).ToList();
+            var modifiedNamedRanges = GetModifiedNamedRanges();
+            var modifiedWorksheetsCount = modifiedWorksheets.Count;
+            var modifiedNamedRangesCount = modifiedNamedRanges.Count;
+
+            InsertOnVtVector(vTVectorOne, "Worksheets", 0, modifiedWorksheetsCount.ToString());
+            InsertOnVtVector(vTVectorOne, "Named Ranges", 2, modifiedNamedRangesCount.ToString());
+
+            vTVectorTwo.Size = (UInt32)(modifiedNamedRangesCount + modifiedWorksheetsCount);
+
+            foreach (
+                var vTlpstr3 in modifiedWorksheets.OrderBy(w => w.Order).Select(w => new VTLPSTR {Text = w.Name}))
+                vTVectorTwo.AppendChild(vTlpstr3);
+
+            foreach (var vTlpstr7 in modifiedNamedRanges.Select(nr => new VTLPSTR {Text = nr}))
+                vTVectorTwo.AppendChild(vTlpstr7);
+
+            if (Properties.Manager != null)
+            {
+                if (!XLHelper.IsNullOrWhiteSpace(Properties.Manager))
+                {
+                    if (properties.Manager == null)
+                        properties.Manager = new Manager();
+
+                    properties.Manager.Text = Properties.Manager;
+                }
+                else
+                    properties.Manager = null;
+            }
+
+            if (Properties.Company == null) return;
+
+            if (!XLHelper.IsNullOrWhiteSpace(Properties.Company))
+            {
+                if (properties.Company == null)
+                    properties.Company = new Company();
+
+                properties.Company.Text = Properties.Company;
+            }
+            else
+                properties.Company = null;
+        }
+
+        private static void InsertOnVtVector(VTVector vTVector, String property, Int32 index, String text)
+        {
+            var m = from e1 in vTVector.Elements<Variant>()
+                where e1.Elements<VTLPSTR>().Any(e2 => e2.Text == property)
+                select e1;
+            if (!m.Any())
+            {
+                if (vTVector.Size == null)
+                    vTVector.Size = new UInt32Value(0U);
+
+                vTVector.Size += 2U;
+                var variant1 = new Variant();
+                var vTlpstr1 = new VTLPSTR {Text = property};
+                variant1.AppendChild(vTlpstr1);
+                vTVector.InsertAt(variant1, index);
+
+                var variant2 = new Variant();
+                var vTInt321 = new VTInt32();
+                variant2.AppendChild(vTInt321);
+                vTVector.InsertAt(variant2, index + 1);
+            }
+
+            var targetIndex = 0;
+            foreach (var e in vTVector.Elements<Variant>())
+            {
+                if (e.Elements<VTLPSTR>().Any(e2 => e2.Text == property))
+                {
+                    vTVector.ElementAt(targetIndex + 1).GetFirstChild<VTInt32>().Text = text;
+                    break;
+                }
+                targetIndex++;
+            }
+        }
+
+        private List<string> GetModifiedNamedRanges()
+        {
+            var namedRanges = new List<String>();
+            foreach (var w in WorksheetsInternal)
+            {
+                var wName = w.Name;
+                namedRanges.AddRange(w.NamedRanges.Select(n => wName + "!" + n.Name));
+                namedRanges.Add(w.Name + "!Print_Area");
+                namedRanges.Add(w.Name + "!Print_Titles");
+            }
+            namedRanges.AddRange(NamedRanges.Select(n => n.Name));
+            return namedRanges;
+        }
+
+        private void GenerateWorkbookPartContent(WorkbookPart workbookPart, SaveContext context)
+        {
+            if (workbookPart.Workbook == null)
+                workbookPart.Workbook = new Workbook();
+
+            var workbook = workbookPart.Workbook;
+            if (
+                !workbook.NamespaceDeclarations.Contains(new KeyValuePair<string, string>("r",
+                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships")))
+            {
+                workbook.AddNamespaceDeclaration("r",
+                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+            }
+
+            #region WorkbookProperties
+
+            if (workbook.WorkbookProperties == null)
+                workbook.WorkbookProperties = new WorkbookProperties();
+
+            if (workbook.WorkbookProperties.CodeName == null)
+                workbook.WorkbookProperties.CodeName = "ThisWorkbook";
+
+            if (Use1904DateSystem)
+                workbook.WorkbookProperties.Date1904 = true;
+
+            #endregion
+
+            if (LockStructure || LockWindows)
+            {
+                if (workbook.WorkbookProtection == null)
+                    workbook.WorkbookProtection = new WorkbookProtection();
+
+                workbook.WorkbookProtection.LockStructure = LockStructure;
+                workbook.WorkbookProtection.LockWindows = LockWindows;
+            }
+            else
+            {
+                workbook.WorkbookProtection = null;
+            }
+            
+
+            if (workbook.BookViews == null)
+                workbook.BookViews = new BookViews();
+
+            if (workbook.Sheets == null)
+                workbook.Sheets = new Sheets();
+
+            var worksheets = WorksheetsInternal;
+            workbook.Sheets.Elements<Sheet>().Where(s => worksheets.Deleted.Contains(s.Id)).ToList().ForEach(
+                s => s.Remove());
+
+            foreach (var sheet in workbook.Sheets.Elements<Sheet>())
+            {
+                var sheetId = (Int32)sheet.SheetId.Value;
+
+                if (WorksheetsInternal.All<XLWorksheet>(w => w.SheetId != sheetId)) continue;
+
+                var wks = WorksheetsInternal.Single<XLWorksheet>(w => w.SheetId == sheetId);
+                wks.RelId = sheet.Id;
+                sheet.Name = wks.Name;
+            }
+
+            foreach (var xlSheet in
+                WorksheetsInternal.Cast<XLWorksheet>().Where(s => s.SheetId == 0).OrderBy(w => w.Position))
+            {
+                var rId = context.RelIdGenerator.GetNext(RelType.Workbook);
+
+                while (WorksheetsInternal.Cast<XLWorksheet>().Any(w => w.SheetId == Int32.Parse(rId.Substring(3))))
+                    rId = context.RelIdGenerator.GetNext(RelType.Workbook);
+
+                xlSheet.SheetId = Int32.Parse(rId.Substring(3));
+                xlSheet.RelId = rId;
+                var newSheet = new Sheet
+                {
+                    Name = xlSheet.Name,
+                    Id = rId,
+                    SheetId = (UInt32)xlSheet.SheetId
+                };
+
+                workbook.Sheets.AppendChild(newSheet);
+            }
+
+            var sheetElements = from sheet in workbook.Sheets.Elements<Sheet>()
+                join worksheet in ((IEnumerable<XLWorksheet>)WorksheetsInternal) on sheet.Id.Value
+                    equals worksheet.RelId
+                orderby worksheet.Position
+                select sheet;
+
+            UInt32 firstSheetVisible = 0;
+            var activeTab =
+                (from us in UnsupportedSheets where us.IsActive select (UInt32)us.Position - 1).FirstOrDefault();
+            var foundVisible = false;
+
+            var totalSheets = sheetElements.Count() + UnsupportedSheets.Count;
+            for (var p = 1; p <= totalSheets; p++)
+            {
+                if (UnsupportedSheets.All(us => us.Position != p))
+                {
+                    var sheet = sheetElements.ElementAt(p - UnsupportedSheets.Count(us => us.Position <= p) - 1);
+                    workbook.Sheets.RemoveChild(sheet);
+                    workbook.Sheets.AppendChild(sheet);
+                    var xlSheet = Worksheet(sheet.Name);
+                    if (xlSheet.Visibility != XLWorksheetVisibility.Visible)
+                        sheet.State = xlSheet.Visibility.ToOpenXml();
+
+                    if (foundVisible) continue;
+
+                    if (sheet.State == null || sheet.State == SheetStateValues.Visible)
+                        foundVisible = true;
+                    else
+                        firstSheetVisible++;
+                }
+                else
+                {
+                    var sheetId = UnsupportedSheets.First(us => us.Position == p).SheetId;
+                    var sheet = workbook.Sheets.Elements<Sheet>().First(s => s.SheetId == sheetId);
+                    workbook.Sheets.RemoveChild(sheet);
+                    workbook.Sheets.AppendChild(sheet);
+                }
+            }
+
+            var workbookView = workbook.BookViews.Elements<WorkbookView>().FirstOrDefault();
+
+            if (activeTab == 0)
+            {
+                activeTab = firstSheetVisible;
+                foreach (var ws in worksheets)
+                {
+                    if (!ws.TabActive) continue;
+
+                    activeTab = (UInt32)(ws.Position - 1);
+                    break;
+                }
+            }
+
+            if (workbookView == null)
+            {
+                workbookView = new WorkbookView {ActiveTab = activeTab, FirstSheet = firstSheetVisible};
+                workbook.BookViews.AppendChild(workbookView);
+            }
+            else
+            {
+                workbookView.ActiveTab = activeTab;
+                workbookView.FirstSheet = firstSheetVisible;
+            }
+
+            var definedNames = new DefinedNames();
+            foreach (var worksheet in WorksheetsInternal)
+            {
+                var wsSheetId = (UInt32)worksheet.SheetId;
+                UInt32 sheetId = 0;
+                foreach (var s in workbook.Sheets.Elements<Sheet>().TakeWhile(s => s.SheetId != wsSheetId))
+                {
+                    sheetId++;
+                }
+
+                if (worksheet.PageSetup.PrintAreas.Any())
+                {
+                    var definedName = new DefinedName {Name = "_xlnm.Print_Area", LocalSheetId = sheetId};
+                    var worksheetName = worksheet.Name;
+                    var definedNameText = worksheet.PageSetup.PrintAreas.Aggregate(String.Empty,
+                        (current, printArea) =>
+                            current +
+                            ("'" + worksheetName + "'!" +
+                             printArea.RangeAddress.
+                                 FirstAddress.ToStringFixed(
+                                     XLReferenceStyle.A1) +
+                             ":" +
+                             printArea.RangeAddress.
+                                 LastAddress.ToStringFixed(
+                                     XLReferenceStyle.A1) +
+                             ","));
+                    definedName.Text = definedNameText.Substring(0, definedNameText.Length - 1);
+                    definedNames.AppendChild(definedName);
+                }
+
+                if (worksheet.AutoFilter.Enabled)
+                {
+                    var definedName = new DefinedName
+                    {
+                        Name = "_xlnm._FilterDatabase",
+                        LocalSheetId = sheetId,
+                        Text = "'" + worksheet.Name + "'!" +
+                               worksheet.AutoFilter.Range.RangeAddress.FirstAddress.ToStringFixed(
+                                   XLReferenceStyle.A1) +
+                               ":" +
+                               worksheet.AutoFilter.Range.RangeAddress.LastAddress.ToStringFixed(
+                                   XLReferenceStyle.A1),
+                        Hidden = BooleanValue.FromBoolean(true)
+                    };
+                    definedNames.AppendChild(definedName);
+                }
+
+                foreach (var nr in worksheet.NamedRanges.Where(n => n.Name != "_xlnm._FilterDatabase"))
+                {
+                    var definedName = new DefinedName
+                    {
+                        Name = nr.Name,
+                        LocalSheetId = sheetId,
+                        Text = nr.ToString()
+                    };
+                    if (!XLHelper.IsNullOrWhiteSpace(nr.Comment))
+                        definedName.Comment = nr.Comment;
+                    definedNames.AppendChild(definedName);
+                }
+
+
+                var definedNameTextRow = String.Empty;
+                var definedNameTextColumn = String.Empty;
+                if (worksheet.PageSetup.FirstRowToRepeatAtTop > 0)
+                {
+                    definedNameTextRow = "'" + worksheet.Name + "'!" + worksheet.PageSetup.FirstRowToRepeatAtTop
+                                         + ":" + worksheet.PageSetup.LastRowToRepeatAtTop;
+                }
+                if (worksheet.PageSetup.FirstColumnToRepeatAtLeft > 0)
+                {
+                    var minColumn = worksheet.PageSetup.FirstColumnToRepeatAtLeft;
+                    var maxColumn = worksheet.PageSetup.LastColumnToRepeatAtLeft;
+                    definedNameTextColumn = "'" + worksheet.Name + "'!" +
+                                            XLHelper.GetColumnLetterFromNumber(minColumn)
+                                            + ":" + XLHelper.GetColumnLetterFromNumber(maxColumn);
+                }
+
+                string titles;
+                if (definedNameTextColumn.Length > 0)
+                {
+                    titles = definedNameTextColumn;
+                    if (definedNameTextRow.Length > 0)
+                        titles += "," + definedNameTextRow;
+                }
+                else
+                    titles = definedNameTextRow;
+
+                if (titles.Length <= 0) continue;
+
+                var definedName2 = new DefinedName
+                {
+                    Name = "_xlnm.Print_Titles",
+                    LocalSheetId = sheetId,
+                    Text = titles
+                };
+
+                definedNames.AppendChild(definedName2);
+            }
+
+            foreach (var nr in NamedRanges)
+            {
+                var definedName = new DefinedName
+                {
+                    Name = nr.Name,
+                    Text = nr.ToString()
+                };
+                if (!XLHelper.IsNullOrWhiteSpace(nr.Comment))
+                    definedName.Comment = nr.Comment;
+                definedNames.AppendChild(definedName);
+            }
+
+            workbook.DefinedNames = definedNames;
+
+            if (workbook.CalculationProperties == null)
+                workbook.CalculationProperties = new CalculationProperties {CalculationId = 125725U};
+
+            if (CalculateMode == XLCalculateMode.Default)
+                workbook.CalculationProperties.CalculationMode = null;
+            else
+                workbook.CalculationProperties.CalculationMode = CalculateMode.ToOpenXml();
+
+            if (ReferenceStyle == XLReferenceStyle.Default)
+                workbook.CalculationProperties.ReferenceMode = null;
+            else
+                workbook.CalculationProperties.ReferenceMode = ReferenceStyle.ToOpenXml();
+        }
+
+        private void GenerateSharedStringTablePartContent(SharedStringTablePart sharedStringTablePart,
+            SaveContext context)
+        {
+            // Call all table headers to make sure their names are filled
+            var x = 0;
+            Worksheets.ForEach(w => w.Tables.ForEach(t => x = (t as XLTable).FieldNames.Count));
+
+            sharedStringTablePart.SharedStringTable = new SharedStringTable {Count = 0, UniqueCount = 0};
+
+            var stringId = 0;
+
+            var newStrings = new Dictionary<String, Int32>();
+            var newRichStrings = new Dictionary<IXLRichText, Int32>();
+            foreach (
+                var c in
+                    Worksheets.Cast<XLWorksheet>().SelectMany(
+                        w =>
+                            w.Internals.CellsCollection.GetCells(
+                                c => ((c.DataType == XLCellValues.Text && c.ShareString) || c.HasRichText)
+                                     && (c as XLCell).InnerText.Length > 0
+                                     && XLHelper.IsNullOrWhiteSpace(c.FormulaA1)
+                                )))
+            {
+                c.DataType = XLCellValues.Text;
+                if (c.HasRichText)
+                {
+                    if (newRichStrings.ContainsKey(c.RichText))
+                        c.SharedStringId = newRichStrings[c.RichText];
+                    else
+                    {
+                        var sharedStringItem = new SharedStringItem();
+                        foreach (var rt in c.RichText.Where(r => !String.IsNullOrEmpty(r.Text)))
+                        {
+                            sharedStringItem.Append(GetRun(rt));
+                        }
+
+                        if (c.RichText.HasPhonetics)
+                        {
+                            foreach (var p in c.RichText.Phonetics)
+                            {
+                                var phoneticRun = new PhoneticRun
+                                {
+                                    BaseTextStartIndex = (UInt32)p.Start,
+                                    EndingBaseIndex = (UInt32)p.End
+                                };
+
+                                var text = new Text {Text = p.Text};
+                                if (p.Text.PreserveSpaces())
+                                    text.Space = SpaceProcessingModeValues.Preserve;
+
+                                phoneticRun.Append(text);
+                                sharedStringItem.Append(phoneticRun);
+                            }
+                            var f = new XLFont(null, c.RichText.Phonetics);
+                            if (!context.SharedFonts.ContainsKey(f))
+                                context.SharedFonts.Add(f, new FontInfo {Font = f});
+
+                            var phoneticProperties = new PhoneticProperties
+                            {
+                                FontId =
+                                    context.SharedFonts[
+                                        new XLFont(null, c.RichText.Phonetics)].
+                                        FontId
+                            };
+                            if (c.RichText.Phonetics.Alignment != XLPhoneticAlignment.Left)
+                                phoneticProperties.Alignment = c.RichText.Phonetics.Alignment.ToOpenXml();
+                            if (c.RichText.Phonetics.Type != XLPhoneticType.FullWidthKatakana)
+                                phoneticProperties.Type = c.RichText.Phonetics.Type.ToOpenXml();
+
+                            sharedStringItem.Append(phoneticProperties);
+                        }
+
+                        sharedStringTablePart.SharedStringTable.Append(sharedStringItem);
+                        sharedStringTablePart.SharedStringTable.Count += 1;
+                        sharedStringTablePart.SharedStringTable.UniqueCount += 1;
+
+                        newRichStrings.Add(c.RichText, stringId);
+                        c.SharedStringId = stringId;
+
+                        stringId++;
+                    }
+                }
+                else
+                {
+                    if (newStrings.ContainsKey(c.Value.ToString()))
+                        c.SharedStringId = newStrings[c.Value.ToString()];
+                    else
+                    {
+                        var s = c.Value.ToString();
+                        var sharedStringItem = new SharedStringItem();
+                        var text = new Text {Text = s};
+                        if (!s.Trim().Equals(s))
+                            text.Space = SpaceProcessingModeValues.Preserve;
+                        sharedStringItem.Append(text);
+                        sharedStringTablePart.SharedStringTable.Append(sharedStringItem);
+                        sharedStringTablePart.SharedStringTable.Count += 1;
+                        sharedStringTablePart.SharedStringTable.UniqueCount += 1;
+
+                        newStrings.Add(c.Value.ToString(), stringId);
+                        c.SharedStringId = stringId;
+
+                        stringId++;
+                    }
+                }
+            }
+        }
+
+        private static Run GetRun(IXLRichString rt)
+        {
+            var run = new Run();
+
+            var runProperties = new RunProperties();
+
+            var bold = rt.Bold ? new Bold() : null;
+            var italic = rt.Italic ? new Italic() : null;
+            var underline = rt.Underline != XLFontUnderlineValues.None
+                ? new Underline {Val = rt.Underline.ToOpenXml()}
+                : null;
+            var strike = rt.Strikethrough ? new Strike() : null;
+            var verticalAlignment = new VerticalTextAlignment
+            {Val = rt.VerticalAlignment.ToOpenXml()};
+            var shadow = rt.Shadow ? new Shadow() : null;
+            var fontSize = new FontSize {Val = rt.FontSize};
+            var color = GetNewColor(rt.FontColor);
+            var fontName = new RunFont {Val = rt.FontName};
+            var fontFamilyNumbering = new FontFamily {Val = (Int32)rt.FontFamilyNumbering};
+
+            if (bold != null) runProperties.Append(bold);
+            if (italic != null) runProperties.Append(italic);
+
+            if (strike != null) runProperties.Append(strike);
+            if (shadow != null) runProperties.Append(shadow);
+            if (underline != null) runProperties.Append(underline);
+            runProperties.Append(verticalAlignment);
+
+            runProperties.Append(fontSize);
+            runProperties.Append(color);
+            runProperties.Append(fontName);
+            runProperties.Append(fontFamilyNumbering);
+
+            var text = new Text {Text = rt.Text};
+            if (rt.Text.PreserveSpaces())
+                text.Space = SpaceProcessingModeValues.Preserve;
+
+            run.Append(runProperties);
+            run.Append(text);
+            return run;
+        }
+
+        private void GenerateCalculationChainPartContent(WorkbookPart workbookPart, SaveContext context)
+        {
+            var thisRelId = context.RelIdGenerator.GetNext(RelType.Workbook);
+            if (workbookPart.CalculationChainPart == null)
+                workbookPart.AddNewPart<CalculationChainPart>(thisRelId);
+
+            if (workbookPart.CalculationChainPart.CalculationChain == null)
+                workbookPart.CalculationChainPart.CalculationChain = new CalculationChain();
+
+            var calculationChain = workbookPart.CalculationChainPart.CalculationChain;
+            calculationChain.RemoveAllChildren<CalculationCell>();
+
+            foreach (var worksheet in WorksheetsInternal)
+            {
+                var cellsWithoutFormulas = new HashSet<String>();
+                foreach (var c in worksheet.Internals.CellsCollection.GetCells())
+                {
+                    if (XLHelper.IsNullOrWhiteSpace(c.FormulaA1))
+                        cellsWithoutFormulas.Add(c.Address.ToStringRelative());
+                    else
+                    {
+                        if (c.FormulaA1.StartsWith("{"))
+                        {
+                            var cc = new CalculationCell
+                            {
+                                CellReference = c.Address.ToString(),
+                                SheetId = worksheet.SheetId
+                            };
+
+                            if (c.FormulaReference == null)
+                                c.FormulaReference = c.AsRange().RangeAddress;
+                            if (c.FormulaReference.FirstAddress.Equals(c.Address))
+                            {
+                                cc.Array = true;
+                                calculationChain.AppendChild(cc);
+                                calculationChain.AppendChild(new CalculationCell {CellReference = c.Address.ToString(), InChildChain = true});
+                            }
+                            else
+                            {
+                                calculationChain.AppendChild(cc);
+                            }
+                        }
+                        else
+                        {
+                            calculationChain.AppendChild(new CalculationCell
+                            {
+                                CellReference = c.Address.ToString(),
+                                SheetId = worksheet.SheetId
+                            });
+                        }
+                    }
+                }
+
+                //var cCellsToRemove = new List<CalculationCell>();
+                var m = from cc in calculationChain.Elements<CalculationCell>()
+                    where !(cc.SheetId != null || cc.InChildChain != null)
+                          && calculationChain.Elements<CalculationCell>()
+                              .Where(c1 => c1.SheetId != null)
+                              .Select(c1 => c1.CellReference.Value)
+                              .Contains(cc.CellReference.Value)
+                          || cellsWithoutFormulas.Contains(cc.CellReference.Value)
+                    select cc;
+                //m.ToList().ForEach(cc => cCellsToRemove.Add(cc));
+                m.ToList().ForEach(cc => calculationChain.RemoveChild(cc));
+            }
+
+            if (!calculationChain.Any())
+                workbookPart.DeletePart(workbookPart.CalculationChainPart);
+        }
+
+        private void GenerateThemePartContent(ThemePart themePart)
+        {
+            var theme1 = new Theme {Name = "Office Theme"};
+            theme1.AddNamespaceDeclaration("a", "http://schemas.openxmlformats.org/drawingml/2006/main");
+
+            var themeElements1 = new ThemeElements();
+
+            var colorScheme1 = new ColorScheme {Name = "Office"};
+
+            var dark1Color1 = new Dark1Color();
+            var systemColor1 = new SystemColor
+            {
+                Val = SystemColorValues.WindowText,
+                LastColor = Theme.Text1.Color.ToHex().Substring(2)
+            };
+
+            dark1Color1.AppendChild(systemColor1);
+
+            var light1Color1 = new Light1Color();
+            var systemColor2 = new SystemColor
+            {
+                Val = SystemColorValues.Window,
+                LastColor = Theme.Background1.Color.ToHex().Substring(2)
+            };
+
+            light1Color1.AppendChild(systemColor2);
+
+            var dark2Color1 = new Dark2Color();
+            var rgbColorModelHex1 = new RgbColorModelHex {Val = Theme.Text2.Color.ToHex().Substring(2)};
+
+            dark2Color1.AppendChild(rgbColorModelHex1);
+
+            var light2Color1 = new Light2Color();
+            var rgbColorModelHex2 = new RgbColorModelHex {Val = Theme.Background2.Color.ToHex().Substring(2)};
+
+            light2Color1.AppendChild(rgbColorModelHex2);
+
+            var accent1Color1 = new Accent1Color();
+            var rgbColorModelHex3 = new RgbColorModelHex {Val = Theme.Accent1.Color.ToHex().Substring(2)};
+
+            accent1Color1.AppendChild(rgbColorModelHex3);
+
+            var accent2Color1 = new Accent2Color();
+            var rgbColorModelHex4 = new RgbColorModelHex {Val = Theme.Accent2.Color.ToHex().Substring(2)};
+
+            accent2Color1.AppendChild(rgbColorModelHex4);
+
+            var accent3Color1 = new Accent3Color();
+            var rgbColorModelHex5 = new RgbColorModelHex {Val = Theme.Accent3.Color.ToHex().Substring(2)};
+
+            accent3Color1.AppendChild(rgbColorModelHex5);
+
+            var accent4Color1 = new Accent4Color();
+            var rgbColorModelHex6 = new RgbColorModelHex {Val = Theme.Accent4.Color.ToHex().Substring(2)};
+
+            accent4Color1.AppendChild(rgbColorModelHex6);
+
+            var accent5Color1 = new Accent5Color();
+            var rgbColorModelHex7 = new RgbColorModelHex {Val = Theme.Accent5.Color.ToHex().Substring(2)};
+
+            accent5Color1.AppendChild(rgbColorModelHex7);
+
+            var accent6Color1 = new Accent6Color();
+            var rgbColorModelHex8 = new RgbColorModelHex {Val = Theme.Accent6.Color.ToHex().Substring(2)};
+
+            accent6Color1.AppendChild(rgbColorModelHex8);
+
+            var hyperlink1 = new DocumentFormat.OpenXml.Drawing.Hyperlink();
+            var rgbColorModelHex9 = new RgbColorModelHex {Val = Theme.Hyperlink.Color.ToHex().Substring(2)};
+
+            hyperlink1.AppendChild(rgbColorModelHex9);
+
+            var followedHyperlinkColor1 = new FollowedHyperlinkColor();
+            var rgbColorModelHex10 = new RgbColorModelHex {Val = Theme.FollowedHyperlink.Color.ToHex().Substring(2)};
+
+            followedHyperlinkColor1.AppendChild(rgbColorModelHex10);
+
+            colorScheme1.AppendChild(dark1Color1);
+            colorScheme1.AppendChild(light1Color1);
+            colorScheme1.AppendChild(dark2Color1);
+            colorScheme1.AppendChild(light2Color1);
+            colorScheme1.AppendChild(accent1Color1);
+            colorScheme1.AppendChild(accent2Color1);
+            colorScheme1.AppendChild(accent3Color1);
+            colorScheme1.AppendChild(accent4Color1);
+            colorScheme1.AppendChild(accent5Color1);
+            colorScheme1.AppendChild(accent6Color1);
+            colorScheme1.AppendChild(hyperlink1);
+            colorScheme1.AppendChild(followedHyperlinkColor1);
+
+            var fontScheme2 = new FontScheme {Name = "Office"};
+
+            var majorFont1 = new MajorFont();
+            var latinFont1 = new LatinFont {Typeface = "Cambria"};
+            var eastAsianFont1 = new EastAsianFont {Typeface = ""};
+            var complexScriptFont1 = new ComplexScriptFont {Typeface = ""};
+            var supplementalFont1 = new SupplementalFont {Script = "Jpan", Typeface = "ＭＳ Ｐゴシック"};
+            var supplementalFont2 = new SupplementalFont {Script = "Hang", Typeface = "맑은 고딕"};
+            var supplementalFont3 = new SupplementalFont {Script = "Hans", Typeface = "宋体"};
+            var supplementalFont4 = new SupplementalFont {Script = "Hant", Typeface = "新細明體"};
+            var supplementalFont5 = new SupplementalFont {Script = "Arab", Typeface = "Times New Roman"};
+            var supplementalFont6 = new SupplementalFont {Script = "Hebr", Typeface = "Times New Roman"};
+            var supplementalFont7 = new SupplementalFont {Script = "Thai", Typeface = "Tahoma"};
+            var supplementalFont8 = new SupplementalFont {Script = "Ethi", Typeface = "Nyala"};
+            var supplementalFont9 = new SupplementalFont {Script = "Beng", Typeface = "Vrinda"};
+            var supplementalFont10 = new SupplementalFont {Script = "Gujr", Typeface = "Shruti"};
+            var supplementalFont11 = new SupplementalFont {Script = "Khmr", Typeface = "MoolBoran"};
+            var supplementalFont12 = new SupplementalFont {Script = "Knda", Typeface = "Tunga"};
+            var supplementalFont13 = new SupplementalFont {Script = "Guru", Typeface = "Raavi"};
+            var supplementalFont14 = new SupplementalFont {Script = "Cans", Typeface = "Euphemia"};
+            var supplementalFont15 = new SupplementalFont {Script = "Cher", Typeface = "Plantagenet Cherokee"};
+            var supplementalFont16 = new SupplementalFont {Script = "Yiii", Typeface = "Microsoft Yi Baiti"};
+            var supplementalFont17 = new SupplementalFont {Script = "Tibt", Typeface = "Microsoft Himalaya"};
+            var supplementalFont18 = new SupplementalFont {Script = "Thaa", Typeface = "MV Boli"};
+            var supplementalFont19 = new SupplementalFont {Script = "Deva", Typeface = "Mangal"};
+            var supplementalFont20 = new SupplementalFont {Script = "Telu", Typeface = "Gautami"};
+            var supplementalFont21 = new SupplementalFont {Script = "Taml", Typeface = "Latha"};
+            var supplementalFont22 = new SupplementalFont {Script = "Syrc", Typeface = "Estrangelo Edessa"};
+            var supplementalFont23 = new SupplementalFont {Script = "Orya", Typeface = "Kalinga"};
+            var supplementalFont24 = new SupplementalFont {Script = "Mlym", Typeface = "Kartika"};
+            var supplementalFont25 = new SupplementalFont {Script = "Laoo", Typeface = "DokChampa"};
+            var supplementalFont26 = new SupplementalFont {Script = "Sinh", Typeface = "Iskoola Pota"};
+            var supplementalFont27 = new SupplementalFont {Script = "Mong", Typeface = "Mongolian Baiti"};
+            var supplementalFont28 = new SupplementalFont {Script = "Viet", Typeface = "Times New Roman"};
+            var supplementalFont29 = new SupplementalFont {Script = "Uigh", Typeface = "Microsoft Uighur"};
+
+            majorFont1.AppendChild(latinFont1);
+            majorFont1.AppendChild(eastAsianFont1);
+            majorFont1.AppendChild(complexScriptFont1);
+            majorFont1.AppendChild(supplementalFont1);
+            majorFont1.AppendChild(supplementalFont2);
+            majorFont1.AppendChild(supplementalFont3);
+            majorFont1.AppendChild(supplementalFont4);
+            majorFont1.AppendChild(supplementalFont5);
+            majorFont1.AppendChild(supplementalFont6);
+            majorFont1.AppendChild(supplementalFont7);
+            majorFont1.AppendChild(supplementalFont8);
+            majorFont1.AppendChild(supplementalFont9);
+            majorFont1.AppendChild(supplementalFont10);
+            majorFont1.AppendChild(supplementalFont11);
+            majorFont1.AppendChild(supplementalFont12);
+            majorFont1.AppendChild(supplementalFont13);
+            majorFont1.AppendChild(supplementalFont14);
+            majorFont1.AppendChild(supplementalFont15);
+            majorFont1.AppendChild(supplementalFont16);
+            majorFont1.AppendChild(supplementalFont17);
+            majorFont1.AppendChild(supplementalFont18);
+            majorFont1.AppendChild(supplementalFont19);
+            majorFont1.AppendChild(supplementalFont20);
+            majorFont1.AppendChild(supplementalFont21);
+            majorFont1.AppendChild(supplementalFont22);
+            majorFont1.AppendChild(supplementalFont23);
+            majorFont1.AppendChild(supplementalFont24);
+            majorFont1.AppendChild(supplementalFont25);
+            majorFont1.AppendChild(supplementalFont26);
+            majorFont1.AppendChild(supplementalFont27);
+            majorFont1.AppendChild(supplementalFont28);
+            majorFont1.AppendChild(supplementalFont29);
+
+            var minorFont1 = new MinorFont();
+            var latinFont2 = new LatinFont {Typeface = "Calibri"};
+            var eastAsianFont2 = new EastAsianFont {Typeface = ""};
+            var complexScriptFont2 = new ComplexScriptFont {Typeface = ""};
+            var supplementalFont30 = new SupplementalFont {Script = "Jpan", Typeface = "ＭＳ Ｐゴシック"};
+            var supplementalFont31 = new SupplementalFont {Script = "Hang", Typeface = "맑은 고딕"};
+            var supplementalFont32 = new SupplementalFont {Script = "Hans", Typeface = "宋体"};
+            var supplementalFont33 = new SupplementalFont {Script = "Hant", Typeface = "新細明體"};
+            var supplementalFont34 = new SupplementalFont {Script = "Arab", Typeface = "Arial"};
+            var supplementalFont35 = new SupplementalFont {Script = "Hebr", Typeface = "Arial"};
+            var supplementalFont36 = new SupplementalFont {Script = "Thai", Typeface = "Tahoma"};
+            var supplementalFont37 = new SupplementalFont {Script = "Ethi", Typeface = "Nyala"};
+            var supplementalFont38 = new SupplementalFont {Script = "Beng", Typeface = "Vrinda"};
+            var supplementalFont39 = new SupplementalFont {Script = "Gujr", Typeface = "Shruti"};
+            var supplementalFont40 = new SupplementalFont {Script = "Khmr", Typeface = "DaunPenh"};
+            var supplementalFont41 = new SupplementalFont {Script = "Knda", Typeface = "Tunga"};
+            var supplementalFont42 = new SupplementalFont {Script = "Guru", Typeface = "Raavi"};
+            var supplementalFont43 = new SupplementalFont {Script = "Cans", Typeface = "Euphemia"};
+            var supplementalFont44 = new SupplementalFont {Script = "Cher", Typeface = "Plantagenet Cherokee"};
+            var supplementalFont45 = new SupplementalFont {Script = "Yiii", Typeface = "Microsoft Yi Baiti"};
+            var supplementalFont46 = new SupplementalFont {Script = "Tibt", Typeface = "Microsoft Himalaya"};
+            var supplementalFont47 = new SupplementalFont {Script = "Thaa", Typeface = "MV Boli"};
+            var supplementalFont48 = new SupplementalFont {Script = "Deva", Typeface = "Mangal"};
+            var supplementalFont49 = new SupplementalFont {Script = "Telu", Typeface = "Gautami"};
+            var supplementalFont50 = new SupplementalFont {Script = "Taml", Typeface = "Latha"};
+            var supplementalFont51 = new SupplementalFont {Script = "Syrc", Typeface = "Estrangelo Edessa"};
+            var supplementalFont52 = new SupplementalFont {Script = "Orya", Typeface = "Kalinga"};
+            var supplementalFont53 = new SupplementalFont {Script = "Mlym", Typeface = "Kartika"};
+            var supplementalFont54 = new SupplementalFont {Script = "Laoo", Typeface = "DokChampa"};
+            var supplementalFont55 = new SupplementalFont {Script = "Sinh", Typeface = "Iskoola Pota"};
+            var supplementalFont56 = new SupplementalFont {Script = "Mong", Typeface = "Mongolian Baiti"};
+            var supplementalFont57 = new SupplementalFont {Script = "Viet", Typeface = "Arial"};
+            var supplementalFont58 = new SupplementalFont {Script = "Uigh", Typeface = "Microsoft Uighur"};
+
+            minorFont1.AppendChild(latinFont2);
+            minorFont1.AppendChild(eastAsianFont2);
+            minorFont1.AppendChild(complexScriptFont2);
+            minorFont1.AppendChild(supplementalFont30);
+            minorFont1.AppendChild(supplementalFont31);
+            minorFont1.AppendChild(supplementalFont32);
+            minorFont1.AppendChild(supplementalFont33);
+            minorFont1.AppendChild(supplementalFont34);
+            minorFont1.AppendChild(supplementalFont35);
+            minorFont1.AppendChild(supplementalFont36);
+            minorFont1.AppendChild(supplementalFont37);
+            minorFont1.AppendChild(supplementalFont38);
+            minorFont1.AppendChild(supplementalFont39);
+            minorFont1.AppendChild(supplementalFont40);
+            minorFont1.AppendChild(supplementalFont41);
+            minorFont1.AppendChild(supplementalFont42);
+            minorFont1.AppendChild(supplementalFont43);
+            minorFont1.AppendChild(supplementalFont44);
+            minorFont1.AppendChild(supplementalFont45);
+            minorFont1.AppendChild(supplementalFont46);
+            minorFont1.AppendChild(supplementalFont47);
+            minorFont1.AppendChild(supplementalFont48);
+            minorFont1.AppendChild(supplementalFont49);
+            minorFont1.AppendChild(supplementalFont50);
+            minorFont1.AppendChild(supplementalFont51);
+            minorFont1.AppendChild(supplementalFont52);
+            minorFont1.AppendChild(supplementalFont53);
+            minorFont1.AppendChild(supplementalFont54);
+            minorFont1.AppendChild(supplementalFont55);
+            minorFont1.AppendChild(supplementalFont56);
+            minorFont1.AppendChild(supplementalFont57);
+            minorFont1.AppendChild(supplementalFont58);
+
+            fontScheme2.AppendChild(majorFont1);
+            fontScheme2.AppendChild(minorFont1);
+
+            var formatScheme1 = new FormatScheme {Name = "Office"};
+
+            var fillStyleList1 = new FillStyleList();
+
+            var solidFill1 = new SolidFill();
+            var schemeColor1 = new SchemeColor {Val = SchemeColorValues.PhColor};
+
+            solidFill1.AppendChild(schemeColor1);
+
+            var gradientFill1 = new GradientFill {RotateWithShape = true};
+
+            var gradientStopList1 = new GradientStopList();
+
+            var gradientStop1 = new GradientStop {Position = 0};
+
+            var schemeColor2 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var tint1 = new Tint {Val = 50000};
+            var saturationModulation1 = new SaturationModulation {Val = 300000};
+
+            schemeColor2.AppendChild(tint1);
+            schemeColor2.AppendChild(saturationModulation1);
+
+            gradientStop1.AppendChild(schemeColor2);
+
+            var gradientStop2 = new GradientStop {Position = 35000};
+
+            var schemeColor3 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var tint2 = new Tint {Val = 37000};
+            var saturationModulation2 = new SaturationModulation {Val = 300000};
+
+            schemeColor3.AppendChild(tint2);
+            schemeColor3.AppendChild(saturationModulation2);
+
+            gradientStop2.AppendChild(schemeColor3);
+
+            var gradientStop3 = new GradientStop {Position = 100000};
+
+            var schemeColor4 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var tint3 = new Tint {Val = 15000};
+            var saturationModulation3 = new SaturationModulation {Val = 350000};
+
+            schemeColor4.AppendChild(tint3);
+            schemeColor4.AppendChild(saturationModulation3);
+
+            gradientStop3.AppendChild(schemeColor4);
+
+            gradientStopList1.AppendChild(gradientStop1);
+            gradientStopList1.AppendChild(gradientStop2);
+            gradientStopList1.AppendChild(gradientStop3);
+            var linearGradientFill1 = new LinearGradientFill {Angle = 16200000, Scaled = true};
+
+            gradientFill1.AppendChild(gradientStopList1);
+            gradientFill1.AppendChild(linearGradientFill1);
+
+            var gradientFill2 = new GradientFill {RotateWithShape = true};
+
+            var gradientStopList2 = new GradientStopList();
+
+            var gradientStop4 = new GradientStop {Position = 0};
+
+            var schemeColor5 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var shade1 = new Shade {Val = 51000};
+            var saturationModulation4 = new SaturationModulation {Val = 130000};
+
+            schemeColor5.AppendChild(shade1);
+            schemeColor5.AppendChild(saturationModulation4);
+
+            gradientStop4.AppendChild(schemeColor5);
+
+            var gradientStop5 = new GradientStop {Position = 80000};
+
+            var schemeColor6 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var shade2 = new Shade {Val = 93000};
+            var saturationModulation5 = new SaturationModulation {Val = 130000};
+
+            schemeColor6.AppendChild(shade2);
+            schemeColor6.AppendChild(saturationModulation5);
+
+            gradientStop5.AppendChild(schemeColor6);
+
+            var gradientStop6 = new GradientStop {Position = 100000};
+
+            var schemeColor7 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var shade3 = new Shade {Val = 94000};
+            var saturationModulation6 = new SaturationModulation {Val = 135000};
+
+            schemeColor7.AppendChild(shade3);
+            schemeColor7.AppendChild(saturationModulation6);
+
+            gradientStop6.AppendChild(schemeColor7);
+
+            gradientStopList2.AppendChild(gradientStop4);
+            gradientStopList2.AppendChild(gradientStop5);
+            gradientStopList2.AppendChild(gradientStop6);
+            var linearGradientFill2 = new LinearGradientFill {Angle = 16200000, Scaled = false};
+
+            gradientFill2.AppendChild(gradientStopList2);
+            gradientFill2.AppendChild(linearGradientFill2);
+
+            fillStyleList1.AppendChild(solidFill1);
+            fillStyleList1.AppendChild(gradientFill1);
+            fillStyleList1.AppendChild(gradientFill2);
+
+            var lineStyleList1 = new LineStyleList();
+
+            var outline1 = new Outline
+            {
+                Width = 9525,
+                CapType = LineCapValues.Flat,
+                CompoundLineType = CompoundLineValues.Single,
+                Alignment = PenAlignmentValues.Center
+            };
+
+            var solidFill2 = new SolidFill();
+
+            var schemeColor8 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var shade4 = new Shade {Val = 95000};
+            var saturationModulation7 = new SaturationModulation {Val = 105000};
+
+            schemeColor8.AppendChild(shade4);
+            schemeColor8.AppendChild(saturationModulation7);
+
+            solidFill2.AppendChild(schemeColor8);
+            var presetDash1 = new PresetDash {Val = PresetLineDashValues.Solid};
+
+            outline1.AppendChild(solidFill2);
+            outline1.AppendChild(presetDash1);
+
+            var outline2 = new Outline
+            {
+                Width = 25400,
+                CapType = LineCapValues.Flat,
+                CompoundLineType = CompoundLineValues.Single,
+                Alignment = PenAlignmentValues.Center
+            };
+
+            var solidFill3 = new SolidFill();
+            var schemeColor9 = new SchemeColor {Val = SchemeColorValues.PhColor};
+
+            solidFill3.AppendChild(schemeColor9);
+            var presetDash2 = new PresetDash {Val = PresetLineDashValues.Solid};
+
+            outline2.AppendChild(solidFill3);
+            outline2.AppendChild(presetDash2);
+
+            var outline3 = new Outline
+            {
+                Width = 38100,
+                CapType = LineCapValues.Flat,
+                CompoundLineType = CompoundLineValues.Single,
+                Alignment = PenAlignmentValues.Center
+            };
+
+            var solidFill4 = new SolidFill();
+            var schemeColor10 = new SchemeColor {Val = SchemeColorValues.PhColor};
+
+            solidFill4.AppendChild(schemeColor10);
+            var presetDash3 = new PresetDash {Val = PresetLineDashValues.Solid};
+
+            outline3.AppendChild(solidFill4);
+            outline3.AppendChild(presetDash3);
+
+            lineStyleList1.AppendChild(outline1);
+            lineStyleList1.AppendChild(outline2);
+            lineStyleList1.AppendChild(outline3);
+
+            var effectStyleList1 = new EffectStyleList();
+
+            var effectStyle1 = new EffectStyle();
+
+            var effectList1 = new EffectList();
+
+            var outerShadow1 = new OuterShadow
+            {
+                BlurRadius = 40000L,
+                Distance = 20000L,
+                Direction = 5400000,
+                RotateWithShape = false
+            };
+
+            var rgbColorModelHex11 = new RgbColorModelHex {Val = "000000"};
+            var alpha1 = new Alpha {Val = 38000};
+
+            rgbColorModelHex11.AppendChild(alpha1);
+
+            outerShadow1.AppendChild(rgbColorModelHex11);
+
+            effectList1.AppendChild(outerShadow1);
+
+            effectStyle1.AppendChild(effectList1);
+
+            var effectStyle2 = new EffectStyle();
+
+            var effectList2 = new EffectList();
+
+            var outerShadow2 = new OuterShadow
+            {
+                BlurRadius = 40000L,
+                Distance = 23000L,
+                Direction = 5400000,
+                RotateWithShape = false
+            };
+
+            var rgbColorModelHex12 = new RgbColorModelHex {Val = "000000"};
+            var alpha2 = new Alpha {Val = 35000};
+
+            rgbColorModelHex12.AppendChild(alpha2);
+
+            outerShadow2.AppendChild(rgbColorModelHex12);
+
+            effectList2.AppendChild(outerShadow2);
+
+            effectStyle2.AppendChild(effectList2);
+
+            var effectStyle3 = new EffectStyle();
+
+            var effectList3 = new EffectList();
+
+            var outerShadow3 = new OuterShadow
+            {
+                BlurRadius = 40000L,
+                Distance = 23000L,
+                Direction = 5400000,
+                RotateWithShape = false
+            };
+
+            var rgbColorModelHex13 = new RgbColorModelHex {Val = "000000"};
+            var alpha3 = new Alpha {Val = 35000};
+
+            rgbColorModelHex13.AppendChild(alpha3);
+
+            outerShadow3.AppendChild(rgbColorModelHex13);
+
+            effectList3.AppendChild(outerShadow3);
+
+            var scene3DType1 = new Scene3DType();
+
+            var camera1 = new Camera {Preset = PresetCameraValues.OrthographicFront};
+            var rotation1 = new Rotation {Latitude = 0, Longitude = 0, Revolution = 0};
+
+            camera1.AppendChild(rotation1);
+
+            var lightRig1 = new LightRig {Rig = LightRigValues.ThreePoints, Direction = LightRigDirectionValues.Top};
+            var rotation2 = new Rotation {Latitude = 0, Longitude = 0, Revolution = 1200000};
+
+            lightRig1.AppendChild(rotation2);
+
+            scene3DType1.AppendChild(camera1);
+            scene3DType1.AppendChild(lightRig1);
+
+            var shape3DType1 = new Shape3DType();
+            var bevelTop1 = new BevelTop {Width = 63500L, Height = 25400L};
+
+            shape3DType1.AppendChild(bevelTop1);
+
+            effectStyle3.AppendChild(effectList3);
+            effectStyle3.AppendChild(scene3DType1);
+            effectStyle3.AppendChild(shape3DType1);
+
+            effectStyleList1.AppendChild(effectStyle1);
+            effectStyleList1.AppendChild(effectStyle2);
+            effectStyleList1.AppendChild(effectStyle3);
+
+            var backgroundFillStyleList1 = new BackgroundFillStyleList();
+
+            var solidFill5 = new SolidFill();
+            var schemeColor11 = new SchemeColor {Val = SchemeColorValues.PhColor};
+
+            solidFill5.AppendChild(schemeColor11);
+
+            var gradientFill3 = new GradientFill {RotateWithShape = true};
+
+            var gradientStopList3 = new GradientStopList();
+
+            var gradientStop7 = new GradientStop {Position = 0};
+
+            var schemeColor12 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var tint4 = new Tint {Val = 40000};
+            var saturationModulation8 = new SaturationModulation {Val = 350000};
+
+            schemeColor12.AppendChild(tint4);
+            schemeColor12.AppendChild(saturationModulation8);
+
+            gradientStop7.AppendChild(schemeColor12);
+
+            var gradientStop8 = new GradientStop {Position = 40000};
+
+            var schemeColor13 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var tint5 = new Tint {Val = 45000};
+            var shade5 = new Shade {Val = 99000};
+            var saturationModulation9 = new SaturationModulation {Val = 350000};
+
+            schemeColor13.AppendChild(tint5);
+            schemeColor13.AppendChild(shade5);
+            schemeColor13.AppendChild(saturationModulation9);
+
+            gradientStop8.AppendChild(schemeColor13);
+
+            var gradientStop9 = new GradientStop {Position = 100000};
+
+            var schemeColor14 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var shade6 = new Shade {Val = 20000};
+            var saturationModulation10 = new SaturationModulation {Val = 255000};
+
+            schemeColor14.AppendChild(shade6);
+            schemeColor14.AppendChild(saturationModulation10);
+
+            gradientStop9.AppendChild(schemeColor14);
+
+            gradientStopList3.AppendChild(gradientStop7);
+            gradientStopList3.AppendChild(gradientStop8);
+            gradientStopList3.AppendChild(gradientStop9);
+
+            var pathGradientFill1 = new PathGradientFill {Path = PathShadeValues.Circle};
+            var fillToRectangle1 = new FillToRectangle {Left = 50000, Top = -80000, Right = 50000, Bottom = 180000};
+
+            pathGradientFill1.AppendChild(fillToRectangle1);
+
+            gradientFill3.AppendChild(gradientStopList3);
+            gradientFill3.AppendChild(pathGradientFill1);
+
+            var gradientFill4 = new GradientFill {RotateWithShape = true};
+
+            var gradientStopList4 = new GradientStopList();
+
+            var gradientStop10 = new GradientStop {Position = 0};
+
+            var schemeColor15 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var tint6 = new Tint {Val = 80000};
+            var saturationModulation11 = new SaturationModulation {Val = 300000};
+
+            schemeColor15.AppendChild(tint6);
+            schemeColor15.AppendChild(saturationModulation11);
+
+            gradientStop10.AppendChild(schemeColor15);
+
+            var gradientStop11 = new GradientStop {Position = 100000};
+
+            var schemeColor16 = new SchemeColor {Val = SchemeColorValues.PhColor};
+            var shade7 = new Shade {Val = 30000};
+            var saturationModulation12 = new SaturationModulation {Val = 200000};
+
+            schemeColor16.AppendChild(shade7);
+            schemeColor16.AppendChild(saturationModulation12);
+
+            gradientStop11.AppendChild(schemeColor16);
+
+            gradientStopList4.AppendChild(gradientStop10);
+            gradientStopList4.AppendChild(gradientStop11);
+
+            var pathGradientFill2 = new PathGradientFill {Path = PathShadeValues.Circle};
+            var fillToRectangle2 = new FillToRectangle {Left = 50000, Top = 50000, Right = 50000, Bottom = 50000};
+
+            pathGradientFill2.AppendChild(fillToRectangle2);
+
+            gradientFill4.AppendChild(gradientStopList4);
+            gradientFill4.AppendChild(pathGradientFill2);
+
+            backgroundFillStyleList1.AppendChild(solidFill5);
+            backgroundFillStyleList1.AppendChild(gradientFill3);
+            backgroundFillStyleList1.AppendChild(gradientFill4);
+
+            formatScheme1.AppendChild(fillStyleList1);
+            formatScheme1.AppendChild(lineStyleList1);
+            formatScheme1.AppendChild(effectStyleList1);
+            formatScheme1.AppendChild(backgroundFillStyleList1);
+
+            themeElements1.AppendChild(colorScheme1);
+            themeElements1.AppendChild(fontScheme2);
+            themeElements1.AppendChild(formatScheme1);
+            var objectDefaults1 = new ObjectDefaults();
+            var extraColorSchemeList1 = new ExtraColorSchemeList();
+
+            theme1.AppendChild(themeElements1);
+            theme1.AppendChild(objectDefaults1);
+            theme1.AppendChild(extraColorSchemeList1);
+
+            themePart.Theme = theme1;
+        }
+
+        private void GenerateCustomFilePropertiesPartContent(CustomFilePropertiesPart customFilePropertiesPart1)
+        {
+            var properties2 = new DocumentFormat.OpenXml.CustomProperties.Properties();
+            properties2.AddNamespaceDeclaration("vt",
+                "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
+            var propertyId = 1;
+            foreach (var p in CustomProperties)
+            {
+                propertyId++;
+                var customDocumentProperty = new CustomDocumentProperty
+                {
+                    FormatId = "{D5CDD505-2E9C-101B-9397-08002B2CF9AE}",
+                    PropertyId = propertyId,
+                    Name = p.Name
+                };
+                if (p.Type == XLCustomPropertyType.Text)
+                {
+                    var vTlpwstr1 = new VTLPWSTR {Text = p.GetValue<string>()};
+                    customDocumentProperty.AppendChild(vTlpwstr1);
+                }
+                else if (p.Type == XLCustomPropertyType.Date)
+                {
+                    var vTFileTime1 = new VTFileTime
+                    {
+                        Text =
+                            p.GetValue<DateTime>().ToUniversalTime().ToString(
+                                "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'")
+                    };
+                    customDocumentProperty.AppendChild(vTFileTime1);
+                }
+                else if (p.Type == XLCustomPropertyType.Number)
+                {
+                    var vTDouble1 = new VTDouble
+                    {
+                        Text = p.GetValue<Double>().ToString(CultureInfo.InvariantCulture)
+                    };
+                    customDocumentProperty.AppendChild(vTDouble1);
+                }
+                else
+                {
+                    var vTBool1 = new VTBool {Text = p.GetValue<Boolean>().ToString().ToLower()};
+                    customDocumentProperty.AppendChild(vTBool1);
+                }
+                properties2.AppendChild(customDocumentProperty);
+            }
+
+            customFilePropertiesPart1.Properties = properties2;
+        }
+
+        private void SetPackageProperties(OpenXmlPackage document)
+        {
+            var created = Properties.Created == DateTime.MinValue ? DateTime.Now : Properties.Created;
+            var modified = Properties.Modified == DateTime.MinValue ? DateTime.Now : Properties.Modified;
+            document.PackageProperties.Created = created;
+            document.PackageProperties.Modified = modified;
+            document.PackageProperties.LastModifiedBy = Properties.LastModifiedBy;
+
+            document.PackageProperties.Creator = Properties.Author;
+            document.PackageProperties.Title = Properties.Title;
+            document.PackageProperties.Subject = Properties.Subject;
+            document.PackageProperties.Category = Properties.Category;
+            document.PackageProperties.Keywords = Properties.Keywords;
+            document.PackageProperties.Description = Properties.Comments;
+            document.PackageProperties.ContentStatus = Properties.Status;
+        }
+
+        private static string GetTableName(String originalTableName, SaveContext context)
+        {
+            var tableName = originalTableName.RemoveSpecialCharacters();
+            var name = tableName;
+            if (context.TableNames.Contains(name))
+            {
+                var i = 1;
+                name = tableName + i.ToInvariantString();
+                while (context.TableNames.Contains(name))
+                {
+                    i++;
+                    name = tableName + i.ToInvariantString();
+                }
+            }
+
+            context.TableNames.Add(name);
+            return name;
+        }
+
+        private static void GenerateTableDefinitionPartContent(TableDefinitionPart tableDefinitionPart, XLTable xlTable,
+            SaveContext context)
+        {
+            context.TableId++;
+            var reference = xlTable.RangeAddress.FirstAddress + ":" + xlTable.RangeAddress.LastAddress;
+            var tableName = GetTableName(xlTable.Name, context);
+            var table = new Table
+            {
+                Id = context.TableId,
+                Name = tableName,
+                DisplayName = tableName,
+                Reference = reference
+            };
+
+            if (!xlTable.ShowHeaderRow)
+                table.HeaderRowCount = 0;
+
+            if (xlTable.ShowTotalsRow)
+                table.TotalsRowCount = 1;
+            else
+                table.TotalsRowShown = false;
+
+            var tableColumns1 = new TableColumns {Count = (UInt32)xlTable.ColumnCount()};
+
+            UInt32 columnId = 0;
+            foreach (var xlField in xlTable.Fields)
+            {
+                columnId++;
+                var fieldName = xlField.Name;
+                var tableColumn1 = new TableColumn
+                {
+                    Id = columnId,
+                    Name = fieldName.Replace("_x000a_", "_x005f_x000a_").Replace(Environment.NewLine, "_x000a_")
+                };
+                if (xlTable.ShowTotalsRow)
+                {
+                    if (xlField.TotalsRowFunction != XLTotalsRowFunction.None)
+                    {
+                        tableColumn1.TotalsRowFunction = xlField.TotalsRowFunction.ToOpenXml();
+
+                        if (xlField.TotalsRowFunction == XLTotalsRowFunction.Custom)
+                            tableColumn1.TotalsRowFormula = new TotalsRowFormula(xlField.TotalsRowFormulaA1);
+                    }
+
+                    if (!XLHelper.IsNullOrWhiteSpace(xlField.TotalsRowLabel))
+                        tableColumn1.TotalsRowLabel = xlField.TotalsRowLabel;
+                }
+                tableColumns1.AppendChild(tableColumn1);
+            }
+
+            var tableStyleInfo1 = new TableStyleInfo
+            {
+                ShowFirstColumn = xlTable.EmphasizeFirstColumn,
+                ShowLastColumn = xlTable.EmphasizeLastColumn,
+                ShowRowStripes = xlTable.ShowRowStripes,
+                ShowColumnStripes = xlTable.ShowColumnStripes
+            };
+
+            if (xlTable.Theme != XLTableTheme.None)
+                tableStyleInfo1.Name = Enum.GetName(typeof(XLTableTheme), xlTable.Theme);
+
+            if (xlTable.ShowAutoFilter)
+            {
+                var autoFilter1 = new AutoFilter();
+                if (xlTable.ShowTotalsRow)
+                {
+                    xlTable.AutoFilter.Range = xlTable.Worksheet.Range(
+                        xlTable.RangeAddress.FirstAddress.RowNumber, xlTable.RangeAddress.FirstAddress.ColumnNumber,
+                        xlTable.RangeAddress.LastAddress.RowNumber - 1, xlTable.RangeAddress.LastAddress.ColumnNumber);
+                }
+                else
+                    xlTable.AutoFilter.Range = xlTable.Worksheet.Range(xlTable.RangeAddress);
+
+                PopulateAutoFilter(xlTable.AutoFilter, autoFilter1);
+
+                table.AppendChild(autoFilter1);
+            }
+
+            table.AppendChild(tableColumns1);
+            table.AppendChild(tableStyleInfo1);
+
+            tableDefinitionPart.Table = table;
+        }
+
+        private static void GeneratePivotTables(WorkbookPart workbookPart, WorksheetPart worksheetPart,
+            XLWorksheet xlWorksheet,
+            SaveContext context)
+        {
+            foreach (var pt in xlWorksheet.PivotTables)
+            {
+                var ptCdp = context.RelIdGenerator.GetNext(RelType.Workbook);
+
+                var pivotTableCacheDefinitionPart = workbookPart.AddNewPart<PivotTableCacheDefinitionPart>(ptCdp);
+                GeneratePivotTableCacheDefinitionPartContent(pivotTableCacheDefinitionPart, pt);
+
+                var pivotCaches = new PivotCaches();
+                var pivotCache = new PivotCache {CacheId = 0U, Id = ptCdp};
+
+                pivotCaches.AppendChild(pivotCache);
+
+                workbookPart.Workbook.AppendChild(pivotCaches);
+
+                var pivotTablePart =
+                    worksheetPart.AddNewPart<PivotTablePart>(context.RelIdGenerator.GetNext(RelType.Workbook));
+                GeneratePivotTablePartContent(pivotTablePart, pt);
+
+                pivotTablePart.AddPart(pivotTableCacheDefinitionPart, context.RelIdGenerator.GetNext(RelType.Workbook));
+            }
+        }
+
+        // Generates content of pivotTableCacheDefinitionPart
+        private static void GeneratePivotTableCacheDefinitionPartContent(
+            PivotTableCacheDefinitionPart pivotTableCacheDefinitionPart, IXLPivotTable pt)
+        {
+            var source = pt.SourceRange;
+
+            var pivotCacheDefinition = new PivotCacheDefinition
+            {
+                Id = "rId1",
+                SaveData = pt.SaveSourceData,
+                RefreshOnLoad = true //pt.RefreshDataOnOpen
+            };
+            if (pt.ItemsToRetainPerField == XLItemsToRetain.None)
+                pivotCacheDefinition.MissingItemsLimit = 0U;
+            else if (pt.ItemsToRetainPerField == XLItemsToRetain.Max)
+                pivotCacheDefinition.MissingItemsLimit = XLHelper.MaxRowNumber;
+
+            pivotCacheDefinition.AddNamespaceDeclaration("r",
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+
+            var cacheSource = new CacheSource {Type = SourceValues.Worksheet};
+            cacheSource.AppendChild(new WorksheetSource {Name = source.ToString()});
+
+            var cacheFields = new CacheFields();
+
+            foreach (var c in source.Columns())
+            {
+                var columnNumber = c.ColumnNumber();
+                var columnName = c.FirstCell().Value.ToString();
+                var xlpf = pt.Fields.Add(columnName);
+
+                var field =
+                    pt.RowLabels.Union(pt.ColumnLabels).Union(pt.ReportFilters).FirstOrDefault(f => f.SourceName == columnName);
+                if (field != null)
+                {
+                    xlpf.CustomName = field.CustomName;
+                    xlpf.Subtotals.AddRange(field.Subtotals);
+                }
+
+                var sharedItems = new SharedItems();
+
+                var onlyNumbers =
+                    !source.Cells().Any(
+                        cell =>
+                            cell.Address.ColumnNumber == columnNumber &&
+                            cell.Address.RowNumber > source.FirstRow().RowNumber() && cell.DataType != XLCellValues.Number);
+                if (onlyNumbers)
+                {
+                    sharedItems = new SharedItems
+                    {ContainsSemiMixedTypes = false, ContainsString = false, ContainsNumber = true};
+                }
+                else
+                {
+                    foreach (var cellValue in source.Cells().Where(cell =>
+                        cell.Address.ColumnNumber == columnNumber &&
+                        cell.Address.RowNumber >
+                        source.FirstRow().RowNumber()).Select(
+                            cell => cell.Value.ToString())
+                        .Where(cellValue => !xlpf.SharedStrings.Contains(cellValue)))
+                    {
+                        xlpf.SharedStrings.Add(cellValue);
+                    }
+
+                    foreach (var li in xlpf.SharedStrings)
+                    {
+                        sharedItems.AppendChild(new StringItem {Val = li});
+                    }
+                }
+
+                var cacheField = new CacheField {Name = xlpf.SourceName};
+                cacheField.AppendChild(sharedItems);
+                cacheFields.AppendChild(cacheField);
+            }
+
+            pivotCacheDefinition.AppendChild(cacheSource);
+            pivotCacheDefinition.AppendChild(cacheFields);
+
+            pivotTableCacheDefinitionPart.PivotCacheDefinition = pivotCacheDefinition;
+
+            var pivotTableCacheRecordsPart = pivotTableCacheDefinitionPart.AddNewPart<PivotTableCacheRecordsPart>("rId1");
+
+            var pivotCacheRecords = new PivotCacheRecords();
+            pivotCacheRecords.AddNamespaceDeclaration("r",
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+            pivotTableCacheRecordsPart.PivotCacheRecords = pivotCacheRecords;
+        }
+
+        // Generates content of pivotTablePart
+        private static void GeneratePivotTablePartContent(PivotTablePart pivotTablePart1, IXLPivotTable pt)
+        {
+            var pivotTableDefinition = new PivotTableDefinition
+            {
+                Name = pt.Name,
+                CacheId = 0U,
+                DataCaption = "Values",
+                MergeItem = GetBooleanValue(pt.MergeAndCenterWithLabels, true),
+                Indent = Convert.ToUInt32(pt.RowLabelIndent),
+                PageOverThenDown = (pt.FilterAreaOrder == XLFilterAreaOrder.OverThenDown),
+                PageWrap = Convert.ToUInt32(pt.FilterFieldsPageWrap),
+                ShowError = String.IsNullOrEmpty(pt.ErrorValueReplacement),
+                UseAutoFormatting = GetBooleanValue(pt.AutofitColumns, true),
+                PreserveFormatting = GetBooleanValue(pt.PreserveCellFormatting, true),
+                RowGrandTotals = GetBooleanValue(pt.ShowGrandTotalsRows, true),
+                ColumnGrandTotals = GetBooleanValue(pt.ShowGrandTotalsColumns, true),
+                SubtotalHiddenItems = GetBooleanValue(pt.FilteredItemsInSubtotals, true),
+                MultipleFieldFilters = GetBooleanValue(pt.AllowMultipleFilters, true),
+                CustomListSort = GetBooleanValue(pt.UseCustomListsForSorting, true),
+                ShowDrill = GetBooleanValue(pt.ShowExpandCollapseButtons, true),
+                ShowDataTips = GetBooleanValue(pt.ShowContextualTooltips, true),
+                ShowMemberPropertyTips = GetBooleanValue(pt.ShowPropertiesInTooltips, true),
+                ShowHeaders = GetBooleanValue(pt.DisplayCaptionsAndDropdowns, true),
+                GridDropZones = GetBooleanValue(pt.ClassicPivotTableLayout, true),
+                ShowEmptyRow = GetBooleanValue(pt.ShowEmptyItemsOnRows, true),
+                ShowEmptyColumn = GetBooleanValue(pt.ShowEmptyItemsOnColumns, true),
+                ShowItems = GetBooleanValue(pt.DisplayItemLabels, true),
+                FieldListSortAscending = GetBooleanValue(pt.SortFieldsAtoZ, true),
+                PrintDrill = GetBooleanValue(pt.PrintExpandCollapsedButtons, true),
+                ItemPrintTitles = GetBooleanValue(pt.RepeatRowLabels, true),
+                FieldPrintTitles = GetBooleanValue(pt.PrintTitles, true),
+                EnableDrill = GetBooleanValue(pt.EnableShowDetails, true)
+            };
+
+            if (pt.EmptyCellReplacement != null)
+            {
+                pivotTableDefinition.ShowMissing = true;
+                pivotTableDefinition.MissingCaption = pt.EmptyCellReplacement;
+            }
+            else
+            {
+                pivotTableDefinition.ShowMissing = false;
+            }
+
+            if (pt.ErrorValueReplacement != null)
+            {
+                pivotTableDefinition.ShowError = true;
+                pivotTableDefinition.ErrorCaption = pt.ErrorValueReplacement;
+            }
+            else
+            {
+                pivotTableDefinition.ShowError = false;
+            }
+
+            var location = new Location
+            {
+                Reference = pt.TargetCell.Address.ToString(),
+                FirstHeaderRow = 1U,
+                FirstDataRow = 1U,
+                FirstDataColumn = 1U
+            };
+
+
+            var rowFields = new RowFields();
+            var columnFields = new ColumnFields();
+            var rowItems = new RowItems();
+            var columnItems = new ColumnItems();
+            var pageFields = new PageFields {Count = (uint)pt.ReportFilters.Count()};
+
+            var pivotFields = new PivotFields {Count = Convert.ToUInt32(pt.SourceRange.ColumnCount())};
+            foreach (var xlpf in pt.Fields.OrderBy(f => pt.RowLabels.Any(p => p.SourceName == f.SourceName) ? pt.RowLabels.IndexOf(f) : Int32.MaxValue ))
+            {
+                if (pt.RowLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
+                {
+                    var f = new Field {Index = pt.Fields.IndexOf(xlpf)};
+                    rowFields.AppendChild(f);
+
+                    for (var i = 0; i < xlpf.SharedStrings.Count; i++)
+                    {
+                        var rowItem = new RowItem();
+                        rowItem.AppendChild(new MemberPropertyIndex {Val = i});
+                        rowItems.AppendChild(rowItem);
+                    }
+
+                    var rowItemTotal = new RowItem {ItemType = ItemValues.Grand};
+                    rowItemTotal.AppendChild(new MemberPropertyIndex());
+                    rowItems.AppendChild(rowItemTotal);
+                }
+                else if (pt.ColumnLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
+                {
+                    var f = new Field {Index = pt.Fields.IndexOf(xlpf)};
+                    columnFields.AppendChild(f);
+
+                    for (var i = 0; i < xlpf.SharedStrings.Count; i++)
+                    {
+                        var rowItem = new RowItem();
+                        rowItem.AppendChild(new MemberPropertyIndex {Val = i});
+                        columnItems.AppendChild(rowItem);
+                    }
+
+                    var rowItemTotal = new RowItem {ItemType = ItemValues.Grand};
+                    rowItemTotal.AppendChild(new MemberPropertyIndex());
+                    columnItems.AppendChild(rowItemTotal);
+                }
+            }
+
+            foreach (var xlpf in pt.Fields)
+            {
+                var pf = new PivotField {ShowAll = false, Name = xlpf.CustomName};
+
+                if (pt.RowLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
+                {
+                    pf.Axis = PivotTableAxisValues.AxisRow;
+                }
+                else if (pt.ColumnLabels.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
+                {
+                    pf.Axis = PivotTableAxisValues.AxisColumn;
+                }
+                else if (pt.ReportFilters.FirstOrDefault(p => p.SourceName == xlpf.SourceName) != null)
+                {
+                    location.ColumnsPerPage = 1;
+                    location.RowPageCount = 1;
+                    pf.Axis = PivotTableAxisValues.AxisPage;
+                    pageFields.AppendChild(new PageField {Hierarchy = -1, Field = pt.Fields.IndexOf(xlpf)});
+                }
+                else if (pt.Values.FirstOrDefault(p => p.CustomName == xlpf.SourceName) != null)
+                {
+                    pf.DataField = true;
+                }
+
+                var fieldItems = new Items();
+
+                if (xlpf.SharedStrings.Count > 0)
+                {
+                    for (uint i = 0; i < xlpf.SharedStrings.Count; i++)
+                    {
+                        fieldItems.AppendChild(new Item {Index = i});
+                    }
+                }
+
+                if (xlpf.Subtotals.Count > 0)
+                {
+                    foreach (var subtotal in xlpf.Subtotals)
+                    {
+                        var itemSubtotal = new Item();
+                        switch (subtotal)
+                        {
+                            case XLSubtotalFunction.Average:
+                                pf.AverageSubTotal = true;
+                                itemSubtotal.ItemType = ItemValues.Average;
+                                break;
+                            case XLSubtotalFunction.Count:
+                                pf.CountASubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.CountA;
+                                break;
+                            case XLSubtotalFunction.CountNumbers:
+                                pf.CountSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.Count;
+                                break;
+                            case XLSubtotalFunction.Maximum:
+                                pf.MaxSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.Maximum;
+                                break;
+                            case XLSubtotalFunction.Minimum:
+                                pf.MinSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.Minimum;
+                                break;
+                            case XLSubtotalFunction.PopulationStandardDeviation:
+                                pf.ApplyStandardDeviationPInSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.StandardDeviationP;
+                                break;
+                            case XLSubtotalFunction.PopulationVariance:
+                                pf.ApplyVariancePInSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.VarianceP;
+                                break;
+                            case XLSubtotalFunction.Product:
+                                pf.ApplyProductInSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.Product;
+                                break;
+                            case XLSubtotalFunction.StandardDeviation:
+                                pf.ApplyStandardDeviationInSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.StandardDeviation;
+                                break;
+                            case XLSubtotalFunction.Sum:
+                                pf.SumSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.Sum;
+                                break;
+                            case XLSubtotalFunction.Variance:
+                                pf.ApplyVarianceInSubtotal = true;
+                                itemSubtotal.ItemType = ItemValues.Variance;
+                                break;
+                        }
+                        fieldItems.AppendChild(itemSubtotal);
+                    }
+                }
+                else
+                {
+                    fieldItems.AppendChild(new Item {ItemType = ItemValues.Default});
+                }
+
+                pf.AppendChild(fieldItems);
+                pivotFields.AppendChild(pf);
+            }
+
+            pivotTableDefinition.AppendChild(location);
+            pivotTableDefinition.AppendChild(pivotFields);
+
+            if (pt.RowLabels.Any())
+            {
+                pivotTableDefinition.AppendChild(rowFields);
+            }
+            else
+            {
+                rowItems.AppendChild(new RowItem());
+            }
+            pivotTableDefinition.AppendChild(rowItems);
+
+            if (!pt.ColumnLabels.Any())
+            {
+                columnItems.AppendChild(new RowItem());
+                pivotTableDefinition.AppendChild(columnItems);
+            }
+            else
+            {
+                pivotTableDefinition.AppendChild(columnFields);
+                pivotTableDefinition.AppendChild(columnItems);
+            }
+
+            if (pt.ReportFilters.Any())
+            {
+                pivotTableDefinition.AppendChild(pageFields);
+            }
+
+
+            var dataFields = new DataFields();
+            foreach (var value in pt.Values)
+            {
+                var sourceColumn =
+                    pt.SourceRange.Columns().FirstOrDefault(c => c.Cell(1).Value.ToString() == value.SourceName);
+                if (sourceColumn == null) continue;
+
+                var df = new DataField
+                {
+                    Name = value.SourceName,
+                    Field = (UInt32)sourceColumn.ColumnNumber() - 1,
+                    Subtotal = value.SummaryFormula.ToOpenXml(),
+                    ShowDataAs = value.Calculation.ToOpenXml(),
+                    NumberFormatId = (UInt32)value.NumberFormat.NumberFormatId
+                };
+
+                if (!String.IsNullOrEmpty(value.BaseField))
+                {
+                    var baseField =
+                        pt.SourceRange.Columns().FirstOrDefault(c => c.Cell(1).Value.ToString() == value.BaseField);
+                    if (baseField != null)
+                        df.BaseField = baseField.ColumnNumber() - 1;
+                }
+                else
+                {
+                    df.BaseField = 0;
+                }
+
+                if (value.CalculationItem == XLPivotCalculationItem.Previous)
+                    df.BaseItem = 1048828U;
+                else if (value.CalculationItem == XLPivotCalculationItem.Next)
+                    df.BaseItem = 1048829U;
+                else
+                    df.BaseItem = 0U;
+
+
+                dataFields.AppendChild(df);
+            }
+            pivotTableDefinition.AppendChild(dataFields);
+
+            pivotTableDefinition.AppendChild(new PivotTableStyle
+            {
+                Name = Enum.GetName(typeof (XLPivotTableTheme), pt.Theme),
+                ShowRowHeaders = pt.ShowRowHeaders,
+                ShowColumnHeaders = pt.ShowColumnHeaders,
+                ShowRowStripes = pt.ShowRowStripes,
+                ShowColumnStripes = pt.ShowColumnStripes
+            });
+
+            #region Excel 2010 Features
+
+            var pivotTableDefinitionExtensionList = new PivotTableDefinitionExtensionList();
+
+            var pivotTableDefinitionExtension = new PivotTableDefinitionExtension
+            {Uri = "{962EF5D1-5CA2-4c93-8EF4-DBF5C05439D2}"};
+            pivotTableDefinitionExtension.AddNamespaceDeclaration("x14",
+                "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+
+            var pivotTableDefinition2 = new DocumentFormat.OpenXml.Office2010.Excel.PivotTableDefinition
+            {EnableEdit = pt.EnableCellEditing, HideValuesRow = !pt.ShowValuesRow};
+            pivotTableDefinition2.AddNamespaceDeclaration("xm", "http://schemas.microsoft.com/office/excel/2006/main");
+
+            pivotTableDefinitionExtension.AppendChild(pivotTableDefinition2);
+
+            pivotTableDefinitionExtensionList.AppendChild(pivotTableDefinitionExtension);
+            pivotTableDefinition.AppendChild(pivotTableDefinitionExtensionList);
+
+            #endregion
+
+            pivotTablePart1.PivotTableDefinition = pivotTableDefinition;
+        }
+
+
+        private static void GenerateWorksheetCommentsPartContent(WorksheetCommentsPart worksheetCommentsPart,
+            XLWorksheet xlWorksheet)
+        {
+            var comments = new Comments();
+            var commentList = new CommentList();
+            var authorsDict = new Dictionary<String, Int32>();
+            foreach (var c in xlWorksheet.Internals.CellsCollection.GetCells(c => c.HasComment))
+            {
+                var comment = new Comment {Reference = c.Address.ToStringRelative()};
+                var authorName = c.Comment.Author;
+
+                Int32 authorId;
+                if (!authorsDict.TryGetValue(authorName, out authorId))
+                {
+                    authorId = authorsDict.Count;
+                    authorsDict.Add(authorName, authorId);
+                }
+                comment.AuthorId = (UInt32)authorId;
+
+                var commentText = new CommentText();
+                foreach (var rt in c.Comment)
+                {
+                    commentText.Append(GetRun(rt));
+                }
+
+                comment.Append(commentText);
+                commentList.Append(comment);
+            }
+
+            var authors = new Authors();
+            foreach (var author in authorsDict.Select(a => new Author {Text = a.Key}))
+            {
+                authors.Append(author);
+            }
+            comments.Append(authors);
+            comments.Append(commentList);
+
+            worksheetCommentsPart.Comments = comments;
+        }
+
+        // Generates content of vmlDrawingPart1.
+        private static void GenerateVmlDrawingPartContent(VmlDrawingPart vmlDrawingPart, XLWorksheet xlWorksheet,
+            SaveContext context)
+        {
+            var ms = new MemoryStream();
+            CopyStream(vmlDrawingPart.GetStream(FileMode.OpenOrCreate), ms);
+            ms.Position = 0;
+            var writer = new XmlTextWriter(vmlDrawingPart.GetStream(FileMode.Create), Encoding.UTF8);
+
+            writer.WriteStartElement("xml");
+
+            const string shapeTypeId = "_x0000_t202"; // arbitrary, assigned by office
+
+            new Vml.Shapetype(
+                new Vml.Stroke {JoinStyle = Vml.StrokeJoinStyleValues.Miter},
+                new Vml.Path {AllowGradientShape = true, ConnectionPointType = ConnectValues.Rectangle}
+                )
+            {
+                Id = shapeTypeId,
+                CoordinateSize = "21600,21600",
+                OptionalNumber = 202,
+                EdgePath = "m,l,21600r21600,l21600,xe",
+            }
+                .WriteTo(writer);
+
+            var cellWithComments = xlWorksheet.Internals.CellsCollection.GetCells().Where(c => c.HasComment);
+
+            foreach (var c in cellWithComments)
+            {
+                GenerateShape(c, shapeTypeId).WriteTo(writer);
+            }
+
+            if (ms.Length > 0)
+            {
+                ms.Position = 0;
+                var xdoc = XDocumentExtensions.Load(ms);
+                xdoc.Root.Elements().ForEach(e => writer.WriteRaw(e.ToString()));
+            }
+
+
+            writer.WriteEndElement();
+            writer.Flush();
+            writer.Close();
+        }
+
+        // VML Shape for Comment
+        private static Vml.Shape GenerateShape(XLCell c, string shapeTypeId)
+        {
+            var rowNumber = c.Address.RowNumber;
+            var columnNumber = c.Address.ColumnNumber;
+
+            var shapeId = String.Format("_x0000_s{0}", c.Comment.ShapeId);
+            // Unique per cell (workbook?), e.g.: "_x0000_s1026"
+            var anchor = GetAnchor(c);
+            var textBox = GetTextBox(c.Comment.Style);
+            var fill = new Vml.Fill {Color2 = "#" + c.Comment.Style.ColorsAndLines.FillColor.Color.ToHex().Substring(2)};
+            if (c.Comment.Style.ColorsAndLines.FillTransparency < 1)
+                fill.Opacity =
+                    Math.Round(Convert.ToDouble(c.Comment.Style.ColorsAndLines.FillTransparency), 2).ToString(
+                        CultureInfo.InvariantCulture);
+            var stroke = GetStroke(c);
+            var shape = new Vml.Shape(
+                fill,
+                stroke,
+                new Vml.Shadow {On = true, Color = "black", Obscured = true},
+                new Vml.Path {ConnectionPointType = ConnectValues.None},
+                textBox,
+                new ClientData(
+                    new MoveWithCells(c.Comment.Style.Properties.Positioning == XLDrawingAnchor.Absolute
+                        ? "True"
+                        : "False"), // Counterintuitive
+                    new ResizeWithCells(c.Comment.Style.Properties.Positioning == XLDrawingAnchor.MoveAndSizeWithCells
+                        ? "False"
+                        : "True"), // Counterintuitive
+                    anchor,
+                    new HorizontalTextAlignment(c.Comment.Style.Alignment.Horizontal.ToString().ToCamel()),
+                    new Vml.Spreadsheet.VerticalTextAlignment(c.Comment.Style.Alignment.Vertical.ToString().ToCamel()),
+                    new AutoFill("False"),
+                    new CommentRowTarget {Text = (rowNumber - 1).ToString()},
+                    new CommentColumnTarget {Text = (columnNumber - 1).ToString()},
+                    new Locked(c.Comment.Style.Protection.Locked ? "True" : "False"),
+                    new LockText(c.Comment.Style.Protection.LockText ? "True" : "False"),
+                    new Visible(c.Comment.Visible ? "True" : "False")
+                    ) {ObjectType = ObjectValues.Note}
+                )
+            {
+                Id = shapeId,
+                Type = "#" + shapeTypeId,
+                Style = GetCommentStyle(c),
+                FillColor = "#" + c.Comment.Style.ColorsAndLines.FillColor.Color.ToHex().Substring(2),
+                StrokeColor = "#" + c.Comment.Style.ColorsAndLines.LineColor.Color.ToHex().Substring(2),
+                StrokeWeight = String.Format(CultureInfo.InvariantCulture, "{0}pt", c.Comment.Style.ColorsAndLines.LineWeight),
+                InsetMode = c.Comment.Style.Margins.Automatic ? InsetMarginValues.Auto : InsetMarginValues.Custom
+            };
+            if (!XLHelper.IsNullOrWhiteSpace(c.Comment.Style.Web.AlternateText))
+                shape.Alternate = c.Comment.Style.Web.AlternateText;
+
+
+            return shape;
+        }
+
+        private static Vml.Stroke GetStroke(XLCell c)
+        {
+            var lineDash = c.Comment.Style.ColorsAndLines.LineDash;
+            var stroke = new Vml.Stroke
+            {
+                LineStyle = c.Comment.Style.ColorsAndLines.LineStyle.ToOpenXml(),
+                DashStyle =
+                    lineDash == XLDashStyle.RoundDot || lineDash == XLDashStyle.SquareDot
+                        ? "shortDot"
+                        : lineDash.ToString().ToCamel()
+            };
+            if (lineDash == XLDashStyle.RoundDot)
+                stroke.EndCap = Vml.StrokeEndCapValues.Round;
+            if (c.Comment.Style.ColorsAndLines.LineTransparency < 1)
+                stroke.Opacity =
+                    Math.Round(Convert.ToDouble(c.Comment.Style.ColorsAndLines.LineTransparency), 2).ToString(
+                        CultureInfo.InvariantCulture);
+            return stroke;
+        }
+
+        private static Vml.TextBox GetTextBox(IXLDrawingStyle ds)
+        {
+            var sb = new StringBuilder();
+            var a = ds.Alignment;
+
+            if (a.Direction == XLDrawingTextDirection.Context)
+                sb.Append("mso-direction-alt:auto;");
+            else if (a.Direction == XLDrawingTextDirection.RightToLeft)
+                sb.Append("direction:RTL;");
+
+            if (a.Orientation != XLDrawingTextOrientation.LeftToRight)
+            {
+                sb.Append("layout-flow:vertical;");
+                if (a.Orientation == XLDrawingTextOrientation.BottomToTop)
+                    sb.Append("mso-layout-flow-alt:bottom-to-top;");
+                else if (a.Orientation == XLDrawingTextOrientation.Vertical)
+                    sb.Append("mso-layout-flow-alt:top-to-bottom;");
+            }
+            if (a.AutomaticSize)
+                sb.Append("mso-fit-shape-to-text:t;");
+            var retVal = new Vml.TextBox {Style = sb.ToString()};
+            var dm = ds.Margins;
+            if (!dm.Automatic)
+                retVal.Inset = String.Format("{0}in,{1}in,{2}in,{3}in",
+                    dm.Left.ToString(CultureInfo.InvariantCulture),
+                    dm.Top.ToString(CultureInfo.InvariantCulture),
+                    dm.Right.ToString(CultureInfo.InvariantCulture),
+                    dm.Bottom.ToString(CultureInfo.InvariantCulture));
+
+            return retVal;
+        }
+
+        private static Anchor GetAnchor(XLCell cell)
+        {
+            var c = cell.Comment;
+            var cWidth = c.Style.Size.Width;
+            var fcNumber = c.Position.Column - 1;
+            var fcOffset = Convert.ToInt32(c.Position.ColumnOffset * 7.5);
+            var widthFromColumns = cell.Worksheet.Column(c.Position.Column).Width - c.Position.ColumnOffset;
+            var lastCell = cell.CellRight(c.Position.Column - cell.Address.ColumnNumber);
+            while (widthFromColumns <= cWidth)
+            {
+                lastCell = lastCell.CellRight();
+                widthFromColumns += lastCell.WorksheetColumn().Width;
+            }
+
+            var lcNumber = lastCell.WorksheetColumn().ColumnNumber() - 1;
+            var lcOffset = Convert.ToInt32((lastCell.WorksheetColumn().Width - (widthFromColumns - cWidth)) * 7.5);
+
+            var cHeight = c.Style.Size.Height; //c.Style.Size.Height * 72.0;
+            var frNumber = c.Position.Row - 1;
+            var frOffset = Convert.ToInt32(c.Position.RowOffset);
+            var heightFromRows = cell.Worksheet.Row(c.Position.Row).Height - c.Position.RowOffset;
+            lastCell = cell.CellBelow(c.Position.Row - cell.Address.RowNumber);
+            while (heightFromRows <= cHeight)
+            {
+                lastCell = lastCell.CellBelow();
+                heightFromRows += lastCell.WorksheetRow().Height;
+            }
+
+            var lrNumber = lastCell.WorksheetRow().RowNumber() - 1;
+            var lrOffset = Convert.ToInt32(lastCell.WorksheetRow().Height - (heightFromRows - cHeight));
+            return new Anchor
+            {
+                Text = string.Format("{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}",
+                    fcNumber, fcOffset,
+                    frNumber, frOffset,
+                    lcNumber, lcOffset,
+                    lrNumber, lrOffset
+                    )
+            };
+        }
+
+        private static StringValue GetCommentStyle(XLCell cell)
+        {
+            var c = cell.Comment;
+            var sb = new StringBuilder("position:absolute; ");
+
+            sb.Append("visibility:");
+            sb.Append(c.Visible ? "visible" : "hidden");
+            sb.Append(";");
+
+            sb.Append("width:");
+            sb.Append(Math.Round(c.Style.Size.Width * 7.5, 2).ToString(CultureInfo.InvariantCulture));
+            sb.Append("pt;");
+            sb.Append("height:");
+            sb.Append(Math.Round(c.Style.Size.Height, 2).ToString(CultureInfo.InvariantCulture));
+            sb.Append("pt;");
+
+            sb.Append("z-index:");
+            sb.Append(c.ZOrder.ToString());
+
+
+            return sb.ToString();
+        }
+
+        #region GenerateWorkbookStylesPartContent
+
+        private void GenerateWorkbookStylesPartContent(WorkbookStylesPart workbookStylesPart, SaveContext context)
+        {
+            var defaultStyle = new XLStyle(null, DefaultStyle);
+            var defaultStyleId = GetStyleId(defaultStyle);
+            if (!context.SharedFonts.ContainsKey(defaultStyle.Font))
+                context.SharedFonts.Add(defaultStyle.Font, new FontInfo {FontId = 0, Font = defaultStyle.Font as XLFont});
+
+            var sharedFills = new Dictionary<IXLFill, FillInfo>
+            {{defaultStyle.Fill, new FillInfo {FillId = 2, Fill = defaultStyle.Fill as XLFill}}};
+
+            var sharedBorders = new Dictionary<IXLBorder, BorderInfo>
+            {{defaultStyle.Border, new BorderInfo {BorderId = 0, Border = defaultStyle.Border as XLBorder}}};
+
+            var sharedNumberFormats = new Dictionary<IXLNumberFormat, NumberFormatInfo>
+            {
+                {
+                    defaultStyle.NumberFormat,
+                    new NumberFormatInfo
+                    {NumberFormatId = 0, NumberFormat = defaultStyle.NumberFormat}
+                }
+            };
+
+            //Dictionary<String, AlignmentInfo> sharedAlignments = new Dictionary<String, AlignmentInfo>();
+            //sharedAlignments.Add(defaultStyle.Alignment.ToString(), new AlignmentInfo() { AlignmentId = 0, Alignment = defaultStyle.Alignment });
+
+            if (workbookStylesPart.Stylesheet == null)
+                workbookStylesPart.Stylesheet = new Stylesheet();
+
+            // Cell styles = Named styles
+            if (workbookStylesPart.Stylesheet.CellStyles == null)
+                workbookStylesPart.Stylesheet.CellStyles = new CellStyles();
+
+            UInt32 defaultFormatId;
+            if (workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Any(c => c.Name == "Normal"))
+            {
+                defaultFormatId =
+                    workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Single(c => c.Name == "Normal").FormatId.Value;
+            }
+            else if (workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Any())
+            {
+                defaultFormatId =
+                    workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().Max(c => c.FormatId.Value) + 1;
+            }
+            else
+                defaultFormatId = 0;
+
+            context.SharedStyles.Add(defaultStyleId,
+                new StyleInfo
+                {
+                    StyleId = defaultFormatId,
+                    Style = defaultStyle,
+                    FontId = 0,
+                    FillId = 0,
+                    BorderId = 0,
+                    NumberFormatId = 0
+                    //AlignmentId = 0
+                });
+
+            UInt32 styleCount = 1;
+            UInt32 fontCount = 1;
+            UInt32 fillCount = 3;
+            UInt32 borderCount = 1;
+            var numberFormatCount = 1;
+            var xlStyles = new HashSet<Int32>();
+
+            foreach (var worksheet in WorksheetsInternal)
+            {
+                foreach (var s in worksheet.GetStyleIds().Where(s => !xlStyles.Contains(s)))
+                    xlStyles.Add(s);
+
+                foreach (
+                    var s in
+                        worksheet.Internals.ColumnsCollection.Select(kp => kp.Value.GetStyleId()).Where(
+                            s => !xlStyles.Contains(s)))
+                    xlStyles.Add(s);
+
+                foreach (
+                    var s in
+                        worksheet.Internals.RowsCollection.Select(kp => kp.Value.GetStyleId()).Where(
+                            s => !xlStyles.Contains(s))
+                    )
+                    xlStyles.Add(s);
+            }
+
+            foreach (var xlStyle in xlStyles.Select(GetStyleById))
+            {
+                if (!context.SharedFonts.ContainsKey(xlStyle.Font))
+                    context.SharedFonts.Add(xlStyle.Font,
+                        new FontInfo {FontId = fontCount++, Font = xlStyle.Font as XLFont});
+
+                if (!sharedFills.ContainsKey(xlStyle.Fill))
+                    sharedFills.Add(xlStyle.Fill, new FillInfo {FillId = fillCount++, Fill = xlStyle.Fill as XLFill});
+
+                if (!sharedBorders.ContainsKey(xlStyle.Border))
+                    sharedBorders.Add(xlStyle.Border,
+                        new BorderInfo {BorderId = borderCount++, Border = xlStyle.Border as XLBorder});
+
+                if (xlStyle.NumberFormat.NumberFormatId != -1
+                    || sharedNumberFormats.ContainsKey(xlStyle.NumberFormat))
+                    continue;
+
+                sharedNumberFormats.Add(xlStyle.NumberFormat,
+                    new NumberFormatInfo
+                    {
+                        NumberFormatId = numberFormatCount + 164,
+                        NumberFormat = xlStyle.NumberFormat
+                    });
+                numberFormatCount++;
+            }
+
+            var allSharedNumberFormats = ResolveNumberFormats(workbookStylesPart, sharedNumberFormats, defaultFormatId);
+            ResolveFonts(workbookStylesPart, context);
+            var allSharedFills = ResolveFills(workbookStylesPart, sharedFills);
+            var allSharedBorders = ResolveBorders(workbookStylesPart, sharedBorders);
+
+            foreach (var id in xlStyles)
+            {
+                var xlStyle = GetStyleById(id);
+                if (context.SharedStyles.ContainsKey(id)) continue;
+
+                var numberFormatId = xlStyle.NumberFormat.NumberFormatId >= 0
+                    ? xlStyle.NumberFormat.NumberFormatId
+                    : allSharedNumberFormats[xlStyle.NumberFormat].NumberFormatId;
+
+                context.SharedStyles.Add(id,
+                    new StyleInfo
+                    {
+                        StyleId = styleCount++,
+                        Style = xlStyle,
+                        FontId = context.SharedFonts[xlStyle.Font].FontId,
+                        FillId = allSharedFills[xlStyle.Fill].FillId,
+                        BorderId = allSharedBorders[xlStyle.Border].BorderId,
+                        NumberFormatId = numberFormatId
+                    });
+            }
+
+            ResolveCellStyleFormats(workbookStylesPart, context);
+            ResolveRest(workbookStylesPart, context);
+
+            if (workbookStylesPart.Stylesheet.CellStyles.Elements<CellStyle>().All(c => c.Name != "Normal"))
+            {
+                //var defaultFormatId = context.SharedStyles.Values.Where(s => s.Style.Equals(DefaultStyle)).Single().StyleId;
+
+                var cellStyle1 = new CellStyle {Name = "Normal", FormatId = defaultFormatId, BuiltinId = 0U};
+                workbookStylesPart.Stylesheet.CellStyles.AppendChild(cellStyle1);
+            }
+            workbookStylesPart.Stylesheet.CellStyles.Count = (UInt32)workbookStylesPart.Stylesheet.CellStyles.Count();
+
+            var newSharedStyles = new Dictionary<Int32, StyleInfo>();
+            foreach (var ss in context.SharedStyles)
+            {
+                var styleId = -1;
+                foreach (CellFormat f in workbookStylesPart.Stylesheet.CellFormats)
+                {
+                    styleId++;
+                    if (CellFormatsAreEqual(f, ss.Value))
+                        break;
+                }
+                if (styleId == -1)
+                    styleId = 0;
+                var si = ss.Value;
+                si.StyleId = (UInt32)styleId;
+                newSharedStyles.Add(ss.Key, si);
+            }
+            context.SharedStyles.Clear();
+            newSharedStyles.ForEach(kp => context.SharedStyles.Add(kp.Key, kp.Value));
+
+            AddDifferentialFormats(workbookStylesPart, context);
+        }
+
+        private void AddDifferentialFormats(WorkbookStylesPart workbookStylesPart, SaveContext context)
+        {
+            if (workbookStylesPart.Stylesheet.DifferentialFormats == null)
+                workbookStylesPart.Stylesheet.DifferentialFormats = new DifferentialFormats();
+
+
+            var differentialFormats = workbookStylesPart.Stylesheet.DifferentialFormats;
+
+            FillDifferentialFormatsCollection(differentialFormats, context.DifferentialFormats);
+
+
+            foreach (var ws in Worksheets)
+            {
+                foreach (var cf in ws.ConditionalFormats)
+                {
+                    if (!context.DifferentialFormats.ContainsKey(cf.Style))
+                        AddDifferentialFormat(workbookStylesPart.Stylesheet.DifferentialFormats, cf, context);
+                }
+            }
+
+            differentialFormats.Count = (UInt32)differentialFormats.Count();
+            if (differentialFormats.Count == 0)
+                workbookStylesPart.Stylesheet.DifferentialFormats = null;
+        }
+
+        private void FillDifferentialFormatsCollection(DifferentialFormats differentialFormats,
+            Dictionary<IXLStyle, int> dictionary)
+        {
+            dictionary.Clear();
+            var id = 0;
+            foreach (var df in differentialFormats.Elements<DifferentialFormat>())
+            {
+                var style = new XLStyle(new XLStylizedEmpty(DefaultStyle), DefaultStyle);
+                LoadFont(df.Font, style.Font);
+                LoadBorder(df.Border, style.Border);
+                LoadNumberFormat(df.NumberingFormat, style.NumberFormat);
+                LoadFill(df.Fill, style.Fill);
+                if (!dictionary.ContainsKey(style))
+                    dictionary.Add(style, ++id);
+            }
+        }
+
+        private static void AddDifferentialFormat(DifferentialFormats differentialFormats, IXLConditionalFormat cf,
+            SaveContext context)
+        {
+            var differentialFormat = new DifferentialFormat();
+            differentialFormat.Append(GetNewFont(new FontInfo {Font = cf.Style.Font as XLFont}, false));
+            if (!XLHelper.IsNullOrWhiteSpace(cf.Style.NumberFormat.Format))
+            {
+                var numberFormat = new NumberingFormat
+                {
+                    NumberFormatId = (UInt32)(differentialFormats.Count() + 164),
+                    FormatCode = cf.Style.NumberFormat.Format
+                };
+                differentialFormat.Append(numberFormat);
+            }
+            differentialFormat.Append(GetNewFill(new FillInfo {Fill = cf.Style.Fill as XLFill}, false));
+            differentialFormat.Append(GetNewBorder(new BorderInfo {Border = cf.Style.Border as XLBorder}, false));
+
+            differentialFormats.Append(differentialFormat);
+
+            context.DifferentialFormats.Add(cf.Style, differentialFormats.Count() - 1);
+        }
+
+        private static void ResolveRest(WorkbookStylesPart workbookStylesPart, SaveContext context)
+        {
+            if (workbookStylesPart.Stylesheet.CellFormats == null)
+                workbookStylesPart.Stylesheet.CellFormats = new CellFormats();
+
+            foreach (var styleInfo in context.SharedStyles.Values)
+            {
+                var info = styleInfo;
+                var foundOne =
+                    workbookStylesPart.Stylesheet.CellFormats.Cast<CellFormat>().Any(f => CellFormatsAreEqual(f, info));
+
+                if (foundOne) continue;
+
+                var cellFormat = GetCellFormat(styleInfo);
+                cellFormat.FormatId = 0;
+                var alignment = new Alignment
+                {
+                    Horizontal = styleInfo.Style.Alignment.Horizontal.ToOpenXml(),
+                    Vertical = styleInfo.Style.Alignment.Vertical.ToOpenXml(),
+                    Indent = (UInt32)styleInfo.Style.Alignment.Indent,
+                    ReadingOrder = (UInt32)styleInfo.Style.Alignment.ReadingOrder,
+                    WrapText = styleInfo.Style.Alignment.WrapText,
+                    TextRotation = (UInt32)styleInfo.Style.Alignment.TextRotation,
+                    ShrinkToFit = styleInfo.Style.Alignment.ShrinkToFit,
+                    RelativeIndent = styleInfo.Style.Alignment.RelativeIndent,
+                    JustifyLastLine = styleInfo.Style.Alignment.JustifyLastLine
+                };
+                cellFormat.AppendChild(alignment);
+
+                if (cellFormat.ApplyProtection.Value)
+                    cellFormat.AppendChild(GetProtection(styleInfo));
+
+                workbookStylesPart.Stylesheet.CellFormats.AppendChild(cellFormat);
+            }
+            workbookStylesPart.Stylesheet.CellFormats.Count = (UInt32)workbookStylesPart.Stylesheet.CellFormats.Count();
+        }
+
+        private static void ResolveCellStyleFormats(WorkbookStylesPart workbookStylesPart,
+            SaveContext context)
+        {
+            if (workbookStylesPart.Stylesheet.CellStyleFormats == null)
+                workbookStylesPart.Stylesheet.CellStyleFormats = new CellStyleFormats();
+
+            foreach (var styleInfo in context.SharedStyles.Values)
+            {
+                var info = styleInfo;
+                var foundOne =
+                    workbookStylesPart.Stylesheet.CellStyleFormats.Cast<CellFormat>().Any(
+                        f => CellFormatsAreEqual(f, info));
+
+                if (foundOne) continue;
+
+                var cellStyleFormat = GetCellFormat(styleInfo);
+
+                if (cellStyleFormat.ApplyProtection.Value)
+                    cellStyleFormat.AppendChild(GetProtection(styleInfo));
+
+                workbookStylesPart.Stylesheet.CellStyleFormats.AppendChild(cellStyleFormat);
+            }
+            workbookStylesPart.Stylesheet.CellStyleFormats.Count =
+                (UInt32)workbookStylesPart.Stylesheet.CellStyleFormats.Count();
+        }
+
+        private static bool ApplyFill(StyleInfo styleInfo)
+        {
+            return styleInfo.Style.Fill.PatternType.ToOpenXml() == PatternValues.None;
+        }
+
+        private static bool ApplyBorder(StyleInfo styleInfo)
+        {
+            var opBorder = styleInfo.Style.Border;
+            return (opBorder.BottomBorder.ToOpenXml() != BorderStyleValues.None
+                    || opBorder.DiagonalBorder.ToOpenXml() != BorderStyleValues.None
+                    || opBorder.RightBorder.ToOpenXml() != BorderStyleValues.None
+                    || opBorder.LeftBorder.ToOpenXml() != BorderStyleValues.None
+                    || opBorder.TopBorder.ToOpenXml() != BorderStyleValues.None);
+        }
+
+        private static bool ApplyProtection(StyleInfo styleInfo)
+        {
+            return styleInfo.Style.Protection != null;
+        }
+
+        private static CellFormat GetCellFormat(StyleInfo styleInfo)
+        {
+            var cellFormat = new CellFormat
+            {
+                NumberFormatId = (UInt32)styleInfo.NumberFormatId,
+                FontId = styleInfo.FontId,
+                FillId = styleInfo.FillId,
+                BorderId = styleInfo.BorderId,
+                ApplyNumberFormat = true,
+                ApplyAlignment = true,
+                ApplyFill = ApplyFill(styleInfo),
+                ApplyBorder = ApplyBorder(styleInfo),
+                ApplyProtection = ApplyProtection(styleInfo)
+            };
+            return cellFormat;
+        }
+
+        private static Protection GetProtection(StyleInfo styleInfo)
+        {
+            return new Protection
+            {
+                Locked = styleInfo.Style.Protection.Locked,
+                Hidden = styleInfo.Style.Protection.Hidden
+            };
+        }
+
+        private static bool CellFormatsAreEqual(CellFormat f, StyleInfo styleInfo)
+        {
+            return
+                f.BorderId != null && styleInfo.BorderId == f.BorderId
+                && f.FillId != null && styleInfo.FillId == f.FillId
+                && f.FontId != null && styleInfo.FontId == f.FontId
+                && f.NumberFormatId != null && styleInfo.NumberFormatId == f.NumberFormatId
+                && f.ApplyFill != null && f.ApplyFill == ApplyFill(styleInfo)
+                && f.ApplyBorder != null && f.ApplyBorder == ApplyBorder(styleInfo)
+                && AlignmentsAreEqual(f.Alignment, styleInfo.Style.Alignment)
+                && ProtectionsAreEqual(f.Protection, styleInfo.Style.Protection)
+                ;
+        }
+
+        private static bool ProtectionsAreEqual(Protection protection, IXLProtection xlProtection)
+        {
+            var p = new XLProtection();
+            if (protection != null)
+            {
+                if (protection.Locked != null)
+                    p.Locked = protection.Locked.Value;
+                if (protection.Hidden != null)
+                    p.Hidden = protection.Hidden.Value;
+            }
+            return p.Equals(xlProtection);
+        }
+
+        private static bool AlignmentsAreEqual(Alignment alignment, IXLAlignment xlAlignment)
+        {
+            var a = new XLAlignment();
+            if (alignment != null)
+            {
+                if (alignment.Indent != null)
+                    a.Indent = (Int32)alignment.Indent.Value;
+
+                if (alignment.Horizontal != null)
+                    a.Horizontal = alignment.Horizontal.Value.ToClosedXml();
+                if (alignment.Vertical != null)
+                    a.Vertical = alignment.Vertical.Value.ToClosedXml();
+
+                if (alignment.ReadingOrder != null)
+                    a.ReadingOrder = alignment.ReadingOrder.Value.ToClosedXml();
+                if (alignment.WrapText != null)
+                    a.WrapText = alignment.WrapText.Value;
+                if (alignment.TextRotation != null)
+                    a.TextRotation = (Int32)alignment.TextRotation.Value;
+                if (alignment.ShrinkToFit != null)
+                    a.ShrinkToFit = alignment.ShrinkToFit.Value;
+                if (alignment.RelativeIndent != null)
+                    a.RelativeIndent = alignment.RelativeIndent.Value;
+                if (alignment.JustifyLastLine != null)
+                    a.JustifyLastLine = alignment.JustifyLastLine.Value;
+            }
+            return a.Equals(xlAlignment);
+        }
+
+        private Dictionary<IXLBorder, BorderInfo> ResolveBorders(WorkbookStylesPart workbookStylesPart,
+            Dictionary<IXLBorder, BorderInfo> sharedBorders)
+        {
+            if (workbookStylesPart.Stylesheet.Borders == null)
+                workbookStylesPart.Stylesheet.Borders = new Borders();
+
+            var allSharedBorders = new Dictionary<IXLBorder, BorderInfo>();
+            foreach (var borderInfo in sharedBorders.Values)
+            {
+                var borderId = 0;
+                var foundOne = false;
+                foreach (Border f in workbookStylesPart.Stylesheet.Borders)
+                {
+                    if (BordersAreEqual(f, borderInfo.Border))
+                    {
+                        foundOne = true;
+                        break;
+                    }
+                    borderId++;
+                }
+                if (!foundOne)
+                {
+                    var border = GetNewBorder(borderInfo);
+                    workbookStylesPart.Stylesheet.Borders.AppendChild(border);
+                }
+                allSharedBorders.Add(borderInfo.Border,
+                    new BorderInfo {Border = borderInfo.Border, BorderId = (UInt32)borderId});
+            }
+            workbookStylesPart.Stylesheet.Borders.Count = (UInt32)workbookStylesPart.Stylesheet.Borders.Count();
+            return allSharedBorders;
+        }
+
+        private static Border GetNewBorder(BorderInfo borderInfo, Boolean ignoreMod = true)
+        {
+            var border = new Border();
+            if (borderInfo.Border.DiagonalUpModified || ignoreMod)
+                border.DiagonalUp = borderInfo.Border.DiagonalUp;
+
+            if (borderInfo.Border.DiagonalDownModified || ignoreMod)
+                border.DiagonalDown = borderInfo.Border.DiagonalDown;
+
+            if (borderInfo.Border.LeftBorderModified || borderInfo.Border.LeftBorderColorModified || ignoreMod)
+            {
+                var leftBorder = new LeftBorder {Style = borderInfo.Border.LeftBorder.ToOpenXml()};
+                if (borderInfo.Border.LeftBorderColorModified || ignoreMod)
+                {
+                    var leftBorderColor = GetNewColor(borderInfo.Border.LeftBorderColor);
+                    leftBorder.AppendChild(leftBorderColor);
+                }
+                border.AppendChild(leftBorder);
+            }
+
+            if (borderInfo.Border.RightBorderModified || borderInfo.Border.RightBorderColorModified || ignoreMod)
+            {
+                var rightBorder = new RightBorder {Style = borderInfo.Border.RightBorder.ToOpenXml()};
+                if (borderInfo.Border.RightBorderColorModified || ignoreMod)
+                {
+                    var rightBorderColor = GetNewColor(borderInfo.Border.RightBorderColor);
+                    rightBorder.AppendChild(rightBorderColor);
+                }
+                border.AppendChild(rightBorder);
+            }
+
+            if (borderInfo.Border.TopBorderModified || borderInfo.Border.TopBorderColorModified || ignoreMod)
+            {
+                var topBorder = new TopBorder {Style = borderInfo.Border.TopBorder.ToOpenXml()};
+                if (borderInfo.Border.TopBorderColorModified || ignoreMod)
+                {
+                    var topBorderColor = GetNewColor(borderInfo.Border.TopBorderColor);
+                    topBorder.AppendChild(topBorderColor);
+                }
+                border.AppendChild(topBorder);
+            }
+
+            if (borderInfo.Border.BottomBorderModified || borderInfo.Border.BottomBorderColorModified || ignoreMod)
+            {
+                var bottomBorder = new BottomBorder {Style = borderInfo.Border.BottomBorder.ToOpenXml()};
+                if (borderInfo.Border.BottomBorderColorModified || ignoreMod)
+                {
+                    var bottomBorderColor = GetNewColor(borderInfo.Border.BottomBorderColor);
+                    bottomBorder.AppendChild(bottomBorderColor);
+                }
+                border.AppendChild(bottomBorder);
+            }
+
+            if (borderInfo.Border.DiagonalBorderModified || borderInfo.Border.DiagonalBorderColorModified || ignoreMod)
+            {
+                var DiagonalBorder = new DiagonalBorder {Style = borderInfo.Border.DiagonalBorder.ToOpenXml()};
+                if (borderInfo.Border.DiagonalBorderColorModified || ignoreMod)
+                {
+                    var DiagonalBorderColor = GetNewColor(borderInfo.Border.DiagonalBorderColor);
+                    DiagonalBorder.AppendChild(DiagonalBorderColor);
+                }
+                border.AppendChild(DiagonalBorder);
+            }
+
+            return border;
+        }
+
+        private bool BordersAreEqual(Border b, IXLBorder xlBorder)
+        {
+            var nb = new XLBorder();
+            if (b.DiagonalUp != null)
+                nb.DiagonalUp = b.DiagonalUp.Value;
+
+            if (b.DiagonalDown != null)
+                nb.DiagonalDown = b.DiagonalDown.Value;
+
+            if (b.LeftBorder != null)
+            {
+                if (b.LeftBorder.Style != null)
+                    nb.LeftBorder = b.LeftBorder.Style.Value.ToClosedXml();
+                var bColor = GetColor(b.LeftBorder.Color);
+                if (bColor.HasValue)
+                    nb.LeftBorderColor = bColor;
+            }
+
+            if (b.RightBorder != null)
+            {
+                if (b.RightBorder.Style != null)
+                    nb.RightBorder = b.RightBorder.Style.Value.ToClosedXml();
+                var bColor = GetColor(b.RightBorder.Color);
+                if (bColor.HasValue)
+                    nb.RightBorderColor = bColor;
+            }
+
+            if (b.TopBorder != null)
+            {
+                if (b.TopBorder.Style != null)
+                    nb.TopBorder = b.TopBorder.Style.Value.ToClosedXml();
+                var bColor = GetColor(b.TopBorder.Color);
+                if (bColor.HasValue)
+                    nb.TopBorderColor = bColor;
+            }
+
+            if (b.BottomBorder != null)
+            {
+                if (b.BottomBorder.Style != null)
+                    nb.BottomBorder = b.BottomBorder.Style.Value.ToClosedXml();
+                var bColor = GetColor(b.BottomBorder.Color);
+                if (bColor.HasValue)
+                    nb.BottomBorderColor = bColor;
+            }
+
+            return nb.Equals(xlBorder);
+
+
+        }
+
+        private Dictionary<IXLFill, FillInfo> ResolveFills(WorkbookStylesPart workbookStylesPart,
+            Dictionary<IXLFill, FillInfo> sharedFills)
+        {
+            if (workbookStylesPart.Stylesheet.Fills == null)
+                workbookStylesPart.Stylesheet.Fills = new Fills();
+
+            ResolveFillWithPattern(workbookStylesPart.Stylesheet.Fills, PatternValues.None);
+            ResolveFillWithPattern(workbookStylesPart.Stylesheet.Fills, PatternValues.Gray125);
+
+            var allSharedFills = new Dictionary<IXLFill, FillInfo>();
+            foreach (var fillInfo in sharedFills.Values)
+            {
+                var fillId = 0;
+                var foundOne = false;
+                foreach (Fill f in workbookStylesPart.Stylesheet.Fills)
+                {
+                    if (FillsAreEqual(f, fillInfo.Fill))
+                    {
+                        foundOne = true;
+                        break;
+                    }
+                    fillId++;
+                }
+                if (!foundOne)
+                {
+                    var fill = GetNewFill(fillInfo);
+                    workbookStylesPart.Stylesheet.Fills.AppendChild(fill);
+                }
+                allSharedFills.Add(fillInfo.Fill, new FillInfo {Fill = fillInfo.Fill, FillId = (UInt32)fillId});
+            }
+
+            workbookStylesPart.Stylesheet.Fills.Count = (UInt32)workbookStylesPart.Stylesheet.Fills.Count();
+            return allSharedFills;
+        }
+
+        private static void ResolveFillWithPattern(Fills fills, PatternValues patternValues)
+        {
+            if (fills.Elements<Fill>().Any(f =>
+                f.PatternFill.PatternType == patternValues
+                && f.PatternFill.ForegroundColor == null
+                && f.PatternFill.BackgroundColor == null
+                )) return;
+
+            var fill1 = new Fill();
+            var patternFill1 = new PatternFill {PatternType = patternValues};
+            fill1.AppendChild(patternFill1);
+            fills.AppendChild(fill1);
+        }
+
+        private static Fill GetNewFill(FillInfo fillInfo, Boolean ignoreMod = true)
+        {
+            var fill = new Fill();
+
+            var patternFill = new PatternFill();
+            if (fillInfo.Fill.PatternTypeModified || ignoreMod)
+                patternFill.PatternType = fillInfo.Fill.PatternType.ToOpenXml();
+
+            if (fillInfo.Fill.PatternColorModified || ignoreMod)
+            {
+                var foregroundColor = new ForegroundColor();
+                if (fillInfo.Fill.PatternColor.ColorType == XLColorType.Color)
+                    foregroundColor.Rgb = fillInfo.Fill.PatternColor.Color.ToHex();
+                else if (fillInfo.Fill.PatternColor.ColorType == XLColorType.Indexed)
+                    foregroundColor.Indexed = (UInt32)fillInfo.Fill.PatternColor.Indexed;
+                else
+                {
+                    foregroundColor.Theme = (UInt32)fillInfo.Fill.PatternColor.ThemeColor;
+                    if (fillInfo.Fill.PatternColor.ThemeTint != 0)
+                        foregroundColor.Tint = fillInfo.Fill.PatternColor.ThemeTint;
+                }
+                patternFill.AppendChild(foregroundColor);
+            }
+
+            if (fillInfo.Fill.PatternBackgroundColorModified || ignoreMod)
+            {
+                var backgroundColor = new BackgroundColor();
+                if (fillInfo.Fill.PatternBackgroundColor.ColorType == XLColorType.Color)
+                    backgroundColor.Rgb = fillInfo.Fill.PatternBackgroundColor.Color.ToHex();
+                else if (fillInfo.Fill.PatternBackgroundColor.ColorType == XLColorType.Indexed)
+                    backgroundColor.Indexed = (UInt32)fillInfo.Fill.PatternBackgroundColor.Indexed;
+                else
+                {
+                    backgroundColor.Theme = (UInt32)fillInfo.Fill.PatternBackgroundColor.ThemeColor;
+                    if (fillInfo.Fill.PatternBackgroundColor.ThemeTint != 0)
+                        backgroundColor.Tint = fillInfo.Fill.PatternBackgroundColor.ThemeTint;
+                }
+                patternFill.AppendChild(backgroundColor);
+            }
+
+            fill.AppendChild(patternFill);
+
+            return fill;
+        }
+
+        private bool FillsAreEqual(Fill f, IXLFill xlFill)
+        {
+            var nF = new XLFill();
+            if (f.PatternFill != null)
+            {
+                if (f.PatternFill.PatternType != null)
+                    nF.PatternType = f.PatternFill.PatternType.Value.ToClosedXml();
+
+                var fColor = GetColor(f.PatternFill.ForegroundColor);
+                if (fColor.HasValue)
+                    nF.PatternColor = fColor;
+
+                var bColor = GetColor(f.PatternFill.BackgroundColor);
+                if (bColor.HasValue)
+                    nF.PatternBackgroundColor = bColor;
+            }
+            return nF.Equals(xlFill);
+        }
+
+        private void ResolveFonts(WorkbookStylesPart workbookStylesPart, SaveContext context)
+        {
+            if (workbookStylesPart.Stylesheet.Fonts == null)
+                workbookStylesPart.Stylesheet.Fonts = new Fonts();
+
+            var newFonts = new Dictionary<IXLFont, FontInfo>();
+            foreach (var fontInfo in context.SharedFonts.Values)
+            {
+                var fontId = 0;
+                var foundOne = false;
+                foreach (Font f in workbookStylesPart.Stylesheet.Fonts)
+                {
+                    if (FontsAreEqual(f, fontInfo.Font))
+                    {
+                        foundOne = true;
+                        break;
+                    }
+                    fontId++;
+                }
+                if (!foundOne)
+                {
+                    var font = GetNewFont(fontInfo);
+                    workbookStylesPart.Stylesheet.Fonts.AppendChild(font);
+                }
+                newFonts.Add(fontInfo.Font, new FontInfo {Font = fontInfo.Font, FontId = (UInt32)fontId});
+            }
+            context.SharedFonts.Clear();
+            foreach (var kp in newFonts)
+                context.SharedFonts.Add(kp.Key, kp.Value);
+
+            workbookStylesPart.Stylesheet.Fonts.Count = (UInt32)workbookStylesPart.Stylesheet.Fonts.Count();
+        }
+
+        private static Font GetNewFont(FontInfo fontInfo, Boolean ignoreMod = true)
+        {
+            var font = new Font();
+            var bold = (fontInfo.Font.BoldModified || ignoreMod) && fontInfo.Font.Bold ? new Bold() : null;
+            var italic = (fontInfo.Font.ItalicModified || ignoreMod) && fontInfo.Font.Italic ? new Italic() : null;
+            var underline = (fontInfo.Font.UnderlineModified || ignoreMod) &&
+                            fontInfo.Font.Underline != XLFontUnderlineValues.None
+                ? new Underline {Val = fontInfo.Font.Underline.ToOpenXml()}
+                : null;
+            var strike = (fontInfo.Font.StrikethroughModified || ignoreMod) && fontInfo.Font.Strikethrough
+                ? new Strike()
+                : null;
+            var verticalAlignment = fontInfo.Font.VerticalAlignmentModified || ignoreMod
+                ? new VerticalTextAlignment {Val = fontInfo.Font.VerticalAlignment.ToOpenXml()}
+                : null;
+            var shadow = (fontInfo.Font.ShadowModified || ignoreMod) && fontInfo.Font.Shadow ? new Shadow() : null;
+            var fontSize = fontInfo.Font.FontSizeModified || ignoreMod
+                ? new FontSize {Val = fontInfo.Font.FontSize}
+                : null;
+            var color = fontInfo.Font.FontColorModified || ignoreMod ? GetNewColor(fontInfo.Font.FontColor) : null;
+
+            var fontName = fontInfo.Font.FontNameModified || ignoreMod
+                ? new FontName {Val = fontInfo.Font.FontName}
+                : null;
+            var fontFamilyNumbering = fontInfo.Font.FontFamilyNumberingModified || ignoreMod
+                ? new FontFamilyNumbering {Val = (Int32)fontInfo.Font.FontFamilyNumbering}
+                : null;
+
+            if (bold != null)
+                font.AppendChild(bold);
+            if (italic != null)
+                font.AppendChild(italic);
+            if (underline != null)
+                font.AppendChild(underline);
+            if (strike != null)
+                font.AppendChild(strike);
+            if (verticalAlignment != null)
+                font.AppendChild(verticalAlignment);
+            if (shadow != null)
+                font.AppendChild(shadow);
+            if (fontSize != null)
+                font.AppendChild(fontSize);
+            if (color != null)
+                font.AppendChild(color);
+            if (fontName != null)
+                font.AppendChild(fontName);
+            if (fontFamilyNumbering != null)
+                font.AppendChild(fontFamilyNumbering);
+
+            return font;
+        }
+
+        private static Color GetNewColor(XLColor xlColor)
+        {
+            var color = new Color();
+            if (xlColor.ColorType == XLColorType.Color)
+                color.Rgb = xlColor.Color.ToHex();
+            else if (xlColor.ColorType == XLColorType.Indexed)
+                color.Indexed = (UInt32)xlColor.Indexed;
+            else
+            {
+                color.Theme = (UInt32)xlColor.ThemeColor;
+                if (xlColor.ThemeTint != 0)
+                    color.Tint = xlColor.ThemeTint;
+            }
+            return color;
+        }
+
+        private static TabColor GetTabColor(XLColor xlColor)
+        {
+            var color = new TabColor();
+            if (xlColor.ColorType == XLColorType.Color)
+                color.Rgb = xlColor.Color.ToHex();
+            else if (xlColor.ColorType == XLColorType.Indexed)
+                color.Indexed = (UInt32)xlColor.Indexed;
+            else
+            {
+                color.Theme = (UInt32)xlColor.ThemeColor;
+                if (xlColor.ThemeTint != 0)
+                    color.Tint = xlColor.ThemeTint;
+            }
+            return color;
+        }
+
+        private bool FontsAreEqual(Font f, IXLFont xlFont)
+        {
+            var nf = new XLFont {Bold = f.Bold != null, Italic = f.Italic != null};
+            if (f.Underline != null)
+            {
+                nf.Underline = f.Underline.Val != null
+                    ? f.Underline.Val.Value.ToClosedXml()
+                    : XLFontUnderlineValues.Single;
+            }
+            nf.Strikethrough = f.Strike != null;
+            if (f.VerticalTextAlignment != null)
+            {
+                nf.VerticalAlignment = f.VerticalTextAlignment.Val != null
+                    ? f.VerticalTextAlignment.Val.Value.ToClosedXml()
+                    : XLFontVerticalTextAlignmentValues.Baseline;
+            }
+            nf.Shadow = f.Shadow != null;
+            if (f.FontSize != null)
+                nf.FontSize = f.FontSize.Val;
+            var fColor = GetColor(f.Color);
+            if (fColor.HasValue)
+                nf.FontColor = fColor;
+            if (f.FontName != null)
+                nf.FontName = f.FontName.Val;
+            if (f.FontFamilyNumbering != null)
+                nf.FontFamilyNumbering = (XLFontFamilyNumberingValues)f.FontFamilyNumbering.Val.Value;
+
+            return nf.Equals(xlFont);
+        }
+
+        private static Dictionary<IXLNumberFormat, NumberFormatInfo> ResolveNumberFormats(
+            WorkbookStylesPart workbookStylesPart,
+            Dictionary<IXLNumberFormat, NumberFormatInfo> sharedNumberFormats,
+            UInt32 defaultFormatId)
+        {
+            if (workbookStylesPart.Stylesheet.NumberingFormats == null)
+            {
+                workbookStylesPart.Stylesheet.NumberingFormats = new NumberingFormats();
+                workbookStylesPart.Stylesheet.NumberingFormats.AppendChild(new NumberingFormat()
+                {
+                    NumberFormatId = 0,
+                    FormatCode = ""
+                });
+            }
+
+            var allSharedNumberFormats = new Dictionary<IXLNumberFormat, NumberFormatInfo>();
+            foreach (var numberFormatInfo in sharedNumberFormats.Values.Where(nf => nf.NumberFormatId != defaultFormatId))
+            {
+                var numberingFormatId = 164;
+                var foundOne = false;
+                foreach (NumberingFormat nf in workbookStylesPart.Stylesheet.NumberingFormats)
+                {
+                    if (NumberFormatsAreEqual(nf, numberFormatInfo.NumberFormat))
+                    {
+                        foundOne = true;
+                        numberingFormatId = (Int32)nf.NumberFormatId.Value;
+                        break;
+                    }
+                    numberingFormatId++;
+                }
+                if (!foundOne)
+                {
+                    var numberingFormat = new NumberingFormat
+                    {
+                        NumberFormatId = (UInt32)numberingFormatId,
+                        FormatCode = numberFormatInfo.NumberFormat.Format
+                    };
+                    workbookStylesPart.Stylesheet.NumberingFormats.AppendChild(numberingFormat);
+                }
+                allSharedNumberFormats.Add(numberFormatInfo.NumberFormat,
+                    new NumberFormatInfo
+                    {
+                        NumberFormat = numberFormatInfo.NumberFormat,
+                        NumberFormatId = numberingFormatId
+                    });
+            }
+            workbookStylesPart.Stylesheet.NumberingFormats.Count =
+                (UInt32)workbookStylesPart.Stylesheet.NumberingFormats.Count();
+            return allSharedNumberFormats;
+        }
+
+        private static bool NumberFormatsAreEqual(NumberingFormat nf, IXLNumberFormat xlNumberFormat)
+        {
+            var newXLNumberFormat = new XLNumberFormat();
+
+            if (nf.FormatCode != null && !XLHelper.IsNullOrWhiteSpace(nf.FormatCode.Value))
+                newXLNumberFormat.Format = nf.FormatCode.Value;
+            else if (nf.NumberFormatId != null)
+                newXLNumberFormat.NumberFormatId = (Int32)nf.NumberFormatId.Value;
+
+            return newXLNumberFormat.Equals(xlNumberFormat);
+        }
+
+        #endregion
+
+        #region GenerateWorksheetPartContent
+
+        private static void GenerateWorksheetPartContent(WorksheetPart worksheetPart, XLWorksheet xlWorksheet,
+            SaveContext context)
+        {
+            #region Worksheet
+
+            if (worksheetPart.Worksheet == null)
+                worksheetPart.Worksheet = new Worksheet();
+
+            GenerateTables(xlWorksheet, worksheetPart, context);
+
+            if (
+                !worksheetPart.Worksheet.NamespaceDeclarations.Contains(new KeyValuePair<String, String>("r",
+                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships")))
+            {
+                worksheetPart.Worksheet.AddNamespaceDeclaration("r",
+                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+            }
+
+            #endregion
+
+            var cm = new XLWSContentManager(worksheetPart.Worksheet);
+
+            #region SheetProperties
+
+            if (worksheetPart.Worksheet.SheetProperties == null)
+                worksheetPart.Worksheet.SheetProperties = new SheetProperties();
+
+            worksheetPart.Worksheet.SheetProperties.TabColor = xlWorksheet.TabColor.HasValue
+                ? GetTabColor(xlWorksheet.TabColor)
+                : null;
+
+            cm.SetElement(XLWSContentManager.XLWSContents.SheetProperties, worksheetPart.Worksheet.SheetProperties);
+
+            if (worksheetPart.Worksheet.SheetProperties.OutlineProperties == null)
+                worksheetPart.Worksheet.SheetProperties.OutlineProperties = new OutlineProperties();
+
+            worksheetPart.Worksheet.SheetProperties.OutlineProperties.SummaryBelow =
+                (xlWorksheet.Outline.SummaryVLocation ==
+                 XLOutlineSummaryVLocation.Bottom);
+            worksheetPart.Worksheet.SheetProperties.OutlineProperties.SummaryRight =
+                (xlWorksheet.Outline.SummaryHLocation ==
+                 XLOutlineSummaryHLocation.Right);
+
+            if (worksheetPart.Worksheet.SheetProperties.PageSetupProperties == null
+                && (xlWorksheet.PageSetup.PagesTall > 0 || xlWorksheet.PageSetup.PagesWide > 0))
+                worksheetPart.Worksheet.SheetProperties.PageSetupProperties = new PageSetupProperties {FitToPage = true};
+
+            #endregion
+
+            var maxColumn = 0;
+
+            var sheetDimensionReference = "A1";
+            if (xlWorksheet.Internals.CellsCollection.Count > 0)
+            {
+                maxColumn = xlWorksheet.Internals.CellsCollection.MaxColumnUsed;
+                var maxRow = xlWorksheet.Internals.CellsCollection.MaxRowUsed;
+                sheetDimensionReference = "A1:" + XLHelper.GetColumnLetterFromNumber(maxColumn) +
+                                          maxRow.ToInvariantString();
+            }
+
+            if (xlWorksheet.Internals.ColumnsCollection.Count > 0)
+            {
+                var maxColCollection = xlWorksheet.Internals.ColumnsCollection.Keys.Max();
+                if (maxColCollection > maxColumn)
+                    maxColumn = maxColCollection;
+            }
+
+            #region SheetViews
+
+            if (worksheetPart.Worksheet.SheetDimension == null)
+                worksheetPart.Worksheet.SheetDimension = new SheetDimension {Reference = sheetDimensionReference};
+
+            cm.SetElement(XLWSContentManager.XLWSContents.SheetDimension, worksheetPart.Worksheet.SheetDimension);
+
+            if (worksheetPart.Worksheet.SheetViews == null)
+                worksheetPart.Worksheet.SheetViews = new SheetViews();
+
+            cm.SetElement(XLWSContentManager.XLWSContents.SheetViews, worksheetPart.Worksheet.SheetViews);
+
+            var sheetView = (SheetView)worksheetPart.Worksheet.SheetViews.FirstOrDefault();
+            if (sheetView == null)
+            {
+                sheetView = new SheetView {WorkbookViewId = 0U};
+                worksheetPart.Worksheet.SheetViews.AppendChild(sheetView);
+            }
+
+            if (xlWorksheet.TabSelected)
+                sheetView.TabSelected = true;
+            else
+                sheetView.TabSelected = null;
+
+
+            if (xlWorksheet.ShowFormulas)
+                sheetView.ShowFormulas = true;
+            else
+                sheetView.ShowFormulas = null;
+
+            if (xlWorksheet.ShowGridLines)
+                sheetView.ShowGridLines = null;
+            else
+                sheetView.ShowGridLines = false;
+
+            if (xlWorksheet.ShowOutlineSymbols)
+                sheetView.ShowOutlineSymbols = null;
+            else
+                sheetView.ShowOutlineSymbols = false;
+
+            if (xlWorksheet.ShowRowColHeaders)
+                sheetView.ShowRowColHeaders = null;
+            else
+                sheetView.ShowRowColHeaders = false;
+
+            if (xlWorksheet.ShowRuler)
+                sheetView.ShowRuler = null;
+            else
+                sheetView.ShowRuler = false;
+
+            if (xlWorksheet.ShowWhiteSpace)
+                sheetView.ShowWhiteSpace = null;
+            else
+                sheetView.ShowWhiteSpace = false;
+
+            if (xlWorksheet.ShowZeros)
+                sheetView.ShowZeros = null;
+            else
+                sheetView.ShowZeros = false;
+
+            if (xlWorksheet.RightToLeft)
+                sheetView.RightToLeft = true;
+            else
+                sheetView.RightToLeft = null;
+
+            if (xlWorksheet.SheetView.View == XLSheetViewOptions.Normal)
+                sheetView.View = null;
+            else
+                sheetView.View = xlWorksheet.SheetView.View.ToOpenXml();
+
+            var pane = sheetView.Elements<Pane>().FirstOrDefault();
+            if (pane == null)
+            {
+                pane = new Pane();
+                sheetView.AppendChild(pane);
+            }
+
+
+            pane.State = PaneStateValues.FrozenSplit;
+            Double hSplit = xlWorksheet.SheetView.SplitColumn;
+            Double ySplit = xlWorksheet.SheetView.SplitRow;
+
+
+            pane.HorizontalSplit = hSplit;
+            pane.VerticalSplit = ySplit;
+
+            pane.TopLeftCell = XLHelper.GetColumnLetterFromNumber(xlWorksheet.SheetView.SplitColumn + 1)
+                               + (xlWorksheet.SheetView.SplitRow + 1);
+
+            if (hSplit == 0 && ySplit == 0)
+                sheetView.RemoveAllChildren<Pane>();
+
+            if (xlWorksheet.SelectedRanges.Any() || xlWorksheet.ActiveCell != null)
+            {
+                sheetView.RemoveAllChildren<Selection>();
+
+                var firstSelection = xlWorksheet.SelectedRanges.FirstOrDefault();
+                var selection = new Selection();
+                if (xlWorksheet.ActiveCell != null)
+                    selection.ActiveCell = xlWorksheet.ActiveCell.Address.ToStringRelative(false);
+                else if (firstSelection != null)
+                    selection.ActiveCell = firstSelection.RangeAddress.FirstAddress.ToStringRelative(false);
+
+
+                var seqRef = new List<String> {selection.ActiveCell.Value};
+                seqRef.AddRange(xlWorksheet.SelectedRanges
+                    .Select(range => range.RangeAddress.ToStringRelative(false)));
+
+
+                selection.SequenceOfReferences = new ListValue<StringValue> {InnerText = String.Join(" ", seqRef.Distinct().ToArray())};
+
+                sheetView.Append(selection);
+            }
+
+            #endregion
+
+            var maxOutlineColumn = 0;
+            if (xlWorksheet.ColumnCount() > 0)
+                maxOutlineColumn = xlWorksheet.GetMaxColumnOutline();
+
+            var maxOutlineRow = 0;
+            if (xlWorksheet.RowCount() > 0)
+                maxOutlineRow = xlWorksheet.GetMaxRowOutline();
+
+            #region SheetFormatProperties
+
+            if (worksheetPart.Worksheet.SheetFormatProperties == null)
+                worksheetPart.Worksheet.SheetFormatProperties = new SheetFormatProperties();
+
+            cm.SetElement(XLWSContentManager.XLWSContents.SheetFormatProperties,
+                worksheetPart.Worksheet.SheetFormatProperties);
+
+            worksheetPart.Worksheet.SheetFormatProperties.DefaultRowHeight = xlWorksheet.RowHeight.SaveRound();
+
+            if (xlWorksheet.RowHeightChanged)
+                worksheetPart.Worksheet.SheetFormatProperties.CustomHeight = true;
+            else
+                worksheetPart.Worksheet.SheetFormatProperties.CustomHeight = null;
+
+
+            var worksheetColumnWidth = GetColumnWidth(xlWorksheet.ColumnWidth).SaveRound();
+            if (xlWorksheet.ColumnWidthChanged)
+                worksheetPart.Worksheet.SheetFormatProperties.DefaultColumnWidth = worksheetColumnWidth;
+            else
+                worksheetPart.Worksheet.SheetFormatProperties.DefaultColumnWidth = null;
+
+
+            if (maxOutlineColumn > 0)
+                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelColumn = (byte)maxOutlineColumn;
+            else
+                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelColumn = null;
+
+            if (maxOutlineRow > 0)
+                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelRow = (byte)maxOutlineRow;
+            else
+                worksheetPart.Worksheet.SheetFormatProperties.OutlineLevelRow = null;
+
+            #endregion
+
+            #region Columns
+
+            if (xlWorksheet.Internals.CellsCollection.Count == 0 &&
+                xlWorksheet.Internals.ColumnsCollection.Count == 0
+                && xlWorksheet.Style.Equals(DefaultStyle))
+                worksheetPart.Worksheet.RemoveAllChildren<Columns>();
+            else
+            {
+                if (!worksheetPart.Worksheet.Elements<Columns>().Any())
+                {
+                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.Columns);
+                    worksheetPart.Worksheet.InsertAfter(new Columns(), previousElement);
+                }
+
+                var columns = worksheetPart.Worksheet.Elements<Columns>().First();
+                cm.SetElement(XLWSContentManager.XLWSContents.Columns, columns);
+
+                var sheetColumnsByMin = columns.Elements<Column>().ToDictionary(c => c.Min.Value, c => c);
+                //Dictionary<UInt32, Column> sheetColumnsByMax = columns.Elements<Column>().ToDictionary(c => c.Max.Value, c => c);
+
+                Int32 minInColumnsCollection;
+                Int32 maxInColumnsCollection;
+                if (xlWorksheet.Internals.ColumnsCollection.Count > 0)
+                {
+                    minInColumnsCollection = xlWorksheet.Internals.ColumnsCollection.Keys.Min();
+                    maxInColumnsCollection = xlWorksheet.Internals.ColumnsCollection.Keys.Max();
+                }
+                else
+                {
+                    minInColumnsCollection = 1;
+                    maxInColumnsCollection = 0;
+                }
+
+                var worksheetStyleId = context.SharedStyles[xlWorksheet.GetStyleId()].StyleId;
+                if (minInColumnsCollection > 1)
+                {
+                    UInt32Value min = 1;
+                    UInt32Value max = (UInt32)(minInColumnsCollection - 1);
+
+
+                    for (var co = min; co <= max; co++)
+                    {
+                        var column = new Column
+                        {
+                            Min = co,
+                            Max = co,
+                            Style = worksheetStyleId,
+                            Width = worksheetColumnWidth,
+                            CustomWidth = true
+                        };
+
+                        UpdateColumn(column, columns, sheetColumnsByMin); //, sheetColumnsByMax);
+                    }
+                }
+
+                for (var co = minInColumnsCollection; co <= maxInColumnsCollection; co++)
+                {
+                    UInt32 styleId;
+                    Double columnWidth;
+                    var isHidden = false;
+                    var collapsed = false;
+                    var outlineLevel = 0;
+                    if (xlWorksheet.Internals.ColumnsCollection.ContainsKey(co))
+                    {
+                        styleId = context.SharedStyles[xlWorksheet.Internals.ColumnsCollection[co].GetStyleId()].StyleId;
+                        columnWidth = GetColumnWidth(xlWorksheet.Internals.ColumnsCollection[co].Width).SaveRound();
+                        isHidden = xlWorksheet.Internals.ColumnsCollection[co].IsHidden;
+                        collapsed = xlWorksheet.Internals.ColumnsCollection[co].Collapsed;
+                        outlineLevel = xlWorksheet.Internals.ColumnsCollection[co].OutlineLevel;
+                    }
+                    else
+                    {
+                        styleId = context.SharedStyles[xlWorksheet.GetStyleId()].StyleId;
+                        columnWidth = worksheetColumnWidth;
+                    }
+
+                    var column = new Column
+                    {
+                        Min = (UInt32)co,
+                        Max = (UInt32)co,
+                        Style = styleId,
+                        Width = columnWidth,
+                        CustomWidth = true
+                    };
+
+                    if (isHidden)
+                        column.Hidden = true;
+                    if (collapsed)
+                        column.Collapsed = true;
+                    if (outlineLevel > 0)
+                        column.OutlineLevel = (byte)outlineLevel;
+
+                    UpdateColumn(column, columns, sheetColumnsByMin); //, sheetColumnsByMax);
+                }
+
+                var collection = maxInColumnsCollection;
+                foreach (
+                    var col in
+                        columns.Elements<Column>().Where(c => c.Min > (UInt32)(collection)).OrderBy(
+                            c => c.Min.Value))
+                {
+                    col.Style = worksheetStyleId;
+                    col.Width = worksheetColumnWidth;
+                    col.CustomWidth = true;
+
+                    if ((Int32)col.Max.Value > maxInColumnsCollection)
+                        maxInColumnsCollection = (Int32)col.Max.Value;
+                }
+
+                if (maxInColumnsCollection < XLHelper.MaxColumnNumber && !xlWorksheet.Style.Equals(DefaultStyle))
+                {
+                    var column = new Column
+                    {
+                        Min = (UInt32)(maxInColumnsCollection + 1),
+                        Max = (UInt32)(XLHelper.MaxColumnNumber),
+                        Style = worksheetStyleId,
+                        Width = worksheetColumnWidth,
+                        CustomWidth = true
+                    };
+                    columns.AppendChild(column);
+                }
+
+                CollapseColumns(columns, sheetColumnsByMin);
+
+                if (!columns.Any())
+                {
+                    worksheetPart.Worksheet.RemoveAllChildren<Columns>();
+                    cm.SetElement(XLWSContentManager.XLWSContents.Columns, null);
+                }
+            }
+
+            #endregion
+
+            #region SheetData
+
+            if (!worksheetPart.Worksheet.Elements<SheetData>().Any())
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.SheetData);
+                worksheetPart.Worksheet.InsertAfter(new SheetData(), previousElement);
+            }
+
+            var sheetData = worksheetPart.Worksheet.Elements<SheetData>().First();
+            cm.SetElement(XLWSContentManager.XLWSContents.SheetData, sheetData);
+
+            var lastRow = 0;
+            var sheetDataRows =
+                sheetData.Elements<Row>().ToDictionary(r => r.RowIndex == null ? ++lastRow : (Int32)r.RowIndex.Value,
+                    r => r);
+            foreach (
+                var r in
+                    xlWorksheet.Internals.RowsCollection.Deleted.Where(r => sheetDataRows.ContainsKey(r.Key)))
+            {
+                sheetData.RemoveChild(sheetDataRows[r.Key]);
+                sheetDataRows.Remove(r.Key);
+                xlWorksheet.Internals.CellsCollection.deleted.Remove(r.Key);
+            }
+
+            var distinctRows = xlWorksheet.Internals.CellsCollection.RowsCollection.Keys.Union(xlWorksheet.Internals.RowsCollection.Keys);
+            var noRows = (sheetData.Elements<Row>().FirstOrDefault() == null);
+            foreach (var distinctRow in distinctRows.OrderBy(r => r))
+            {
+                Row row;
+                if (sheetDataRows.ContainsKey(distinctRow))
+                    row = sheetDataRows[distinctRow];
+                else
+                {
+                    row = new Row {RowIndex = (UInt32)distinctRow};
+                    if (noRows)
+                    {
+                        sheetData.AppendChild(row);
+                        noRows = false;
+                    }
+                    else
+                    {
+                        if (sheetDataRows.Any(r => r.Key > row.RowIndex.Value))
+                        {
+                            var minRow = sheetDataRows.Where(r => r.Key > (Int32)row.RowIndex.Value).Min(r => r.Key);
+                            var rowBeforeInsert = sheetDataRows[minRow];
+                            sheetData.InsertBefore(row, rowBeforeInsert);
+                        }
+                        else
+                            sheetData.AppendChild(row);
+                    }
+                }
+
+                if (maxColumn > 0)
+                    row.Spans = new ListValue<StringValue> {InnerText = "1:" + maxColumn.ToInvariantString()};
+
+                row.Height = null;
+                row.CustomHeight = null;
+                row.Hidden = null;
+                row.StyleIndex = null;
+                row.CustomFormat = null;
+                row.Collapsed = null;
+                if (xlWorksheet.Internals.RowsCollection.ContainsKey(distinctRow))
+                {
+                    var thisRow = xlWorksheet.Internals.RowsCollection[distinctRow];
+                    if (thisRow.HeightChanged)
+                    {
+                        row.Height = thisRow.Height.SaveRound();
+                        row.CustomHeight = true;
+                        row.CustomFormat = true;
+                    }
+
+                    if (thisRow.GetStyleId() != xlWorksheet.GetStyleId())
+                    {
+                        row.StyleIndex = context.SharedStyles[thisRow.GetStyleId()].StyleId;
+                        row.CustomFormat = true;
+                    }
+
+                    if (thisRow.IsHidden)
+                        row.Hidden = true;
+                    if (thisRow.Collapsed)
+                        row.Collapsed = true;
+                    if (thisRow.OutlineLevel > 0)
+                        row.OutlineLevel = (byte)thisRow.OutlineLevel;
+                }
+
+                var lastCell = 0;
+                var cellsByReference = row.Elements<Cell>().ToDictionary(c => c.CellReference == null
+                    ? XLHelper.GetColumnLetterFromNumber(
+                        ++lastCell) + distinctRow
+                    : c.CellReference.Value, c => c);
+
+                foreach (var kpDel in xlWorksheet.Internals.CellsCollection.deleted.ToList())
+                {
+                    foreach (var delCo in kpDel.Value.ToList())
+                    {
+                        var key = XLHelper.GetColumnLetterFromNumber(delCo) + kpDel.Key.ToInvariantString();
+                        if (!cellsByReference.ContainsKey(key)) continue;
+                        row.RemoveChild(cellsByReference[key]);
+                        kpDel.Value.Remove(delCo);
+                    }
+                    if (kpDel.Value.Count == 0)
+                        xlWorksheet.Internals.CellsCollection.deleted.Remove(kpDel.Key);
+                }
+
+
+                if (!xlWorksheet.Internals.CellsCollection.RowsCollection.ContainsKey(distinctRow)) continue;
+
+                var isNewRow = !row.Elements<Cell>().Any();
+                lastCell = 0;
+                var mRows = row.Elements<Cell>().ToDictionary(c => XLHelper.GetColumnNumberFromAddress(c.CellReference == null
+                    ? (XLHelper.GetColumnLetterFromNumber(++lastCell) + distinctRow) : c.CellReference.Value), c => c);
+                foreach (var opCell in xlWorksheet.Internals.CellsCollection.RowsCollection[distinctRow].Values
+                    .OrderBy(c => c.Address.ColumnNumber)
+                    .Select(c => c))
+                {
+                    var styleId = context.SharedStyles[opCell.GetStyleId()].StyleId;
+
+                    var dataType = opCell.DataType;
+                    var cellReference = (opCell.Address).GetTrimmedAddress();
+
+                    var isEmpty = opCell.IsEmpty(true);
+
+                    Cell cell = null;
+                    if (cellsByReference.ContainsKey(cellReference))
+                    {
+                        cell = cellsByReference[cellReference];
+                        if (isEmpty)
+                        {
+                            cell.Remove();
+                        }
+                    }
+
+                    if (!isEmpty)
+                    {
+                        if (cell == null)
+                        {
+                            cell = new Cell();
+                            cell.CellReference = new StringValue(cellReference);
+
+                            if (isNewRow)
+                                row.AppendChild(cell);
+                            else
+                            {
+                                var newColumn = XLHelper.GetColumnNumberFromAddress(cellReference);
+
+                                Cell cellBeforeInsert = null;
+                                int[] lastCo = { Int32.MaxValue };
+                                foreach (var c in mRows.Where(kp => kp.Key > newColumn).Where(c => lastCo[0] > c.Key))
+                                {
+                                    cellBeforeInsert = c.Value;
+                                    lastCo[0] = c.Key;
+                                }
+                                if (cellBeforeInsert == null)
+                                    row.AppendChild(cell);
+                                else
+                                    row.InsertBefore(cell, cellBeforeInsert);
+                            }
+                        }
+
+                        cell.StyleIndex = styleId;
+                        var formula = opCell.FormulaA1;
+                        if (opCell.HasFormula)
+                        {
+                            if (formula.StartsWith("{"))
+                            {
+                                formula = formula.Substring(1, formula.Length - 2);
+                                var f = new CellFormula { FormulaType = CellFormulaValues.Array };
+
+                                if (opCell.FormulaReference == null)
+                                    opCell.FormulaReference = opCell.AsRange().RangeAddress;
+                                if (opCell.FormulaReference.FirstAddress.Equals(opCell.Address))
+                                {
+                                    f.Text = formula;
+                                    f.Reference = opCell.FormulaReference.ToStringRelative();
+                                }
+
+                                cell.CellFormula = f;
+                            }
+                            else
+                            {
+                                cell.CellFormula = new CellFormula();
+                                cell.CellFormula.Text = formula;
+                            }
+
+                            cell.CellValue = null;
+                        }
+                        else
+                        {
+                            cell.CellFormula = null;
+
+                            cell.DataType = opCell.DataType == XLCellValues.DateTime ? null : GetCellValue(opCell);
+
+                            if (dataType == XLCellValues.Text)
+                            {
+                                if (opCell.InnerText.Length == 0)
+                                    cell.CellValue = null;
+                                else
+                                {
+                                    if (opCell.ShareString)
+                                    {
+                                        var cellValue = new CellValue();
+                                        cellValue.Text = opCell.SharedStringId.ToString();
+                                        cell.CellValue = cellValue;
+                                    }
+                                    else
+                                    {
+                                        var text = opCell.GetString();
+                                        var t = new Text(text);
+                                        if (text.PreserveSpaces())
+                                            t.Space = SpaceProcessingModeValues.Preserve;
+
+                                        cell.InlineString = new InlineString { Text = t };
+                                    }
+                                }
+                            }
+                            else if (dataType == XLCellValues.TimeSpan)
+                            {
+                                var timeSpan = opCell.GetTimeSpan();
+                                var cellValue = new CellValue();
+                                cellValue.Text =
+                                    XLCell.BaseDate.Add(timeSpan).ToOADate().ToString(CultureInfo.InvariantCulture);
+                                cell.CellValue = cellValue;
+                            }
+                            else if (dataType == XLCellValues.DateTime || dataType == XLCellValues.Number)
+                            {
+                                if (!XLHelper.IsNullOrWhiteSpace(opCell.InnerText))
+                                {
+                                    var cellValue = new CellValue();
+                                    cellValue.Text = Double.Parse(opCell.InnerText).ToString(CultureInfo.InvariantCulture);
+                                    cell.CellValue = cellValue;
+                                }
+                            }
+                            else
+                            {
+                                var cellValue = new CellValue();
+                                cellValue.Text = opCell.InnerText;
+                                cell.CellValue = cellValue;
+                            }
+                        }
+                    }
+                }
+                xlWorksheet.Internals.CellsCollection.deleted.Remove(distinctRow);
+            }
+            foreach (
+                var r in
+                    xlWorksheet.Internals.CellsCollection.deleted.Keys.Where(
+                        sheetDataRows.ContainsKey))
+            {
+                sheetData.RemoveChild(sheetDataRows[r]);
+                sheetDataRows.Remove(r);
+            }
+
+            #endregion
+
+            #region SheetProtection
+
+            if (xlWorksheet.Protection.Protected)
+            {
+                if (!worksheetPart.Worksheet.Elements<SheetProtection>().Any())
+                {
+                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.SheetProtection);
+                    worksheetPart.Worksheet.InsertAfter(new SheetProtection(), previousElement);
+                }
+
+                var sheetProtection = worksheetPart.Worksheet.Elements<SheetProtection>().First();
+                cm.SetElement(XLWSContentManager.XLWSContents.SheetProtection, sheetProtection);
+
+                var protection = xlWorksheet.Protection;
+                sheetProtection.Sheet = protection.Protected;
+                if (!XLHelper.IsNullOrWhiteSpace(protection.PasswordHash))
+                    sheetProtection.Password = protection.PasswordHash;
+                sheetProtection.FormatCells = GetBooleanValue(!protection.FormatCells, true);
+                sheetProtection.FormatColumns = GetBooleanValue(!protection.FormatColumns, true);
+                sheetProtection.FormatRows = GetBooleanValue(!protection.FormatRows, true);
+                sheetProtection.InsertColumns = GetBooleanValue(!protection.InsertColumns, true);
+                sheetProtection.InsertHyperlinks = GetBooleanValue(!protection.InsertHyperlinks, true);
+                sheetProtection.InsertRows = GetBooleanValue(!protection.InsertRows, true);
+                sheetProtection.DeleteColumns = GetBooleanValue(!protection.DeleteColumns, true);
+                sheetProtection.DeleteRows = GetBooleanValue(!protection.DeleteRows, true);
+                sheetProtection.AutoFilter = GetBooleanValue(!protection.AutoFilter, true);
+                sheetProtection.PivotTables = GetBooleanValue(!protection.PivotTables, true);
+                sheetProtection.Sort = GetBooleanValue(!protection.Sort, true);
+                sheetProtection.SelectLockedCells = GetBooleanValue(!protection.SelectLockedCells, false);
+                sheetProtection.SelectUnlockedCells = GetBooleanValue(!protection.SelectUnlockedCells, false);
+            }
+            else
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<SheetProtection>();
+                cm.SetElement(XLWSContentManager.XLWSContents.SheetProtection, null);
+            }
+
+            #endregion
+
+            #region AutoFilter
+
+            worksheetPart.Worksheet.RemoveAllChildren<AutoFilter>();
+            if (xlWorksheet.AutoFilter.Enabled)
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.AutoFilter);
+                worksheetPart.Worksheet.InsertAfter(new AutoFilter(), previousElement);
+
+
+                var autoFilter = worksheetPart.Worksheet.Elements<AutoFilter>().First();
+                cm.SetElement(XLWSContentManager.XLWSContents.AutoFilter, autoFilter);
+
+                PopulateAutoFilter(xlWorksheet.AutoFilter, autoFilter);
+            }
+            else
+            {
+                cm.SetElement(XLWSContentManager.XLWSContents.AutoFilter, null);
+            }
+
+            #endregion
+
+            #region MergeCells
+
+            if ((xlWorksheet).Internals.MergedRanges.Any())
+            {
+                if (!worksheetPart.Worksheet.Elements<MergeCells>().Any())
+                {
+                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.MergeCells);
+                    worksheetPart.Worksheet.InsertAfter(new MergeCells(), previousElement);
+                }
+
+                var mergeCells = worksheetPart.Worksheet.Elements<MergeCells>().First();
+                cm.SetElement(XLWSContentManager.XLWSContents.MergeCells, mergeCells);
+                mergeCells.RemoveAllChildren<MergeCell>();
+
+                foreach (var mergeCell in (xlWorksheet).Internals.MergedRanges.Select(
+                    m => m.RangeAddress.FirstAddress.ToString() + ":" + m.RangeAddress.LastAddress.ToString()).Select(
+                        merged => new MergeCell {Reference = merged}))
+                    mergeCells.AppendChild(mergeCell);
+
+                mergeCells.Count = (UInt32)mergeCells.Count();
+            }
+            else
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<MergeCells>();
+                cm.SetElement(XLWSContentManager.XLWSContents.MergeCells, null);
+            }
+
+            #endregion
+
+            #region Conditional Formatting
+
+            if (!xlWorksheet.ConditionalFormats.Any())
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<ConditionalFormatting>();
+                cm.SetElement(XLWSContentManager.XLWSContents.ConditionalFormatting, null);
+            }
+            else
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<ConditionalFormatting>();
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.ConditionalFormatting);
+
+                var priority = 0;
+                foreach (var cfGroup in xlWorksheet.ConditionalFormats
+                    .GroupBy(
+                        c => c.Range.RangeAddress.ToStringRelative(false),
+                        c => c,
+                        (key, g) => new { RangeId = key, CfList = g.ToList() }
+                    )
+                    )
+                {
+                    
+                    priority++;
+                    var conditionalFormatting = new ConditionalFormatting
+                    {
+                        SequenceOfReferences =
+                            new ListValue<StringValue> { InnerText = cfGroup.RangeId }
+                    };
+                    foreach(var cf in cfGroup.CfList)
+                    {
+                        conditionalFormatting.Append(XLCFConverters.Convert(cf, priority, context));
+                    }
+                    worksheetPart.Worksheet.InsertAfter(conditionalFormatting, previousElement);
+                    previousElement = conditionalFormatting;
+                    cm.SetElement(XLWSContentManager.XLWSContents.ConditionalFormatting, conditionalFormatting);                    
+                }
+            }
+
+            #endregion
+
+            #region DataValidations
+
+            if (!xlWorksheet.DataValidations.Any(d => d.IsDirty()))
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<DataValidations>();
+                cm.SetElement(XLWSContentManager.XLWSContents.DataValidations, null);
+            }
+            else
+            {
+                if (!worksheetPart.Worksheet.Elements<DataValidations>().Any())
+                {
+                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.DataValidations);
+                    worksheetPart.Worksheet.InsertAfter(new DataValidations(), previousElement);
+                }
+
+                var dataValidations = worksheetPart.Worksheet.Elements<DataValidations>().First();
+                cm.SetElement(XLWSContentManager.XLWSContents.DataValidations, dataValidations);
+                dataValidations.RemoveAllChildren<DataValidation>();
+                foreach (var dv in xlWorksheet.DataValidations)
+                {
+                    var sequence = dv.Ranges.Aggregate(String.Empty, (current, r) => current + (r.RangeAddress + " "));
+
+                    if (sequence.Length > 0)
+                        sequence = sequence.Substring(0, sequence.Length - 1);
+
+                    var dataValidation = new DataValidation
+                    {
+                        AllowBlank = dv.IgnoreBlanks,
+                        Formula1 = new Formula1(dv.MinValue),
+                        Formula2 = new Formula2(dv.MaxValue),
+                        Type = dv.AllowedValues.ToOpenXml(),
+                        ShowErrorMessage = dv.ShowErrorMessage,
+                        Prompt = dv.InputMessage,
+                        PromptTitle = dv.InputTitle,
+                        ErrorTitle = dv.ErrorTitle,
+                        Error = dv.ErrorMessage,
+                        ShowDropDown = !dv.InCellDropdown,
+                        ShowInputMessage = dv.ShowInputMessage,
+                        ErrorStyle = dv.ErrorStyle.ToOpenXml(),
+                        Operator = dv.Operator.ToOpenXml(),
+                        SequenceOfReferences =
+                            new ListValue<StringValue> {InnerText = sequence}
+                    };
+
+                    dataValidations.AppendChild(dataValidation);
+                }
+                dataValidations.Count = (UInt32)xlWorksheet.DataValidations.Count();
+            }
+
+            #endregion
+
+            #region Hyperlinks
+
+            var relToRemove = worksheetPart.HyperlinkRelationships.ToList();
+            relToRemove.ForEach(worksheetPart.DeleteReferenceRelationship);
+            if (!xlWorksheet.Hyperlinks.Any())
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<Hyperlinks>();
+                cm.SetElement(XLWSContentManager.XLWSContents.Hyperlinks, null);
+            }
+            else
+            {
+                if (!worksheetPart.Worksheet.Elements<Hyperlinks>().Any())
+                {
+                    var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.Hyperlinks);
+                    worksheetPart.Worksheet.InsertAfter(new Hyperlinks(), previousElement);
+                }
+
+                var hyperlinks = worksheetPart.Worksheet.Elements<Hyperlinks>().First();
+                cm.SetElement(XLWSContentManager.XLWSContents.Hyperlinks, hyperlinks);
+                hyperlinks.RemoveAllChildren<Hyperlink>();
+                foreach (var hl in xlWorksheet.Hyperlinks)
+                {
+                    Hyperlink hyperlink;
+                    if (hl.IsExternal)
+                    {
+                        var rId = context.RelIdGenerator.GetNext(RelType.Workbook);
+                        hyperlink = new Hyperlink {Reference = hl.Cell.Address.ToString(), Id = rId};
+                        worksheetPart.AddHyperlinkRelationship(hl.ExternalAddress, true, rId);
+                    }
+                    else
+                    {
+                        hyperlink = new Hyperlink
+                        {
+                            Reference = hl.Cell.Address.ToString(),
+                            Location = hl.InternalAddress,
+                            Display = hl.Cell.GetFormattedString()
+                        };
+                    }
+                    if (!XLHelper.IsNullOrWhiteSpace(hl.Tooltip))
+                        hyperlink.Tooltip = hl.Tooltip;
+                    hyperlinks.AppendChild(hyperlink);
+                }
+            }
+
+            #endregion
+
+            #region PrintOptions
+
+            if (!worksheetPart.Worksheet.Elements<PrintOptions>().Any())
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.PrintOptions);
+                worksheetPart.Worksheet.InsertAfter(new PrintOptions(), previousElement);
+            }
+
+            var printOptions = worksheetPart.Worksheet.Elements<PrintOptions>().First();
+            cm.SetElement(XLWSContentManager.XLWSContents.PrintOptions, printOptions);
+
+            printOptions.HorizontalCentered = xlWorksheet.PageSetup.CenterHorizontally;
+            printOptions.VerticalCentered = xlWorksheet.PageSetup.CenterVertically;
+            printOptions.Headings = xlWorksheet.PageSetup.ShowRowAndColumnHeadings;
+            printOptions.GridLines = xlWorksheet.PageSetup.ShowGridlines;
+
+            #endregion
+
+            #region PageMargins
+
+            if (!worksheetPart.Worksheet.Elements<PageMargins>().Any())
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.PageMargins);
+                worksheetPart.Worksheet.InsertAfter(new PageMargins(), previousElement);
+            }
+
+            var pageMargins = worksheetPart.Worksheet.Elements<PageMargins>().First();
+            cm.SetElement(XLWSContentManager.XLWSContents.PageMargins, pageMargins);
+            pageMargins.Left = xlWorksheet.PageSetup.Margins.Left;
+            pageMargins.Right = xlWorksheet.PageSetup.Margins.Right;
+            pageMargins.Top = xlWorksheet.PageSetup.Margins.Top;
+            pageMargins.Bottom = xlWorksheet.PageSetup.Margins.Bottom;
+            pageMargins.Header = xlWorksheet.PageSetup.Margins.Header;
+            pageMargins.Footer = xlWorksheet.PageSetup.Margins.Footer;
+
+            #endregion
+
+            #region PageSetup
+
+            if (!worksheetPart.Worksheet.Elements<PageSetup>().Any())
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.PageSetup);
+                worksheetPart.Worksheet.InsertAfter(new PageSetup(), previousElement);
+            }
+
+            var pageSetup = worksheetPart.Worksheet.Elements<PageSetup>().First();
+            cm.SetElement(XLWSContentManager.XLWSContents.PageSetup, pageSetup);
+
+            pageSetup.Orientation = xlWorksheet.PageSetup.PageOrientation.ToOpenXml();
+            pageSetup.PaperSize = (UInt32)xlWorksheet.PageSetup.PaperSize;
+            pageSetup.BlackAndWhite = xlWorksheet.PageSetup.BlackAndWhite;
+            pageSetup.Draft = xlWorksheet.PageSetup.DraftQuality;
+            pageSetup.PageOrder = xlWorksheet.PageSetup.PageOrder.ToOpenXml();
+            pageSetup.CellComments = xlWorksheet.PageSetup.ShowComments.ToOpenXml();
+            pageSetup.Errors = xlWorksheet.PageSetup.PrintErrorValue.ToOpenXml();
+
+            if (xlWorksheet.PageSetup.FirstPageNumber > 0)
+            {
+                pageSetup.FirstPageNumber = (UInt32)xlWorksheet.PageSetup.FirstPageNumber;
+                pageSetup.UseFirstPageNumber = true;
+            }
+            else
+            {
+                pageSetup.FirstPageNumber = null;
+                pageSetup.UseFirstPageNumber = null;
+            }
+
+            if (xlWorksheet.PageSetup.HorizontalDpi > 0)
+                pageSetup.HorizontalDpi = (UInt32)xlWorksheet.PageSetup.HorizontalDpi;
+            else
+                pageSetup.HorizontalDpi = null;
+
+            if (xlWorksheet.PageSetup.VerticalDpi > 0)
+                pageSetup.VerticalDpi = (UInt32)xlWorksheet.PageSetup.VerticalDpi;
+            else
+                pageSetup.VerticalDpi = null;
+
+            if (xlWorksheet.PageSetup.Scale > 0)
+            {
+                pageSetup.Scale = (UInt32)xlWorksheet.PageSetup.Scale;
+                pageSetup.FitToWidth = null;
+                pageSetup.FitToHeight = null;
+            }
+            else
+            {
+                pageSetup.Scale = null;
+
+                if (xlWorksheet.PageSetup.PagesWide > 0)
+                    pageSetup.FitToWidth = (UInt32)xlWorksheet.PageSetup.PagesWide;
+                else
+                    pageSetup.FitToWidth = 0;
+
+                if (xlWorksheet.PageSetup.PagesTall > 0)
+                    pageSetup.FitToHeight = (UInt32)xlWorksheet.PageSetup.PagesTall;
+                else
+                    pageSetup.FitToHeight = 0;
+            }
+
+            #endregion
+
+            #region HeaderFooter
+
+            var headerFooter = worksheetPart.Worksheet.Elements<HeaderFooter>().FirstOrDefault();
+            if (headerFooter == null)
+                headerFooter = new HeaderFooter();
+            else
+                worksheetPart.Worksheet.RemoveAllChildren<HeaderFooter>();
+
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.HeaderFooter);
+                worksheetPart.Worksheet.InsertAfter(headerFooter, previousElement);
+                cm.SetElement(XLWSContentManager.XLWSContents.HeaderFooter, headerFooter);
+            }
+            if (((XLHeaderFooter)xlWorksheet.PageSetup.Header).Changed
+                || ((XLHeaderFooter)xlWorksheet.PageSetup.Footer).Changed)
+            {
+                //var headerFooter = worksheetPart.Worksheet.Elements<HeaderFooter>().First();
+
+                headerFooter.RemoveAllChildren();
+
+                headerFooter.ScaleWithDoc = xlWorksheet.PageSetup.ScaleHFWithDocument;
+                headerFooter.AlignWithMargins = xlWorksheet.PageSetup.AlignHFWithMargins;
+                headerFooter.DifferentFirst = xlWorksheet.PageSetup.DifferentFirstPageOnHF;
+                headerFooter.DifferentOddEven = xlWorksheet.PageSetup.DifferentOddEvenPagesOnHF;
+
+                var oddHeader = new OddHeader(xlWorksheet.PageSetup.Header.GetText(XLHFOccurrence.OddPages));
+                headerFooter.AppendChild(oddHeader);
+                var oddFooter = new OddFooter(xlWorksheet.PageSetup.Footer.GetText(XLHFOccurrence.OddPages));
+                headerFooter.AppendChild(oddFooter);
+
+                var evenHeader = new EvenHeader(xlWorksheet.PageSetup.Header.GetText(XLHFOccurrence.EvenPages));
+                headerFooter.AppendChild(evenHeader);
+                var evenFooter = new EvenFooter(xlWorksheet.PageSetup.Footer.GetText(XLHFOccurrence.EvenPages));
+                headerFooter.AppendChild(evenFooter);
+
+                var firstHeader = new FirstHeader(xlWorksheet.PageSetup.Header.GetText(XLHFOccurrence.FirstPage));
+                headerFooter.AppendChild(firstHeader);
+                var firstFooter = new FirstFooter(xlWorksheet.PageSetup.Footer.GetText(XLHFOccurrence.FirstPage));
+                headerFooter.AppendChild(firstFooter);
+            }
+
+            #endregion
+
+            #region RowBreaks
+
+            if (!worksheetPart.Worksheet.Elements<RowBreaks>().Any())
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.RowBreaks);
+                worksheetPart.Worksheet.InsertAfter(new RowBreaks(), previousElement);
+            }
+
+            var rowBreaks = worksheetPart.Worksheet.Elements<RowBreaks>().First();
+
+            var rowBreakCount = xlWorksheet.PageSetup.RowBreaks.Count;
+            if (rowBreakCount > 0)
+            {
+                rowBreaks.Count = (UInt32)rowBreakCount;
+                rowBreaks.ManualBreakCount = (UInt32)rowBreakCount;
+                var lastRowNum = (UInt32)xlWorksheet.RangeAddress.LastAddress.RowNumber;
+                foreach (var break1 in xlWorksheet.PageSetup.RowBreaks.Select(rb => new Break
+                {
+                    Id = (UInt32)rb,
+                    Max = lastRowNum,
+                    ManualPageBreak = true
+                }))
+                    rowBreaks.AppendChild(break1);
+                cm.SetElement(XLWSContentManager.XLWSContents.RowBreaks, rowBreaks);
+            }
+            else
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<RowBreaks>();
+                cm.SetElement(XLWSContentManager.XLWSContents.RowBreaks, null);
+            }
+
+            #endregion
+
+            #region ColumnBreaks
+
+            if (!worksheetPart.Worksheet.Elements<ColumnBreaks>().Any())
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.ColumnBreaks);
+                worksheetPart.Worksheet.InsertAfter(new ColumnBreaks(), previousElement);
+            }
+
+            var columnBreaks = worksheetPart.Worksheet.Elements<ColumnBreaks>().First();
+
+            var columnBreakCount = xlWorksheet.PageSetup.ColumnBreaks.Count;
+            if (columnBreakCount > 0)
+            {
+                columnBreaks.Count = (UInt32)columnBreakCount;
+                columnBreaks.ManualBreakCount = (UInt32)columnBreakCount;
+                var maxColumnNumber = (UInt32)xlWorksheet.RangeAddress.LastAddress.ColumnNumber;
+                foreach (var break1 in xlWorksheet.PageSetup.ColumnBreaks.Select(cb => new Break
+                {
+                    Id = (UInt32)cb,
+                    Max = maxColumnNumber,
+                    ManualPageBreak = true
+                }))
+                    columnBreaks.AppendChild(break1);
+                cm.SetElement(XLWSContentManager.XLWSContents.ColumnBreaks, columnBreaks);
+            }
+            else
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<ColumnBreaks>();
+                cm.SetElement(XLWSContentManager.XLWSContents.ColumnBreaks, null);
+            }
+
+            #endregion
+
+            #region Drawings
+
+            //worksheetPart.Worksheet.RemoveAllChildren<Drawing>();
+            //{
+            //    OpenXmlElement previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.Drawing);
+            //    worksheetPart.Worksheet.InsertAfter(new Drawing() { Id = String.Format("rId{0}", 1) }, previousElement);
+            //}
+
+            //Drawing drawing = worksheetPart.Worksheet.Elements<Drawing>().First();
+            //cm.SetElement(XLWSContentManager.XLWSContents.Drawing, drawing);
+
+            #endregion
+
+            #region Tables
+
+            worksheetPart.Worksheet.RemoveAllChildren<TableParts>();
+            {
+                var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.TableParts);
+                worksheetPart.Worksheet.InsertAfter(new TableParts(), previousElement);
+            }
+
+            var tableParts = worksheetPart.Worksheet.Elements<TableParts>().First();
+            cm.SetElement(XLWSContentManager.XLWSContents.TableParts, tableParts);
+
+            tableParts.Count = (UInt32)xlWorksheet.Tables.Count();
+            foreach (
+                var tablePart in
+                    from XLTable xlTable in xlWorksheet.Tables select new TablePart {Id = xlTable.RelId})
+                tableParts.AppendChild(tablePart);
+
+            #endregion
+
+            #region LegacyDrawing
+
+            if (xlWorksheet.LegacyDrawingIsNew)
+            {
+                worksheetPart.Worksheet.RemoveAllChildren<LegacyDrawing>();
+                {
+                    if (!XLHelper.IsNullOrWhiteSpace(xlWorksheet.LegacyDrawingId))
+                    {
+                        var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.LegacyDrawing);
+                        worksheetPart.Worksheet.InsertAfter(new LegacyDrawing {Id = xlWorksheet.LegacyDrawingId},
+                            previousElement);
+                    }
+                }
+            }
+
+            #endregion
+
+            #region LegacyDrawingHeaderFooter
+
+            //LegacyDrawingHeaderFooter legacyHeaderFooter = worksheetPart.Worksheet.Elements<LegacyDrawingHeaderFooter>().FirstOrDefault();
+            //if (legacyHeaderFooter != null)
+            //{
+            //    worksheetPart.Worksheet.RemoveAllChildren<LegacyDrawingHeaderFooter>();
+            //    {
+            //            var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.LegacyDrawingHeaderFooter);
+            //            worksheetPart.Worksheet.InsertAfter(new LegacyDrawingHeaderFooter { Id = xlWorksheet.LegacyDrawingId },
+            //                                                previousElement);
+            //    }
+            //}
+
+            #endregion
+        }
+
+        private static void PopulateAutoFilter(XLAutoFilter xlAutoFilter, AutoFilter autoFilter)
+        {
+            var filterRange = xlAutoFilter.Range;
+            autoFilter.Reference = filterRange.RangeAddress.ToString();
+
+            foreach (var kp in xlAutoFilter.Filters)
+            {
+                var filterColumn = new FilterColumn {ColumnId = (UInt32)kp.Key - 1};
+                var xlFilterColumn = xlAutoFilter.Column(kp.Key);
+                var filterType = xlFilterColumn.FilterType;
+                if (filterType == XLFilterType.Custom)
+                {
+                    var customFilters = new CustomFilters();
+                    foreach (var filter in kp.Value)
+                    {
+                        var customFilter = new CustomFilter {Val = filter.Value.ToString()};
+
+                        if (filter.Operator != XLFilterOperator.Equal)
+                            customFilter.Operator = filter.Operator.ToOpenXml();
+
+                        if (filter.Connector == XLConnector.And)
+                            customFilters.And = true;
+
+                        customFilters.Append(customFilter);
+                    }
+                    filterColumn.Append(customFilters);
+                }
+                else if (filterType == XLFilterType.TopBottom)
+                {
+                    var top101 = new Top10 {Val = (double)xlFilterColumn.TopBottomValue};
+                    if (xlFilterColumn.TopBottomType == XLTopBottomType.Percent)
+                        top101.Percent = true;
+                    if (xlFilterColumn.TopBottomPart == XLTopBottomPart.Bottom)
+                        top101.Top = false;
+
+                    filterColumn.Append(top101);
+                }
+                else if (filterType == XLFilterType.Dynamic)
+                {
+                    var dynamicFilter = new DynamicFilter
+                    {Type = xlFilterColumn.DynamicType.ToOpenXml(), Val = xlFilterColumn.DynamicValue};
+                    filterColumn.Append(dynamicFilter);
+                }
+                else
+                {
+                    var filters = new Filters();
+                    foreach (var filter in kp.Value)
+                    {
+                        filters.Append(new Filter {Val = filter.Value.ToString()});
+                    }
+
+                    filterColumn.Append(filters);
+                }
+                autoFilter.Append(filterColumn);
+            }
+
+
+            if (xlAutoFilter.Sorted)
+            {
+                var sortState = new SortState
+                {
+                    Reference =
+                        filterRange.Range(filterRange.FirstCell().CellBelow(), filterRange.LastCell()).RangeAddress.
+                            ToString()
+                };
+                var sortCondition = new SortCondition
+                {
+                    Reference =
+                        filterRange.Range(1, xlAutoFilter.SortColumn, filterRange.RowCount(),
+                            xlAutoFilter.SortColumn).RangeAddress.ToString()
+                };
+                if (xlAutoFilter.SortOrder == XLSortOrder.Descending)
+                    sortCondition.Descending = true;
+
+                sortState.Append(sortCondition);
+                autoFilter.Append(sortState);
+            }
+        }
+
+        private static BooleanValue GetBooleanValue(bool value, bool defaultValue)
+        {
+            return value == defaultValue ? null : new BooleanValue(value);
+        }
+
+        private static void CollapseColumns(Columns columns, Dictionary<uint, Column> sheetColumns)
+        {
+            UInt32 lastMin = 1;
+            var count = sheetColumns.Count;
+            var arr = sheetColumns.OrderBy(kp => kp.Key).ToArray();
+            // sheetColumns[kp.Key + 1]
+            //Int32 i = 0;
+            //foreach (KeyValuePair<uint, Column> kp in arr
+            //    //.Where(kp => !(kp.Key < count && ColumnsAreEqual(kp.Value, )))
+            //    )
+            for (var i = 0; i < count; i++)
+            {
+                var kp = arr[i];
+                if (i + 1 != count && ColumnsAreEqual(kp.Value, arr[i + 1].Value)) continue;
+
+                var newColumn = (Column)kp.Value.CloneNode(true);
+                newColumn.Min = lastMin;
+                var newColumnMax = newColumn.Max.Value;
+                var columnsToRemove =
+                    columns.Elements<Column>().Where(co => co.Min >= lastMin && co.Max <= newColumnMax).
+                        Select(co => co).ToList();
+                columnsToRemove.ForEach(c => columns.RemoveChild(c));
+
+                columns.AppendChild(newColumn);
+                lastMin = kp.Key + 1;
+                //i++;
+            }
+        }
+
+        private static double GetColumnWidth(double columnWidth)
+        {
+            var retVal = columnWidth + ColumnWidthOffset;
+            return retVal > 0 ? retVal : 0;
+        }
+
+        private static void UpdateColumn(Column column, Columns columns, Dictionary<uint, Column> sheetColumnsByMin)
+        {
+            var co = column.Min.Value;
+            Column newColumn;
+            if (!sheetColumnsByMin.ContainsKey(co))
+            {
+                newColumn = (Column)column.CloneNode(true);
+                columns.AppendChild(newColumn);
+                sheetColumnsByMin.Add(co, newColumn);
+            }
+            else
+            {
+                var existingColumn = sheetColumnsByMin[column.Min.Value];
+                newColumn = (Column)existingColumn.CloneNode(true);
+                newColumn.Min = column.Min;
+                newColumn.Max = column.Max;
+                newColumn.Style = column.Style;
+                newColumn.Width = column.Width.SaveRound();
+                newColumn.CustomWidth = column.CustomWidth;
+
+                if (column.Hidden != null)
+                    newColumn.Hidden = true;
+                else
+                    newColumn.Hidden = null;
+
+                if (column.Collapsed != null)
+                    newColumn.Collapsed = true;
+                else
+                    newColumn.Collapsed = null;
+
+                if (column.OutlineLevel != null && column.OutlineLevel > 0)
+                    newColumn.OutlineLevel = (byte)column.OutlineLevel;
+                else
+                    newColumn.OutlineLevel = null;
+
+                sheetColumnsByMin.Remove(column.Min.Value);
+                if (existingColumn.Min + 1 > existingColumn.Max)
+                {
+                    //existingColumn.Min = existingColumn.Min + 1;
+                    //columns.InsertBefore(existingColumn, newColumn);
+                    //existingColumn.Remove();
+                    columns.RemoveChild(existingColumn);
+                    columns.AppendChild(newColumn);
+                    sheetColumnsByMin.Add(newColumn.Min.Value, newColumn);
+                }
+                else
+                {
+                    //columns.InsertBefore(existingColumn, newColumn);
+                    columns.AppendChild(newColumn);
+                    sheetColumnsByMin.Add(newColumn.Min.Value, newColumn);
+                    existingColumn.Min = existingColumn.Min + 1;
+                    sheetColumnsByMin.Add(existingColumn.Min.Value, existingColumn);
+                }
+            }
+        }
+
+        private static bool ColumnsAreEqual(Column left, Column right)
+        {
+            return
+                ((left.Style == null && right.Style == null)
+                 || (left.Style != null && right.Style != null && left.Style.Value == right.Style.Value))
+                && ((left.Width == null && right.Width == null)
+                    || (left.Width != null && right.Width != null && left.Width.Value == right.Width.Value))
+                && ((left.Hidden == null && right.Hidden == null)
+                    || (left.Hidden != null && right.Hidden != null && left.Hidden.Value == right.Hidden.Value))
+                && ((left.Collapsed == null && right.Collapsed == null)
+                    ||
+                    (left.Collapsed != null && right.Collapsed != null && left.Collapsed.Value == right.Collapsed.Value))
+                && ((left.OutlineLevel == null && right.OutlineLevel == null)
+                    ||
+                    (left.OutlineLevel != null && right.OutlineLevel != null &&
+                     left.OutlineLevel.Value == right.OutlineLevel.Value));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/Excel/XLWorksheet.cs
new file mode 100644
index 0000000..b8018fa
--- /dev/null
+++ b/ClosedXML/Excel/XLWorksheet.cs
@@ -0,0 +1,1459 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using ClosedXML.Excel.CalcEngine;
+using ClosedXML.Excel.Misc;
+
+
+namespace ClosedXML.Excel
+{
+    internal class XLWorksheet : XLRangeBase, IXLWorksheet
+    {
+        #region Constants
+
+        #endregion
+
+        #region Events
+
+		public XLReentrantEnumerableSet<XLCallbackAction> RangeShiftedRows;
+		public XLReentrantEnumerableSet<XLCallbackAction> RangeShiftedColumns;
+
+        #endregion
+
+        #region Fields
+
+        private readonly Dictionary<Int32, Int32> _columnOutlineCount = new Dictionary<Int32, Int32>();
+        private readonly Dictionary<Int32, Int32> _rowOutlineCount = new Dictionary<Int32, Int32>();
+        internal Int32 ZOrder = 1;
+        private String _name;
+        internal Int32 _position;
+
+        private Double _rowHeight;
+        private Boolean _tabActive;
+        internal Boolean EventTrackingEnabled;
+        #endregion
+
+        #region Constructor
+
+        public XLWorksheet(String sheetName, XLWorkbook workbook)
+            : base(
+                new XLRangeAddress(
+                    new XLAddress(null, XLHelper.MinRowNumber, XLHelper.MinColumnNumber, false, false),
+                    new XLAddress(null, XLHelper.MaxRowNumber, XLHelper.MaxColumnNumber, false, false)))
+        {
+            EventTrackingEnabled = workbook.EventTracking == XLEventTracking.Enabled;
+
+			RangeShiftedRows = new XLReentrantEnumerableSet<XLCallbackAction>();
+			RangeShiftedColumns = new XLReentrantEnumerableSet<XLCallbackAction>();
+
+            RangeAddress.Worksheet = this;
+            RangeAddress.FirstAddress.Worksheet = this;
+            RangeAddress.LastAddress.Worksheet = this;
+
+            NamedRanges = new XLNamedRanges(workbook);
+            SheetView = new XLSheetView();
+            Tables = new XLTables();
+            Hyperlinks = new XLHyperlinks();
+            DataValidations = new XLDataValidations();
+            PivotTables = new XLPivotTables();
+            Protection = new XLSheetProtection();
+            AutoFilter = new XLAutoFilter();
+            ConditionalFormats = new XLConditionalFormats();
+            Workbook = workbook;
+            SetStyle(workbook.Style);
+            Internals = new XLWorksheetInternals(new XLCellsCollection(), new XLColumnsCollection(),
+                                                 new XLRowsCollection(), new XLRanges());
+            PageSetup = new XLPageSetup((XLPageSetup)workbook.PageOptions, this);
+            Outline = new XLOutline(workbook.Outline);
+            _columnWidth = workbook.ColumnWidth;
+            _rowHeight = workbook.RowHeight;
+            RowHeightChanged = Math.Abs(workbook.RowHeight - XLWorkbook.DefaultRowHeight) > XLHelper.Epsilon;
+			Name = sheetName;
+			SubscribeToShiftedRows((range, rowsShifted) => this.WorksheetRangeShiftedRows(range, rowsShifted));
+			SubscribeToShiftedColumns((range, columnsShifted) => this.WorksheetRangeShiftedColumns(range, columnsShifted));
+            Charts = new XLCharts();
+            ShowFormulas = workbook.ShowFormulas;
+            ShowGridLines = workbook.ShowGridLines;
+            ShowOutlineSymbols = workbook.ShowOutlineSymbols;
+            ShowRowColHeaders = workbook.ShowRowColHeaders;
+            ShowRuler = workbook.ShowRuler;
+            ShowWhiteSpace = workbook.ShowWhiteSpace;
+            ShowZeros = workbook.ShowZeros;
+            RightToLeft = workbook.RightToLeft;
+            TabColor = XLColor.NoColor;
+            SelectedRanges = new XLRanges();
+
+            Author = workbook.Author;
+        }
+
+        #endregion
+
+        //private IXLStyle _style;
+        private const String InvalidNameChars = @":\/?*[]";
+        public string LegacyDrawingId;
+        public Boolean LegacyDrawingIsNew;
+        private Double _columnWidth;
+        public XLWorksheetInternals Internals { get; private set; }
+
+        public override IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return GetStyle();
+                foreach (XLCell c in Internals.CellsCollection.GetCells())
+                    yield return c.Style;
+                UpdatingStyle = false;
+            }
+        }
+
+        public override Boolean UpdatingStyle { get; set; }
+
+        public override IXLStyle InnerStyle
+        {
+            get { return GetStyle(); }
+            set { SetStyle(value); }
+        }
+
+        internal Boolean RowHeightChanged { get; set; }
+        internal Boolean ColumnWidthChanged { get; set; }
+
+        public Int32 SheetId { get; set; }
+        public String RelId { get; set; }
+        public XLDataValidations DataValidations { get; private set; }
+        public IXLCharts Charts { get; private set; }
+        public XLSheetProtection Protection { get; private set; }
+        public XLAutoFilter AutoFilter { get; private set; }
+
+        #region IXLWorksheet Members
+
+        public XLWorkbook Workbook { get; private set; }
+
+        public override IXLStyle Style
+        {
+            get
+            {
+                return GetStyle();
+            }
+            set
+            {
+                SetStyle(value);
+                foreach (XLCell cell in Internals.CellsCollection.GetCells())
+                    cell.Style = value;
+            }
+        }
+
+        public Double ColumnWidth
+        {
+            get { return _columnWidth; }
+            set
+            {
+                ColumnWidthChanged = true;
+                _columnWidth = value;
+            }
+        }
+
+        public Double RowHeight
+        {
+            get { return _rowHeight; }
+            set
+            {
+                RowHeightChanged = true;
+                _rowHeight = value;
+            }
+        }
+
+        public String Name
+        {
+            get { return _name; }
+            set
+            {
+                if (value.IndexOfAny(InvalidNameChars.ToCharArray()) != -1)
+                    throw new ArgumentException("Worksheet names cannot contain any of the following characters: " +
+                                                InvalidNameChars);
+
+                if (XLHelper.IsNullOrWhiteSpace(value))
+                    throw new ArgumentException("Worksheet names cannot be empty");
+
+                if (value.Length > 31)
+                    throw new ArgumentException("Worksheet names cannot be more than 31 characters");
+
+                Workbook.WorksheetsInternal.Rename(_name, value);
+                _name = value;
+            }
+        }
+
+        public Int32 Position
+        {
+            get { return _position; }
+            set
+            {
+                if (value > Workbook.WorksheetsInternal.Count + Workbook.UnsupportedSheets.Count + 1)
+                    throw new IndexOutOfRangeException("Index must be equal or less than the number of worksheets + 1.");
+
+                if (value < _position)
+                {
+                    Workbook.WorksheetsInternal
+                        .Where<XLWorksheet>(w => w.Position >= value && w.Position < _position)
+                        .ForEach(w => w._position += 1);
+                }
+
+                if (value > _position)
+                {
+                    Workbook.WorksheetsInternal
+                        .Where<XLWorksheet>(w => w.Position <= value && w.Position > _position)
+                        .ForEach(w => (w)._position -= 1);
+                }
+
+                _position = value;
+            }
+        }
+
+        public IXLPageSetup PageSetup { get; private set; }
+        public IXLOutline Outline { get; private set; }
+
+        IXLRow IXLWorksheet.FirstRowUsed()
+        {
+            return FirstRowUsed();
+        }
+
+        IXLRow IXLWorksheet.FirstRowUsed(Boolean includeFormats)
+        {
+            return FirstRowUsed(includeFormats);
+        }
+
+        IXLRow IXLWorksheet.LastRowUsed()
+        {
+            return LastRowUsed();
+        }
+
+        IXLRow IXLWorksheet.LastRowUsed(Boolean includeFormats)
+        {
+            return LastRowUsed(includeFormats);
+        }
+
+        IXLColumn IXLWorksheet.LastColumn()
+        {
+            return LastColumn();
+        }
+
+        IXLColumn IXLWorksheet.FirstColumn()
+        {
+            return FirstColumn();
+        }
+
+        IXLRow IXLWorksheet.FirstRow()
+        {
+            return FirstRow();
+        }
+
+        IXLRow IXLWorksheet.LastRow()
+        {
+            return LastRow();
+        }
+
+        IXLColumn IXLWorksheet.FirstColumnUsed()
+        {
+            return FirstColumnUsed();
+        }
+
+        IXLColumn IXLWorksheet.FirstColumnUsed(Boolean includeFormats)
+        {
+            return FirstColumnUsed(includeFormats);
+        }
+
+        IXLColumn IXLWorksheet.LastColumnUsed()
+        {
+            return LastColumnUsed();
+        }
+
+        IXLColumn IXLWorksheet.LastColumnUsed(Boolean includeFormats)
+        {
+            return LastColumnUsed(includeFormats);
+        }
+
+
+        public IXLColumns Columns()
+        {
+            var retVal = new XLColumns(this);
+            var columnList = new List<Int32>();
+
+            if (Internals.CellsCollection.Count > 0)
+                columnList.AddRange(Internals.CellsCollection.ColumnsUsed.Keys);
+
+            if (Internals.ColumnsCollection.Count > 0)
+                columnList.AddRange(Internals.ColumnsCollection.Keys.Where(c => !columnList.Contains(c)));
+
+            foreach (int c in columnList)
+                retVal.Add(Column(c));
+
+            return retVal;
+        }
+
+        public IXLColumns Columns(String columns)
+        {
+            var retVal = new XLColumns(null);
+            var columnPairs = columns.Split(',');
+            foreach (string tPair in columnPairs.Select(pair => pair.Trim()))
+            {
+                String firstColumn;
+                String lastColumn;
+                if (tPair.Contains(':') || tPair.Contains('-'))
+                {
+                    var columnRange = XLHelper.SplitRange(tPair);
+                    firstColumn = columnRange[0];
+                    lastColumn = columnRange[1];
+                }
+                else
+                {
+                    firstColumn = tPair;
+                    lastColumn = tPair;
+                }
+
+                Int32 tmp;
+                if (Int32.TryParse(firstColumn, out tmp))
+                {
+                    foreach (IXLColumn col in Columns(Int32.Parse(firstColumn), Int32.Parse(lastColumn)))
+                        retVal.Add((XLColumn)col);
+                }
+                else
+                {
+                    foreach (IXLColumn col in Columns(firstColumn, lastColumn))
+                        retVal.Add((XLColumn)col);
+                }
+            }
+            return retVal;
+        }
+
+        public IXLColumns Columns(String firstColumn, String lastColumn)
+        {
+            return Columns(XLHelper.GetColumnNumberFromLetter(firstColumn),
+                           XLHelper.GetColumnNumberFromLetter(lastColumn));
+        }
+
+        public IXLColumns Columns(Int32 firstColumn, Int32 lastColumn)
+        {
+            var retVal = new XLColumns(null);
+
+            for (int co = firstColumn; co <= lastColumn; co++)
+                retVal.Add(Column(co));
+            return retVal;
+        }
+
+        public IXLRows Rows()
+        {
+            var retVal = new XLRows(this);
+            var rowList = new List<Int32>();
+
+            if (Internals.CellsCollection.Count > 0)
+                rowList.AddRange(Internals.CellsCollection.RowsUsed.Keys);
+
+            if (Internals.RowsCollection.Count > 0)
+                rowList.AddRange(Internals.RowsCollection.Keys.Where(r => !rowList.Contains(r)));
+
+            foreach (int r in rowList)
+                retVal.Add(Row(r));
+
+            return retVal;
+        }
+
+        public IXLRows Rows(String rows)
+        {
+            var retVal = new XLRows(null);
+            var rowPairs = rows.Split(',');
+            foreach (string tPair in rowPairs.Select(pair => pair.Trim()))
+            {
+                String firstRow;
+                String lastRow;
+                if (tPair.Contains(':') || tPair.Contains('-'))
+                {
+                    var rowRange = XLHelper.SplitRange(tPair);
+                    firstRow = rowRange[0];
+                    lastRow = rowRange[1];
+                }
+                else
+                {
+                    firstRow = tPair;
+                    lastRow = tPair;
+                }
+                foreach (IXLRow row in Rows(Int32.Parse(firstRow), Int32.Parse(lastRow)))
+                    retVal.Add((XLRow)row);
+            }
+            return retVal;
+        }
+
+        public IXLRows Rows(Int32 firstRow, Int32 lastRow)
+        {
+            var retVal = new XLRows(null);
+
+            for (int ro = firstRow; ro <= lastRow; ro++)
+                retVal.Add(Row(ro));
+            return retVal;
+        }
+
+        IXLRow IXLWorksheet.Row(Int32 row)
+        {
+            return Row(row);
+        }
+
+        IXLColumn IXLWorksheet.Column(Int32 column)
+        {
+            return Column(column);
+        }
+
+        IXLColumn IXLWorksheet.Column(String column)
+        {
+            return Column(column);
+        }
+
+        IXLCell IXLWorksheet.Cell(int row, int column)
+        {
+            return Cell(row, column);
+        }
+
+        IXLCell IXLWorksheet.Cell(string cellAddressInRange)
+        {
+            return Cell(cellAddressInRange);
+        }
+
+        IXLCell IXLWorksheet.Cell(int row, string column)
+        {
+            return Cell(row, column);
+        }
+
+        IXLCell IXLWorksheet.Cell(IXLAddress cellAddressInRange)
+        {
+            return Cell(cellAddressInRange);
+        }
+
+        IXLRange IXLWorksheet.Range(IXLRangeAddress rangeAddress)
+        {
+            return Range(rangeAddress);
+        }
+
+        IXLRange IXLWorksheet.Range(string rangeAddress)
+        {
+            return Range(rangeAddress);
+        }
+
+        IXLRange IXLWorksheet.Range(IXLCell firstCell, IXLCell lastCell)
+        {
+            return Range(firstCell, lastCell);
+        }
+
+        IXLRange IXLWorksheet.Range(string firstCellAddress, string lastCellAddress)
+        {
+            return Range(firstCellAddress, lastCellAddress);
+        }
+
+        IXLRange IXLWorksheet.Range(IXLAddress firstCellAddress, IXLAddress lastCellAddress)
+        {
+            return Range(firstCellAddress, lastCellAddress);
+        }
+
+        IXLRange IXLWorksheet.Range(int firstCellRow, int firstCellColumn, int lastCellRow, int lastCellColumn)
+        {
+            return Range(firstCellRow, firstCellColumn, lastCellRow, lastCellColumn);
+        }
+
+        public IXLWorksheet CollapseRows()
+        {
+            Enumerable.Range(1, 8).ForEach(i => CollapseRows(i));
+            return this;
+        }
+
+        public IXLWorksheet CollapseColumns()
+        {
+            Enumerable.Range(1, 8).ForEach(i => CollapseColumns(i));
+            return this;
+        }
+
+        public IXLWorksheet ExpandRows()
+        {
+            Enumerable.Range(1, 8).ForEach(i => ExpandRows(i));
+            return this;
+        }
+
+        public IXLWorksheet ExpandColumns()
+        {
+            Enumerable.Range(1, 8).ForEach(i => ExpandRows(i));
+            return this;
+        }
+
+        public IXLWorksheet CollapseRows(Int32 outlineLevel)
+        {
+            if (outlineLevel < 1 || outlineLevel > 8)
+                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
+
+            Internals.RowsCollection.Values.Where(r => r.OutlineLevel == outlineLevel).ForEach(r => r.Collapse());
+            return this;
+        }
+
+        public IXLWorksheet CollapseColumns(Int32 outlineLevel)
+        {
+            if (outlineLevel < 1 || outlineLevel > 8)
+                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
+
+            Internals.ColumnsCollection.Values.Where(c => c.OutlineLevel == outlineLevel).ForEach(c => c.Collapse());
+            return this;
+        }
+
+        public IXLWorksheet ExpandRows(Int32 outlineLevel)
+        {
+            if (outlineLevel < 1 || outlineLevel > 8)
+                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
+
+            Internals.RowsCollection.Values.Where(r => r.OutlineLevel == outlineLevel).ForEach(r => r.Expand());
+            return this;
+        }
+
+        public IXLWorksheet ExpandColumns(Int32 outlineLevel)
+        {
+            if (outlineLevel < 1 || outlineLevel > 8)
+                throw new ArgumentOutOfRangeException("outlineLevel", "Outline level must be between 1 and 8.");
+
+            Internals.ColumnsCollection.Values.Where(c => c.OutlineLevel == outlineLevel).ForEach(c => c.Expand());
+            return this;
+        }
+
+        public void Delete()
+        {
+            Workbook.WorksheetsInternal.Delete(Name);
+        }
+
+        public IXLNamedRanges NamedRanges { get; private set; }
+
+        public IXLNamedRange NamedRange(String rangeName)
+        {
+            return NamedRanges.NamedRange(rangeName);
+        }
+
+        public IXLSheetView SheetView { get; private set; }
+        public IXLTables Tables { get; private set; }
+
+        public IXLTable Table(Int32 index)
+        {
+            return Tables.Table(index);
+        }
+
+        public IXLTable Table(String name)
+        {
+            return Tables.Table(name);
+        }
+
+        public IXLWorksheet CopyTo(String newSheetName)
+        {
+            return CopyTo(Workbook, newSheetName, Workbook.WorksheetsInternal.Count + 1);
+        }
+
+        public IXLWorksheet CopyTo(String newSheetName, Int32 position)
+        {
+            return CopyTo(Workbook, newSheetName, position);
+        }
+
+        public IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName)
+        {
+            return CopyTo(workbook, newSheetName, workbook.WorksheetsInternal.Count + 1);
+        }
+
+        public IXLWorksheet CopyTo(XLWorkbook workbook, String newSheetName, Int32 position)
+        {
+            var targetSheet = (XLWorksheet)workbook.WorksheetsInternal.Add(newSheetName, position);
+            Internals.ColumnsCollection.ForEach(kp => targetSheet.Internals.ColumnsCollection.Add(kp.Key, new XLColumn(kp.Value)));
+            Internals.RowsCollection.ForEach(kp => targetSheet.Internals.RowsCollection.Add(kp.Key, new XLRow(kp.Value)));
+            Internals.CellsCollection.GetCells().ForEach(c => targetSheet.Cell(c.Address).CopyFrom(c, false));
+            DataValidations.ForEach(dv => targetSheet.DataValidations.Add(new XLDataValidation(dv)));
+            targetSheet.Visibility = Visibility;
+            targetSheet.ColumnWidth = ColumnWidth;
+            targetSheet.ColumnWidthChanged = ColumnWidthChanged;
+            targetSheet.RowHeight = RowHeight;
+            targetSheet.RowHeightChanged = RowHeightChanged;
+            targetSheet.SetStyle(Style);
+            targetSheet.PageSetup = new XLPageSetup((XLPageSetup)PageSetup, targetSheet);
+            (targetSheet.PageSetup.Header as XLHeaderFooter).Changed = true;
+            (targetSheet.PageSetup.Footer as XLHeaderFooter).Changed = true;
+            targetSheet.Outline = new XLOutline(Outline);
+            targetSheet.SheetView = new XLSheetView(SheetView);
+            Internals.MergedRanges.ForEach(
+                kp => targetSheet.Internals.MergedRanges.Add(targetSheet.Range(kp.RangeAddress.ToString())));
+
+            foreach (IXLNamedRange r in NamedRanges)
+            {
+                var ranges = new XLRanges();
+                r.Ranges.ForEach(ranges.Add);
+                targetSheet.NamedRanges.Add(r.Name, ranges);
+            }
+
+            foreach (XLTable t in Tables.Cast<XLTable>())
+            {
+                String tableName = t.Name;
+                var table = targetSheet.Tables.Any(tt => tt.Name == tableName)
+                                ? new XLTable(targetSheet.Range(t.RangeAddress.ToString()), true)
+                                : new XLTable(targetSheet.Range(t.RangeAddress.ToString()), tableName, true);
+
+                table.RelId = t.RelId;
+                table.EmphasizeFirstColumn = t.EmphasizeFirstColumn;
+                table.EmphasizeLastColumn = t.EmphasizeLastColumn;
+                table.ShowRowStripes = t.ShowRowStripes;
+                table.ShowColumnStripes = t.ShowColumnStripes;
+                table.ShowAutoFilter = t.ShowAutoFilter;
+                table.Theme = t.Theme;
+                table._showTotalsRow = t.ShowTotalsRow;
+                table._uniqueNames.Clear();
+
+                t._uniqueNames.ForEach(n => table._uniqueNames.Add(n));
+                Int32 fieldCount = t.ColumnCount();
+                for (Int32 f = 0; f < fieldCount; f++)
+                {
+                    var tableField = table.Field(f) as XLTableField;
+                    var tField = t.Field(f) as XLTableField;
+                    tableField.Index = tField.Index;
+                    tableField.Name = tField.Name;
+                    tableField.totalsRowLabel = tField.totalsRowLabel;
+                    tableField.totalsRowFunction = tField.totalsRowFunction;
+                }
+            }
+
+            if (AutoFilter.Enabled)
+                targetSheet.Range(AutoFilter.Range.RangeAddress).SetAutoFilter();
+
+            return targetSheet;
+        }
+
+        private String ReplaceRelativeSheet(string newSheetName, String value)
+        {
+            if (XLHelper.IsNullOrWhiteSpace(value)) return value;
+
+            var newValue = new StringBuilder();
+            var addresses = value.Split(',');
+            foreach (var address in addresses)
+            {
+                var pair = address.Split('!');
+                if (pair.Length == 2)
+                {
+                    String sheetName = pair[0];
+                    if (sheetName.StartsWith("'"))
+                        sheetName = sheetName.Substring(1, sheetName.Length - 2);
+
+                    String name = sheetName.ToLower().Equals(Name.ToLower())
+                                      ? newSheetName
+                                      : sheetName;
+                    newValue.Append(String.Format("'{0}'!{1}", name, pair[1]));
+                }
+                else
+                {
+                    newValue.Append(address);
+                }
+            }
+            return newValue.ToString();
+        }
+
+        public new IXLHyperlinks Hyperlinks { get; private set; }
+
+        IXLDataValidations IXLWorksheet.DataValidations
+        {
+            get { return DataValidations; }
+        }
+
+        private XLWorksheetVisibility _visibility;
+        public XLWorksheetVisibility Visibility
+        {
+            get { return _visibility; }
+            set
+            {
+                if (value != XLWorksheetVisibility.Visible)
+                    TabSelected = false;
+
+                _visibility = value;
+            }
+        }
+
+        public IXLWorksheet Hide()
+        {
+            Visibility = XLWorksheetVisibility.Hidden;
+            return this;
+        }
+
+        public IXLWorksheet Unhide()
+        {
+            Visibility = XLWorksheetVisibility.Visible;
+            return this;
+        }
+
+        IXLSheetProtection IXLWorksheet.Protection
+        {
+            get { return Protection; }
+        }
+
+        public IXLSheetProtection Protect()
+        {
+            return Protection.Protect();
+        }
+
+        public IXLSheetProtection Protect(String password)
+        {
+            return Protection.Protect(password);
+        }
+
+        public IXLSheetProtection Unprotect()
+        {
+            return Protection.Unprotect();
+        }
+
+        public IXLSheetProtection Unprotect(String password)
+        {
+            return Protection.Unprotect(password);
+        }
+
+
+        public new IXLRange Sort()
+        {
+            return GetRangeForSort().Sort();
+        }
+
+        public new IXLRange Sort(String columnsToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending,
+                                 Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            return GetRangeForSort().Sort(columnsToSortBy, sortOrder, matchCase, ignoreBlanks);
+        }
+
+        public new IXLRange Sort(Int32 columnToSortBy, XLSortOrder sortOrder = XLSortOrder.Ascending,
+                                 Boolean matchCase = false, Boolean ignoreBlanks = true)
+        {
+            return GetRangeForSort().Sort(columnToSortBy, sortOrder, matchCase, ignoreBlanks);
+        }
+
+        public new IXLRange SortLeftToRight(XLSortOrder sortOrder = XLSortOrder.Ascending, Boolean matchCase = false,
+                                            Boolean ignoreBlanks = true)
+        {
+            return GetRangeForSort().SortLeftToRight(sortOrder, matchCase, ignoreBlanks);
+        }
+
+        public Boolean ShowFormulas { get; set; }
+        public Boolean ShowGridLines { get; set; }
+        public Boolean ShowOutlineSymbols { get; set; }
+        public Boolean ShowRowColHeaders { get; set; }
+        public Boolean ShowRuler { get; set; }
+        public Boolean ShowWhiteSpace { get; set; }
+        public Boolean ShowZeros { get; set; }
+
+        public IXLWorksheet SetShowFormulas()
+        {
+            ShowFormulas = true;
+            return this;
+        }
+
+        public IXLWorksheet SetShowFormulas(Boolean value)
+        {
+            ShowFormulas = value;
+            return this;
+        }
+
+        public IXLWorksheet SetShowGridLines()
+        {
+            ShowGridLines = true;
+            return this;
+        }
+
+        public IXLWorksheet SetShowGridLines(Boolean value)
+        {
+            ShowGridLines = value;
+            return this;
+        }
+
+        public IXLWorksheet SetShowOutlineSymbols()
+        {
+            ShowOutlineSymbols = true;
+            return this;
+        }
+
+        public IXLWorksheet SetShowOutlineSymbols(Boolean value)
+        {
+            ShowOutlineSymbols = value;
+            return this;
+        }
+
+        public IXLWorksheet SetShowRowColHeaders()
+        {
+            ShowRowColHeaders = true;
+            return this;
+        }
+
+        public IXLWorksheet SetShowRowColHeaders(Boolean value)
+        {
+            ShowRowColHeaders = value;
+            return this;
+        }
+
+        public IXLWorksheet SetShowRuler()
+        {
+            ShowRuler = true;
+            return this;
+        }
+
+        public IXLWorksheet SetShowRuler(Boolean value)
+        {
+            ShowRuler = value;
+            return this;
+        }
+
+        public IXLWorksheet SetShowWhiteSpace()
+        {
+            ShowWhiteSpace = true;
+            return this;
+        }
+
+        public IXLWorksheet SetShowWhiteSpace(Boolean value)
+        {
+            ShowWhiteSpace = value;
+            return this;
+        }
+
+        public IXLWorksheet SetShowZeros()
+        {
+            ShowZeros = true;
+            return this;
+        }
+
+        public IXLWorksheet SetShowZeros(Boolean value)
+        {
+            ShowZeros = value;
+            return this;
+        }
+
+        public XLColor TabColor { get; set; }
+
+        public IXLWorksheet SetTabColor(XLColor color)
+        {
+            TabColor = color;
+            return this;
+        }
+
+        public Boolean TabSelected { get; set; }
+
+        public Boolean TabActive
+        {
+            get { return _tabActive; }
+            set
+            {
+                if (value && !_tabActive)
+                {
+                    foreach (XLWorksheet ws in Worksheet.Workbook.WorksheetsInternal)
+                        ws._tabActive = false;
+                }
+                _tabActive = value;
+            }
+        }
+
+        public IXLWorksheet SetTabSelected()
+        {
+            TabSelected = true;
+            return this;
+        }
+
+        public IXLWorksheet SetTabSelected(Boolean value)
+        {
+            TabSelected = value;
+            return this;
+        }
+
+        public IXLWorksheet SetTabActive()
+        {
+            TabActive = true;
+            return this;
+        }
+
+        public IXLWorksheet SetTabActive(Boolean value)
+        {
+            TabActive = value;
+            return this;
+        }
+
+        IXLPivotTable IXLWorksheet.PivotTable(String name)
+        {
+            return PivotTable(name);
+        }
+
+        public IXLPivotTables PivotTables { get; private set; }
+
+        public Boolean RightToLeft { get; set; }
+
+        public IXLWorksheet SetRightToLeft()
+        {
+            RightToLeft = true;
+            return this;
+        }
+
+        public IXLWorksheet SetRightToLeft(Boolean value)
+        {
+            RightToLeft = value;
+            return this;
+        }
+
+        public new IXLRanges Ranges(String ranges)
+        {
+            var retVal = new XLRanges();
+            foreach (string rangeAddressStr in ranges.Split(',').Select(s => s.Trim()))
+            {
+                if (XLHelper.IsValidRangeAddress(rangeAddressStr))
+                    retVal.Add(Range(new XLRangeAddress(Worksheet, rangeAddressStr)));
+                else if (NamedRanges.Any(n => String.Compare(n.Name, rangeAddressStr, true) == 0))
+                    NamedRange(rangeAddressStr).Ranges.ForEach(retVal.Add);
+                else
+                {
+                    Workbook.NamedRanges.First(n =>
+                                               String.Compare(n.Name, rangeAddressStr, true) == 0
+                                               && n.Ranges.First().Worksheet == this)
+                        .Ranges.ForEach(retVal.Add);
+                }
+            }
+            return retVal;
+        }
+
+        IXLBaseAutoFilter IXLWorksheet.AutoFilter
+        {
+            get { return AutoFilter; }
+        }
+
+        public IXLRows RowsUsed(Boolean includeFormats = false, Func<IXLRow, Boolean> predicate = null)
+        {
+            var rows = new XLRows(Worksheet);
+            var rowsUsed = new HashSet<Int32>();
+            Internals.RowsCollection.Keys.ForEach(r => rowsUsed.Add(r));
+            Internals.CellsCollection.RowsUsed.Keys.ForEach(r => rowsUsed.Add(r));
+            foreach (var rowNum in rowsUsed)
+            {
+                var row = Row(rowNum);
+                if (!row.IsEmpty(includeFormats) && (predicate == null || predicate(row)))
+                    rows.Add(row);
+                else
+                    row.Dispose();
+            }
+            return rows;
+        }
+        public IXLRows RowsUsed(Func<IXLRow, Boolean> predicate = null)
+        {
+            return RowsUsed(false, predicate);
+        }
+
+        public IXLColumns ColumnsUsed(Boolean includeFormats = false, Func<IXLColumn, Boolean> predicate = null)
+        {
+            var columns = new XLColumns(Worksheet);
+            var columnsUsed = new HashSet<Int32>();
+            Internals.ColumnsCollection.Keys.ForEach(r => columnsUsed.Add(r));
+            Internals.CellsCollection.ColumnsUsed.Keys.ForEach(r => columnsUsed.Add(r));
+            foreach (var columnNum in columnsUsed)
+            {
+                var column = Column(columnNum);
+                if (!column.IsEmpty(includeFormats) && (predicate == null || predicate(column)))
+                    columns.Add(column);
+                else
+                    column.Dispose();
+            }
+            return columns;
+        }
+        public IXLColumns ColumnsUsed(Func<IXLColumn, Boolean> predicate = null)
+        {
+            return ColumnsUsed(false, predicate);
+        }
+
+        public new void Dispose()
+        {
+            if (AutoFilter != null)
+                AutoFilter.Dispose();
+
+            Internals.Dispose();
+
+            base.Dispose();
+        }
+
+        #endregion
+
+        #region Outlines
+
+        public void IncrementColumnOutline(Int32 level)
+        {
+            if (level <= 0) return;
+            if (!_columnOutlineCount.ContainsKey(level))
+                _columnOutlineCount.Add(level, 0);
+
+            _columnOutlineCount[level]++;
+        }
+
+        public void DecrementColumnOutline(Int32 level)
+        {
+            if (level <= 0) return;
+            if (!_columnOutlineCount.ContainsKey(level))
+                _columnOutlineCount.Add(level, 0);
+
+            if (_columnOutlineCount[level] > 0)
+                _columnOutlineCount[level]--;
+        }
+
+        public Int32 GetMaxColumnOutline()
+        {
+            var list = _columnOutlineCount.Where(kp => kp.Value > 0).ToList();
+            return list.Count == 0 ? 0 : list.Max(kp => kp.Key);
+        }
+
+        public void IncrementRowOutline(Int32 level)
+        {
+            if (level <= 0) return;
+            if (!_rowOutlineCount.ContainsKey(level))
+                _rowOutlineCount.Add(level, 0);
+
+            _rowOutlineCount[level]++;
+        }
+
+        public void DecrementRowOutline(Int32 level)
+        {
+            if (level <= 0) return;
+            if (!_rowOutlineCount.ContainsKey(level))
+                _rowOutlineCount.Add(level, 0);
+
+            if (_rowOutlineCount[level] > 0)
+                _rowOutlineCount[level]--;
+        }
+
+        public Int32 GetMaxRowOutline()
+        {
+            return _rowOutlineCount.Count == 0 ? 0 : _rowOutlineCount.Where(kp => kp.Value > 0).Max(kp => kp.Key);
+        }
+
+        #endregion
+
+        public HashSet<Int32> GetStyleIds()
+        {
+            return Internals.CellsCollection.GetStyleIds(GetStyleId());
+        }
+
+        public XLRow FirstRowUsed()
+        {
+            return FirstRowUsed(false);
+        }
+
+        public XLRow FirstRowUsed(Boolean includeFormats)
+        {
+            using (var asRange = AsRange())
+                using (var rngRow = asRange.FirstRowUsed(includeFormats))
+                    return rngRow != null ? Row(rngRow.RangeAddress.FirstAddress.RowNumber) : null;
+        }
+
+        public XLRow LastRowUsed()
+        {
+            return LastRowUsed(false);
+        }
+
+        public XLRow LastRowUsed(Boolean includeFormats)
+        {
+            using (var asRange = AsRange())
+                using (var rngRow = asRange.LastRowUsed(includeFormats))
+                    return rngRow != null ? Row(rngRow.RangeAddress.LastAddress.RowNumber) : null;
+        }
+
+        public XLColumn LastColumn()
+        {
+            return Column(XLHelper.MaxColumnNumber);
+        }
+
+        public XLColumn FirstColumn()
+        {
+            return Column(1);
+        }
+
+        public XLRow FirstRow()
+        {
+            return Row(1);
+        }
+
+        public XLRow LastRow()
+        {
+            return Row(XLHelper.MaxRowNumber);
+        }
+
+        public XLColumn FirstColumnUsed()
+        {
+            return FirstColumnUsed(false);
+        }
+
+        public XLColumn FirstColumnUsed(Boolean includeFormats)
+        {
+            using (var asRange = AsRange())
+                using (var rngColumn = asRange.FirstColumnUsed(includeFormats))
+                    return rngColumn != null ? Column(rngColumn.RangeAddress.FirstAddress.ColumnNumber) : null;
+        }
+
+        public XLColumn LastColumnUsed()
+        {
+            return LastColumnUsed(false);
+        }
+
+        public XLColumn LastColumnUsed(Boolean includeFormats)
+        {
+            using (var asRange = AsRange())
+                using (var rngColumn = asRange.LastColumnUsed(includeFormats))
+                    return rngColumn != null ? Column(rngColumn.RangeAddress.LastAddress.ColumnNumber) : null;
+        }
+
+        public XLRow Row(Int32 row)
+        {
+            return Row(row, true);
+        }
+
+        public XLColumn Column(Int32 column)
+        {
+            if (column <= 0 || column > XLHelper.MaxColumnNumber)
+                throw new IndexOutOfRangeException(String.Format("Column number must be between 1 and {0}",
+                                                                 XLHelper.MaxColumnNumber));
+
+            Int32 thisStyleId = GetStyleId();
+            if (!Internals.ColumnsCollection.ContainsKey(column))
+            {
+                // This is a new row so we're going to reference all 
+                // cells in this row to preserve their formatting
+                Internals.RowsCollection.Keys.ForEach(r => Cell(r, column));
+                Internals.ColumnsCollection.Add(column,
+                                                new XLColumn(column, new XLColumnParameters(this, thisStyleId, false)));
+            }
+
+            return new XLColumn(column, new XLColumnParameters(this, thisStyleId, true));
+        }
+
+        public IXLColumn Column(String column)
+        {
+            return Column(XLHelper.GetColumnNumberFromLetter(column));
+        }
+
+        public override XLRange AsRange()
+        {
+            return Range(1, 1, XLHelper.MaxRowNumber, XLHelper.MaxColumnNumber);
+        }
+
+        public void Clear()
+        {
+            Internals.CellsCollection.Clear();
+            Internals.ColumnsCollection.Clear();
+            Internals.MergedRanges.Clear();
+            Internals.RowsCollection.Clear();
+        }
+
+        private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted)
+        {
+            var newMerge = new XLRanges();
+            foreach (IXLRange rngMerged in Internals.MergedRanges)
+            {
+                if (range.RangeAddress.FirstAddress.ColumnNumber <= rngMerged.RangeAddress.FirstAddress.ColumnNumber
+                    && rngMerged.RangeAddress.FirstAddress.RowNumber >= range.RangeAddress.FirstAddress.RowNumber
+                    && rngMerged.RangeAddress.LastAddress.RowNumber <= range.RangeAddress.LastAddress.RowNumber)
+                {
+                    var newRng = Range(
+                        rngMerged.RangeAddress.FirstAddress.RowNumber,
+                        rngMerged.RangeAddress.FirstAddress.ColumnNumber + columnsShifted,
+                        rngMerged.RangeAddress.LastAddress.RowNumber,
+                        rngMerged.RangeAddress.LastAddress.ColumnNumber + columnsShifted);
+                    newMerge.Add(newRng);
+                }
+                else if (
+                    !(range.RangeAddress.FirstAddress.ColumnNumber <= rngMerged.RangeAddress.FirstAddress.ColumnNumber
+                      && range.RangeAddress.FirstAddress.RowNumber <= rngMerged.RangeAddress.LastAddress.RowNumber))
+                    newMerge.Add(rngMerged);
+            }
+            Internals.MergedRanges = newMerge;
+
+            Workbook.Worksheets.ForEach(ws => MoveNamedRangesColumns(range, columnsShifted, ws.NamedRanges));
+            MoveNamedRangesColumns(range, columnsShifted, Workbook.NamedRanges);
+            ShiftConditionalFormattingColumns(range, columnsShifted);
+        }
+        private void ShiftConditionalFormattingColumns(XLRange range, int columnsShifted)
+        {
+            Int32 firstColumn = range.RangeAddress.FirstAddress.ColumnNumber;
+            if (firstColumn == 1) return;
+
+            Int32 lastColumn = range.RangeAddress.FirstAddress.ColumnNumber + columnsShifted - 1;
+            Int32 firstRow = range.RangeAddress.FirstAddress.RowNumber;
+            Int32 lastRow = range.RangeAddress.LastAddress.RowNumber;
+            var insertedRange = Range(firstRow, firstColumn, lastRow, lastColumn);
+            var fc = insertedRange.FirstColumn();
+            var model = fc.ColumnLeft();
+            Int32 modelFirstRow = model.RangeAddress.FirstAddress.RowNumber;
+            if (ConditionalFormats.Any(cf => cf.Range.Intersects(model)))
+            {
+                for (Int32 ro = firstRow; ro <= lastRow; ro++)
+                {
+                    var cellModel = model.Cell(ro - modelFirstRow + 1);
+                    foreach (var cf in ConditionalFormats.Where(cf => cf.Range.Intersects(cellModel.AsRange())).ToList())
+                    {
+                        Range(ro, firstColumn, ro, lastColumn).AddConditionalFormat(cf);
+                    }
+                }
+            }
+            insertedRange.Dispose();
+            model.Dispose();
+            fc.Dispose();
+        }
+
+        private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted)
+        {
+            var newMerge = new XLRanges();
+            foreach (IXLRange rngMerged in Internals.MergedRanges)
+            {
+                if (range.RangeAddress.FirstAddress.RowNumber <= rngMerged.RangeAddress.FirstAddress.RowNumber
+                    && rngMerged.RangeAddress.FirstAddress.ColumnNumber >= range.RangeAddress.FirstAddress.ColumnNumber
+                    && rngMerged.RangeAddress.LastAddress.ColumnNumber <= range.RangeAddress.LastAddress.ColumnNumber)
+                {
+                    var newRng = Range(
+                        rngMerged.RangeAddress.FirstAddress.RowNumber + rowsShifted,
+                        rngMerged.RangeAddress.FirstAddress.ColumnNumber,
+                        rngMerged.RangeAddress.LastAddress.RowNumber + rowsShifted,
+                        rngMerged.RangeAddress.LastAddress.ColumnNumber);
+                    newMerge.Add(newRng);
+                }
+                else if (!(range.RangeAddress.FirstAddress.RowNumber <= rngMerged.RangeAddress.FirstAddress.RowNumber
+                           && range.RangeAddress.FirstAddress.ColumnNumber <= rngMerged.RangeAddress.LastAddress.ColumnNumber))
+                    newMerge.Add(rngMerged);
+            }
+            Internals.MergedRanges = newMerge;
+
+            Workbook.Worksheets.ForEach(ws => MoveNamedRangesRows(range, rowsShifted, ws.NamedRanges));
+            MoveNamedRangesRows(range, rowsShifted, Workbook.NamedRanges);
+            ShiftConditionalFormattingRows(range, rowsShifted);
+        }
+        private void ShiftConditionalFormattingRows(XLRange range, int rowsShifted)
+        {
+            Int32 firstRow = range.RangeAddress.FirstAddress.RowNumber;
+            if (firstRow == 1) return;
+
+            SuspendEvents();
+            var rangeUsed = range.Worksheet.RangeUsed(true);
+            IXLRangeAddress usedAddress;
+            if (rangeUsed == null)
+                usedAddress = range.RangeAddress;
+            else
+                usedAddress = rangeUsed.RangeAddress;
+            ResumeEvents();
+
+            if (firstRow < usedAddress.FirstAddress.RowNumber) firstRow = usedAddress.FirstAddress.RowNumber;
+
+            Int32 lastRow = range.RangeAddress.FirstAddress.RowNumber + rowsShifted - 1;
+            if (lastRow > usedAddress.LastAddress.RowNumber) lastRow = usedAddress.LastAddress.RowNumber;
+
+            Int32 firstColumn = range.RangeAddress.FirstAddress.ColumnNumber;
+            if (firstColumn < usedAddress.FirstAddress.ColumnNumber) firstColumn = usedAddress.FirstAddress.ColumnNumber;
+
+            Int32 lastColumn = range.RangeAddress.LastAddress.ColumnNumber;
+            if (lastColumn > usedAddress.LastAddress.ColumnNumber) lastColumn = usedAddress.LastAddress.ColumnNumber;
+
+            var insertedRange = Range(firstRow, firstColumn, lastRow, lastColumn);
+            var fr = insertedRange.FirstRow();
+            var model = fr.RowAbove();
+            Int32 modelFirstColumn = model.RangeAddress.FirstAddress.ColumnNumber;
+            if (ConditionalFormats.Any(cf=>cf.Range.Intersects(model)))
+            {
+                for (Int32 co = firstColumn; co <= lastColumn; co++)
+                {
+                    var cellModel = model.Cell(co - modelFirstColumn + 1);
+                    foreach (var cf in ConditionalFormats.Where(cf => cf.Range.Intersects(cellModel.AsRange())).ToList())
+                    {
+                        Range(firstRow, co, lastRow, co).AddConditionalFormat(cf);
+                    }
+                }
+            }
+            insertedRange.Dispose();
+            model.Dispose();
+            fr.Dispose();
+        }
+
+
+        internal void BreakConditionalFormatsIntoCells(List<IXLAddress> addresses)
+        {
+            var newConditionalFormats = new XLConditionalFormats();
+            SuspendEvents();
+            foreach (var conditionalFormat in ConditionalFormats)
+            {
+                foreach (XLCell cell in conditionalFormat.Range.Cells(c=>!addresses.Contains(c.Address)))
+                {
+                    var row = cell.Address.RowNumber;
+                    var column = cell.Address.ColumnLetter;
+                    var newConditionalFormat = new XLConditionalFormat(cell.AsRange(), true);
+                    newConditionalFormat.CopyFrom(conditionalFormat);
+                    newConditionalFormat.Values.Values.Where(f => f.IsFormula)
+                        .ForEach(f => f._value = XLHelper.ReplaceRelative(f.Value, row, column));
+                    newConditionalFormats.Add(newConditionalFormat);
+                }
+                conditionalFormat.Range.Dispose();
+            }
+            ResumeEvents();
+            ConditionalFormats = newConditionalFormats;
+        }
+
+
+
+        private void MoveNamedRangesRows(XLRange range, int rowsShifted, IXLNamedRanges namedRanges)
+        {
+            foreach (XLNamedRange nr in namedRanges)
+            {
+                var newRangeList =
+                    nr.RangeList.Select(r => XLCell.ShiftFormulaRows(r, this, range, rowsShifted)).Where(
+                        newReference => newReference.Length > 0).ToList();
+                nr.RangeList = newRangeList;
+            }
+        }
+
+        private void MoveNamedRangesColumns(XLRange range, int columnsShifted, IXLNamedRanges namedRanges)
+        {
+            foreach (XLNamedRange nr in namedRanges)
+            {
+                var newRangeList =
+                    nr.RangeList.Select(r => XLCell.ShiftFormulaColumns(r, this, range, columnsShifted)).Where(
+                        newReference => newReference.Length > 0).ToList();
+                nr.RangeList = newRangeList;
+            }
+        }
+
+        public void NotifyRangeShiftedRows(XLRange range, Int32 rowsShifted)
+        {
+            if (RangeShiftedRows != null)
+            {
+                foreach(var item in RangeShiftedRows)
+                {
+                    item.Action(range, rowsShifted);
+                }
+            }
+        }
+
+        public void NotifyRangeShiftedColumns(XLRange range, Int32 columnsShifted)
+        {
+            if (RangeShiftedColumns != null)
+            {
+                foreach(var item in RangeShiftedColumns)
+                {
+                    item.Action(range, columnsShifted);
+                }
+            }
+        }
+
+        public XLRow Row(Int32 row, Boolean pingCells)
+        {
+            if (row <= 0 || row > XLHelper.MaxRowNumber)
+                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}",
+                                                                 XLHelper.MaxRowNumber));
+
+            Int32 styleId;
+            XLRow rowToUse;
+            if (Internals.RowsCollection.TryGetValue(row, out rowToUse))
+                styleId = rowToUse.GetStyleId();
+            else
+            {
+                if (pingCells)
+                {
+                    // This is a new row so we're going to reference all 
+                    // cells in columns of this row to preserve their formatting
+
+                    var usedColumns = from c in Internals.ColumnsCollection
+                                      join dc in Internals.CellsCollection.ColumnsUsed.Keys
+                                          on c.Key equals dc
+                                      where !Internals.CellsCollection.Contains(row, dc)
+                                      select dc;
+
+                    usedColumns.ForEach(c => Cell(row, c));
+                }
+                styleId = GetStyleId();
+                Internals.RowsCollection.Add(row, new XLRow(row, new XLRowParameters(this, styleId, false)));
+            }
+
+            return new XLRow(row, new XLRowParameters(this, styleId));
+        }
+
+        private IXLRange GetRangeForSort()
+        {
+            var range = RangeUsed();
+            SortColumns.ForEach(e => range.SortColumns.Add(e.ElementNumber, e.SortOrder, e.IgnoreBlanks, e.MatchCase));
+            SortRows.ForEach(e => range.SortRows.Add(e.ElementNumber, e.SortOrder, e.IgnoreBlanks, e.MatchCase));
+            return range;
+        }
+
+        public XLPivotTable PivotTable(String name)
+        {
+            return (XLPivotTable)PivotTables.PivotTable(name);
+        }
+
+        public new XLCells Cells()
+        {
+            return CellsUsed(true);
+        }
+
+        public new XLCell Cell(String cellAddressInRange)
+        {
+            if (XLHelper.IsValidA1Address(cellAddressInRange))
+                return Cell(XLAddress.Create(this, cellAddressInRange));
+
+            if (NamedRanges.Any(n => String.Compare(n.Name, cellAddressInRange, true) == 0))
+                return (XLCell)NamedRange(cellAddressInRange).Ranges.First().FirstCell();
+
+            var namedRanges = Workbook.NamedRanges.FirstOrDefault(n =>
+                                                      String.Compare(n.Name, cellAddressInRange, true) == 0
+                                                      && n.Ranges.Count == 1);
+            if (namedRanges == null || !namedRanges.Ranges.Any()) return null;
+            
+            return (XLCell)namedRanges.Ranges.First().FirstCell();
+        }
+
+        public XLCell CellFast(String cellAddressInRange)
+        {
+            return Cell(XLAddress.Create(this, cellAddressInRange));
+        }
+
+        public override XLRange Range(String rangeAddressStr)
+        {
+            if (XLHelper.IsValidRangeAddress(rangeAddressStr))
+                return Range(new XLRangeAddress(Worksheet, rangeAddressStr));
+
+            if (rangeAddressStr.Contains("["))
+                return Table(rangeAddressStr.Substring(0, rangeAddressStr.IndexOf("["))) as XLRange;
+
+            if (NamedRanges.Any(n => String.Compare(n.Name, rangeAddressStr, true) == 0))
+                return (XLRange)NamedRange(rangeAddressStr).Ranges.First();
+
+            var namedRanges = Workbook.NamedRanges.FirstOrDefault(n =>
+                                                       String.Compare(n.Name, rangeAddressStr, true) == 0
+                                                       && n.Ranges.Count == 1
+                                                       );
+            if (namedRanges == null || !namedRanges.Ranges.Any()) return null;
+            return (XLRange)namedRanges.Ranges.First();
+        }
+
+        public IXLRanges MergedRanges { get { return Internals.MergedRanges; } }
+
+        public IXLConditionalFormats ConditionalFormats { get; private set; }
+
+        private Boolean _eventTracking;
+        public void SuspendEvents()
+        {
+            _eventTracking = EventTrackingEnabled;
+            EventTrackingEnabled = false;
+        }
+        public void ResumeEvents()
+        {
+            EventTrackingEnabled = _eventTracking;
+        }
+        
+        public IXLRanges SelectedRanges { get; internal set; }
+
+        public IXLCell ActiveCell { get; set; }
+
+        private XLCalcEngine _calcEngine;
+        private XLCalcEngine CalcEngine
+        {
+            get { return _calcEngine ?? (_calcEngine = new XLCalcEngine(this)); }
+        }
+
+        public Object Evaluate(String expression)
+        {
+            return CalcEngine.Evaluate(expression);
+        }
+
+        public String Author { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Excel/XLWorksheetInternals.cs b/ClosedXML/Excel/XLWorksheetInternals.cs
new file mode 100644
index 0000000..e7b7b0c
--- /dev/null
+++ b/ClosedXML/Excel/XLWorksheetInternals.cs
@@ -0,0 +1,31 @@
+using System;
+namespace ClosedXML.Excel
+{
+    internal class XLWorksheetInternals: IDisposable
+    {
+        public XLWorksheetInternals(
+            XLCellsCollection cellsCollection, 
+            XLColumnsCollection columnsCollection,
+            XLRowsCollection rowsCollection,
+            XLRanges mergedRanges
+            )
+        {
+            CellsCollection = cellsCollection;
+            ColumnsCollection = columnsCollection;
+            RowsCollection = rowsCollection;
+            MergedRanges = mergedRanges;
+        }
+
+        public XLCellsCollection CellsCollection { get; private set; }
+        public XLColumnsCollection ColumnsCollection { get; private set; }
+        public XLRowsCollection RowsCollection { get; private set; }
+        public XLRanges MergedRanges { get; internal set; }
+
+        public void Dispose()
+        {
+            ColumnsCollection.Dispose();
+            RowsCollection.Dispose();
+            MergedRanges.Dispose();
+        }
+    }
+}
diff --git a/ClosedXML/Excel/XLWorksheets.cs b/ClosedXML/Excel/XLWorksheets.cs
new file mode 100644
index 0000000..673328a
--- /dev/null
+++ b/ClosedXML/Excel/XLWorksheets.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
+
+namespace ClosedXML.Excel
+{
+    internal class XLWorksheets : IXLWorksheets, IEnumerable<XLWorksheet>
+    {
+        #region Constructor
+
+        private readonly XLWorkbook _workbook;
+        private readonly Dictionary<String, XLWorksheet> _worksheets = new Dictionary<String, XLWorksheet>();
+
+        #endregion
+
+        public HashSet<String> Deleted = new HashSet<String>();
+
+        #region Constructor
+
+        public XLWorksheets(XLWorkbook workbook)
+        {
+            _workbook = workbook;
+        }
+
+        #endregion
+
+        #region IEnumerable<XLWorksheet> Members
+
+        public IEnumerator<XLWorksheet> GetEnumerator()
+        {
+            return ((IEnumerable<XLWorksheet>)_worksheets.Values).GetEnumerator();
+        }
+
+        #endregion
+
+        #region IXLWorksheets Members
+
+        public int Count
+        {
+            [DebuggerStepThrough]
+            get { return _worksheets.Count; }
+        }
+
+        public bool TryGetWorksheet(string sheetName, out IXLWorksheet worksheet)
+        {
+            XLWorksheet w;
+            if (_worksheets.TryGetValue(sheetName, out w))
+            {
+                worksheet = w;
+                return true;
+            }
+            worksheet = null;
+            return false;
+        }
+
+        public IXLWorksheet Worksheet(String sheetName)
+        {
+            XLWorksheet w;
+            if (_worksheets.TryGetValue(sheetName, out w))
+                return w;
+
+            var wss = _worksheets.Where(ws => ws.Key.ToLower().Equals(sheetName.ToLower()));
+
+            if (wss.Any())
+                return wss.First().Value;
+
+            throw new Exception("There isn't a worksheet named '" + sheetName + "'.");
+        }
+
+        public IXLWorksheet Worksheet(Int32 position)
+        {
+            int wsCount = _worksheets.Values.Count(w => w.Position == position);
+            if (wsCount == 0)
+                throw new Exception("There isn't a worksheet associated with that position.");
+
+            if (wsCount > 1)
+            {
+                throw new Exception(
+                    "Can't retrieve a worksheet because there are multiple worksheets associated with that position.");
+            }
+
+            return _worksheets.Values.Single(w => w.Position == position);
+        }
+
+        public IXLWorksheet Add(String sheetName)
+        {
+            var sheet = new XLWorksheet(sheetName, _workbook);
+            _worksheets.Add(sheetName, sheet);
+            sheet._position = _worksheets.Count + _workbook.UnsupportedSheets.Count;
+            return sheet;
+        }
+
+        public IXLWorksheet Add(String sheetName, Int32 position)
+        {
+            _worksheets.Values.Where(w => w._position >= position).ForEach(w => w._position += 1);
+            _workbook.UnsupportedSheets.Where(w => w.Position >= position).ForEach(w => w.Position += 1);
+            var sheet = new XLWorksheet(sheetName, _workbook);
+            _worksheets.Add(sheetName, sheet);
+            sheet._position = position;
+            return sheet;
+        }
+
+        public void Delete(String sheetName)
+        {
+            Delete(_worksheets[sheetName].Position);
+        }
+
+        public void Delete(Int32 position)
+        {
+            int wsCount = _worksheets.Values.Count(w => w.Position == position);
+            if (wsCount == 0)
+                throw new Exception("There isn't a worksheet associated with that index.");
+
+            if (wsCount > 1)
+                throw new Exception(
+                    "Can't delete the worksheet because there are multiple worksheets associated with that index.");
+
+            var ws = _worksheets.Values.Single(w => w.Position == position);
+            if (!XLHelper.IsNullOrWhiteSpace(ws.RelId) && !Deleted.Contains(ws.RelId))
+                Deleted.Add(ws.RelId);
+
+            _worksheets.RemoveAll(w => w.Position == position);
+            _worksheets.Values.Where(w => w.Position > position).ForEach(w => w._position -= 1);
+            _workbook.UnsupportedSheets.Where(w => w.Position > position).ForEach(w => w.Position -= 1);
+        }
+
+        IEnumerator<IXLWorksheet> IEnumerable<IXLWorksheet>.GetEnumerator()
+        {
+            return _worksheets.Values.Cast<IXLWorksheet>().GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public IXLWorksheet Add(DataTable dataTable)
+        {
+            return Add(dataTable, dataTable.TableName);
+        }
+
+        public IXLWorksheet Add(DataTable dataTable, String sheetName)
+        {
+            var ws = Add(sheetName);
+            ws.Cell(1, 1).InsertTable(dataTable);
+            ws.Columns().AdjustToContents(1, 75);
+            return ws;
+        }
+
+        public void Add(DataSet dataSet)
+        {
+            foreach (DataTable t in dataSet.Tables)
+                Add(t);
+        }
+
+        #endregion
+
+        public void Rename(String oldSheetName, String newSheetName)
+        {
+            if (XLHelper.IsNullOrWhiteSpace(oldSheetName) || !_worksheets.ContainsKey(oldSheetName)) return;
+
+            var ws = _worksheets[oldSheetName];
+            _worksheets.Remove(oldSheetName);
+            _worksheets.Add(newSheetName, ws);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Extensions.cs b/ClosedXML/Extensions.cs
new file mode 100644
index 0000000..1a33550
--- /dev/null
+++ b/ClosedXML/Extensions.cs
@@ -0,0 +1,300 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
+using System.IO;
+using System.Xml;
+using ClosedXML.Utils;
+using DocumentFormat.OpenXml;
+
+[assembly: CLSCompliantAttribute(true)]
+namespace ClosedXML.Excel
+{
+    public static class Extensions
+    {
+        // Adds the .ForEach method to all IEnumerables
+
+
+        private static readonly char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+        public static String ToHex(this Color color)
+        {
+
+            byte[] bytes = new byte[4];
+
+            bytes[0] = color.A;
+
+            bytes[1] = color.R;
+
+            bytes[2] = color.G;
+
+            bytes[3] = color.B;
+
+            char[] chars = new char[bytes.Length * 2];
+
+            for (int i = 0; i < bytes.Length; i++)
+            {
+
+                int b = bytes[i];
+
+                chars[i * 2] = hexDigits[b >> 4];
+
+                chars[i * 2 + 1] = hexDigits[b & 0xF];
+
+            }
+
+            return new string(chars);
+
+        }
+
+        public static String RemoveSpecialCharacters(this String str)
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (char c in str)
+            {
+                if (Char.IsLetterOrDigit(c) || c == '.' || c == '_')
+                {
+                    sb.Append(c);
+                }
+            }
+            return sb.ToString();
+        }
+
+        public static Int32 CharCount(this String instance, Char c)
+        {
+            return instance.Length - instance.Replace(c.ToString(), "").Length;
+        }
+
+        public static Boolean HasDuplicates<T>(this IEnumerable<T> source)
+        {
+            HashSet<T> distinctItems = new HashSet<T>();
+            foreach (var item in source)
+            {
+                if (distinctItems.Contains(item))
+                    return true;
+                else
+                    distinctItems.Add(item);
+            }
+            return false;
+        }
+
+        public static T CastTo<T>(this Object o)
+        {
+            return (T)Convert.ChangeType(o, typeof(T));
+        }
+
+    }
+
+    public static class DictionaryExtensions
+    {
+        public static void RemoveAll<TKey, TValue>(this Dictionary<TKey, TValue> dic,
+            Func<TValue, bool> predicate)
+        {
+            var keys = dic.Keys.Where(k => predicate(dic[k])).ToList();
+            foreach (var key in keys)
+            {
+                dic.Remove(key);
+            }
+        }
+    }
+
+    public static class StringExtensions
+    {
+        private static readonly Regex RegexNewLine = new Regex(@"((?<!\r)\n|\r\n)", RegexOptions.Compiled);
+        public static String FixNewLines(this String value)
+        {
+            return value.Contains("\n") ? RegexNewLine.Replace(value, Environment.NewLine) : value;
+        }
+
+        public static Boolean PreserveSpaces(this String value)
+        {
+            return value.StartsWith(" ") || value.EndsWith(" ") || value.Contains(Environment.NewLine);
+        }
+
+        public static String ToCamel(this String value)
+        {
+            if (value.Length == 0)
+                return value;
+
+            if (value.Length == 1)
+                return value.ToLower();
+
+            return value.Substring(0, 1).ToLower() + value.Substring(1);
+        }
+
+        public static String ToProper(this String value)
+        {
+            if (value.Length == 0)
+                return value;
+
+            if (value.Length == 1)
+                return value.ToUpper();
+
+            return value.Substring(0, 1).ToUpper() + value.Substring(1);
+        }
+    }
+
+    public static class DateTimeExtensions
+    {
+        public static Double MaxOADate
+        {
+            get
+            {
+                return 2958465.99999999;
+            }
+        }
+
+        public static DateTime NextWorkday(this DateTime date, List<DateTime> bankHolidays)
+        {
+            var nextDate = date.AddDays(1);
+            while (nextDate.DayOfWeek == DayOfWeek.Saturday
+                || nextDate.DayOfWeek == DayOfWeek.Sunday
+                || bankHolidays.Contains(nextDate)
+                )
+                nextDate = nextDate.AddDays(1);
+
+            return nextDate;
+        }
+    }
+
+    public static class IntegerExtensions
+    {
+        private static readonly NumberFormatInfo nfi = CultureInfo.InvariantCulture.NumberFormat;
+        [ThreadStatic]
+        private static Dictionary<Int32, String> intToString;
+        public static String ToInvariantString(this Int32 value)
+        {
+            String sValue;
+            if (intToString == null)
+            {
+                intToString = new Dictionary<int, string>();
+                sValue = value.ToString(nfi);
+                intToString.Add(value, sValue);
+            }
+            else
+            {
+                if (!intToString.TryGetValue(value, out sValue))
+                {
+                    sValue = value.ToString(nfi);
+                    intToString.Add(value, sValue);
+                }
+            }
+            return sValue;
+        }
+
+    }
+
+    public static class DoubleExtensions
+    {
+        //All numbers are stored in XL files as invarient culture this is just a easy helper
+        public static String ToInvariantString(this Double value)
+        {
+            return value.ToString(CultureInfo.InvariantCulture);
+        }
+
+        public static Double SaveRound(this Double value)
+        {
+            return Math.Round(value, 6);
+        }
+    }
+
+    public static class FontBaseExtensions
+    {
+
+        private static Font GetCachedFont(IXLFontBase fontBase, Dictionary<IXLFontBase, Font> fontCache)
+        {
+            Font font;
+            if (!fontCache.TryGetValue(fontBase, out font))
+            {
+                font = new Font(fontBase.FontName, (float)fontBase.FontSize, GetFontStyle(fontBase));
+                fontCache.Add(fontBase, font);
+            }
+            return font;
+        }
+
+        public static Double GetWidth(this IXLFontBase fontBase, String text, Dictionary<IXLFontBase, Font> fontCache)
+        {
+            if (XLHelper.IsNullOrWhiteSpace(text))
+                return 0;
+
+            var font = GetCachedFont(fontBase, fontCache);
+
+            var textSize = GraphicsUtils.MeasureString(text, font);
+
+            double width = (((textSize.Width / (double)7) * 256) - (128 / 7)) / 256;
+            width = (double)decimal.Round((decimal)width + 0.2M, 2);
+
+            return width;
+        }
+
+        private static FontStyle GetFontStyle(IXLFontBase font)
+        {
+            FontStyle fontStyle = FontStyle.Regular;
+            if (font.Bold) fontStyle |= FontStyle.Bold;
+            if (font.Italic) fontStyle |= FontStyle.Italic;
+            if (font.Strikethrough) fontStyle |= FontStyle.Strikeout;
+            if (font.Underline != XLFontUnderlineValues.None ) fontStyle |= FontStyle.Underline;
+            return fontStyle;
+        }
+
+        public static Double GetHeight(this IXLFontBase fontBase, Dictionary<IXLFontBase, Font> fontCache)
+        {
+            var font = GetCachedFont(fontBase, fontCache);
+            var textSize = GraphicsUtils.MeasureString("X", font);
+            return (double)textSize.Height * 0.85;
+        }
+
+        public static void CopyFont(this IXLFontBase font, IXLFontBase sourceFont)
+        {
+            font.Bold = sourceFont.Bold;
+            font.Italic = sourceFont.Italic;
+            font.Underline = sourceFont.Underline;
+            font.Strikethrough = sourceFont.Strikethrough;
+            font.VerticalAlignment = sourceFont.VerticalAlignment;
+            font.Shadow = sourceFont.Shadow;
+            font.FontSize = sourceFont.FontSize;
+            font.FontColor = sourceFont.FontColor;
+            font.FontName = sourceFont.FontName;
+            font.FontFamilyNumbering = sourceFont.FontFamilyNumbering;
+        }
+    }
+
+    public static class XDocumentExtensions
+    {
+        public static XDocument Load(Stream stream)
+        {
+            using (XmlReader reader = XmlReader.Create(stream))
+            {
+                return XDocument.Load(reader);
+            }
+        }
+    }
+
+    public static class EnumerableExtensions
+    {
+        public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
+        {
+            foreach (T item in source)
+                action(item);
+        }
+
+        public static Type GetItemType<T>(this IEnumerable<T> source)
+        {
+            return typeof(T);
+        }
+    }
+
+    public static class DoubleValueExtensions
+    {
+        public static DoubleValue SaveRound(this DoubleValue value)
+        {
+            return value.HasValue ? new DoubleValue(Math.Round(value, 6)) : value;
+        }
+    }
+}
+
diff --git a/ClosedXML/PathHelper.cs b/ClosedXML/PathHelper.cs
new file mode 100644
index 0000000..83cbb4c
--- /dev/null
+++ b/ClosedXML/PathHelper.cs
@@ -0,0 +1,243 @@
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace ClosedXML
+{
+    /// <summary>
+    ///   Help methods for work with files
+    /// </summary>
+    internal static class PathHelper
+    {
+        private static readonly Regex ms_checkValidAbsolutePathRegEx = new Regex(
+                "^(([a-zA-Z]\\:)|\\\\)(\\\\|(\\\\[^\\n\\r\\t/:*?<>\\\"|]*)+)$",
+                RegexOptions.IgnoreCase
+                | RegexOptions.Singleline
+                | RegexOptions.CultureInvariant
+                | RegexOptions.Compiled
+                );
+        /// <summary>
+        ///   Can check only .\dfdfd\dfdf\dfdf or ..\..\gfhfgh\fghfh
+        /// </summary>
+        private static readonly Regex ms_checkValidRelativePathRegEx = new Regex(
+                "^(\\.\\.|\\.)(\\\\|(\\\\[^\\n\\r\\t/:*?<>\\\"|]*)+)$",
+                RegexOptions.IgnoreCase
+                | RegexOptions.Multiline
+                | RegexOptions.CultureInvariant
+                | RegexOptions.Compiled
+                );
+
+        private static readonly object ms_syncAbsolutePathObj = new object();
+
+        /// <summary>
+        ///   Gets data and time string stamp for file name
+        /// </summary>
+        /// <returns></returns>
+        public static string GetTimeStamp()
+        {
+            return GetTimeStamp(DateTime.Now);
+        }
+        /// <summary>
+        ///   Gets data and time string stamp for file name
+        /// </summary>
+        /// <returns></returns>
+        public static string GetTimeStamp(DateTime dateTime)
+        {
+            return dateTime.ToString("ddMMMyyyy_HHmmss", DateTimeFormatInfo.InvariantInfo);
+        }
+        /// <summary>
+        ///   Safety delete file(with try block)
+        /// </summary>
+        /// <param name = "fileName">file name</param>
+        public static void SafetyDeleteFile(string fileName)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(fileName) && File.Exists(fileName))
+                {
+                    File.Delete(fileName);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Fail("Error during file deleting. Error message:" + ex.Message);
+            }
+        }
+        /// <summary>
+        ///   Replace all not implemented symbols to '_'
+        /// </summary>
+        /// <param name = "fileName">input filename</param>
+        /// <returns></returns>
+        public static string NormalizeFileName(string fileName)
+        {
+            char[] invalidCharacters = Path.GetInvalidFileNameChars();
+            #region Replace begin space
+            string result = fileName.TrimStart(' ');
+            if (result.Length < fileName.Length)
+            {
+                result = new string('_', fileName.Length - result.Length) + result;
+            }
+            #endregion
+            foreach (char curChar in invalidCharacters)
+            {
+                result = result.Replace(curChar, '_');
+            }
+            return result;
+        }
+
+        public static string NormalizePathName(string fileName)
+        {
+            char[] invalidCharacters = Path.GetInvalidPathChars();
+            string result = fileName.TrimStart(' ');
+            foreach (char curChar in invalidCharacters)
+            {
+                result = result.Replace(curChar, '_');
+            }
+            return result;
+        }
+        /// <summary>
+        ///   ValidatePath file or diretory path
+        /// </summary>
+        /// <param name = "path"></param>
+        /// <param name = "type">path type</param>
+        /// <returns></returns>
+        public static bool ValidatePath(string path, PathTypes type)
+        {
+            bool _result = false;
+            if ((type & PathTypes.Absolute) == PathTypes.Absolute)
+            {
+                _result |= ms_checkValidAbsolutePathRegEx.IsMatch(path);
+            }
+            if ((type & PathTypes.Relative) == PathTypes.Relative)
+            {
+                _result |= ms_checkValidRelativePathRegEx.IsMatch(path);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        ///   ValidatePath file or diretory path
+        /// </summary>
+        /// <param name = "fileName"></param>
+        /// <returns></returns>
+        public static bool ValidateFileName(string fileName)
+        {
+            return fileName.LastIndexOfAny(Path.GetInvalidFileNameChars()) < 0;
+        }
+
+        public static string EvaluateRelativePath(string mainDirPath, string absoluteFilePath)
+        {
+            string[] firstPathParts = mainDirPath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);
+            string[] secondPathParts = absoluteFilePath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);
+
+            int sameCounter = 0;
+            int partsCount = Math.Min(firstPathParts.Length, secondPathParts.Length);
+            for (int i = 0; i < partsCount; i++)
+            {
+                if (String.Compare(firstPathParts[i], secondPathParts[i], true) != 0)
+                {
+                    break;
+                }
+                sameCounter++;
+            }
+
+            if (sameCounter == 0)
+            {
+                return absoluteFilePath;
+            }
+
+            string newPath = string.Empty;
+            for (int i = sameCounter; i < firstPathParts.Length; i++)
+            {
+                if (i > sameCounter)
+                {
+                    newPath += Path.DirectorySeparatorChar;
+                }
+                newPath += "..";
+            }
+            if (newPath.Length == 0)
+            {
+                newPath = ".";
+            }
+            for (int i = sameCounter; i < secondPathParts.Length; i++)
+            {
+                newPath += Path.DirectorySeparatorChar;
+                newPath += secondPathParts[i];
+            }
+            return newPath;
+        }
+
+        public static string EvaluateAbsolutePath(string rootPath, string relativePath)
+        {
+            lock (ms_syncAbsolutePathObj)
+            {
+                string _temp = Environment.CurrentDirectory;
+                Environment.CurrentDirectory = rootPath;
+                string _result = Path.GetFullPath(relativePath);
+                Environment.CurrentDirectory = _temp;
+                return _result;
+            }
+        }
+
+        public static bool TryCreateFile(string filePath, out string message)
+        {
+            #region Check
+            if (string.IsNullOrEmpty(filePath))
+            {
+                throw new ArgumentNullException("filePath");
+            }
+            #endregion
+            try
+            {
+                if (File.Exists(filePath))
+                {
+                    message = null;
+                    return true;
+                }
+
+                using (FileStream _stream = new FileStream(filePath,
+                                                           FileMode.Create,
+                                                           FileAccess.ReadWrite,
+                                                           FileShare.Read,
+                                                           1024,
+                                                           FileOptions.DeleteOnClose))
+                {
+                }
+            }
+            catch (Exception exc)
+            {
+                message = exc.Message;
+                return false;
+            }
+
+            message = null;
+            return true;
+        }
+
+        public static string CreateDirectory(string path)
+        {
+            try
+            {
+                var info = new DirectoryInfo(path);
+                if (!info.Exists)
+                {
+                    info.Create();
+                }
+            }
+            catch
+            {
+            }
+            return path;
+        }
+
+        [Flags]
+        public enum PathTypes
+        {
+            None = 0,
+            Absolute = 1,
+            Relative = 2
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/Properties/AssemblyInfo.cs b/ClosedXML/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..e90dd2e
--- /dev/null
+++ b/ClosedXML/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ClosedXML")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ClosedXML")]
+[assembly: AssemblyCopyright("Copyright © Manuel De Leon 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8747331d-de58-4621-8c7f-a7d57ca3467a")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.75.0.0")]
+[assembly: AssemblyFileVersion("0.75.0.0")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ClosedXML_Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a1fb8ba59167fe734d64128ca73d32c45cb8a117246d09c95c8769db88fe332b0a3396bedd0ea48ee42b0e5796fec0798ca5cb628a9a6de80d35d6c67b936ca1670347b3d4f2b769c8ce2ddcf959dbac6bcd88e6c08751ea1fffa0522de3507193e7035305a8aa008d6c88cca1341b3120fa9c347ab3f97e2d772e2709277da5")]
\ No newline at end of file
diff --git a/ClosedXML/Utils/GraphicsUtils.cs b/ClosedXML/Utils/GraphicsUtils.cs
new file mode 100644
index 0000000..b5e6762
--- /dev/null
+++ b/ClosedXML/Utils/GraphicsUtils.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Drawing;
+
+namespace ClosedXML.Utils
+{
+    internal static class GraphicsUtils
+    {
+        [ThreadStatic]
+        private static Graphics threadLocalGraphics;
+        private static Graphics g
+        {
+            get
+            {
+                if (threadLocalGraphics == null)
+                {
+                    var image = new Bitmap(1, 1);
+                    threadLocalGraphics = Graphics.FromImage(image);
+                }
+                return threadLocalGraphics;
+            }
+        }
+
+        public static SizeF MeasureString(string s, Font font)
+        {
+            SizeF result = g.MeasureString(s, font, Int32.MaxValue, StringFormat.GenericTypographic);
+            return result;
+        }
+    }
+}
diff --git a/ClosedXML/XLHelper.cs b/ClosedXML/XLHelper.cs
new file mode 100644
index 0000000..d5f704d
--- /dev/null
+++ b/ClosedXML/XLHelper.cs
@@ -0,0 +1,302 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    using System.Linq;
+    using System.Text.RegularExpressions;
+    using System.Drawing;
+
+    /// <summary>
+    /// 	Common methods
+    /// </summary>
+    public static class XLHelper
+    {
+        public const int MinRowNumber = 1;
+        public const int MinColumnNumber = 1;
+        public const int MaxRowNumber = 1048576;
+        public const int MaxColumnNumber = 16384;
+        public const String MaxColumnLetter = "XFD";
+        public const Double Epsilon = 1e-10;
+
+        private const Int32 TwoT26 = 26*26;
+        internal static readonly NumberFormatInfo NumberFormatForParse = CultureInfo.InvariantCulture.NumberFormat;
+        internal static readonly Graphics Graphic = Graphics.FromImage(new Bitmap(200, 200));
+        internal static readonly Double DpiX = Graphic.DpiX;
+
+        internal static readonly Regex A1SimpleRegex = new Regex(
+            @"\A"
+            + @"(?<Reference>" // Start Group to pick
+            + @"(?<Sheet>" // Start Sheet Name, optional
+            + @"("
+            + @"\'([^\[\]\*/\\\?:\']+|\'\')\'"
+            // Sheet name with special characters, surrounding apostrophes are required
+            + @"|"
+            + @"\'?\w+\'?" // Sheet name with letters and numbers, surrounding apostrophes are optional
+            + @")"
+            + @"!)?" // End Sheet Name, optional
+            + @"(?<Range>" // Start range
+            + @"\$?[a-zA-Z]{1,3}\$?\d{1,7}" // A1 Address 1
+            + @"(?<RangeEnd>:\$?[a-zA-Z]{1,3}\$?\d{1,7})?" // A1 Address 2, optional
+            + @"|"
+            + @"(?<ColumnNumbers>\$?\d{1,7}:\$?\d{1,7})" // 1:1
+            + @"|"
+            + @"(?<ColumnLetters>\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})" // A:A
+            + @")" // End Range
+            + @")" // End Group to pick
+            + @"\Z"
+            , RegexOptions.Compiled);
+
+        internal static readonly Regex NamedRangeReferenceRegex =
+            new Regex(@"^('?(?<Sheet>[^'!]+)'?!(?<Range>.+))|((?<Table>[^\[]+)\[(?<Column>[^\]]+)\])$",
+                      RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture
+                );
+
+        /// <summary>
+        /// Gets the column number of a given column letter.
+        /// </summary>
+        /// <param name="columnLetter"> The column letter to translate into a column number. </param>
+        public static int GetColumnNumberFromLetter(string columnLetter)
+        {
+            if (string.IsNullOrEmpty(columnLetter)) throw new ArgumentNullException("columnLetter");
+
+            int retVal;
+            columnLetter = columnLetter.ToUpper();
+
+            //Extra check because we allow users to pass row col positions in as strings
+            if (columnLetter[0] <= '9')
+            {
+                retVal = Int32.Parse(columnLetter, NumberFormatForParse);
+                return retVal;
+            }
+
+            int sum = 0;
+
+            for (int i = 0; i < columnLetter.Length; i++)
+            {
+                sum *= 26;
+                sum += (columnLetter[i] - 'A' + 1);
+            }
+
+            return sum;
+        }
+
+        private static readonly string[] letters = new[] { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
+
+        /// <summary>
+        /// 	Gets the column letter of a given column number.
+        /// </summary>
+        /// <param name="columnNumber"> The column number to translate into a column letter. </param>
+        public static string GetColumnLetterFromNumber(int columnNumber)
+        {
+            columnNumber--; // Adjust for start on column 1
+            if (columnNumber <= 25)
+            {
+                return letters[columnNumber];
+            }
+            var firstPart = (columnNumber) / 26;
+            var remainder = ((columnNumber) % 26) + 1;
+            return GetColumnLetterFromNumber(firstPart) + GetColumnLetterFromNumber(remainder);
+        }
+
+        public static bool IsValidColumn(string column)
+        {
+            var length = column.Length;
+            if (IsNullOrWhiteSpace(column) || length > 3)
+                return false;
+
+            var theColumn = column.ToUpper();
+
+
+            var isValid = theColumn[0] >= 'A' && theColumn[0] <= 'Z';
+            if (length == 1)
+                return isValid;
+
+            if (length == 2)
+                return isValid && theColumn[1] >= 'A' && theColumn[1] <= 'Z';
+
+            if (theColumn[0] >= 'A' && theColumn[0] < 'X')
+                return theColumn[1] >= 'A' && theColumn[1] <= 'Z'
+                       && theColumn[2] >= 'A' && theColumn[2] <= 'Z';
+
+            if (theColumn[0] != 'X') return false;
+
+            if (theColumn[1] < 'F')
+                return theColumn[2] >= 'A' && theColumn[2] <= 'Z';
+
+            if (theColumn[1] != 'F') return false;
+
+            return theColumn[2] >= 'A' && theColumn[2] <= 'D';
+        }
+
+        public static bool IsValidRow(string rowString)
+        {
+            Int32 row;
+            if (Int32.TryParse(rowString, out row))
+                return row > 0 && row <= MaxRowNumber;
+            return false;
+        }
+
+        public static bool IsValidA1Address(string address)
+        {
+            if (IsNullOrWhiteSpace(address))
+                return false;
+
+            address = address.Replace("$", "");
+            var rowPos = 0;
+            var addressLength = address.Length;
+            while (rowPos < addressLength && (address[rowPos] > '9' || address[rowPos] < '0'))
+                rowPos++;
+
+            return
+                rowPos < addressLength
+                && IsValidRow(address.Substring(rowPos))
+                && IsValidColumn(address.Substring(0, rowPos));
+        }
+
+        public static Boolean IsValidRangeAddress(String rangeAddress)
+        {
+            return A1SimpleRegex.IsMatch(rangeAddress);
+        }
+
+        public static Boolean IsValidRangeAddress(IXLRangeAddress rangeAddress)
+        {
+
+            return !rangeAddress.IsInvalid 
+                   && rangeAddress.FirstAddress.RowNumber >= 1 && rangeAddress.LastAddress.RowNumber <= MaxRowNumber
+                   && rangeAddress.FirstAddress.ColumnNumber >= 1 && rangeAddress.LastAddress.ColumnNumber <= MaxColumnNumber
+                   && rangeAddress.FirstAddress.RowNumber <= rangeAddress.LastAddress.RowNumber
+                   && rangeAddress.FirstAddress.ColumnNumber <= rangeAddress.LastAddress.ColumnNumber;
+        }
+
+        public static int GetColumnNumberFromAddress(string cellAddressString)
+        {
+            var rowPos = 0;
+            while (cellAddressString[rowPos] > '9')
+                rowPos++;
+
+            return GetColumnNumberFromLetter(cellAddressString.Substring(0, rowPos));
+        }
+
+        internal static string[] SplitRange(string range)
+        {
+            return range.Contains('-') ? range.Replace('-', ':').Split(':') : range.Split(':');
+        }
+
+        public static Int32 GetPtFromPx(Double px)
+        {
+            return Convert.ToInt32(px*72.0/DpiX);
+        }
+
+        public static Double GetPxFromPt(Int32 pt)
+        {
+            return Convert.ToDouble(pt)*DpiX/72.0;
+        }
+
+        internal static IXLTableRows InsertRowsWithoutEvents(Func<int, bool, IXLRangeRows> insertFunc,
+                                                             XLTableRange tableRange, Int32 numberOfRows,
+                                                             Boolean expandTable)
+        {
+            var ws = tableRange.Worksheet;
+            var tracking = ws.EventTrackingEnabled;
+            ws.EventTrackingEnabled = false;
+
+            var rows = new XLTableRows(ws.Style);
+            var inserted = insertFunc(numberOfRows, false);
+            inserted.ForEach(r => rows.Add(new XLTableRow(tableRange, r as XLRangeRow)));
+
+            if (expandTable)
+                tableRange.Table.ExpandTableRows(numberOfRows);
+
+            ws.EventTrackingEnabled = tracking;
+
+            return rows;
+        }
+
+
+
+        public static bool IsNullOrWhiteSpace(string value)
+        {
+#if NET4
+            return String.IsNullOrWhiteSpace(value);
+#else
+            if (value != null)
+            {
+                var length = value.Length;
+                for (int i = 0; i < length; i++)
+                {
+                    if (!char.IsWhiteSpace(value[i]))
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+#endif
+
+        }
+
+        private static readonly Regex A1RegexRelative = new Regex(
+      @"(?<=\W)(?<one>\$?[a-zA-Z]{1,3}\$?\d{1,7})(?=\W)" // A1
+    + @"|(?<=\W)(?<two>\$?\d{1,7}:\$?\d{1,7})(?=\W)" // 1:1
+    + @"|(?<=\W)(?<three>\$?[a-zA-Z]{1,3}:\$?[a-zA-Z]{1,3})(?=\W)", RegexOptions.Compiled); // A:A
+
+        private static string Evaluator(Match match, Int32 row, String column)
+        {
+            if (match.Groups["one"].Success)
+            {
+                var split = match.Groups["one"].Value.Split('$');
+                if (split.Length == 1) return column + row; // A1
+                if (split.Length == 3) return match.Groups["one"].Value; // $A$1
+                var a = XLAddress.Create(match.Groups["one"].Value);
+                if (split[0] == String.Empty) return "$" + a.ColumnLetter + row; // $A1
+                return column + "$" + a.RowNumber;
+            }
+
+            if (match.Groups["two"].Success)
+                return ReplaceGroup(match.Groups["two"].Value, row.ToString());
+
+            return ReplaceGroup(match.Groups["three"].Value, column);
+        }
+
+        private static String ReplaceGroup(String value, String item)
+        {
+            var split = value.Split(':');
+            String ret1 = split[0].StartsWith("$") ? split[0] : item;
+            String ret2 = split[1].StartsWith("$") ? split[1] : item;
+            return ret1 + ":" + ret2;
+        }
+
+        internal static String ReplaceRelative(String value, Int32 row, String column)
+        {
+            var oldValue = ">" + value + "<";
+            var newVal = A1RegexRelative.Replace(oldValue, m => Evaluator(m, row, column));
+            return newVal.Substring(1, newVal.Length - 2);
+        }
+
+        public static Boolean AreEqual(Double d1, Double d2)
+        {
+            return Math.Abs(d1 - d2) < Epsilon;
+        }
+
+        public static DateTime GetDate(Object v)
+        {
+            // handle dates
+            if (v is DateTime)
+            {
+                return (DateTime)v;
+            }
+
+            // handle doubles
+            if (v is double)
+            {
+                return DateTime.FromOADate((double)v);
+            }
+
+            // handle everything else
+            return (DateTime)Convert.ChangeType(v, typeof(DateTime));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML/packages.config b/ClosedXML/packages.config
new file mode 100644
index 0000000..dfe0d07
--- /dev/null
+++ b/ClosedXML/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40-Client" />
+</packages>
\ No newline at end of file
diff --git a/ClosedXML_Examples/AutoFilters/CustomAutoFilter.cs b/ClosedXML_Examples/AutoFilters/CustomAutoFilter.cs
new file mode 100644
index 0000000..6dcdaa4
--- /dev/null
+++ b/ClosedXML_Examples/AutoFilters/CustomAutoFilter.cs
@@ -0,0 +1,139 @@
+using System;
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class CustomAutoFilter : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws;
+
+            #region Single Column Numbers
+            String singleColumnNumbers = "Single Column Numbers";
+            ws = wb.Worksheets.Add(singleColumnNumbers);
+
+            // Add a bunch of numbers to filter
+            ws.Cell("A1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).EqualTo(3).Or.GreaterThan(4);
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Single Column Strings
+            String singleColumnStrings = "Single Column Strings";
+            ws = wb.Worksheets.Add(singleColumnStrings);
+
+            // Add a bunch of strings to filter
+            ws.Cell("A1").SetValue("Strings")
+                         .CellBelow().SetValue("B")
+                         .CellBelow().SetValue("C")
+                         .CellBelow().SetValue("C")
+                         .CellBelow().SetValue("E")
+                         .CellBelow().SetValue("A")
+                         .CellBelow().SetValue("D");
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).Between("B", "D");
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Single Column Mixed
+            String singleColumnMixed = "Single Column Mixed";
+            ws = wb.Worksheets.Add(singleColumnMixed);
+
+            // Add a bunch of items to filter
+            ws.Cell("A1").SetValue("Mixed")
+                         .CellBelow().SetValue("B")
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue("C")
+                         .CellBelow().SetValue("E")
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).EqualTo(3).Or.EqualTo("C");
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Multi Column
+            String multiColumn = "Multi Column";
+            ws = wb.Worksheets.Add(multiColumn);
+
+            ws.Cell("A1").SetValue("First")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            ws.Cell("B1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            ws.Cell("C1").SetValue("Strings")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(2).EqualTo(3).Or.GreaterThan(4);
+            ws.RangeUsed().SetAutoFilter().Column(3).Between("B", "D");
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(3);
+            #endregion
+
+            using (var ms = new MemoryStream())
+            {
+                wb.SaveAs(ms);
+
+                var workbook = new XLWorkbook(ms);
+
+                #region Single Column Numbers
+                workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Single Column Strings
+                workbook.Worksheet(singleColumnStrings).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Single Column Mixed
+                workbook.Worksheet(singleColumnMixed).AutoFilter.Column(1).EqualOrGreaterThan("D");
+                workbook.Worksheet(singleColumnMixed).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Multi Column 
+                workbook.Worksheet(multiColumn).AutoFilter.Column(3).EqualTo("E");
+                workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
+                #endregion
+
+                workbook.SaveAs(filePath);
+                ms.Close();
+            }
+        }
+    }
+}
diff --git a/ClosedXML_Examples/AutoFilters/DynamicAutoFilter.cs b/ClosedXML_Examples/AutoFilters/DynamicAutoFilter.cs
new file mode 100644
index 0000000..3791185
--- /dev/null
+++ b/ClosedXML_Examples/AutoFilters/DynamicAutoFilter.cs
@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class DynamicAutoFilter : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws;
+
+            #region Single Column Numbers
+            String singleColumnNumbers = "Single Column Numbers";
+            ws = wb.Worksheets.Add(singleColumnNumbers);
+
+            // Add a bunch of numbers to filter
+            ws.Cell("A1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).AboveAverage();
+
+            // Sort the filtered list
+            //ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Multi Column
+            String multiColumn = "Multi Column";
+            ws = wb.Worksheets.Add(multiColumn);
+
+            ws.Cell("A1").SetValue("First")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            ws.Cell("B1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            ws.Cell("C1").SetValue("Strings")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(2).BelowAverage();
+
+            // Sort the filtered list
+            //ws.AutoFilter.Sort(3);
+            #endregion
+
+            using (var ms = new MemoryStream())
+            {
+                wb.SaveAs(ms);
+
+                var workbook = new XLWorkbook(ms);
+
+                #region Single Column Numbers
+                //workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Multi Column 
+                //workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
+                #endregion
+
+                workbook.SaveAs(filePath);
+                ms.Close();
+            }
+        }
+    }
+}
diff --git a/ClosedXML_Examples/AutoFilters/RegularAutoFilter.cs b/ClosedXML_Examples/AutoFilters/RegularAutoFilter.cs
new file mode 100644
index 0000000..9a65eab
--- /dev/null
+++ b/ClosedXML_Examples/AutoFilters/RegularAutoFilter.cs
@@ -0,0 +1,172 @@
+using System;
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class RegularAutoFilter : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws;
+
+            #region Single Column Numbers
+            String singleColumnNumbers = "Single Column Numbers";
+            ws = wb.Worksheets.Add(singleColumnNumbers);
+
+            // Add a bunch of numbers to filter
+            ws.Cell("A1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).AddFilter(3)
+                                                    .AddFilter(1);
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Single Column Strings
+            String singleColumnStrings = "Single Column Strings";
+            ws = wb.Worksheets.Add(singleColumnStrings);
+
+            // Add a bunch of strings to filter
+            ws.Cell("A1").SetValue("Strings")
+                         .CellBelow().SetValue("B")
+                         .CellBelow().SetValue("C")
+                         .CellBelow().SetValue("C")
+                         .CellBelow().SetValue("E")
+                         .CellBelow().SetValue("A")
+                         .CellBelow().SetValue("D");
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).AddFilter("C")
+                                                    .AddFilter("A");
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Single Column Mixed
+            String singleColumnMixed = "Single Column Mixed";
+            ws = wb.Worksheets.Add(singleColumnMixed);
+
+            // Add a bunch of items to filter
+            ws.Cell("A1").SetValue("Mixed")
+                         .CellBelow().SetValue("B")
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue("C")
+                         .CellBelow().SetValue("E")
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).AddFilter("C")
+                                                    .AddFilter(1);
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Multi Column
+            String multiColumn = "Multi Column";
+            ws = wb.Worksheets.Add(multiColumn);
+
+            ws.Cell("A1").SetValue("First")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            ws.Cell("B1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            ws.Cell("C1").SetValue("Strings")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(2).AddFilter(3)
+                                                    .AddFilter(1);
+
+            // Sort the filtered list
+            ws.AutoFilter.Sort(3);
+            #endregion
+
+            #region Table
+            String tableSheetName = "Table";
+            ws = wb.Worksheets.Add(tableSheetName);
+
+            // Add a bunch of numbers to filter
+            ws.Cell("A1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            // Add filters
+            var table = ws.RangeUsed().CreateTable();
+            table.ShowTotalsRow = true;
+            table.Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
+            table.AutoFilter.Column(1).AddFilter(3).AddFilter(4);
+
+            table.AutoFilter.Sort(1);
+            #endregion
+
+            using (var ms = new MemoryStream())
+            {
+                wb.SaveAs(ms);
+
+                var workbook = new XLWorkbook(ms);
+
+                #region Single Column Numbers
+                workbook.Worksheet(singleColumnNumbers).AutoFilter.Column(1).AddFilter(5);
+                workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Single Column Strings
+                workbook.Worksheet(singleColumnStrings).AutoFilter.Column(1).AddFilter("E");
+                workbook.Worksheet(singleColumnStrings).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Single Column Mixed
+                workbook.Worksheet(singleColumnMixed).AutoFilter.Column(1).AddFilter("E");
+                workbook.Worksheet(singleColumnMixed).AutoFilter.Column(1).AddFilter(3);
+                workbook.Worksheet(singleColumnMixed).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Multi Column 
+                workbook.Worksheet(multiColumn).AutoFilter.Column(3).AddFilter("C");
+                workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
+                #endregion
+
+                #region Table
+                workbook.Worksheet(tableSheetName).Table(0).AutoFilter.Column(1).AddFilter(5);
+                workbook.Worksheet(tableSheetName).Table(0).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                workbook.SaveAs(filePath);
+                ms.Close();
+            }
+        }
+    }
+}
diff --git a/ClosedXML_Examples/AutoFilters/TopBottomAutoFilter.cs b/ClosedXML_Examples/AutoFilters/TopBottomAutoFilter.cs
new file mode 100644
index 0000000..dbd8f88
--- /dev/null
+++ b/ClosedXML_Examples/AutoFilters/TopBottomAutoFilter.cs
@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class TopBottomAutoFilter : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws;
+
+            #region Single Column Numbers
+            String singleColumnNumbers = "Single Column Numbers";
+            ws = wb.Worksheets.Add(singleColumnNumbers);
+
+            // Add a bunch of numbers to filter
+            ws.Cell("A1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(1).Top(2);
+
+            // Sort the filtered list
+            //ws.AutoFilter.Sort(1);
+            #endregion
+
+            #region Multi Column
+            String multiColumn = "Multi Column";
+            ws = wb.Worksheets.Add(multiColumn);
+
+            ws.Cell("A1").SetValue("First")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            ws.Cell("B1").SetValue("Numbers")
+                         .CellBelow().SetValue(2)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(3)
+                         .CellBelow().SetValue(5)
+                         .CellBelow().SetValue(1)
+                         .CellBelow().SetValue(4);
+
+            ws.Cell("C1").SetValue("Strings")
+             .CellBelow().SetValue("B")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("C")
+             .CellBelow().SetValue("E")
+             .CellBelow().SetValue("A")
+             .CellBelow().SetValue("D");
+
+            // Add filters
+            ws.RangeUsed().SetAutoFilter().Column(2).Bottom(50, XLTopBottomType.Percent);
+
+            // Sort the filtered list
+            //ws.AutoFilter.Sort(3);
+            #endregion
+
+            using (var ms = new MemoryStream())
+            {
+                wb.SaveAs(ms);
+
+                var workbook = new XLWorkbook(ms);
+
+                #region Single Column Numbers
+                //workbook.Worksheet(singleColumnNumbers).AutoFilter.Sort(1, XLSortOrder.Descending);
+                #endregion
+
+                #region Multi Column 
+                //workbook.Worksheet(multiColumn).AutoFilter.Sort(3, XLSortOrder.Descending);
+                #endregion
+
+                workbook.SaveAs(filePath);
+                ms.Close();
+            }
+        }
+    }
+}
diff --git a/ClosedXML_Examples/BasicTable.cs b/ClosedXML_Examples/BasicTable.cs
new file mode 100644
index 0000000..c084772
--- /dev/null
+++ b/ClosedXML_Examples/BasicTable.cs
@@ -0,0 +1,94 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class BasicTable : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            // Creating a new workbook
+            var wb = new XLWorkbook();
+
+            //Adding a worksheet
+            var ws = wb.Worksheets.Add("Contacts");
+
+            //Adding text
+            //Title
+            ws.Cell("B2").Value = "Contacts";
+            //First Names
+            ws.Cell("B3").Value = "FName";
+            ws.Cell("B4").Value = "John";
+            ws.Cell("B5").Value = "Hank";
+            ws.Cell("B6").Value = "Dagny";
+            //Last Names
+            ws.Cell("C3").Value = "LName";
+            ws.Cell("C4").Value = "Galt";
+            ws.Cell("C5").Value = "Rearden";
+            ws.Cell("C6").Value = "Taggart";
+
+            //Adding more data types
+            //Is an outcast?
+            ws.Cell("D3").Value = "Outcast";
+            ws.Cell("D4").Value = true;
+            ws.Cell("D5").Value = false;
+            ws.Cell("D6").Value = false;
+            //Date of Birth
+            ws.Cell("E3").Value = "DOB";
+            ws.Cell("E4").Value = new DateTime(1919, 1, 21);
+            ws.Cell("E5").Value = new DateTime(1907, 3, 4);
+            ws.Cell("E6").Value = new DateTime(1921, 12, 15);
+            //Income
+            ws.Cell("F3").Value = "Income";
+            ws.Cell("F4").Value = 2000;
+            ws.Cell("F5").Value = 40000;
+            ws.Cell("F6").Value = 10000;
+
+            //Defining ranges
+            //From worksheet
+            var rngTable = ws.Range("B2:F6");
+            //From another range
+            var rngDates = rngTable.Range("D3:D5"); // The address is relative to rngTable (NOT the worksheet)
+            var rngNumbers = rngTable.Range("E3:E5"); // The address is relative to rngTable (NOT the worksheet)
+
+            //Formatting dates and numbers
+            //Using a OpenXML's predefined formats
+            rngDates.Style.NumberFormat.NumberFormatId = 15;
+            //Using a custom format
+            rngNumbers.Style.NumberFormat.Format = "$ #,##0";
+
+            //Formatting headers
+            var rngHeaders = rngTable.Range("A2:E2"); // The address is relative to rngTable (NOT the worksheet)
+            rngHeaders.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+            rngHeaders.Style.Font.Bold = true;
+            rngHeaders.Style.Fill.BackgroundColor = XLColor.Aqua;
+
+            //Adding grid lines
+            rngTable.Style.Border.BottomBorder = XLBorderStyleValues.Thin;
+
+            //Format title cell
+            rngTable.Cell(1, 1).Style.Font.Bold = true;
+            rngTable.Cell(1, 1).Style.Fill.BackgroundColor = XLColor.CornflowerBlue;
+            rngTable.Cell(1, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+
+            //Merge title cells
+            rngTable.Row(1).Merge(); // We could've also used: rngTable.Range("A1:E1").Merge()
+            
+            //Add thick borders
+            rngTable.Style.Border.OutsideBorder = XLBorderStyleValues.Thick;
+
+            // You can also specify the border for each side with:
+            // rngTable.FirstColumn().Style.Border.LeftBorder = XLBorderStyleValues.Thick;
+            // rngTable.LastColumn().Style.Border.RightBorder = XLBorderStyleValues.Thick;
+            // rngTable.FirstRow().Style.Border.TopBorder = XLBorderStyleValues.Thick;
+            // rngTable.LastRow().Style.Border.BottomBorder = XLBorderStyleValues.Thick;
+
+            // Adjust column widths to their content
+            ws.Columns(2, 6).AdjustToContents();
+
+            //Saving the workbook
+            wb.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/ClosedXML.snk b/ClosedXML_Examples/ClosedXML.snk
new file mode 100644
index 0000000..a17cff7
--- /dev/null
+++ b/ClosedXML_Examples/ClosedXML.snk
Binary files differ
diff --git a/ClosedXML_Examples/ClosedXML_Examples.csproj b/ClosedXML_Examples/ClosedXML_Examples.csproj
new file mode 100644
index 0000000..6ae7ae6
--- /dev/null
+++ b/ClosedXML_Examples/ClosedXML_Examples.csproj
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{03A518D0-1CB7-488E-861C-C4E782B27A46}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ClosedXML_Examples</RootNamespace>
+    <AssemblyName>ClosedXML_Examples</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML_Examples.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>ClosedXML_Examples.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AutoFilters\DynamicAutoFilter.cs" />
+    <Compile Include="AutoFilters\TopBottomAutoFilter.cs" />
+    <Compile Include="AutoFilters\CustomAutoFilter.cs" />
+    <Compile Include="AutoFilters\RegularAutoFilter.cs" />
+    <Compile Include="BasicTable.cs" />
+    <Compile Include="Columns\ColumnCollections.cs" />
+    <Compile Include="Columns\ColumnSettings.cs" />
+    <Compile Include="Columns\ColumnCells.cs" />
+    <Compile Include="Columns\DeletingColumns.cs" />
+    <Compile Include="Comments\AddingComments.cs" />
+    <Compile Include="Comments\EditingComments.cs" />
+    <Compile Include="ConditionalFormatting\ConditionalFormatting.cs" />
+    <Compile Include="Delete\DeleteFewWorksheets.cs" />
+    <Compile Include="IXLExample.cs" />
+    <Compile Include="Misc\CopyingRowsAndColumns.cs" />
+    <Compile Include="ModifyFiles.cs" />
+    <Compile Include="Creating\CreateFiles.cs" />
+    <Compile Include="Loading\ChangingBasicTable.cs" />
+    <Compile Include="Misc\AdjustToContents.cs" />
+    <Compile Include="Misc\Collections.cs" />
+    <Compile Include="Misc\BlankCells.cs" />
+    <Compile Include="Misc\AutoFilter.cs" />
+    <Compile Include="Misc\AddingDataTableAsWorksheet.cs" />
+    <Compile Include="Misc\AddingDataSet.cs" />
+    <Compile Include="Misc\TabColors.cs" />
+    <Compile Include="Misc\SheetProtection.cs" />
+    <Compile Include="Misc\ShiftingFormulas.cs" />
+    <Compile Include="Misc\HideSheets.cs" />
+    <Compile Include="Misc\DataValidation.cs" />
+    <Compile Include="Misc\Hyperlinks.cs" />
+    <Compile Include="Misc\InsertingData.cs" />
+    <Compile Include="Misc\InsertingTables.cs" />
+    <Compile Include="Misc\CopyingWorksheets.cs" />
+    <Compile Include="Misc\FreezePanes.cs" />
+    <Compile Include="PageSetup\TwoPages.cs" />
+    <Compile Include="Misc\ShowCase.cs" />
+    <Compile Include="ExampleHelper.cs" />
+    <Compile Include="PivotTables\PivotTables.cs" />
+    <Compile Include="Ranges\SelectingRanges.cs" />
+    <Compile Include="Ranges\CurrentRowColumn.cs" />
+    <Compile Include="Ranges\WalkingRanges.cs" />
+    <Compile Include="Ranges\SortExample.cs" />
+    <Compile Include="Ranges\Sorting.cs" />
+    <Compile Include="Ranges\UsingTables.cs" />
+    <Compile Include="Ranges\CopyingRanges.cs" />
+    <Compile Include="Ranges\NamedRanges.cs" />
+    <Compile Include="Misc\Formulas.cs" />
+    <Compile Include="Misc\Outline.cs" />
+    <Compile Include="Misc\HideUnhide.cs" />
+    <Compile Include="Misc\WorkbookProperties.cs" />
+    <Compile Include="Misc\MergeMoves.cs" />
+    <Compile Include="Ranges\TransposeRanges.cs" />
+    <Compile Include="Ranges\TransposeRangesPlus.cs" />
+    <Compile Include="Misc\LambdaExpressions.cs" />
+    <Compile Include="Loading\LoadFiles.cs" />
+    <Compile Include="Misc\CellValues.cs" />
+    <Compile Include="PageSetup\SheetTab.cs" />
+    <Compile Include="PageSetup\Sheets.cs" />
+    <Compile Include="PageSetup\HeaderFooters.cs" />
+    <Compile Include="PageSetup\Margins.cs" />
+    <Compile Include="PageSetup\Page.cs" />
+    <Compile Include="Ranges\ClearingRanges.cs" />
+    <Compile Include="Ranges\InsertingDeletingColumns.cs" />
+    <Compile Include="Ranges\InsertingDeletingRows.cs" />
+    <Compile Include="Ranges\DeletingRanges.cs" />
+    <Compile Include="Ranges\DefiningRanges.cs" />
+    <Compile Include="Ranges\ShiftingRanges.cs" />
+    <Compile Include="Ranges\MultipleRanges.cs" />
+    <Compile Include="Delete\DeleteRows.cs" />
+    <Compile Include="Rows\RowCells.cs" />
+    <Compile Include="Rows\RowCollection.cs" />
+    <Compile Include="Columns\InsertColumns.cs" />
+    <Compile Include="HelloWorld.cs" />
+    <Compile Include="Misc\MultipleSheets.cs" />
+    <Compile Include="Misc\DataTypes.cs" />
+    <Compile Include="Misc\MergeCells.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Rows\InsertRows.cs" />
+    <Compile Include="Rows\RowSettings.cs" />
+    <Compile Include="StyleExamples.cs" />
+    <Compile Include="Styles\PurpleWorksheet.cs" />
+    <Compile Include="Styles\UsingPhonetics.cs" />
+    <Compile Include="Styles\UsingRichText.cs" />
+    <Compile Include="Styles\UsingColors.cs" />
+    <Compile Include="Styles\DefaultStyles.cs" />
+    <Compile Include="Styles\StyleRowsColumns.cs" />
+    <Compile Include="Styles\StyleWorksheet.cs" />
+    <Compile Include="Styles\StyleAlignment.cs" />
+    <Compile Include="Styles\StyleBorder.cs" />
+    <Compile Include="Styles\StyleFill.cs" />
+    <Compile Include="Styles\StyleFont.cs" />
+    <Compile Include="Styles\StyleNumberFormat.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="ClosedXML.snk" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
+      <Project>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</Project>
+      <Name>ClosedXML</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ClosedXML_Examples/Columns/ColumnCells.cs b/ClosedXML_Examples/Columns/ColumnCells.cs
new file mode 100644
index 0000000..f4ccf50
--- /dev/null
+++ b/ClosedXML_Examples/Columns/ColumnCells.cs
@@ -0,0 +1,32 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class ColumnCells : IXLExample
+    {
+
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Column Cells");
+
+            var columnFromWorksheet = ws.Column(1);
+            columnFromWorksheet.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
+            columnFromWorksheet.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
+            columnFromWorksheet.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
+            columnFromWorksheet.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
+
+            var columnFromRange = ws.Range("B1:B9").FirstColumn();
+
+            columnFromRange.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
+            columnFromRange.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
+            columnFromRange.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
+            columnFromRange.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
+
+            workbook.SaveAs(filePath);
+        }
+
+    }
+}
diff --git a/ClosedXML_Examples/Columns/ColumnCollections.cs b/ClosedXML_Examples/Columns/ColumnCollections.cs
new file mode 100644
index 0000000..a97b777
--- /dev/null
+++ b/ClosedXML_Examples/Columns/ColumnCollections.cs
@@ -0,0 +1,108 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Columns
+{
+    public class ColumnCollection : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Columns of a Range");
+
+            // All columns in a range
+            ws.Range("A1:B2").Columns().Style.Fill.BackgroundColor = XLColor.DimGray;
+
+            var bigRange = ws.Range("A4:V6");
+
+            // Contiguous columns by number
+            bigRange.Columns(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
+
+            // Contiguous columns by letter
+            bigRange.Columns("D", "E").Style.Fill.BackgroundColor = XLColor.Blue;
+
+            // Contiguous columns by letter
+            bigRange.Columns("G:H").Style.Fill.BackgroundColor = XLColor.DeepPink;
+
+            // Spread columns by number
+            bigRange.Columns("10:11,13:14").Style.Fill.BackgroundColor = XLColor.Orange;
+
+            // Spread columns by letter
+            bigRange.Columns("P:Q,S:T").Style.Fill.BackgroundColor = XLColor.Turquoise;
+
+            // Use a single number/letter
+            bigRange.Columns("V").Style.Fill.BackgroundColor = XLColor.Cyan;
+
+            // Adjust the width
+            ws.Columns("A:V").Width = 3; 
+
+            var ws2 = workbook.Worksheets.Add("Columns of a worksheet");
+            
+            // Contiguous columns by number
+            ws2.Columns(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
+
+            // Contiguous columns by letter
+            ws2.Columns("D", "E").Style.Fill.BackgroundColor = XLColor.Blue;
+
+            // Contiguous columns by letter
+            ws2.Columns("G:H").Style.Fill.BackgroundColor = XLColor.DeepPink;
+
+            // Spread columns by number
+            ws2.Columns("10:11,13:14").Style.Fill.BackgroundColor = XLColor.Orange;
+
+            // Spread columns by letter
+            ws2.Columns("P:Q,S:T").Style.Fill.BackgroundColor = XLColor.Turquoise;
+
+            // Use a single number/letter
+            ws2.Columns("V").Style.Fill.BackgroundColor = XLColor.Cyan;
+
+            // Adjust the width
+            ws2.Columns("A:V").Width = 3;
+            
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Columns/ColumnSettings.cs b/ClosedXML_Examples/Columns/ColumnSettings.cs
new file mode 100644
index 0000000..e051640
--- /dev/null
+++ b/ClosedXML_Examples/Columns/ColumnSettings.cs
@@ -0,0 +1,80 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Columns
+{
+    public class ColumnSettings : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Constructors
+
+        // Public
+        public ColumnSettings()
+        {
+
+        }
+
+
+        // Private
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Column Settings");
+
+            var col1 = ws.Column("B");
+            col1.Style.Fill.BackgroundColor = XLColor.Red;
+            col1.Width = 20;
+
+            var col2 = ws.Column(4);
+            col2.Style.Fill.BackgroundColor = XLColor.DarkOrange;
+            col2.Width = 5;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Columns/DeletingColumns.cs b/ClosedXML_Examples/Columns/DeletingColumns.cs
new file mode 100644
index 0000000..405a9bf
--- /dev/null
+++ b/ClosedXML_Examples/Columns/DeletingColumns.cs
@@ -0,0 +1,75 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class DeletingColumns : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Deleting Columns");
+
+            var rngTitles = ws.Range("B2:D2");
+            ws.Row(1).InsertRowsBelow(2);
+
+            var rng1 = ws.Range("B2:D2");
+            var rng2 = ws.Range("F2:G2");
+            var rng3 = ws.Range("A1:A3");
+            var col1 = ws.Column(1);
+
+            rng1.Style.Fill.BackgroundColor = XLColor.Orange;
+            rng2.Style.Fill.BackgroundColor = XLColor.Blue;
+            rng3.Style.Fill.BackgroundColor = XLColor.Red;
+            col1.Style.Fill.BackgroundColor = XLColor.Black;
+
+            ws.Columns("A,C,E:H").Delete();
+            ws.Cell("A2").Value = "OK";
+            ws.Cell("B2").Value = "OK";
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Columns/InsertColumns.cs b/ClosedXML_Examples/Columns/InsertColumns.cs
new file mode 100644
index 0000000..e5f5579
--- /dev/null
+++ b/ClosedXML_Examples/Columns/InsertColumns.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Columns
+{
+    public class InsertColumns : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Inserting Columns");
+
+            // Color the entire spreadsheet using columns
+            ws.Columns().Style.Fill.BackgroundColor = XLColor.LightCyan;
+
+            // Put a value in a few cells
+            foreach (var r in Enumerable.Range(1, 5))
+                foreach (var c in Enumerable.Range(1, 5))
+                    ws.Cell(r, c).Value = "X";
+
+
+            var blueColumn = ws.Column(2);
+            var redColumn = ws.Column(5);
+
+            blueColumn.Style.Fill.BackgroundColor = XLColor.Blue;
+            blueColumn.InsertColumnsAfter(2);
+
+
+            redColumn.Style.Fill.BackgroundColor = XLColor.Red;
+            redColumn.InsertColumnsBefore(2);
+
+            ws.Rows(3, 4).Style.Fill.BackgroundColor = XLColor.Orange;
+            ws.Range("B1:D1").InsertColumnsAfter(2);
+            ws.Range("B2:D2").InsertColumnsBefore(2);
+            ws.Range("B3:D3").InsertColumnsAfter(2);
+            ws.Range("B4:D4").InsertColumnsBefore(2);
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Comments/AddingComments.cs b/ClosedXML_Examples/Comments/AddingComments.cs
new file mode 100644
index 0000000..fe5b0d3
--- /dev/null
+++ b/ClosedXML_Examples/Comments/AddingComments.cs
@@ -0,0 +1,284 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ClosedXML.Excel;
+using System.IO;
+
+namespace ClosedXML_Examples 
+{
+    public class AddingComments : IXLExample 
+    {
+
+        public void Create(string filePath)
+        {
+            var wb = new XLWorkbook {Author = "Manuel"};
+            AddMiscComments(wb);
+            AddVisibilityComments(wb);
+            AddPosition(wb);
+            AddSignatures(wb);
+            AddStyleAlignment(wb);
+            AddColorsAndLines(wb);
+            AddMagins(wb);
+            AddProperties(wb);
+            AddProtection(wb);
+            AddSize(wb);
+            AddWeb(wb);
+
+            wb.SaveAs(filePath);
+        }
+
+        private void AddWeb(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Web");
+            ws.Cell("A1").Comment.Style.Web.AlternateText = "The alternate text in case you need it.";
+        }
+
+        private void AddSize(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Size");
+
+            // Automatic size is a copy of the property comment.Style.Alignment.AutomaticSize
+            // I created the duplicate because it makes more sense for it to be in Size
+            // but Excel has it under the Alignment tab.
+            ws.Cell("A2").Comment.AddText("Things are very tight around here.");
+            ws.Cell("A2").Comment.Style.Size.SetAutomaticSize();
+
+            ws.Cell("A4").Comment.AddText("Different size");
+            ws.Cell("A4").Comment.Style
+                .Size.SetHeight(30) // The height is set in the same units as row.Height
+                .Size.SetWidth(30); // The width is set in the same units as row.Width
+
+            // Set all comments to visible
+            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
+        }
+
+        private void AddProtection(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Protection");
+
+            ws.Cell("A1").Comment.Style
+                .Protection.SetLocked(false)
+                .Protection.SetLockText(false);
+        }
+
+        private void AddProperties(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Properties");
+
+            ws.Cell("A1").Comment.Style.Properties.Positioning = XLDrawingAnchor.Absolute;
+            ws.Cell("A2").Comment.Style.Properties.Positioning = XLDrawingAnchor.MoveAndSizeWithCells;
+            ws.Cell("A3").Comment.Style.Properties.Positioning = XLDrawingAnchor.MoveWithCells;
+        }
+
+        private void AddMagins(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Margins");
+
+            ws.Cell("A2").Comment
+                .SetVisible()
+                .AddText("Lorem ipsum dolor sit amet, adipiscing elit. ").AddNewLine()
+                .AddText("Nunc elementum, sapien a ultrices, commodo nisl. ").AddNewLine()
+                .AddText("Consequat erat lectus a nisi. Aliquam facilisis.");
+
+            ws.Cell("A2").Comment.Style
+                .Margins.SetAll(0.25)
+                .Size.SetAutomaticSize();
+        }
+
+        private void AddColorsAndLines(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Colors and Lines");
+
+            ws.Cell("A2").Comment
+                .AddText("Now ")
+                .AddText("THIS").SetBold().SetFontColor(XLColor.Red)
+                .AddText(" is colorful!");
+            ws.Cell("A2").Comment.Style
+                .ColorsAndLines.SetFillColor(XLColor.RichCarmine)
+                .ColorsAndLines.SetFillTransparency(0.25) // 25% opaque
+                .ColorsAndLines.SetLineColor(XLColor.Blue)
+                .ColorsAndLines.SetLineTransparency(0.75) // 75% opaque
+                .ColorsAndLines.SetLineDash(XLDashStyle.LongDash)
+                .ColorsAndLines.SetLineStyle(XLLineStyle.ThickBetweenThin)
+                .ColorsAndLines.SetLineWeight(7.5);
+
+            // Set all comments to visible
+            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
+        }
+
+        private void AddStyleAlignment(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Alignment");
+
+            // Automagically adjust the size of the comment to fit the contents
+            ws.Cell("A1").Comment.Style.Alignment.SetAutomaticSize();
+            ws.Cell("A1").Comment.AddText("Things are pretty tight around here");
+
+            // Default values
+            ws.Cell("A3").Comment
+                .AddText("Default Alignments:").AddNewLine()
+                .AddText("Vertical = Top").AddNewLine()
+                .AddText("Horizontal = Left").AddNewLine()
+                .AddText("Orientation = Left to Right");
+
+            // Let's change the alignments
+            ws.Cell("A8").Comment
+                .AddText("Vertical = Bottom").AddNewLine()
+                .AddText("Horizontal = Right");
+            ws.Cell("A8").Comment.Style
+                .Alignment.SetVertical(XLDrawingVerticalAlignment.Bottom)
+                .Alignment.SetHorizontal(XLDrawingHorizontalAlignment.Right);
+
+            // And now the orientation...
+            ws.Cell("D3").Comment.AddText("Orientation = Bottom to Top");
+            ws.Cell("D3").Comment.Style
+                .Alignment.SetOrientation(XLDrawingTextOrientation.BottomToTop)
+                .Alignment.SetAutomaticSize();
+
+            ws.Cell("E3").Comment.AddText("Orientation = Top to Bottom");
+            ws.Cell("E3").Comment.Style
+                .Alignment.SetOrientation(XLDrawingTextOrientation.TopToBottom)
+                .Alignment.SetAutomaticSize();
+
+            ws.Cell("F3").Comment.AddText("Orientation = Vertical");
+            ws.Cell("F3").Comment.Style
+                .Alignment.SetOrientation(XLDrawingTextOrientation.Vertical)
+                .Alignment.SetAutomaticSize();
+
+
+            // Set all comments to visible
+            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
+        }
+
+        private static void AddMiscComments(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Comments");
+
+            ws.Cell("A1").SetValue("Hidden").Comment.AddText("Hidden");
+            ws.Cell("A2").SetValue("Visible").Comment.AddText("Visible");
+            ws.Cell("A3").SetValue("On Top").Comment.AddText("On Top");
+            ws.Cell("A4").SetValue("Underneath").Comment.AddText("Underneath");
+            ws.Cell("A4").Comment.Style.Alignment.SetVertical(XLDrawingVerticalAlignment.Bottom);
+            ws.Cell("A3").Comment.SetZOrder(ws.Cell("A4").Comment.ZOrder + 1);
+
+            ws.Cell("D9").Comment.AddText("Vertical");
+            ws.Cell("D9").Comment.Style.Alignment.Orientation = XLDrawingTextOrientation.Vertical;
+            ws.Cell("D9").Comment.Style.Size.SetAutomaticSize();
+
+            ws.Cell("E9").Comment.AddText("Top to Bottom");
+            ws.Cell("E9").Comment.Style.Alignment.Orientation = XLDrawingTextOrientation.TopToBottom;
+            ws.Cell("E9").Comment.Style.Size.SetAutomaticSize();
+
+            ws.Cell("F9").Comment.AddText("Bottom to Top");
+            ws.Cell("F9").Comment.Style.Alignment.Orientation = XLDrawingTextOrientation.BottomToTop;
+            ws.Cell("F9").Comment.Style.Size.SetAutomaticSize();
+
+            ws.Cell("E1").Comment.Position.SetColumn(5);
+            ws.Cell("E1").Comment.AddText("Start on Col E, on top border");
+            ws.Cell("E1").Comment.Style.Size.SetWidth(10);
+            var cE3 = ws.Cell("E3").Comment;
+            cE3.AddText("Size and position");
+            cE3.Position.SetColumn(5).SetRow(4).SetColumnOffset(7).SetRowOffset(10);
+            cE3.Style.Size.SetHeight(25).Size.SetWidth(10);
+            var cE7 = ws.Cell("E7").Comment;
+            cE7.Position.SetColumn(6).SetRow(7).SetColumnOffset(0).SetRowOffset(0);
+            cE7.Style.Size.SetHeight(ws.Row(7).Height).Size.SetWidth(ws.Column(6).Width);
+
+            ws.Cell("G1").Comment.AddText("Automatic Size");
+            ws.Cell("G1").Comment.Style.Alignment.SetAutomaticSize();
+            var cG3 = ws.Cell("G3").Comment;
+            cG3.SetAuthor("MDeLeon");
+            cG3.AddSignature();
+            cG3.AddText("This is a test of the emergency broadcast system.");
+            cG3.AddNewLine();
+            cG3.AddText("Do ");
+            cG3.AddText("NOT").SetFontColor(XLColor.RadicalRed).SetUnderline().SetBold();
+            cG3.AddText(" forget it.");
+            cG3.Style
+                .Size.SetWidth(25)
+                .Size.SetHeight(100)
+                .Alignment.SetDirection(XLDrawingTextDirection.LeftToRight)
+                .Alignment.SetHorizontal(XLDrawingHorizontalAlignment.Distributed)
+                .Alignment.SetVertical(XLDrawingVerticalAlignment.Center)
+                .Alignment.SetOrientation(XLDrawingTextOrientation.LeftToRight)
+                .ColorsAndLines.SetFillColor(XLColor.Cyan)
+                .ColorsAndLines.SetFillTransparency(0.25)
+                .ColorsAndLines.SetLineColor(XLColor.DarkBlue)
+                .ColorsAndLines.SetLineTransparency(0.75)
+                .ColorsAndLines.SetLineDash(XLDashStyle.DashDot)
+                .ColorsAndLines.SetLineStyle(XLLineStyle.ThinThick)
+                .ColorsAndLines.SetLineWeight(5)
+                .Margins.SetAll(0.25)
+                .Properties.SetPositioning(XLDrawingAnchor.MoveAndSizeWithCells)
+                .Protection.SetLocked(false)
+                .Protection.SetLockText(false)
+                .Web.SetAlternateText("This won't be released to the web");
+
+            ws.Cell("A9").Comment.SetAuthor("MDeLeon").AddSignature().AddText("Something");
+            ws.Cell("A9").Comment.SetBold().SetFontColor(XLColor.DarkBlue);
+
+            ws.CellsUsed(true, c => !c.Address.ToStringRelative().Equals("A1") && c.HasComment).ForEach(c => c.Comment.SetVisible());
+        }
+
+        private static void AddVisibilityComments(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Visibility");
+
+            // By default comments are hidden
+            ws.Cell("A1").SetValue("I have a hidden comment").Comment.AddText("Hidden");
+            
+            // Set the comment as visible
+            ws.Cell("A2").Comment.SetVisible().AddText("Visible");
+
+            // The ZOrder on previous comments were 1 and 2 respectively
+            // here we're explicit about the ZOrder
+            ws.Cell("A3").Comment.SetZOrder(5).SetVisible().AddText("On Top");
+
+            // We want this comment to appear underneath the one for A3
+            // so we set the ZOrder to something lower
+            ws.Cell("A4").Comment.SetZOrder(4).SetVisible().AddText("Underneath");
+            ws.Cell("A4").Comment.Style.Alignment.SetVertical(XLDrawingVerticalAlignment.Bottom);
+            
+            // Alternatively you could set all comments to visible with the following line:
+            // ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
+
+            ws.Columns().AdjustToContents();
+        }
+
+        private void AddPosition(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Position");
+            
+            ws.Columns().Width = 10;
+
+            ws.Cell("A1").Comment.AddText("This is an unusual place for a comment...");
+            ws.Cell("A1").Comment.Position
+                .SetColumn(3) // Starting from the third column
+                .SetColumnOffset(5) // The comment will start in the middle of the third column
+                .SetRow(5) // Starting from the fifth row
+                .SetRowOffset(7.5); // The comment will start in the middle of the fifth row
+
+            // Set all comments to visible
+            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
+        }
+
+        private void AddSignatures(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.Add("Signatures");
+
+            // By default the signature will be with the logged user
+            // ws.Cell("A2").Comment.AddSignature().AddText("Hello World!");
+
+            // You can override this by specifying the comment's author:
+            ws.Cell("A2").Comment
+                .SetAuthor("MDeLeon")
+                .AddSignature()
+                .AddText("Hello World!");
+            
+
+            // Set all comments to visible
+            ws.CellsUsed(true, c => c.HasComment).ForEach(c => c.Comment.SetVisible());
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Comments/EditingComments.cs b/ClosedXML_Examples/Comments/EditingComments.cs
new file mode 100644
index 0000000..163bbea
--- /dev/null
+++ b/ClosedXML_Examples/Comments/EditingComments.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ClosedXML.Excel;
+using System.IO;
+
+namespace ClosedXML_Examples 
+{
+    class EditingComments : IXLExample 
+    {
+
+        public void Create(string filePath) {
+
+            // Exercise(@"path/to/test/resources/comments");
+          
+        }
+
+        public void Exercise(string basePath) 
+        {
+
+            // INCOMPLETE
+
+            var book = new XLWorkbook(Path.Combine(basePath, "EditingComments.xlsx"));
+            var sheet = book.Worksheet(1);
+
+            // no change
+            // A1
+
+            // edit existing comment
+            sheet.Cell("B3").Comment.AddNewLine();
+            sheet.Cell("B3").Comment.AddSignature();
+            sheet.Cell("B3").Comment.AddText("more comment");
+
+            // delete
+            //sheet.Cell("C1").DeleteComment();
+
+            // clear contents
+            sheet.Cell("D3").Clear(XLClearOptions.Contents);
+
+            // new basic
+            sheet.Cell("E1").Comment.AddText("non authored comment");
+
+            // new with author
+            sheet.Cell("F3").Comment.AddSignature();
+            sheet.Cell("F3").Comment.AddText("comment from author");
+
+            // TODO: merge with cells
+            // TODO: resize with cells
+            // TODO: visible
+
+            book.SaveAs(Path.Combine(basePath, "EditingComments_modified.xlsx"));
+        }
+    }
+}
diff --git a/ClosedXML_Examples/ConditionalFormatting/ConditionalFormatting.cs b/ClosedXML_Examples/ConditionalFormatting/ConditionalFormatting.cs
new file mode 100644
index 0000000..f87825b
--- /dev/null
+++ b/ClosedXML_Examples/ConditionalFormatting/ConditionalFormatting.cs
@@ -0,0 +1,596 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class CFColorScaleLowMidHigh : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().ColorScale()
+                .LowestValue(XLColor.Red)
+                .Midpoint(XLCFContentType.Percent, "50", XLColor.Yellow) 
+                .HighestValue(XLColor.Green);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFColorScaleLowHigh : IXLExample
+    {
+
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().ColorScale()
+                .Minimum(XLCFContentType.Number, "2", XLColor.Red)
+                .Maximum(XLCFContentType.Percentile, "90", XLColor.Green);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFStartsWith : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("Hellos")
+                .CellBelow().SetValue("Hell")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenStartsWith("Hell")
+                .Fill.SetBackgroundColor(XLColor.Red)
+                .Border.SetOutsideBorder(XLBorderStyleValues.Thick)
+                .Border.SetOutsideBorderColor(XLColor.Blue)
+                .Font.SetBold();
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFEndsWith : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("Hellos")
+                .CellBelow().SetValue("Hell")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenEndsWith("ll")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFIsBlank : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("")
+                .CellBelow().SetValue("")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenIsBlank()
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFNotBlank : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("")
+                .CellBelow().SetValue("")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenNotBlank()
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFIsError : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetFormulaA1("1/0")
+                .CellBelow().SetFormulaA1("1/0")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenIsError()
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFNotError : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetFormulaA1("1/0")
+                .CellBelow().SetFormulaA1("1/0")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenNotError()
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFContains : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("Hellos")
+                .CellBelow().SetValue("Hell")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenContains("Hell")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFNotContains : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("Hellos")
+                .CellBelow().SetValue("Hell")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenNotContains("Hell")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+
+    public class CFEqualsString : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("Hellos")
+                .CellBelow().SetValue("Hell")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenEquals("Hell")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFEqualsNumber : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenEquals(2)
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFNotEqualsString : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue("Hello")
+                .CellBelow().SetValue("Hellos")
+                .CellBelow().SetValue("Hell")
+                .CellBelow().SetValue("Holl");
+
+            ws.RangeUsed().AddConditionalFormat().WhenNotEquals("Hell")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFNotEqualsNumber : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenNotEquals(2)
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFGreaterThan : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenGreaterThan("2")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFEqualOrGreaterThan : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenEqualOrGreaterThan("2")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFLessThan : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenLessThan("2")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFEqualOrLessThan : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenEqualOrLessThan("2")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFBetween : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenBetween("2", "3")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFNotBetween : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenNotBetween("2", "3")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFUnique : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenIsUnique()
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFDuplicate : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenIsDuplicate()
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFIsTrue : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenIsTrue("TRUE")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFTop : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenIsTop(2)
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFBottom : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().WhenIsBottom(10, XLTopBottomType.Percent)
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFDataBar : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().DataBar(XLColor.Red, true)
+                .LowestValue()
+                .Maximum(XLCFContentType.Percent, "100");
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFIconSet : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().IconSet(XLIconSetStyle.ThreeTrafficLights2, true, true)
+                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "0", XLCFContentType.Number)
+                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "2", XLCFContentType.Number)
+                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "3", XLCFContentType.Number);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFTwoConditions : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+                .CellBelow().SetValue(1)
+                .CellBelow().SetValue(2)
+                .CellBelow().SetValue(3);
+
+            ws.RangeUsed().AddConditionalFormat().IconSet(XLIconSetStyle.ThreeTrafficLights2, true, true)
+                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "0", XLCFContentType.Number)
+                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "2", XLCFContentType.Number)
+                .AddValue(XLCFIconSetOperator.EqualOrGreaterThan, "3", XLCFContentType.Number);
+
+            ws.RangeUsed().AddConditionalFormat().WhenContains("1")
+                .Fill.SetBackgroundColor(XLColor.Red);
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFInsertRows : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.Cell(2,1).SetValue(1)
+                .CellRight().SetValue(1)
+                .CellRight().SetValue(2)
+                .CellRight().SetValue(3);
+
+            var range = ws.RangeUsed();
+            range.AddConditionalFormat().WhenEquals("1").Font.SetBold();
+            range.InsertRowsAbove(1);
+            
+
+            workbook.SaveAs(filePath);
+        }
+    }
+
+    public class CFTest : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Sheet1");
+
+            ws.FirstCell().SetValue(1)
+              .CellBelow().SetValue(1)
+              .CellBelow().SetValue(2)
+              .CellBelow().SetValue(3)
+              .CellBelow().SetValue(4);
+
+            ws.RangeUsed().AddConditionalFormat().DataBar(XLColor.Red)
+                .LowestValue()
+                .HighestValue();
+                
+            workbook.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Creating/CreateFiles.cs b/ClosedXML_Examples/Creating/CreateFiles.cs
new file mode 100644
index 0000000..24cd221
--- /dev/null
+++ b/ClosedXML_Examples/Creating/CreateFiles.cs
@@ -0,0 +1,90 @@
+using ClosedXML_Examples.Columns;
+using ClosedXML_Examples.Misc;
+using ClosedXML_Examples.PageSetup;
+using ClosedXML_Examples.Ranges;
+using ClosedXML_Examples.Rows;
+using ClosedXML_Examples.Styles;
+using System.IO;
+
+namespace ClosedXML_Examples
+{
+    public class CreateFiles
+    {
+        public static void CreateAllFiles()
+        {
+            var path = @"C:\ClosedXML_Tests\Created";
+          
+            new HelloWorld().Create(path + @"\HelloWorld.xlsx");
+            new BasicTable().Create(path + @"\BasicTable.xlsx");
+
+            new StyleExamples().Create();
+            new ChangingBasicTable().Create(path + @"\BasicTable_Modified.xlsx");
+            new ShiftingRanges().Create(path + @"\ShiftingRanges.xlsx");
+            new ColumnSettings().Create(path + @"\ColumnSettings.xlsx");
+            new RowSettings().Create(path + @"\RowSettings.xlsx");
+            new MergeCells().Create(path + @"\MergedCells.xlsx");
+            new InsertRows().Create(path + @"\InsertRows.xlsx");
+            new InsertColumns().Create(path + @"\InsertColumns.xlsx");
+            new ColumnCollection().Create(path + @"\ColumnCollection.xlsx");
+            new DataTypes().Create(path + @"\DataTypes.xlsx");
+            new MultipleSheets().Create(path + @"\MultipleSheets.xlsx");
+            new RowCollection().Create(path + @"\RowCollection.xlsx");
+            new DefiningRanges().Create(path + @"\DefiningRanges.xlsx");
+            new ClearingRanges().Create(path + @"\ClearingRanges.xlsx");
+            new DeletingRanges().Create(path + @"\DeletingRanges.xlsx");
+            new Margins().Create(path + @"\Margins.xlsx");
+            new Page().Create(path + @"\Page.xlsx");
+            new HeaderFooters().Create(path + @"\HeaderFooters.xlsx");
+            new Sheets().Create(path + @"\Sheets.xlsx");
+            new SheetTab().Create(path + @"\SheetTab.xlsx");
+            new MultipleRanges().Create(path + @"\MultipleRanges.xlsx");
+            new StyleWorksheet().Create(path + @"\StyleWorksheet.xlsx");
+            new StyleRowsColumns().Create(path + @"\StyleRowsColumns.xlsx");
+            new InsertingDeletingRows().Create(path + @"\InsertingDeletingRows.xlsx");
+            new InsertingDeletingColumns().Create(path + @"\InsertingDeletingColumns.xlsx");
+            new DeletingColumns().Create(path + @"\DeletingColumns.xlsx");
+            new CellValues().Create(path + @"\CellValues.xlsx");
+            new LambdaExpressions().Create(path + @"\LambdaExpressions.xlsx");
+            new DefaultStyles().Create(path + @"\DefaultStyles.xlsx");
+            new TransposeRanges().Create(path + @"\TransposeRanges.xlsx");
+            new TransposeRangesPlus().Create(path + @"\TransposeRangesPlus.xlsx");
+            new MergeMoves().Create(path + @"\MergedMoves.xlsx");
+            new WorkbookProperties().Create(path + @"\WorkbookProperties.xlsx");
+            new AdjustToContents().Create(path + @"\AdjustToContents.xlsx");
+            new HideUnhide().Create(path + @"\HideUnhide.xlsx");
+            new Outline().Create(path + @"\Outline.xlsx");
+            new Formulas().Create(path + @"\Formulas.xlsx");
+            new Collections().Create(path + @"\Collections.xlsx");
+            new NamedRanges().Create(path + @"\NamedRanges.xlsx");
+            new CopyingRanges().Create(path + @"\CopyingRanges.xlsx");
+            new BlankCells().Create(path + @"\BlankCells.xlsx");
+            new TwoPages().Create(path + @"\TwoPages.xlsx");
+            new UsingColors().Create(path + @"\UsingColors.xlsx");
+
+            new ColumnCells().Create(path + @"\ColumnCells.xlsx");
+            new RowCells().Create(path + @"\RowCells.xlsx");
+            new FreezePanes().Create(path + @"\FreezePanes.xlsx");
+            new UsingTables().Create(path + @"\UsingTables.xlsx");
+            new ShowCase().Create(path + @"\ShowCase.xlsx");
+            new CopyingWorksheets().Create(path + @"\CopyingWorksheets.xlsx");
+            new InsertingTables().Create(path + @"\InsertingTables.xlsx");
+            new InsertingData().Create(path + @"\InsertingData.xlsx");
+            new Hyperlinks().Create(path + @"\Hyperlinks.xlsx");
+            new DataValidation().Create(path + @"\DataValidation.xlsx");
+            new HideSheets().Create(path + @"\HideSheets.xlsx");
+            new SheetProtection().Create(path + @"\SheetProtection.xlsx");
+            new AutoFilter().Create(path + @"\AutoFilter.xlsx");
+            new Sorting().Create(path + @"\Sorting.xlsx");
+            new SortExample().Create(path + @"\SortExample.xlsx");
+            new AddingDataSet().Create(path + @"\AddingDataSet.xlsx");
+            new AddingDataTableAsWorksheet().Create(path + @"\AddingDataTableAsWorksheet.xlsx");
+            new TabColors().Create(path + @"\TabColors.xlsx");
+            new ShiftingFormulas().Create(path + @"\ShiftingFormulas.xlsx");
+            new CopyingRowsAndColumns().Create(path + @"\CopyingRowsAndColumns.xlsx");
+            new UsingRichText().Create(path + @"\UsingRichText.xlsx");
+            new UsingPhonetics().Create(path + @"\UsingPhonetics.xlsx");
+            new WalkingRanges().Create(path + @"\CellMoves.xlsx");
+            new AddingComments().Create(path + @"\AddingComments.xlsx");
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Delete/DeleteFewWorksheets.cs b/ClosedXML_Examples/Delete/DeleteFewWorksheets.cs
new file mode 100644
index 0000000..8d879fc
--- /dev/null
+++ b/ClosedXML_Examples/Delete/DeleteFewWorksheets.cs
@@ -0,0 +1,41 @@
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Delete
+{
+    public class DeleteFewWorksheets:IXLExample
+    {
+        public void Create(string filePath)
+        {
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                //Note: Prepare
+                {
+                    var workbook = new XLWorkbook();
+                    workbook.Worksheets.Add("1");
+                    workbook.Worksheets.Add("2");
+                    workbook.Worksheets.Add("3");
+                    workbook.Worksheets.Add("4");
+                    workbook.SaveAs(tempFile);
+                }
+
+                //Note: Delate few worksheet
+                {
+                    var workbook = new XLWorkbook(tempFile);
+                    workbook.Worksheets.Delete("1");
+                    workbook.Worksheets.Delete("2");
+                    workbook.SaveAs(filePath);
+                }
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Delete/DeleteRows.cs b/ClosedXML_Examples/Delete/DeleteRows.cs
new file mode 100644
index 0000000..25b7152
--- /dev/null
+++ b/ClosedXML_Examples/Delete/DeleteRows.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Delete
+{
+    public class DeleteRows : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            #region Create case
+            {
+                var workbook = new XLWorkbook();
+                var ws = workbook.Worksheets.Add("Delete red rows");
+
+                // Put a value in a few cells
+                foreach (var r in Enumerable.Range(1, 5))
+                    foreach (var c in Enumerable.Range(1, 5))
+                        ws.Cell(r, c).Value = string.Format("R{0}C{1}", r, c);
+
+
+                var blueRow = ws.Rows(1, 2);
+                var redRow = ws.Row(5);
+
+                blueRow.Style.Fill.BackgroundColor = XLColor.Blue;
+
+                redRow.Style.Fill.BackgroundColor = XLColor.Red;
+                workbook.SaveAs(filePath);
+            }
+            #endregion
+
+            #region Remove rows
+            {
+                var workbook = new XLWorkbook(filePath);
+                var ws = workbook.Worksheets.Worksheet("Delete red rows");
+
+                ws.Rows(1, 2).Delete();
+                workbook.Save();
+            }
+            #endregion
+
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/ExampleHelper.cs b/ClosedXML_Examples/ExampleHelper.cs
new file mode 100644
index 0000000..188a5b1
--- /dev/null
+++ b/ClosedXML_Examples/ExampleHelper.cs
@@ -0,0 +1,19 @@
+using System.IO;
+
+namespace ClosedXML_Examples
+{
+    public static class ExampleHelper
+    {
+        public static string GetTempFilePath()
+        {
+            return Path.GetTempFileName();
+        }
+
+        public static string GetTempFilePath(string filePath)
+        {
+            var extension = Path.GetExtension(filePath);
+            var tempFilePath = GetTempFilePath();
+            return Path.ChangeExtension(tempFilePath, extension);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/HelloWorld.cs b/ClosedXML_Examples/HelloWorld.cs
new file mode 100644
index 0000000..5249a60
--- /dev/null
+++ b/ClosedXML_Examples/HelloWorld.cs
@@ -0,0 +1,16 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class HelloWorld
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var worksheet = workbook.Worksheets.Add("Sample Sheet");
+            worksheet.Cell("A1").Value = "Hello World!";
+            workbook.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/IXLExample.cs b/ClosedXML_Examples/IXLExample.cs
new file mode 100644
index 0000000..ad4384f
--- /dev/null
+++ b/ClosedXML_Examples/IXLExample.cs
@@ -0,0 +1,7 @@
+namespace ClosedXML_Examples
+{
+    public interface IXLExample
+    {
+        void Create(string filePath);
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Loading/ChangingBasicTable.cs b/ClosedXML_Examples/Loading/ChangingBasicTable.cs
new file mode 100644
index 0000000..10d122e
--- /dev/null
+++ b/ClosedXML_Examples/Loading/ChangingBasicTable.cs
@@ -0,0 +1,48 @@
+using System.IO;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class ChangingBasicTable : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new BasicTable().Create(tempFile);
+                var workbook = new XLWorkbook(tempFile);
+                var ws = workbook.Worksheet(1);
+
+                // Change the background color of the headers
+                var rngHeaders = ws.Range("B3:F3");
+                rngHeaders.Style.Fill.BackgroundColor = XLColor.LightSalmon;
+
+                // Change the date formats
+                var rngDates = ws.Range("E4:E6");
+                rngDates.Style.DateFormat.Format = "MM/dd/yyyy";
+
+                // Change the income values to text
+                var rngNumbers = ws.Range("F4:F6");
+                foreach (var cell in rngNumbers.Cells())
+                {
+                    string formattedString = cell.GetFormattedString();
+                    cell.DataType = XLCellValues.Text;
+                    cell.Value = formattedString + " Dollars";
+                }
+
+                ws.Columns().AdjustToContents();
+
+                workbook.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Loading/LoadFiles.cs b/ClosedXML_Examples/Loading/LoadFiles.cs
new file mode 100644
index 0000000..cc1b1d6
--- /dev/null
+++ b/ClosedXML_Examples/Loading/LoadFiles.cs
@@ -0,0 +1,31 @@
+using System;
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class LoadFiles
+    {
+        public static void LoadAllFiles()
+        {
+            var forLoadingFolder = @"C:\ClosedXML_Tests\Created";
+            var forSavingFolder = @"C:\ClosedXML_Tests\Modified";
+
+            foreach (var file in Directory.GetFiles(forLoadingFolder))
+            {
+                var fileInfo = new FileInfo(file);
+                var fileName = fileInfo.Name;
+                LoadAndSaveFile(forLoadingFolder + @"\" + fileName, forSavingFolder + @"\" + fileName);
+            }
+
+            //LoadAndSaveFile(forLoadingFolder + @"\StyleRowsColumns.xlsx", forSavingFolder + @"\StyleRowsColumns.xlsx");
+        }
+
+        private static void LoadAndSaveFile(String input, String output)
+        {
+            var wb = new XLWorkbook(input);
+            wb.SaveAs(output);
+            wb.SaveAs(output);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Misc/AddingDataSet.cs b/ClosedXML_Examples/Misc/AddingDataSet.cs
new file mode 100644
index 0000000..ad822aa
--- /dev/null
+++ b/ClosedXML_Examples/Misc/AddingDataSet.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Data;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Misc
+{
+    public class AddingDataSet : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+
+            var dataSet = GetDataSet();
+
+            // Add all DataTables in the DataSet as a worksheets
+            wb.Worksheets.Add(dataSet);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+        private DataSet GetDataSet()
+        {
+            var ds = new DataSet();
+            ds.Tables.Add(GetTable("Patients"));
+            ds.Tables.Add(GetTable("Employees"));
+            ds.Tables.Add(GetTable("Information"));
+            return ds;
+        }
+
+        private DataTable GetTable(String tableName)
+        {
+            DataTable table = new DataTable();
+            table.TableName = tableName;
+            table.Columns.Add("Dosage", typeof(int));
+            table.Columns.Add("Drug", typeof(string));
+            table.Columns.Add("Patient", typeof(string));
+            table.Columns.Add("Date", typeof(DateTime));
+
+            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
+            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
+            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
+            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
+            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
+            return table;
+        }
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/AddingDataTableAsWorksheet.cs b/ClosedXML_Examples/Misc/AddingDataTableAsWorksheet.cs
new file mode 100644
index 0000000..cc142a0
--- /dev/null
+++ b/ClosedXML_Examples/Misc/AddingDataTableAsWorksheet.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Data;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Misc
+{
+    public class AddingDataTableAsWorksheet : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+
+            var dataTable = GetTable("Information");
+
+            // Add a DataTable as a worksheet
+            wb.Worksheets.Add(dataTable);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+        private DataTable GetTable(String tableName)
+        {
+            DataTable table = new DataTable();
+            table.TableName = tableName;
+            table.Columns.Add("Dosage", typeof(int));
+            table.Columns.Add("Drug", typeof(string));
+            table.Columns.Add("Patient", typeof(string));
+            table.Columns.Add("Date", typeof(DateTime));
+
+            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
+            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
+            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
+            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
+            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
+            return table;
+        }
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/AdjustToContents.cs b/ClosedXML_Examples/Misc/AdjustToContents.cs
new file mode 100644
index 0000000..c35304d
--- /dev/null
+++ b/ClosedXML_Examples/Misc/AdjustToContents.cs
@@ -0,0 +1,145 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class AdjustToContents : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Adjust To Contents");
+
+            // Set some values with different font sizes
+            ws.Cell(1, 1).Value = "Tall Row";
+            ws.Cell(1, 1).Style.Font.FontSize = 30;
+            ws.Cell(2, 1).Value = "Very Wide Column";
+            ws.Cell(2, 1).Style.Font.FontSize = 20;
+            
+            // Adjust column width
+            ws.Column(1).AdjustToContents();
+
+            // Adjust row heights
+            ws.Rows(1, 2).AdjustToContents();
+
+            // You can also adjust all rows/columns in one shot
+            // ws.Rows().AdjustToContents();
+            // ws.Columns().AdjustToContents();
+
+
+            // We'll now select which cells should be used for calculating the
+            // column widths (same method applies for row heights)
+            
+            // Set the values
+            ws.Cell(4, 2).Value = "Width ignored because calling column.AdjustToContents(5, 7)";
+            ws.Cell(5, 2).Value = "Short text";
+            ws.Cell(6, 2).Value = "Width ignored because it's part of a merge";
+            ws.Range(6, 2, 6, 4).Merge();
+            ws.Cell(7, 2).Value = "Width should adjust to this cell";
+            ws.Cell(8, 2).Value = "Width ignored because calling column.AdjustToContents(5, 7)";
+
+            // Adjust column widths only taking into account rows 5-7
+            // (merged cells will be ignored)
+            ws.Column(2).AdjustToContents(5, 7);
+
+            // You can also specify the starting row to start calculating the widths:
+            // e.g. ws.Column(3).AdjustToContents(9);
+
+            var ws2 = wb.Worksheets.Add("Adjust Widths");
+            ws2.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
+            for (Int32 co = 0; co < 90; co += 5)
+            {
+                ws2.Cell(1, (co / 5) + 2).SetValue("Text to adjust - " + co).Style.Alignment.TextRotation = co;
+            }
+
+            ws2.Columns().AdjustToContents();
+
+            var ws4 = wb.Worksheets.Add("Adjust Widths 2");
+            ws4.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
+            for (Int32 co = 0; co < 90; co += 5)
+            {
+                var c = ws4.Cell(1, (co / 5) + 2);
+                
+                c.RichText.AddText("Text to adjust - " + co).SetBold();
+                c.RichText.AddText(Environment.NewLine);
+                c.RichText.AddText("World!").SetBold().SetFontColor(XLColor.Blue).SetFontSize(25);
+                c.RichText.AddText(Environment.NewLine);
+                c.RichText.AddText("Hello Cruel and unsusual world").SetBold().SetFontSize(20);
+                c.RichText.AddText(Environment.NewLine);
+                c.RichText.AddText("Hello").SetBold();
+                c.Style.Alignment.SetTextRotation(co);
+            }
+            ws4.Columns().AdjustToContents();
+
+            var ws3 = wb.Worksheets.Add("Adjust Heights");
+            ws3.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
+            for (Int32 ro = 0; ro < 90; ro += 5)
+            {
+                ws3.Cell((ro / 5) + 2, 1).SetValue("Text to adjust - " + ro).Style.Alignment.TextRotation = ro;
+            }
+
+            ws3.Rows().AdjustToContents();
+
+            var ws5 = wb.Worksheets.Add("Adjust Heights 2");
+            ws5.Cell(1, 1).SetValue("Text to adjust - 255").Style.Alignment.TextRotation = 255;
+            for (Int32 ro = 0; ro < 90; ro += 5)
+            {
+                var c = ws5.Cell((ro / 5) + 2, 1);
+                c.RichText.AddText("Text to adjust - " + ro).SetBold();
+                c.RichText.AddText(Environment.NewLine);
+                c.RichText.AddText("World!").SetBold().SetFontColor(XLColor.Blue).SetFontSize(10);
+                c.RichText.AddText(Environment.NewLine);
+                c.RichText.AddText("Hello Cruel and unsusual world").SetBold().SetFontSize(15);
+                c.RichText.AddText(Environment.NewLine);
+                c.RichText.AddText("Hello").SetBold();
+                c.Style.Alignment.SetTextRotation(ro);
+            }
+
+            ws5.Rows().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/AutoFilter.cs b/ClosedXML_Examples/Misc/AutoFilter.cs
new file mode 100644
index 0000000..acf82dd
--- /dev/null
+++ b/ClosedXML_Examples/Misc/AutoFilter.cs
@@ -0,0 +1,69 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class AutoFilter : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("AutoFilter");
+            ws.Cell("A1").Value = "Names";
+            ws.Cell("A2").Value = "John";
+            ws.Cell("A3").Value = "Hank";
+            ws.Cell("A4").Value = "Dagny";
+
+            ws.RangeUsed().SetAutoFilter();
+            
+            // Your can turn off the autofilter in three ways:
+            // 1) worksheet.AutoFilterRange.SetAutoFilter(false)
+            // 2) worksheet.AutoFilterRange = null
+            // 3) Pick any range in the worksheet and call range.SetAutoFilter(false);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/BlankCells.cs b/ClosedXML_Examples/Misc/BlankCells.cs
new file mode 100644
index 0000000..232950e
--- /dev/null
+++ b/ClosedXML_Examples/Misc/BlankCells.cs
@@ -0,0 +1,59 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class BlankCells : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).Value = "X";
+            ws.Cell(1, 1).Clear();
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/CellValues.cs b/ClosedXML_Examples/Misc/CellValues.cs
new file mode 100644
index 0000000..6919bcf
--- /dev/null
+++ b/ClosedXML_Examples/Misc/CellValues.cs
@@ -0,0 +1,185 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class CellValues : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Cell Values");
+
+            // Set the titles
+            ws.Cell(2, 2).Value = "Initial Value";
+            ws.Cell(2, 3).Value = "Casting";
+            ws.Cell(2, 4).Value = "Using Get...()";
+            ws.Cell(2, 5).Value = "Using GetValue<T>()";
+            ws.Cell(2, 6).Value = "GetString()";
+            ws.Cell(2, 7).Value = "GetFormattedString()";
+
+            //////////////////////////////////////////////////////////////////
+            // DateTime
+
+            // Fill a cell with a date
+            var cellDateTime = ws.Cell(3, 2);
+            cellDateTime.Value = new DateTime(2010, 9, 2);
+            cellDateTime.Style.DateFormat.Format = "yyyy-MMM-dd";
+
+            // Extract the date in different ways
+            DateTime dateTime1 = (DateTime)cellDateTime.Value;
+            DateTime dateTime2 = cellDateTime.GetDateTime();
+            DateTime dateTime3 = cellDateTime.GetValue<DateTime>();
+            String dateTimeString = cellDateTime.GetString();
+            String dateTimeFormattedString = cellDateTime.GetFormattedString();
+
+            // Set the values back to cells
+            // The apostrophe is to force ClosedXML to treat the date as a string
+            ws.Cell(3, 3).Value = dateTime1;
+            ws.Cell(3, 4).Value = dateTime2;
+            ws.Cell(3, 5).Value = dateTime3;
+            ws.Cell(3, 6).Value = "'" + dateTimeString;
+            ws.Cell(3, 7).Value = "'" + dateTimeFormattedString;
+
+            //////////////////////////////////////////////////////////////////
+            // Boolean
+
+            // Fill a cell with a boolean
+            var cellBoolean = ws.Cell(4, 2);
+            cellBoolean.Value = true;
+
+            // Extract the boolean in different ways
+            Boolean boolean1 = (Boolean)cellBoolean.Value;
+            Boolean boolean2 = cellBoolean.GetBoolean();
+            Boolean boolean3 = cellBoolean.GetValue<Boolean>();
+            String booleanString = cellBoolean.GetString();
+            String booleanFormattedString = cellBoolean.GetFormattedString();
+
+            // Set the values back to cells
+            // The apostrophe is to force ClosedXML to treat the boolean as a string
+            ws.Cell(4, 3).Value = boolean1;
+            ws.Cell(4, 4).Value = boolean2;
+            ws.Cell(4, 5).Value = boolean3;
+            ws.Cell(4, 6).Value = "'" + booleanString;
+            ws.Cell(4, 7).Value = "'" + booleanFormattedString;
+
+            //////////////////////////////////////////////////////////////////
+            // Double
+
+            // Fill a cell with a double
+            var cellDouble = ws.Cell(5, 2);
+            cellDouble.Value = 1234.567;
+            cellDouble.Style.NumberFormat.Format = "#,##0.00";
+
+            // Extract the double in different ways
+            Double double1 = (Double)cellDouble.Value;
+            Double double2 = cellDouble.GetDouble();
+            Double double3 = cellDouble.GetValue<Double>();
+            String doubleString = cellDouble.GetString();
+            String doubleFormattedString = cellDouble.GetFormattedString();
+
+            // Set the values back to cells
+            // The apostrophe is to force ClosedXML to treat the double as a string
+            ws.Cell(5, 3).Value = double1;
+            ws.Cell(5, 4).Value = double2;
+            ws.Cell(5, 5).Value = double3;
+            ws.Cell(5, 6).Value = "'" + doubleString;
+            ws.Cell(5, 7).Value = "'" + doubleFormattedString;
+
+            //////////////////////////////////////////////////////////////////
+            // String
+
+            // Fill a cell with a string
+            var cellString = ws.Cell(6, 2);
+            cellString.Value = "Test Case";
+
+            // Extract the string in different ways
+            String string1 = (String)cellString.Value;
+            String string2 = cellString.GetString();
+            String string3 = cellString.GetValue<String>();
+            String stringString = cellString.GetString();
+            String stringFormattedString = cellString.GetFormattedString();
+
+            // Set the values back to cells
+            ws.Cell(6, 3).Value = string1;
+            ws.Cell(6, 4).Value = string2;
+            ws.Cell(6, 5).Value = string3;
+            ws.Cell(6, 6).Value = stringString;
+            ws.Cell(6, 7).Value = stringFormattedString;
+
+            //////////////////////////////////////////////////////////////////
+            // TimeSpan
+
+            // Fill a cell with a timeSpan
+            var cellTimeSpan = ws.Cell(7, 2);
+            cellTimeSpan.Value = new TimeSpan(1, 2, 31, 45);
+
+            // Extract the timeSpan in different ways
+            TimeSpan timeSpan1 = (TimeSpan)cellTimeSpan.Value;
+            TimeSpan timeSpan2 = cellTimeSpan.GetTimeSpan();
+            TimeSpan timeSpan3 = cellTimeSpan.GetValue<TimeSpan>();
+            String timeSpanString = cellTimeSpan.GetString();
+            String timeSpanFormattedString = cellTimeSpan.GetFormattedString();
+
+            // Set the values back to cells
+            ws.Cell(7, 3).Value = timeSpan1;
+            ws.Cell(7, 4).Value = timeSpan2;
+            ws.Cell(7, 5).Value = timeSpan3;
+            ws.Cell(7, 6).Value = timeSpanString;
+            ws.Cell(7, 7).Value = timeSpanFormattedString;
+
+            //////////////////////////////////////////////////////////////////
+            // Do some formatting
+            ws.Columns("B:G").Width = 20;
+            var rngTitle = ws.Range("B2:G2");
+            rngTitle.Style.Font.Bold = true;
+            rngTitle.Style.Fill.BackgroundColor = XLColor.Cyan;
+
+            ws.Columns().AdjustToContents();
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/Collections.cs b/ClosedXML_Examples/Misc/Collections.cs
new file mode 100644
index 0000000..c97a995
--- /dev/null
+++ b/ClosedXML_Examples/Misc/Collections.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Misc
+{
+    public class Collections : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Collections");
+
+            // From a list of strings
+            var listOfStrings = new List<String>();
+            listOfStrings.Add("House");
+            listOfStrings.Add("Car");
+            ws.Cell(1, 1).Value = "Strings";
+            ws.Cell(1, 1).AsRange().AddToNamed("Titles");
+            ws.Cell(2, 1).Value = listOfStrings;
+
+            // From a list of arrays
+            var listOfArr = new List<Int32[]>();
+            listOfArr.Add(new Int32[] { 1, 2, 3 });
+            listOfArr.Add(new Int32[] { 1 });
+            listOfArr.Add(new Int32[] { 1, 2, 3, 4, 5, 6 });
+            ws.Cell(1, 3).Value = "Arrays";
+            ws.Range(1, 3, 1, 8).Merge().AddToNamed("Titles");
+            ws.Cell(2, 3).Value = listOfArr;
+
+            // From a DataTable
+            var dataTable = GetTable();
+            ws.Cell(6, 1).Value = "DataTable";
+            ws.Range(6, 1, 6, 4).Merge().AddToNamed("Titles");
+            ws.Cell(7, 1).Value = dataTable.AsEnumerable();
+
+            // From a query
+            var list = new List<Person>();
+            list.Add(new Person() { Name = "John", Age = 30, House = "On Elm St."   });
+            list.Add(new Person() { Name = "Mary", Age = 15, House = "On Main St."  });
+            list.Add(new Person() { Name = "Luis", Age = 21, House = "On 23rd St."  });
+            list.Add(new Person() { Name = "Henry", Age = 45, House = "On 5th Ave." });
+
+            var people = from p in list
+                         where p.Age >= 21
+                         select new { p.Name, p.House, p.Age };
+
+            ws.Cell(6, 6).Value = "Query";
+            ws.Range(6, 6, 6, 8).Merge().AddToNamed("Titles");
+            ws.Cell(7, 6).Value = people.AsEnumerable();    // Very Important to call the AsEnumerable method
+                                                            // otherwise it won't be copied.
+
+
+            // Prepare the style for the titles
+            var titlesStyle = wb.Style;
+            titlesStyle.Font.Bold = true;
+            titlesStyle.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+            titlesStyle.Fill.BackgroundColor = XLColor.Cyan;
+            
+            // Format all titles in one shot
+            wb.NamedRanges.NamedRange("Titles").Ranges.Style = titlesStyle;
+
+            ws.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+
+        class Person
+        {
+            public String House { get; set; }
+            public String Name { get; set; }
+            public Int32 Age { get; set; }
+        }
+
+        // Private
+        private DataTable GetTable()
+        {
+
+            DataTable table = new DataTable();
+            table.Columns.Add("Dosage", typeof(int));
+            table.Columns.Add("Drug", typeof(string));
+            table.Columns.Add("Patient", typeof(string));
+            table.Columns.Add("Date", typeof(DateTime));
+
+            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
+            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
+            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
+            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
+            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
+            return table;
+        }
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/CopyingRowsAndColumns.cs b/ClosedXML_Examples/Misc/CopyingRowsAndColumns.cs
new file mode 100644
index 0000000..a597e35
--- /dev/null
+++ b/ClosedXML_Examples/Misc/CopyingRowsAndColumns.cs
@@ -0,0 +1,114 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class CopyingRowsAndColumns : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+
+            var originalSheet = workbook.Worksheets.Add("original");
+
+            originalSheet.Cell("A2").SetValue("test value");
+            originalSheet.Range("A2:E2").Merge();
+
+            originalSheet.Cell("F1").SetValue("test value").Style.Alignment.SetTopToBottom();
+            originalSheet.Range("F1:F6").Merge();
+
+            var fromRow = workbook.Worksheets.Add("From a Row");
+            fromRow.Cell(1, 1).SetValue("Row to Row:");
+            originalSheet.Row(2).CopyTo(fromRow.Row(2));
+            fromRow.Cell(3, 1).SetValue("Row to Range:");
+            originalSheet.Row(2).CopyTo(fromRow.Row(4).AsRange());
+            fromRow.Cell(5, 1).SetValue("Row to Cell:");
+            originalSheet.Row(2).CopyTo(fromRow.Row(6).FirstCell());
+
+            var fromRange = workbook.Worksheets.Add("From a Range");
+            fromRange.Cell(1, 1).SetValue("Range to Row:");
+            originalSheet.Row(2).AsRange().CopyTo(fromRange.Row(2));
+            fromRange.Cell(3, 1).SetValue("Range to Range:");
+            originalSheet.Row(2).AsRange().CopyTo(fromRange.Row(4).AsRange());
+            fromRange.Cell(5, 1).SetValue("Range to Cell:");
+            originalSheet.Row(2).AsRange().CopyTo(fromRange.Row(6).FirstCell());
+
+            CopyRowAsRange(originalSheet, 2, fromRange, 8);
+
+            var fromColumn = workbook.Worksheets.Add("From a Column to Column");
+            fromColumn.Cell(1, 1).SetValue("Column to Column:").Style.Alignment.SetTopToBottom();
+            originalSheet.Column("F").CopyTo(fromColumn.Column(2));
+            fromColumn.Cell(1, 3).SetValue("Column to Range:").Style.Alignment.SetTopToBottom();
+            originalSheet.Column("F").CopyTo(fromColumn.Column(4).AsRange());
+            fromColumn.Cell(1, 5).SetValue("Column to Cell:").Style.Alignment.SetTopToBottom();
+            originalSheet.Column("F").CopyTo(fromColumn.Column(6).FirstCell());
+
+            var fromRangeToColumn = workbook.Worksheets.Add("From a Range to Column");
+            fromRangeToColumn.Cell(1, 1).SetValue("Range to Column:").Style.Alignment.SetTopToBottom();
+            originalSheet.Column("F").AsRange().CopyTo(fromRangeToColumn.Column(2));
+            fromRangeToColumn.Cell(1, 3).SetValue("Range to Range:").Style.Alignment.SetTopToBottom();
+            originalSheet.Column("F").AsRange().CopyTo(fromRangeToColumn.Column(4).AsRange());
+            fromRangeToColumn.Cell(1, 5).SetValue("Range to Cell:").Style.Alignment.SetTopToBottom();
+            originalSheet.Column("F").AsRange().CopyTo(fromRangeToColumn.Column(6).FirstCell());
+          
+
+            workbook.SaveAs(filePath);
+        }
+
+        private static void CopyRowAsRange(IXLWorksheet originalSheet, int originalRowNumber, IXLWorksheet destSheet, int destRowNumber)
+        {
+            {
+                var destinationRow = destSheet.Row(destRowNumber);
+                destinationRow.Clear();
+
+                var originalRow = originalSheet.Row(originalRowNumber);
+                int columnNumber = originalRow.LastCellUsed(true).Address.ColumnNumber;
+
+                var originalRange = originalSheet.Range(originalRowNumber, 1, originalRowNumber, columnNumber);
+                var destRange = destSheet.Range(destRowNumber, 1, destRowNumber, columnNumber);
+                originalRange.CopyTo(destRange);
+            }
+        }
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/CopyingWorksheets.cs b/ClosedXML_Examples/Misc/CopyingWorksheets.cs
new file mode 100644
index 0000000..2c86867
--- /dev/null
+++ b/ClosedXML_Examples/Misc/CopyingWorksheets.cs
@@ -0,0 +1,45 @@
+using System.IO;
+using ClosedXML.Excel;
+using ClosedXML_Examples.Ranges;
+
+namespace ClosedXML_Examples.Misc
+{
+    public class CopyingWorksheets : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            string tempFile1 = ExampleHelper.GetTempFilePath(filePath);
+            string tempFile2 = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new UsingTables().Create(tempFile1);
+                var wb = new XLWorkbook(tempFile1);
+
+                var wsSource = wb.Worksheet(1);
+                // Copy the worksheet to a new sheet in this workbook
+                wsSource.CopyTo("Copy");
+                
+                // We're going to open another workbook to show that you can
+                // copy a sheet from one workbook to another:
+                new BasicTable().Create(tempFile2);
+                var wbSource = new XLWorkbook(tempFile2);
+                wbSource.Worksheet(1).CopyTo(wb, "Copy From Other");
+
+                // Save the workbook with the 2 copies
+                wb.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile1))
+                {
+                    File.Delete(tempFile1);
+                }
+                if (File.Exists(tempFile2))
+                {
+                    File.Delete(tempFile2);
+                }
+            }
+        }
+
+    }
+}
diff --git a/ClosedXML_Examples/Misc/DataTypes.cs b/ClosedXML_Examples/Misc/DataTypes.cs
new file mode 100644
index 0000000..e4feeb1
--- /dev/null
+++ b/ClosedXML_Examples/Misc/DataTypes.cs
@@ -0,0 +1,208 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class DataTypes : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Data Types");
+
+            var co = 2;
+            var ro = 1;
+
+            ws.Cell(++ro, co).Value = "Plain Text:";
+            ws.Cell(ro, co + 1).Value = "Hello World.";
+
+            ws.Cell(++ro, co).Value = "Plain Date:";
+            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2);
+
+            ws.Cell(++ro, co).Value = "Plain DateTime:";
+            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2, 13, 45, 22);
+
+            ws.Cell(++ro, co).Value = "Plain Boolean:";
+            ws.Cell(ro, co + 1).Value = true;
+
+            ws.Cell(++ro, co).Value = "Plain Number:";
+            ws.Cell(ro, co + 1).Value = 123.45;
+
+            ws.Cell(++ro, co).Value = "TimeSpan:";
+            ws.Cell(ro, co + 1).Value = new TimeSpan(33, 45, 22);
+
+            ro++;
+
+            ws.Cell(++ro, co).Value = "Explicit Text:";
+            ws.Cell(ro, co + 1).Value = "'Hello World.";
+
+            ws.Cell(++ro, co).Value = "Date as Text:";
+            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2).ToString();
+
+            ws.Cell(++ro, co).Value = "DateTime as Text:";
+            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2, 13, 45, 22).ToString();
+
+            ws.Cell(++ro, co).Value = "Boolean as Text:";
+            ws.Cell(ro, co + 1).Value = "'" + true.ToString();
+
+            ws.Cell(++ro, co).Value = "Number as Text:";
+            ws.Cell(ro, co + 1).Value = "'123.45";
+
+            ws.Cell(++ro, co).Value = "Number with @ format:";
+            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "@";
+            ws.Cell(ro, co + 1).Value = 123.45;
+
+            ws.Cell(++ro, co).Value = "Format number with @:";
+            ws.Cell(ro, co + 1).Value = 123.45;
+            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "@";
+
+            ws.Cell(++ro, co).Value = "TimeSpan as Text:";
+            ws.Cell(ro, co + 1).Value = "'" + new TimeSpan(33, 45, 22).ToString();
+
+            ro++;
+
+            ws.Cell(++ro, co).Value = "Changing Data Types:";
+
+            ro++;
+
+            ws.Cell(++ro, co).Value = "Date to Text:";
+            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2);
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+
+            ws.Cell(++ro, co).Value = "DateTime to Text:";
+            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2, 13, 45, 22);
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+
+            ws.Cell(++ro, co).Value = "Boolean to Text:";
+            ws.Cell(ro, co + 1).Value = true;
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+
+            ws.Cell(++ro, co).Value = "Number to Text:";
+            ws.Cell(ro, co + 1).Value = 123.45;
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+
+            ws.Cell(++ro, co).Value = "TimeSpan to Text:";
+            ws.Cell(ro, co + 1).Value = new TimeSpan(33, 45, 22);
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+
+            ws.Cell(++ro, co).Value = "Text to Date:";
+            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2).ToString();
+            ws.Cell(ro, co + 1).DataType = XLCellValues.DateTime;
+
+            ws.Cell(++ro, co).Value = "Text to DateTime:";
+            ws.Cell(ro, co + 1).Value = "'" + new DateTime(2010, 9, 2, 13, 45, 22).ToString();
+            ws.Cell(ro, co + 1).DataType = XLCellValues.DateTime;
+
+            ws.Cell(++ro, co).Value = "Text to Boolean:";
+            ws.Cell(ro, co + 1).Value = "'" + true.ToString();
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Boolean;
+
+            ws.Cell(++ro, co).Value = "Text to Number:";
+            ws.Cell(ro, co + 1).Value = "'123.45";
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Number;
+
+            ws.Cell(++ro, co).Value = "@ format to Number:";
+            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "@";
+            ws.Cell(ro, co + 1).Value = 123.45;
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Number;
+
+            ws.Cell(++ro, co).Value = "Text to TimeSpan:";
+            ws.Cell(ro, co + 1).Value = "'" + new TimeSpan(33, 45, 22).ToString();
+            ws.Cell(ro, co + 1).DataType = XLCellValues.TimeSpan;
+
+            ro++;
+
+            ws.Cell(++ro, co).Value = "Formatted Date to Text:";
+            ws.Cell(ro, co + 1).Value = new DateTime(2010, 9, 2);
+            ws.Cell(ro, co + 1).Style.DateFormat.Format = "yyyy-MM-dd";
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+
+            ws.Cell(++ro, co).Value = "Formatted Number to Text:";
+            ws.Cell(ro, co + 1).Value = 12345.6789;
+            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "#,##0.00";
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+
+            ro++;
+
+            ws.Cell(++ro, co).Value = "Blank Text:";
+            ws.Cell(ro, co + 1).Value = 12345.6789;
+            ws.Cell(ro, co + 1).Style.NumberFormat.Format = "#,##0.00";
+            ws.Cell(ro, co + 1).DataType = XLCellValues.Text;
+            ws.Cell(ro, co + 1).Value = "";
+
+            ro++;
+
+            // Using inline strings (few users will ever need to use this feature)
+            //
+            // By default all strings are stored as shared so one block of text
+            // can be reference by multiple cells.
+            // You can override this by setting the .ShareString property to false
+            ws.Cell(++ro, co).Value = "Inline String:";
+            var cell = ws.Cell(ro, co + 1);
+            cell.Value = "Not Shared";
+            cell.ShareString = false;
+
+            // To view all shared strings (all texts in the workbook actually), use the following:
+            // workbook.GetSharedStrings()
+
+            ws.Cell(++ro, co)
+                .SetDataType(XLCellValues.Text)
+                .SetDataType(XLCellValues.Boolean)
+                .SetDataType(XLCellValues.DateTime)
+                .SetDataType(XLCellValues.Number)
+                .SetDataType(XLCellValues.TimeSpan)
+                .SetDataType(XLCellValues.Text)
+                .SetDataType(XLCellValues.TimeSpan)
+                .SetDataType(XLCellValues.Number)
+                .SetDataType(XLCellValues.DateTime)
+                .SetDataType(XLCellValues.Boolean)
+                .SetDataType(XLCellValues.Text);
+                    
+            ws.Columns(2, 3).AdjustToContents();
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/DataValidation.cs b/ClosedXML_Examples/Misc/DataValidation.cs
new file mode 100644
index 0000000..fdbe3cc
--- /dev/null
+++ b/ClosedXML_Examples/Misc/DataValidation.cs
@@ -0,0 +1,139 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class DataValidation : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Data Validation");
+
+            // Decimal between 1 and 5
+            ws.Cell(1, 1).SetDataValidation().Decimal.Between(1, 5);
+
+            // Whole number equals 2
+            var dv1 = ws.Range("A2:A3").SetDataValidation();
+            dv1.WholeNumber.EqualTo(2);
+            // Change the error message
+            dv1.ErrorStyle = XLErrorStyle.Warning;
+            dv1.ErrorTitle = "Number out of range";
+            dv1.ErrorMessage = "This cell only allows the number 2.";
+
+            // Date after the millenium
+            var dv2 = ws.Cell("A4").SetDataValidation();
+            dv2.Date.EqualOrGreaterThan(new DateTime(2000, 1, 1));
+            // Change the input message
+            dv2.InputTitle = "Can't party like it's 1999.";
+            dv2.InputMessage = "Please enter a date in this century.";
+
+            // From a list
+            ws.Cell("C1").Value = "Yes";
+            ws.Cell("C2").Value = "No";
+            ws.Cell("A5").SetDataValidation().List(ws.Range("C1:C2"));
+
+            ws.Range("C1:C2").AddToNamed("YesNo");
+            ws.Cell("A6").SetDataValidation().List("=YesNo");
+
+            // Intersecting dataValidations
+            ws.Range("B1:B4").SetDataValidation().WholeNumber.EqualTo(1);
+            ws.Range("B3:B4").SetDataValidation().WholeNumber.EqualTo(2);
+
+
+            // Validate with multiple ranges
+            var ws2 = wb.Worksheets.Add("Validate Ranges");
+            var rng1 = ws2.Ranges("A1:B2,B4:D7,F4:G5");
+            rng1.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
+            var rng1Validation = rng1.SetDataValidation();
+            rng1Validation.Decimal.EqualTo(1);
+            rng1Validation.IgnoreBlanks = false;
+
+            var rng2 = ws2.Range("A11:E14");
+            rng2.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
+            var rng2Validation = rng2.SetDataValidation();
+            rng2Validation.Decimal.EqualTo(2);
+            rng2Validation.IgnoreBlanks = false;
+
+            var rng3 = ws2.Range("B2:B12");
+            //rng3.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
+            var rng3Validation = rng3.SetDataValidation();
+            rng3Validation.Decimal.EqualTo(3);
+            rng3Validation.IgnoreBlanks = true;
+            
+            var rng4 = ws2.Range("D5:D6");
+            //rng4.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
+            var rng4Validation = rng4.SetDataValidation();
+            rng4Validation.Decimal.EqualTo(4);
+            rng4Validation.IgnoreBlanks = true;
+
+            var rng5 = ws2.Range("C13:C14");
+            //rng5.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
+            var rng5Validation = rng5.SetDataValidation();
+            rng5Validation.Decimal.EqualTo(5);
+            rng5Validation.IgnoreBlanks = true;
+
+            var rng6 = ws2.Range("D11:D12");
+            //rng6.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
+            var rng6Validation = rng6.SetDataValidation();
+            rng6Validation.Decimal.EqualTo(5);
+            rng6Validation.IgnoreBlanks = true;
+
+            var rng7 = ws2.Range("G4:G5");
+            //rng7.Style.Fill.SetBackgroundColor(XLColor.YellowGreen);
+            var rng7Validation = rng7.SetDataValidation();
+            rng7Validation.Decimal.EqualTo(5);
+            rng7Validation.IgnoreBlanks = true;
+
+            ws.CopyTo(ws.Name + " - Copy");
+            ws2.CopyTo(ws2.Name + " - Copy");
+
+            wb.AddWorksheet("Copy From Range 1").FirstCell().Value = ws.RangeUsed(true);
+            wb.AddWorksheet("Copy From Range 2").FirstCell().Value = ws2.RangeUsed(true);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/Formulas.cs b/ClosedXML_Examples/Misc/Formulas.cs
new file mode 100644
index 0000000..8707e4c
--- /dev/null
+++ b/ClosedXML_Examples/Misc/Formulas.cs
@@ -0,0 +1,120 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class Formulas : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Formulas");
+
+            ws.Cell(1, 1).Value = "Num1";
+            ws.Cell(1, 2).Value = "Num2";
+            ws.Cell(1, 3).Value = "Total";
+            ws.Cell(1, 4).Value = "cell.FormulaA1";
+            ws.Cell(1, 5).Value = "cell.FormulaR1C1";
+            ws.Cell(1, 6).Value = "cell.Value";
+            ws.Cell(1, 7).Value = "Are Equal?";
+
+            ws.Cell(2, 1).Value = 1;
+            ws.Cell(2, 2).Value = 2;
+            var cellWithFormulaA1 = ws.Cell(2, 3);
+            // Use A1 notation
+            cellWithFormulaA1.FormulaA1 = "=A2+$B$2"; // The equal sign (=) in a formula is optional
+            ws.Cell(2, 4).Value = cellWithFormulaA1.FormulaA1;
+            ws.Cell(2, 5).Value = cellWithFormulaA1.FormulaR1C1;
+            ws.Cell(2, 6).Value = cellWithFormulaA1.Value;
+
+            ws.Cell(3, 1).Value = 1;
+            ws.Cell(3, 2).Value = 2;
+            var cellWithFormulaR1C1 = ws.Cell(3, 3);
+            // Use R1C1 notation
+            cellWithFormulaR1C1.FormulaR1C1 = "RC[-2]+R3C2"; // The equal sign (=) in a formula is optional
+            ws.Cell(3, 4).Value = cellWithFormulaR1C1.FormulaA1;
+            ws.Cell(3, 5).Value = cellWithFormulaR1C1.FormulaR1C1;
+            ws.Cell(3, 6).Value = cellWithFormulaR1C1.Value;
+
+            ws.Cell(4, 1).Value = "A";
+            ws.Cell(4, 2).Value = "B";
+            var cellWithStringFormula = ws.Cell(4, 3);
+
+            // Use R1C1 notation
+            cellWithStringFormula.FormulaR1C1 = "=\"Test\" & RC[-2] & \"R3C2\"";
+            ws.Cell(4, 4).Value = cellWithStringFormula.FormulaA1;
+            ws.Cell(4, 5).Value = cellWithStringFormula.FormulaR1C1;
+            ws.Cell(4, 6).Value = cellWithStringFormula.Value;
+
+            // Setting the formula of a range
+            var rngData = ws.Range(2, 1, 4, 7);
+            rngData.LastColumn().FormulaR1C1 = "=IF(RC[-3]=RC[-1],\"Yes\", \"No\")";
+
+            // Using an array formula:
+            // Just put the formula between curly braces
+            ws.Cell("A6").Value = "Array Formula: ";
+            ws.Cell("B6").FormulaA1 = "{A2+A3}";
+
+            ws.Range(1, 1, 1, 7).Style.Fill.BackgroundColor = XLColor.Cyan;
+            ws.Range(1, 1, 1, 7).Style.Font.Bold = true;
+            ws.Columns().AdjustToContents();
+
+            // You can also change the reference notation:
+            wb.ReferenceStyle = XLReferenceStyle.R1C1;
+
+            // And the workbook calculation mode:
+            wb.CalculateMode = XLCalculateMode.Auto;
+
+            ws.Range("A10").AddToNamed("A10_R1C1_A10_R1C1");
+            ws.Cell("A10").Value = 0;
+            ws.Cell("A11").FormulaA1 = "A2 + A10_R1C1_A10_R1C1";
+            ws.Cell("A12").FormulaR1C1 = "R2C1 + A10_R1C1_A10_R1C1";
+            ws.Cell("A13").FormulaR1C1 = "=SUM(R[-5]:R[-4])";
+            ws.Cell("A14").FormulaA1 = "=SUM(8:9)";
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/FreezePanes.cs b/ClosedXML_Examples/Misc/FreezePanes.cs
new file mode 100644
index 0000000..913738f
--- /dev/null
+++ b/ClosedXML_Examples/Misc/FreezePanes.cs
@@ -0,0 +1,72 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class FreezePanes : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var wsFreeze = wb.Worksheets.Add("Freeze View");
+            
+            // Freeze rows and columns in one shot
+            wsFreeze.SheetView.Freeze(3, 3);
+
+            // You can also be more specific on what you want to freeze
+            // For example:
+            // wsFreeze.SheetView.FreezeRows(3);
+            // wsFreeze.SheetView.FreezeColumns(3);
+
+
+            //////////////////////////////
+            //var wsSplit = wb.Worksheets.Add("Split View");
+            //wsSplit.SheetView.SplitRow = 3;
+            //wsSplit.SheetView.SplitColumn = 3;
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/HideSheets.cs b/ClosedXML_Examples/Misc/HideSheets.cs
new file mode 100644
index 0000000..8d0b6fd
--- /dev/null
+++ b/ClosedXML_Examples/Misc/HideSheets.cs
@@ -0,0 +1,63 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class HideSheets : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            
+            wb.Worksheets.Add("First Hidden").Hide();
+            wb.Worksheets.Add("Visible");
+            wb.Worksheets.Add("Unhidden").Hide().Unhide();
+            wb.Worksheets.Add("VeryHidden").Visibility = XLWorksheetVisibility.VeryHidden;
+            wb.Worksheets.Add("Last Hidden").Hide();
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/HideUnhide.cs b/ClosedXML_Examples/Misc/HideUnhide.cs
new file mode 100644
index 0000000..82fe795
--- /dev/null
+++ b/ClosedXML_Examples/Misc/HideUnhide.cs
@@ -0,0 +1,64 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class HideUnhide : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Hide Rows Columns");
+
+            ws.Columns(1, 3).Hide();
+            ws.Rows(1, 3).Hide();
+
+            ws.Column(2).Unhide();
+            ws.Row(2).Unhide();
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/Hyperlinks.cs b/ClosedXML_Examples/Misc/Hyperlinks.cs
new file mode 100644
index 0000000..e40d32a
--- /dev/null
+++ b/ClosedXML_Examples/Misc/Hyperlinks.cs
@@ -0,0 +1,123 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class Hyperlinks : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Hyperlinks");
+            wb.Worksheets.Add("Second Sheet");
+
+            Int32 ro = 0;
+
+            // You can create a link with pretty much anything you can put on a
+            // browser: http, ftp, mailto, gopher, news, nntp, etc.
+            
+            ws.Cell(++ro, 1).Value = "Link to a web page, no tooltip - Yahoo!";
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"http://www.yahoo.com");
+
+            ws.Cell(++ro, 1).Value = "Link to a web page, with a tooltip - Yahoo!";
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"http://www.yahoo.com", "Click to go to Yahoo!");
+
+            ws.Cell(++ro, 1).Value = "Link to a file - same folder";
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink("Test.xlsx");
+
+            ws.Cell(++ro, 1).Value = "Link to a file - Absolute";
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"D:\Test.xlsx");
+
+            ws.Cell(++ro, 1).Value = "Link to a file - relative address";
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(@"../Test.xlsx");
+
+            ws.Cell(++ro, 1).Value = "Link to an address in this worksheet";
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink("B1");
+
+            ws.Cell(++ro, 1).Value = "Link to an address in another worksheet";
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink("'Second Sheet'!A1");
+
+            // You can also set the properties of a hyperlink directly:
+
+            ws.Cell(++ro, 1).Value = "Link to a range in this worksheet";
+            ws.Cell(ro, 1).Hyperlink.InternalAddress = "B1:C2";
+            ws.Cell(ro, 1).Hyperlink.Tooltip = "SquareBox";
+
+            ws.Cell(++ro, 1).Value = "Link to an email message";
+            ws.Cell(ro, 1).Hyperlink.ExternalAddress = new Uri(@"mailto:SantaClaus@NorthPole.com?subject=Presents");
+
+            // Deleting a hyperlink
+            ws.Cell(++ro, 1).Value = "This is no longer a link";
+            ws.Cell(ro, 1).Hyperlink.InternalAddress = "A1";
+            ws.Cell(ro, 1).Hyperlink.Delete();
+
+            // Setting a hyperlink preserves previous formatting:
+            ws.Cell(++ro, 1).Value = "Odd looking link";
+            ws.Cell(ro, 1).Style.Font.FontColor = XLColor.Red;
+            ws.Cell(ro, 1).Style.Font.Underline = XLFontUnderlineValues.Double;
+            ws.Cell(ro, 1).Hyperlink = new XLHyperlink(ws.Range("B1:C2"));
+
+            // List all hyperlinks in a worksheet:
+            var hyperlinksInWorksheet = ws.Hyperlinks;
+
+            // List all hyperlinks in a range:
+            var hyperlinksInRange = ws.Range("A1:A3").Hyperlinks;
+
+            // Clearing a cell with a hyperlink
+            ws.Cell(++ro, 1).Value = "ERROR!";
+            ws.Cell(ro, 1).Hyperlink.InternalAddress = "A1";
+            ws.Cell(ro, 1).Clear();
+
+            // Deleting a cell with a hyperlink
+            ws.Cell(++ro, 1).Value = "ERROR!";
+            ws.Cell(ro, 1).Hyperlink.InternalAddress = "A1";
+            ws.Cell(ro, 1).Clear();
+
+            ws.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/InsertingData.cs b/ClosedXML_Examples/Misc/InsertingData.cs
new file mode 100644
index 0000000..3877daa
--- /dev/null
+++ b/ClosedXML_Examples/Misc/InsertingData.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Misc
+{
+    public class InsertingData : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Inserting Data");
+
+            // From a list of strings
+            var listOfStrings = new List<String>();
+            listOfStrings.Add("House");
+            listOfStrings.Add("001");
+            ws.Cell(1, 1).Value = "From Strings";
+            ws.Cell(1, 1).AsRange().AddToNamed("Titles");
+            ws.Cell(2, 1).InsertData(listOfStrings);
+
+            // From a list of arrays
+            var listOfArr = new List<Int32[]>();
+            listOfArr.Add(new Int32[] { 1, 2, 3 });
+            listOfArr.Add(new Int32[] { 1 });
+            listOfArr.Add(new Int32[] { 1, 2, 3, 4, 5, 6 });
+            ws.Cell(1, 3).Value = "From Arrays";
+            ws.Range(1, 3, 1, 8).Merge().AddToNamed("Titles");
+            ws.Cell(2, 3).InsertData(listOfArr);
+
+            // From a DataTable
+            var dataTable = GetTable();
+            ws.Cell(6, 1).Value = "From DataTable";
+            ws.Range(6, 1, 6, 4).Merge().AddToNamed("Titles");
+            ws.Cell(7, 1).InsertData(dataTable.AsEnumerable());
+
+            // From a query
+            var list = new List<Person>();
+            list.Add(new Person() { Name = "John", Age = 30, House = "On Elm St."   });
+            list.Add(new Person() { Name = "Mary", Age = 15, House = "On Main St."  });
+            list.Add(new Person() { Name = "Luis", Age = 21, House = "On 23rd St."  });
+            list.Add(new Person() { Name = "Henry", Age = 45, House = "On 5th Ave." });
+
+            var people = from p in list
+                         where p.Age >= 21
+                         select new { p.Name, p.House, p.Age };
+
+            ws.Cell(6, 6).Value = "From Query";
+            ws.Range(6, 6, 6, 8).Merge().AddToNamed("Titles");
+            ws.Cell(7, 6).InsertData(people.AsEnumerable()); 
+
+            // Prepare the style for the titles
+            var titlesStyle = wb.Style;
+            titlesStyle.Font.Bold = true;
+            titlesStyle.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+            titlesStyle.Fill.BackgroundColor = XLColor.Cyan;
+            
+            // Format all titles in one shot
+            wb.NamedRanges.NamedRange("Titles").Ranges.Style = titlesStyle;
+
+            ws.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+
+        class Person
+        {
+            public String House { get; set; }
+            public String Name { get; set; }
+            public Int32 Age { get; set; }
+        }
+
+        // Private
+        private DataTable GetTable()
+        {
+
+            DataTable table = new DataTable();
+            table.Columns.Add("Dosage", typeof(int));
+            table.Columns.Add("Drug", typeof(string));
+            table.Columns.Add("Patient", typeof(string));
+            table.Columns.Add("Date", typeof(DateTime));
+
+            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
+            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
+            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
+            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
+            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
+            return table;
+        }
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/InsertingTables.cs b/ClosedXML_Examples/Misc/InsertingTables.cs
new file mode 100644
index 0000000..0e865d1
--- /dev/null
+++ b/ClosedXML_Examples/Misc/InsertingTables.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Data;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class InsertingTables : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Inserting Tables");
+
+            // From a list of strings
+            var listOfStrings = new List<String>();
+            listOfStrings.Add("House");
+            listOfStrings.Add("Car");
+            ws.Cell(1, 1).Value = "From Strings";
+            ws.Cell(1, 1).AsRange().AddToNamed("Titles");
+            ws.Cell(2, 1).InsertTable(listOfStrings);
+
+            // From a list of arrays
+            var listOfArr = new List<Int32[]>();
+            listOfArr.Add(new Int32[] { 1, 2, 3 });
+            listOfArr.Add(new Int32[] { 1 });
+            listOfArr.Add(new Int32[] { 1, 2, 3, 4, 5, 6 });
+            ws.Cell(1, 3).Value = "From Arrays";
+            ws.Range(1, 3, 1, 8).Merge().AddToNamed("Titles");
+            ws.Cell(2, 3).InsertTable(listOfArr);
+
+            // From a DataTable
+            var dataTable = GetTable();
+            ws.Cell(7, 1).Value = "From DataTable";
+            ws.Range(7, 1, 7, 4).Merge().AddToNamed("Titles");
+            ws.Cell(8, 1).InsertTable(dataTable.AsEnumerable());
+
+            // From a query
+            var list = new List<Person>();
+            list.Add(new Person() { Name = "John", Age = 30, House = "On Elm St."   });
+            list.Add(new Person() { Name = "Mary", Age = 15, House = "On Main St."  });
+            list.Add(new Person() { Name = "Luis", Age = 21, House = "On 23rd St."  });
+            list.Add(new Person() { Name = "Henry", Age = 45, House = "On 5th Ave." });
+
+            var people = from p in list
+                         where p.Age >= 21
+                         select p;
+
+
+            ws.Cell(7, 6).Value = "From Query";
+            ws.Range(7, 6, 7, 8).Merge().AddToNamed("Titles");
+            ws.Cell(8, 6).InsertTable(people.AsEnumerable()); 
+
+            // Prepare the style for the titles
+            var titlesStyle = wb.Style;
+            titlesStyle.Font.Bold = true;
+            titlesStyle.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+            titlesStyle.Fill.BackgroundColor = XLColor.Cyan;
+            
+            // Format all titles in one shot
+            wb.NamedRanges.NamedRange("Titles").Ranges.Style = titlesStyle;
+
+            ws.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+        
+        class Person
+        {
+            [Display(Name = "House Street")]
+            public String House { get; set; }
+            public String Name { get; set; }
+            public Int32 Age { get; set; }
+        }
+
+        // Private
+        private DataTable GetTable()
+        {
+
+            DataTable table = new DataTable();
+            table.Columns.Add("Dosage", typeof(int));
+            table.Columns.Add("Drug", typeof(string));
+            table.Columns.Add("Patient", typeof(string));
+            table.Columns.Add("Date", typeof(DateTime));
+
+            table.Rows.Add(25, "Indocin", "David", new DateTime(2000, 1, 1));
+            table.Rows.Add(50, "Enebrel", "Sam", new DateTime(2000, 1, 2));
+            table.Rows.Add(10, "Hydralazine", "Christoff", new DateTime(2000, 1, 3));
+            table.Rows.Add(21, "Combivent", "Janet", new DateTime(2000, 1, 4));
+            table.Rows.Add(100, "Dilantin", "Melanie", new DateTime(2000, 1, 5));
+            return table;
+        }
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/LambdaExpressions.cs b/ClosedXML_Examples/Misc/LambdaExpressions.cs
new file mode 100644
index 0000000..325cf58
--- /dev/null
+++ b/ClosedXML_Examples/Misc/LambdaExpressions.cs
@@ -0,0 +1,56 @@
+using System.IO;
+using System.Linq;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class LambdaExpressions : IXLExample
+    {
+        public void Create(string filePath)
+        {
+
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new BasicTable().Create(tempFile);
+                var workbook = new XLWorkbook(tempFile);
+                var ws = workbook.Worksheet(1);
+
+                // Define a range with the data
+                var firstDataCell = ws.Cell("B4");
+                var lastDataCell = ws.LastCellUsed();
+                var rngData = ws.Range(firstDataCell.Address, lastDataCell.Address);
+
+                // Delete all rows where Outcast = false (the 3rd column)
+                rngData.Rows() // From all rows
+                        .Where(r => !r.Cell(3).GetBoolean()) // where the 3rd cell of each row is false
+                        .ForEach(r => r.Delete()); // delete the row and shift the cells up (the default for rows in a range)
+
+                //// Put a light gray background to all text cells
+                //rngData.Cells() // From all cells
+                //        .Where(c => c.DataType == XLCellValues.Text) // where the data type is Text
+                //        .ForEach(c => c.Style.Fill.BackgroundColor = XLColor.LightGray); // Fill with a light gray
+
+                var cells = rngData.Cells();
+                var filtered = cells.Where(c => c.DataType == XLCellValues.Text);
+                var list = filtered.ToList();
+                foreach (var c in list)
+                {
+                    c.Style.Fill.BackgroundColor = XLColor.LightGray;
+                }
+
+                // Put a thick border to the bottom of the table (we may have deleted the bottom cells with the border)
+                rngData.LastRow().Style.Border.BottomBorder = XLBorderStyleValues.Thick;
+
+                workbook.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Misc/MergeCells.cs b/ClosedXML_Examples/Misc/MergeCells.cs
new file mode 100644
index 0000000..ed9456f
--- /dev/null
+++ b/ClosedXML_Examples/Misc/MergeCells.cs
@@ -0,0 +1,88 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class MergeCells : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Constructors
+
+        // Public
+
+
+        // Private
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Merge Cells");
+
+            // Merge a row
+            ws.Cell("B2").Value = "Merged Row(1) of Range (B2:D3)";
+            ws.Range("B2:D3").Row(1).Merge();
+
+            // Merge a column
+            ws.Cell("F2").Value = "Merged Column(1) of Range (F2:G8)";
+            ws.Cell("F2").Style.Alignment.WrapText = true;
+            ws.Range("F2:G8").Column(1).Merge();
+
+            // Merge a range
+            ws.Cell("B4").Value = "Merged Range (B4:D6)";
+            ws.Cell("B4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+            ws.Cell("B4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+            ws.Range("B4:D6").Merge();
+
+            // Unmerging a range...
+            ws.Cell("B8").Value = "Unmerged";
+            ws.Range("B8:D8").Merge();
+            ws.Range("B8:D8").Unmerge();
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/MergeMoves.cs b/ClosedXML_Examples/Misc/MergeMoves.cs
new file mode 100644
index 0000000..d2d5f46
--- /dev/null
+++ b/ClosedXML_Examples/Misc/MergeMoves.cs
@@ -0,0 +1,53 @@
+using System.IO;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class MergeMoves : IXLExample
+    {
+
+        public void Create(string filePath)
+        {
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new MergeCells().Create(tempFile);
+                var workbook = new XLWorkbook(tempFile);
+
+                var ws = workbook.Worksheet(1);
+
+                ws.Range("B1:F1").InsertRowsBelow(1);
+                ws.Range("A3:A9").InsertColumnsAfter(1);
+                ws.Row(1).Delete();
+                ws.Column(1).Delete();
+
+                ws.Range("E8:E9").InsertColumnsAfter(1);
+                ws.Range("F2:F8").Merge();
+                ws.Range("E3:E4").InsertColumnsAfter(1);
+                ws.Range("F2:F8").Merge();
+                ws.Range("E1:E2").InsertColumnsAfter(1);
+                ws.Range("G2:G8").Merge();
+                ws.Range("E1:E2").Delete(XLShiftDeletedCells.ShiftCellsLeft);
+
+                ws.Range("D3:E3").InsertRowsBelow(1);
+                ws.Range("A1:B1").InsertRowsBelow(1);
+                ws.Range("B3:D3").Merge();
+                ws.Range("A1:B1").Delete(XLShiftDeletedCells.ShiftCellsUp);
+
+                ws.Range("B8:D8").Merge();
+                ws.Range("D8:D9").Clear();
+
+                workbook.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+
+    }
+}
diff --git a/ClosedXML_Examples/Misc/MultipleSheets.cs b/ClosedXML_Examples/Misc/MultipleSheets.cs
new file mode 100644
index 0000000..630c139
--- /dev/null
+++ b/ClosedXML_Examples/Misc/MultipleSheets.cs
@@ -0,0 +1,30 @@
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class MultipleSheets : IXLExample
+    {
+        
+        public void Create(string filePath)
+        {
+            var wb = new XLWorkbook();
+            foreach (var wsNum in Enumerable.Range(1, 5))
+            {
+                wb.Worksheets.Add("Original Pos. is " + wsNum.ToString());
+            }
+
+            // Move first worksheet to the last position
+            wb.Worksheet(1).Position = wb.Worksheets.Count() + 1;
+
+            // Delete worksheet on position 4 (in this case it's where original position = 5)
+            wb.Worksheet(4).Delete();
+
+            // Swap sheets in positions 1 and 2
+            wb.Worksheet(2).Position = 1;
+
+            wb.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Misc/Outline.cs b/ClosedXML_Examples/Misc/Outline.cs
new file mode 100644
index 0000000..0d7dd21
--- /dev/null
+++ b/ClosedXML_Examples/Misc/Outline.cs
@@ -0,0 +1,86 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class Outline : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Outline");
+
+            ws.Outline.SummaryHLocation = XLOutlineSummaryHLocation.Right;
+            ws.Columns(2, 6).Group(); // Create an outline (level 1) for columns 2-6
+            ws.Columns(2, 4).Group(); // Create an outline (level 2) for columns 2-4
+            ws.Column(2).Ungroup(true); // Remove column 2 from all outlines
+
+            ws.Outline.SummaryVLocation = XLOutlineSummaryVLocation.Bottom;
+            ws.Rows(1, 5).Group(); // Create an outline (level 1) for rows 1-5
+            ws.Rows(1, 4).Group(); // Create an outline (level 2) for rows 1-4
+            ws.Rows(1, 4).Collapse(); // Collapse rows 1-4
+            ws.Rows(1, 2).Group(); // Create an outline (level 3) for rows 1-2
+            ws.Rows(1, 2).Ungroup(); // Ungroup rows 1-2 from their last outline
+
+            // You can also Collapse/Expand specific outline levels
+            // 
+            // ws.CollapseRows(Int32 outlineLevel)
+            // ws.CollapseColumns(Int32 outlineLevel)
+            //
+            // ws.ExpandRows(Int32 outlineLevel)
+            // ws.ExpandColumns(Int32 outlineLevel)
+
+            // And you can also Collapse/Expand ALL outline levels in one shot
+            // 
+            // ws.CollapseRows()
+            // ws.CollapseColumns()
+            //
+            // ws.ExpandRows()
+            // ws.ExpandColumns()
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/SheetProtection.cs b/ClosedXML_Examples/Misc/SheetProtection.cs
new file mode 100644
index 0000000..9ff9e3e
--- /dev/null
+++ b/ClosedXML_Examples/Misc/SheetProtection.cs
@@ -0,0 +1,92 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class SheetProtection : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Protected No-Password");
+
+            ws.Protect()            // On this sheet we will only allow:
+                .SetFormatCells()   // Cell Formatting
+                .SetInsertColumns() // Inserting Columns
+                .SetDeleteColumns() // Deleting Columns
+                .SetDeleteRows();   // Deleting Rows
+
+            ws.Cell("A1").SetValue("Locked, No Hidden (Default):").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
+            ws.Cell("B1").Style
+                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
+
+            ws.Cell("A2").SetValue("Locked, Hidden:").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
+            ws.Cell("B2").Style
+                .Protection.SetHidden()
+                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
+
+            ws.Cell("A3").SetValue("Not Locked, Hidden:").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
+            ws.Cell("B3").Style
+                .Protection.SetLocked(false)
+                .Protection.SetHidden()
+                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
+
+            ws.Cell("A4").SetValue("Not Locked, Not Hidden:").Style.Font.SetBold().Fill.SetBackgroundColor(XLColor.Cyan);
+            ws.Cell("B4").Style
+                .Protection.SetLocked(false)
+                .Border.SetOutsideBorder(XLBorderStyleValues.Medium);
+
+            ws.Columns().AdjustToContents();
+
+            // Protect a sheet with a password
+            var protectedSheet = wb.Worksheets.Add("Protected Password = 123");
+            var protection = protectedSheet.Protect("123");
+            protection.InsertRows = true;
+            protection.InsertColumns = true;
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/ShiftingFormulas.cs b/ClosedXML_Examples/Misc/ShiftingFormulas.cs
new file mode 100644
index 0000000..f54aeb3
--- /dev/null
+++ b/ClosedXML_Examples/Misc/ShiftingFormulas.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class ShiftingFormulas : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Shifting Formulas");
+            ws.Cell("B2").Value = 5;
+            ws.Cell("B3").Value = 6;
+            ws.Cell("C2").Value = 1;
+            ws.Cell("C3").Value = 2;
+            ws.Cell("A4").Value = "Sum:";
+            ws.Range("B4:C4").FormulaR1C1 = "Sum(R[-2]C:R[-1]C)";
+            ws.Range("B4:C4").AddToNamed("WorkbookB4C4");
+            ws.Range("B4:C4").AddToNamed("WorksheetB4C4", XLScope.Worksheet);
+            ws.Cell("E2").Value = "Avg:";
+
+            ws.Cell("F2").FormulaA1 = "Average(B2:C3)";
+            ws.Ranges("A4,E2").Style
+                .Font.SetBold()
+                .Fill.SetBackgroundColor(XLColor.CyanProcess);
+
+            var ws2 = wb.Worksheets.Add("WS2");
+            ws2.Cell(1, 1).FormulaA1 = "='Shifting Formulas'!B2";
+            ws2.Cell(1, 2).Value = ws2.Cell(1, 1).Value;
+            ws2.Cell(2, 1).FormulaA1 = "Average('Shifting Formulas'!$B$2:$C$3)";
+            ws2.Cell(3, 1).FormulaA1 = "Average('Shifting Formulas'!$B$2:$C3)";
+            ws2.Cell(4, 1).FormulaA1 = "Average('Shifting Formulas'!$B$2:C3)";
+            ws2.Cell(5, 1).FormulaA1 = "Average('Shifting Formulas'!$B2:C3)";
+            ws2.Cell(6, 1).FormulaA1 = "Average('Shifting Formulas'!B2:C3)";
+            ws2.Cell(7, 1).FormulaA1 = "Average('Shifting Formulas'!B2:C$3)";
+            ws2.Cell(8, 1).FormulaA1 = "Average('Shifting Formulas'!B2:$C$3)";
+            ws2.Cell(9, 1).FormulaA1 = "Average('Shifting Formulas'!B$2:$C$3)";
+
+            var dataGrid = ws.Range("B2:D3");
+            ws.Row(1).InsertRowsAbove(1);
+            var newRow = dataGrid.LastRow().InsertRowsAbove(1).First();
+            newRow.Value = 1;
+            dataGrid.LastColumn().FormulaR1C1 = String.Format("SUM(RC[-{0}]:RC[-1])", dataGrid.ColumnCount() - 1);
+            ws.Cell(1, 1).InsertCellsBelow(1);
+            ws.Column(1).InsertColumnsBefore(1);
+            ws.Row(4).Delete();
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/ShowCase.cs b/ClosedXML_Examples/Misc/ShowCase.cs
new file mode 100644
index 0000000..c8edc32
--- /dev/null
+++ b/ClosedXML_Examples/Misc/ShowCase.cs
@@ -0,0 +1,105 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class ShowCase : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            // Creating a new workbook
+            var wb = new XLWorkbook();
+
+            //Adding a worksheet
+            var ws = wb.Worksheets.Add("Contacts");
+
+            //Adding text
+            //Title
+            ws.Cell("B2").Value = "Contacts";
+            //First Names
+            ws.Cell("B3").Value = "FName";
+            ws.Cell("B4").Value = "John";
+            ws.Cell("B5").Value = "Hank";
+            ws.Cell("B6").SetValue("Dagny"); // Another way to set the value
+            //Last Names
+            ws.Cell("C3").Value = "LName";
+            ws.Cell("C4").Value = "Galt";
+            ws.Cell("C5").Value = "Rearden";
+            ws.Cell("C6").SetValue("Taggart"); // Another way to set the value
+
+            //Adding more data types
+            //Is an outcast?
+            ws.Cell("D3").Value = "Outcast";
+            ws.Cell("D4").Value = true;
+            ws.Cell("D5").Value = false;
+            ws.Cell("D6").SetValue(false); // Another way to set the value
+            //Date of Birth
+            ws.Cell("E3").Value = "DOB";
+            ws.Cell("E4").Value = new DateTime(1919, 1, 21);
+            ws.Cell("E5").Value = new DateTime(1907, 3, 4);
+            ws.Cell("E6").SetValue(new DateTime(1921, 12, 15)); // Another way to set the value
+            //Income
+            ws.Cell("F3").Value = "Income";
+            ws.Cell("F4").Value = 2000;
+            ws.Cell("F5").Value = 40000;
+            ws.Cell("F6").SetValue(10000); // Another way to set the value
+
+            //Defining ranges
+            //From worksheet
+            var rngTable = ws.Range("B2:F6");
+            //From another range
+            var rngDates = rngTable.Range("D3:D5"); // The address is relative to rngTable (NOT the worksheet)
+            var rngNumbers = rngTable.Range("E3:E5"); // The address is relative to rngTable (NOT the worksheet)
+
+            //Formatting dates and numbers
+            //Using a OpenXML's predefined formats
+            rngDates.Style.NumberFormat.NumberFormatId = 15;
+            //Using a custom format
+            rngNumbers.Style.NumberFormat.Format = "$ #,##0";
+
+            //Format title cell in one shot
+            rngTable.Cell(1, 1).Style
+                .Font.SetBold()
+                .Fill.SetBackgroundColor(XLColor.CornflowerBlue)
+                .Alignment.SetHorizontal(XLAlignmentHorizontalValues.Center);
+
+            //Merge title cells
+            rngTable.FirstRow().Merge(); // We could've also used: rngTable.Range("A1:E1").Merge() or rngTable.Row(1).Merge()
+
+            //Formatting headers
+            var rngHeaders = rngTable.Range("A2:E2"); // The address is relative to rngTable (NOT the worksheet)
+            rngHeaders.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+            rngHeaders.Style.Font.Bold = true;
+            rngHeaders.Style.Font.FontColor = XLColor.DarkBlue;
+            rngHeaders.Style.Fill.BackgroundColor = XLColor.Aqua;
+
+            // Create an Excel table with the data portion
+            var rngData = ws.Range("B3:F6");
+            var excelTable = rngData.CreateTable();
+
+            // Add the totals row
+            excelTable.ShowTotalsRow = true;
+            // Put the average on the field "Income"
+            // Notice how we're calling the cell by the column name
+            excelTable.Field("Income").TotalsRowFunction = XLTotalsRowFunction.Average;
+            // Put a label on the totals cell of the field "DOB"
+            excelTable.Field("DOB").TotalsRowLabel = "Average:";
+            
+            //Add thick borders to the contents of our spreadsheet
+            ws.RangeUsed().Style.Border.OutsideBorder = XLBorderStyleValues.Thick;
+
+            // You can also specify the border for each side with:
+            // contents.FirstColumn().Style.Border.LeftBorder = XLBorderStyleValues.Thick;
+            // contents.LastColumn().Style.Border.RightBorder = XLBorderStyleValues.Thick;
+            // contents.FirstRow().Style.Border.TopBorder = XLBorderStyleValues.Thick;
+            // contents.LastRow().Style.Border.BottomBorder = XLBorderStyleValues.Thick;
+
+            // Adjust column widths to their content
+            ws.Columns(2, 6).AdjustToContents();
+
+            //Saving the workbook
+            wb.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Misc/TabColors.cs b/ClosedXML_Examples/Misc/TabColors.cs
new file mode 100644
index 0000000..19f1664
--- /dev/null
+++ b/ClosedXML_Examples/Misc/TabColors.cs
@@ -0,0 +1,67 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class TabColors : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+
+            var wsRed = wb.Worksheets.Add("Red").SetTabColor(XLColor.Red);
+
+            var wsAccent3 = wb.Worksheets.Add("Accent3").SetTabColor(XLColor.FromTheme(XLThemeColor.Accent3));
+
+            var wsIndexed = wb.Worksheets.Add("Indexed");
+            wsIndexed.TabColor = XLColor.FromIndex(24);
+
+            var wsArgb = wb.Worksheets.Add("Argb");
+            wsArgb.TabColor = XLColor.FromArgb(23, 23, 23);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Misc/WorkbookProperties.cs b/ClosedXML_Examples/Misc/WorkbookProperties.cs
new file mode 100644
index 0000000..3a32bcf
--- /dev/null
+++ b/ClosedXML_Examples/Misc/WorkbookProperties.cs
@@ -0,0 +1,75 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class WorkbookProperties : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Workbook Properties");
+
+            wb.Properties.Author = "theAuthor";
+            wb.Properties.Title = "theTitle";
+            wb.Properties.Subject = "theSubject";
+            wb.Properties.Category = "theCategory";
+            wb.Properties.Keywords = "theKeywords";
+            wb.Properties.Comments = "theComments";
+            wb.Properties.Status = "theStatus";
+            wb.Properties.LastModifiedBy = "theLastModifiedBy";
+            wb.Properties.Company = "theCompany";
+            wb.Properties.Manager = "theManager";
+
+            // Creating/Using custom properties
+            wb.CustomProperties.Add("theText", "XXX");
+            wb.CustomProperties.Add("theDate", new DateTime(2011, 1, 1, 17, 0, 0, DateTimeKind.Utc)); // Use UTC to make sure test can be run in any time zone
+            wb.CustomProperties.Add("theNumber", 123.456);
+            wb.CustomProperties.Add("theBoolean", true);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/ModifyFiles.cs b/ClosedXML_Examples/ModifyFiles.cs
new file mode 100644
index 0000000..9e2cc47
--- /dev/null
+++ b/ClosedXML_Examples/ModifyFiles.cs
@@ -0,0 +1,12 @@
+using ClosedXML_Examples.Delete;
+
+namespace ClosedXML_Examples
+{
+    public class ModifyFiles
+    {
+        public static void Run()
+        {
+            new DeleteRows().Create(@"C:\ClosedXML_Tests\Modified\DeleteRows.xlsx");
+        }
+    }
+}
diff --git a/ClosedXML_Examples/PageSetup/HeaderFooters.cs b/ClosedXML_Examples/PageSetup/HeaderFooters.cs
new file mode 100644
index 0000000..ed8646e
--- /dev/null
+++ b/ClosedXML_Examples/PageSetup/HeaderFooters.cs
@@ -0,0 +1,65 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.PageSetup
+{
+    public class HeaderFooters : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Headers and Footers");
+            
+            // Simple left header to be placed on all pages
+            ws.PageSetup.Header.Left.AddText("Created with ClosedXML");
+
+            // Using various font decorations for the right header on the first page only
+            // Here we show different methods for setting font decorations.
+            
+            // Set single font decorations immediately
+            ws.PageSetup.Header.Right.AddText("The ", XLHFOccurrence.FirstPage).SetBold();
+            ws.PageSetup.Header.Right.AddText("First ", XLHFOccurrence.FirstPage).SetFontColor(XLColor.Red);
+
+            // Use the IXLRichText returned by the AddText(...) method to later on modify the font
+            var richText = ws.PageSetup.Header.Right.AddText("Colorful ", XLHFOccurrence.FirstPage);
+            richText.FontColor = XLColor.Blue;
+            richText.Underline = XLFontUnderlineValues.Double;
+
+            // Set multiple font decorations chained
+            ws.PageSetup.Header.Right.AddText("Page", XLHFOccurrence.FirstPage)
+                .SetBold()
+                .SetItalic()
+                .SetFontName("Broadway");
+
+
+            // Using predefined header/footer text:
+
+            // Let's put the full path to the file on the right footer of every odd page:
+            ws.PageSetup.Footer.Right.AddText(XLHFPredefinedText.FullPath, XLHFOccurrence.OddPages);
+
+            // Let's put the current page number and total pages on the center of every footer:
+            ws.PageSetup.Footer.Center.AddText(XLHFPredefinedText.PageNumber, XLHFOccurrence.AllPages);
+            ws.PageSetup.Footer.Center.AddText(" / ", XLHFOccurrence.AllPages);
+            ws.PageSetup.Footer.Center.AddText(XLHFPredefinedText.NumberOfPages, XLHFOccurrence.AllPages);
+
+            // Don't align headers and footers with the margins
+            ws.PageSetup.AlignHFWithMargins = false;
+
+            // Don't scale headers and footers with the document
+            ws.PageSetup.ScaleHFWithDocument = false;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/PageSetup/Margins.cs b/ClosedXML_Examples/PageSetup/Margins.cs
new file mode 100644
index 0000000..e343126
--- /dev/null
+++ b/ClosedXML_Examples/PageSetup/Margins.cs
@@ -0,0 +1,36 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.PageSetup
+{
+    public class Margins : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Margins");
+            ws.PageSetup.Margins.Top = 1;
+            ws.PageSetup.Margins.Bottom = 1.25;
+            ws.PageSetup.Margins.Left = 0.5;
+            ws.PageSetup.Margins.Right = 0.75;
+            ws.PageSetup.Margins.Footer = 0.15;
+            ws.PageSetup.Margins.Header = 0.30;
+
+            ws.PageSetup.CenterHorizontally = true;
+            ws.PageSetup.CenterVertically = true;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/PageSetup/Page.cs b/ClosedXML_Examples/PageSetup/Page.cs
new file mode 100644
index 0000000..e4d745e
--- /dev/null
+++ b/ClosedXML_Examples/PageSetup/Page.cs
@@ -0,0 +1,43 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.PageSetup
+{
+    public class Page : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws1 = workbook.Worksheets.Add("Page Setup - Page1");
+            ws1.PageSetup.PageOrientation = XLPageOrientation.Landscape;
+            ws1.PageSetup.AdjustTo(80);
+            ws1.PageSetup.PaperSize = XLPaperSize.LegalPaper;
+            ws1.PageSetup.VerticalDpi = 600;
+            ws1.PageSetup.HorizontalDpi = 600;
+
+            var ws2 = workbook.Worksheets.Add("Page Setup - Page2");
+            ws2.PageSetup.PageOrientation = XLPageOrientation.Portrait;
+            ws2.PageSetup.FitToPages(2, 2);     // Alternatively you can use 
+                                                // ws2.PageSetup.PagesTall = #
+                                                // and/or ws2.PageSetup.PagesWide = #
+
+            ws2.PageSetup.PaperSize = XLPaperSize.LetterPaper;
+            ws2.PageSetup.VerticalDpi = 600;
+            ws2.PageSetup.HorizontalDpi = 600;
+            ws2.PageSetup.FirstPageNumber = 5;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/PageSetup/SheetTab.cs b/ClosedXML_Examples/PageSetup/SheetTab.cs
new file mode 100644
index 0000000..1048dec
--- /dev/null
+++ b/ClosedXML_Examples/PageSetup/SheetTab.cs
@@ -0,0 +1,58 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.PageSetup
+{
+    public class SheetTab : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Sheet Tab");
+            
+            // Adding print areas
+            ws.PageSetup.PrintAreas.Add("A1:B2");
+            ws.PageSetup.PrintAreas.Add("D3:D5");
+
+            // Adding rows to repeat at top
+            ws.PageSetup.SetRowsToRepeatAtTop(1,2);
+
+            // Adding columns to repeat at left
+            ws.PageSetup.SetColumnsToRepeatAtLeft(1, 2);
+
+            // Show gridlines
+            ws.PageSetup.ShowGridlines = true;
+
+            // Print in black and white
+            ws.PageSetup.BlackAndWhite = true;
+
+            // Print in draft quality
+            ws.PageSetup.DraftQuality = true;
+
+            // Show row and column headings
+            ws.PageSetup.ShowRowAndColumnHeadings = true;
+
+            // Set the page print order to over, then down
+            ws.PageSetup.PageOrder = XLPageOrderValues.OverThenDown;
+
+            // Place comments at the end of the sheet
+            ws.PageSetup.ShowComments = XLShowCommentsValues.AtEnd;
+
+            // Print errors as #N/A
+            ws.PageSetup.PrintErrorValue = XLPrintErrorValues.NA;
+            
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/PageSetup/Sheets.cs b/ClosedXML_Examples/PageSetup/Sheets.cs
new file mode 100644
index 0000000..a7b2584
--- /dev/null
+++ b/ClosedXML_Examples/PageSetup/Sheets.cs
@@ -0,0 +1,34 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.PageSetup
+{
+    public class Sheets : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws1 = workbook.Worksheets.Add("Separate PrintAreas");
+            ws1.PageSetup.PrintAreas.Add("A1:B2");
+            ws1.PageSetup.PrintAreas.Add("D3:D5");
+
+            var ws2 = workbook.Worksheets.Add("Page Breaks");
+            ws2.PageSetup.PrintAreas.Add("A1:D5");
+            ws2.PageSetup.AddHorizontalPageBreak(2);
+            ws2.PageSetup.AddVerticalPageBreak(2);
+            
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/PageSetup/TwoPages.cs b/ClosedXML_Examples/PageSetup/TwoPages.cs
new file mode 100644
index 0000000..33cf47d
--- /dev/null
+++ b/ClosedXML_Examples/PageSetup/TwoPages.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.PageSetup
+{
+    public class TwoPages : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Sheet1");
+            foreach (var ro in Enumerable.Range(1, 100))
+            {
+                foreach (var co in Enumerable.Range(1, 10))
+                {
+                    ws.Cell(ro, co).Value = ws.Cell(ro, co).Address.ToString();
+                }
+            }
+            ws.PageSetup.PagesWide = 1;
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/PivotTables/PivotTables.cs b/ClosedXML_Examples/PivotTables/PivotTables.cs
new file mode 100644
index 0000000..b36a956
--- /dev/null
+++ b/ClosedXML_Examples/PivotTables/PivotTables.cs
@@ -0,0 +1,31 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class PivotTables
+    {
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Pivot Table");
+            
+            ws.Cell("A1").Value = "Category";
+            ws.Cell("A2").Value = "A";
+            ws.Cell("A3").Value = "B";
+            ws.Cell("A4").Value = "B";
+            ws.Cell("B1").Value = "Number";
+            ws.Cell("B2").Value = 100;
+            ws.Cell("B3").Value = 150;
+            ws.Cell("B4").Value = 75;
+
+            //var pivotTable = ws.Range("A1:B4").CreatePivotTable(ws.Cell("D1"));
+            //pivotTable.RowLabels.Add("Category");
+            //pivotTable.Values.Add("Number")
+            //    .ShowAsPctFrom("Category").And("A")
+            //    .NumberFormat.Format = "0%";
+
+            wb.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Program.cs b/ClosedXML_Examples/Program.cs
new file mode 100644
index 0000000..16edb3c
--- /dev/null
+++ b/ClosedXML_Examples/Program.cs
@@ -0,0 +1,12 @@
+
+namespace ClosedXML_Examples
+{
+    public class Program
+    {
+        static void Main(string[] args)
+        {
+            CreateFiles.CreateAllFiles();
+            LoadFiles.LoadAllFiles();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Properties/AssemblyInfo.cs b/ClosedXML_Examples/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3b0f1c9
--- /dev/null
+++ b/ClosedXML_Examples/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ClosedXML_Examples")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("ClosedXML_Examples")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("603cd89c-23f2-415e-8afc-2e9ab7a4c372")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.56.0.0")]
+[assembly: AssemblyFileVersion("0.56.0.0")]
diff --git a/ClosedXML_Examples/Ranges/ClearingRanges.cs b/ClosedXML_Examples/Ranges/ClearingRanges.cs
new file mode 100644
index 0000000..4f9c9c1
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/ClearingRanges.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Ranges
+{
+    public class ClearingRanges : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Clearing Ranges");
+            foreach (var ro in Enumerable.Range(1, 10))
+            {
+                foreach (var co in Enumerable.Range(1, 10))
+                {
+                    var cell = ws.Cell(ro, co);
+                    cell.Value = cell.Address.ToString();
+                    cell.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+                    cell.Style.Fill.BackgroundColor = XLColor.Turquoise;
+                    cell.Style.Font.Bold = true;
+                }
+            }
+
+            // Clearing a range
+            ws.Range("B1:C2").Clear();
+
+            // Clearing a row in a range
+            ws.Range("B4:C5").Row(1).Clear();
+
+            // Clearing a column in a range
+            ws.Range("E1:F4").Column(2).Clear();
+
+            // Clear an entire row
+            ws.Row(7).Clear();
+
+            // Clear an entire column
+            ws.Column("H").Clear();
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/CopyingRanges.cs b/ClosedXML_Examples/Ranges/CopyingRanges.cs
new file mode 100644
index 0000000..1550592
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/CopyingRanges.cs
@@ -0,0 +1,37 @@
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class CopyingRanges : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            var tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new BasicTable().Create(tempFile);
+                var workbook = new XLWorkbook(tempFile);
+                var ws = workbook.Worksheet(1);
+
+                // Define a range with the data
+                var firstTableCell = ws.FirstCellUsed();
+                var lastTableCell = ws.LastCellUsed();
+                var rngData = ws.Range(firstTableCell.Address, lastTableCell.Address);
+
+                // Copy the table to another worksheet
+                var wsCopy = workbook.Worksheets.Add("Contacts Copy");
+                wsCopy.Cell(1, 1).Value = rngData;
+
+                workbook.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Ranges/CurrentRowColumn.cs b/ClosedXML_Examples/Ranges/CurrentRowColumn.cs
new file mode 100644
index 0000000..8c1934c
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/CurrentRowColumn.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Ranges
+{
+    public class CurrentRowColumn : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Current Row Column");
+
+            var cell = ws.Cell(5, 2);
+            cell.Style.Fill.SetBackgroundColor(XLColor.Red);
+            ws.Cell(1, 1)
+                .SetValue("Red's Row:")
+                .CellRight().SetValue(cell.WorksheetRow().RowNumber())
+                .CellBelow().SetValue(cell.WorksheetColumn().ColumnLetter())
+                .CellLeft().SetValue("Red's Column:");
+
+            var row = ws.Range("A6:C6").FirstRow();
+            row.Style.Fill.SetBackgroundColor(XLColor.Blue);
+
+            var column = ws.Range("B7:B9").FirstColumn();
+            column.Style.Fill.SetBackgroundColor(XLColor.Green);
+
+            ws.Cell(1, 4)
+                .SetValue("Blue's Row:")
+                .CellRight().SetValue(row.WorksheetRow().RowNumber())
+                .CellBelow().SetValue(column.WorksheetColumn().ColumnLetter())
+                .CellLeft().SetValue("Green's Column:");
+
+            ws.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
+            ws.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/DefiningRanges.cs b/ClosedXML_Examples/Ranges/DefiningRanges.cs
new file mode 100644
index 0000000..ba51969
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/DefiningRanges.cs
@@ -0,0 +1,49 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Ranges
+{
+    public class DefiningRanges : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Defining a Range");
+
+            // With a string
+            var range1 = ws.Range("A1:B1");
+            range1.Cell(1, 1).Value = "ws.Range(\"A1:B1\").Merge()";
+            range1.Merge();
+
+            // With two XLAddresses
+            var range2 = ws.Range(ws.Cell(2, 1).Address, ws.Cell(2, 2).Address);
+            range2.Cell(1, 1).Value = "ws.Range(ws.Cell(2, 1).Address, ws.Cell(2, 2).Address).Merge()";
+            range2.Merge();
+
+            // With two strings
+            var range4 = ws.Range("A3", "B3");
+            range4.Cell(1, 1).Value = "ws.Range(\"A3\", \"B3\").Merge()";
+            range4.Merge();
+
+            // With 4 points
+            var range5 = ws.Range(4, 1, 4, 2);
+            range5.Cell(1, 1).Value = "ws.Range(4, 1, 4, 2).Merge()";
+            range5.Merge();
+
+            ws.Column("A").AdjustToContents();
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/DeletingRanges.cs b/ClosedXML_Examples/Ranges/DeletingRanges.cs
new file mode 100644
index 0000000..fa10274
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/DeletingRanges.cs
@@ -0,0 +1,69 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Ranges
+{
+    public class DeletingRanges : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Deleting Ranges");
+
+            // Deleting Columns
+            // Setup test values
+            ws.Columns("1-3, 5, 7").Style.Fill.BackgroundColor = XLColor.Gray;
+            ws.Columns("4, 6").Style.Fill.BackgroundColor = XLColor.GreenPigment;
+            ws.Row(1).Cells("1-3, 5, 7").Value = "FAIL";
+
+            ws.Column(7).Delete();
+            ws.Column(1).Delete();
+            ws.Columns(1,2).Delete();
+            ws.Column(2).Delete();
+
+            // Deleting Rows
+            ws.Rows("1,5,7").Style.Fill.BackgroundColor = XLColor.GreenPigment;
+            ws.Rows("2-4,6, 8").Style.Fill.BackgroundColor = XLColor.Gray;
+            ws.Column(1).Cells("2-4,6, 8").Value = "FAIL";
+
+            ws.Row(8).Delete();
+            ws.Row(2).Delete();
+            ws.Rows(2, 3).Delete();
+            ws.Rows(3, 4).Delete();
+
+            // Deleting Ranges (Shifting Left)
+            var rng1 = ws.Range(2, 2, 8, 8);
+            rng1.Columns("1-3, 5, 7").Style.Fill.BackgroundColor = XLColor.Gray;
+            rng1.Columns("4, 6").Style.Fill.BackgroundColor = XLColor.Orange;
+            rng1.Row(1).Cells("1-3, 5, 7").Value = "FAIL";
+
+            rng1.Column(7).Delete();
+            rng1.Column(1).Delete();
+            rng1.Range(1, 1, rng1.RowCount(), 2).Delete(XLShiftDeletedCells.ShiftCellsLeft);
+            rng1.Column(2).Delete();
+
+            // Deleting Ranges (Shifting Up)
+            rng1.Rows("4, 6").Style.Fill.BackgroundColor = XLColor.Orange;
+            rng1.Rows("1-3, 5, 7").Style.Fill.BackgroundColor = XLColor.Gray;
+            rng1.Column(1).Cells("1-3, 5, 7").Value = "FAIL";
+
+            rng1.Row(7).Delete();
+            rng1.Row(1).Delete();
+            rng1.Range(1, 1, 2, rng1.ColumnCount()).Delete(XLShiftDeletedCells.ShiftCellsUp);
+            rng1.Row(2).Delete();
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs b/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs
new file mode 100644
index 0000000..1e23002
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs
@@ -0,0 +1,55 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class InsertingDeletingColumns : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Inserting and Deleting Columns");
+
+            // Range starts with 2 columns
+            var rng = ws.Range("B2:C3"); // Range starts on B2
+
+            // Insert a column before the range
+            ws.Column(1).InsertColumnsAfter(1); // Range starts on C2
+
+            // Insert a column in between the range
+            ws.Column(3).InsertColumnsAfter(1); // Range now has 3 columns
+
+            // Insert a column (from a range) before the range
+            ws.Range("A2:A3").InsertColumnsAfter(1); // Range starts on D2
+
+            // Insert a column (from a range) in between the range
+            ws.Range("D2:D3").InsertColumnsAfter(1); // Range now has 4 columns
+
+            // Inserting columns from a range not covering all columns
+            // does not affect our defined range
+            ws.Range("A1:A2").InsertColumnsAfter(1);
+            ws.Range("E3:E4").InsertColumnsAfter(1);
+
+            // Delete a column before the range
+            ws.Column(1).Delete(); // Range starts on C2
+
+            // Delete a column (from a range) before the range
+            ws.Range("A2:A3").Delete(XLShiftDeletedCells.ShiftCellsLeft); // Range starts on B2
+
+            // Delete a column in between the range
+            ws.Column(3).Delete(); // Range now has 3 columns
+
+            // Delete a column (from a range) in between the range
+            ws.Range("C2:C3").Delete(XLShiftDeletedCells.ShiftCellsLeft); // Range now has 2 columns
+
+            // Deleting columns from a range not covering all columns
+            // does not affect our defined range
+            ws.Range("A1:A2").Delete(XLShiftDeletedCells.ShiftCellsLeft);
+            ws.Range("D3:D4").Delete(XLShiftDeletedCells.ShiftCellsLeft);
+
+            rng.Style.Fill.BackgroundColor = XLColor.Orange;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs b/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs
new file mode 100644
index 0000000..4c5a4db
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs
@@ -0,0 +1,55 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class InsertingDeletingRows : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Inserting and Deleting Rows");
+
+            // Range starts with 2 rows
+            var rng = ws.Range("B2:C3");
+
+            // Insert a row above the range
+            ws.Row(1).InsertRowsBelow(1); // Range starts on B3
+
+            // Insert a row in between the range
+            ws.Row(3).InsertRowsBelow(1); // Range now has 3 rows
+
+            // Insert a row (from a range) above the range
+            ws.Range("B1:C1").InsertRowsBelow(1); // Range starts on B4
+
+            // Insert a row (from a range) in between the range
+            ws.Range("B4:C4").InsertRowsBelow(1); // Range now has 4 rows
+
+            // Inserting rows from a range not covering all columns
+            // does not affect our defined range
+            ws.Range("A1:B1").InsertRowsBelow(1);
+            ws.Range("C4:D4").InsertRowsBelow(1);
+
+            // Delete a row above the range
+            ws.Row(1).Delete(); // Range starts on B3
+
+            // Delete a row (from a range) above the range
+            ws.Range("B1:C1").Delete(XLShiftDeletedCells.ShiftCellsUp); // Range starts on B2
+
+            // Delete a row in between the range
+            ws.Row(3).Delete(); // Range now has 3 rows
+
+            // Delete a row (from a range) in between the range
+            ws.Range("B3:C3").Delete(XLShiftDeletedCells.ShiftCellsUp); // Range now has 2 rows
+
+            // Deleting rows from a range not covering all columns
+            // does not affect our defined range
+            ws.Range("A1:B1").Delete(XLShiftDeletedCells.ShiftCellsUp);
+            ws.Range("C4:D4").Delete(XLShiftDeletedCells.ShiftCellsUp);
+
+            rng.Style.Fill.BackgroundColor = XLColor.Orange;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/MultipleRanges.cs b/ClosedXML_Examples/Ranges/MultipleRanges.cs
new file mode 100644
index 0000000..d49becf
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/MultipleRanges.cs
@@ -0,0 +1,22 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class MultipleRanges : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Multiple Ranges");
+            
+            // using multiple string range definitions
+            ws.Ranges("A1:B2,C3:D4,E5:F6").Style.Fill.BackgroundColor = XLColor.Red;
+
+            // using a single string separated by commas
+            ws.Ranges("A5:B6,E1:F2").Style.Fill.BackgroundColor = XLColor.Orange;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/NamedRanges.cs b/ClosedXML_Examples/Ranges/NamedRanges.cs
new file mode 100644
index 0000000..8b035df
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/NamedRanges.cs
@@ -0,0 +1,82 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class NamedRanges : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var wsPresentation = wb.Worksheets.Add("Presentation");
+            var wsData = wb.Worksheets.Add("Data");
+
+            // Fill up some data
+            wsData.Cell(1, 1).Value = "Name";
+            wsData.Cell(1, 2).Value = "Age";
+            wsData.Cell(2, 1).Value = "Tom";
+            wsData.Cell(2, 2).Value = 30;
+            wsData.Cell(3, 1).Value = "Dick";
+            wsData.Cell(3, 2).Value = 25;
+            wsData.Cell(4, 1).Value = "Harry";
+            wsData.Cell(4, 2).Value = 29;
+
+            // Create a named range with the data:
+            wsData.Range("A2:B4").AddToNamed("PeopleData"); // Default named range scope is Workbook
+
+            // Let's use the named range in a formula:
+            wsPresentation.Cell(1, 1).Value = "People Count:";
+            wsPresentation.Cell(1, 2).FormulaA1 = "COUNT(PeopleData)";
+
+            // Create a named range with worksheet scope:
+            wsPresentation.Range("B1").AddToNamed("PeopleCount", XLScope.Worksheet);
+
+            // Let's use the named range:
+            wsPresentation.Cell(2, 1).Value = "Total:";
+            wsPresentation.Cell(2, 2).FormulaA1 = "PeopleCount";
+
+            // Copy the data in a named range:
+            wsPresentation.Cell(4, 1).Value = "People Data:";
+            wsPresentation.Cell(5, 1).Value = wb.Range("PeopleData");
+            
+
+            /////////////////////////////////////////////////////////////////////////
+            // For the Excel geeks out there who actually know about
+            // named ranges with relative addresses, you can
+            // create such a thing with the following methods:
+
+            // The following creates a relative named range pointing to the same row
+            // and one column to the right. For example if the current cell is B4
+            // relativeRange1 will point to C4.
+            wsPresentation.NamedRanges.Add("relativeRange1", "Presentation!B1");
+
+            // The following creates a ralative named range pointing to the same row
+            // and one column to the left. For example if the current cell is D2
+            // relativeRange2 will point to C2.
+            wb.NamedRanges.Add("relativeRange2", "Presentation!XFD1");
+
+            // Explanation: The address of a relative range always starts at A1
+            // and moves from then on. To get the desired relative range just
+            // add or subtract the required rows and/or columns from A1.
+            // Column -1 = XFD, Column -2 = XFC, etc.
+            // Row -1 = 1048576, Row -2 = 1048575, etc.
+            /////////////////////////////////////////////////////////////////////////
+
+            wsData.Columns().AdjustToContents();
+            wsPresentation.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/SelectingRanges.cs b/ClosedXML_Examples/Ranges/SelectingRanges.cs
new file mode 100644
index 0000000..963a3cd
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/SelectingRanges.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Ranges
+{
+    public class SelectingRanges : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var wsActiveCell = wb.AddWorksheet("Set Active Cell");
+            wsActiveCell.Cell("B2").SetActive();
+
+            var wsSelectRowsColumns = wb.AddWorksheet("Select Rows and Columns");
+            wsSelectRowsColumns.Rows("2, 4-5").Select();
+            wsSelectRowsColumns.Columns("2, 4-5").Select();
+
+            var wsSelectMisc = wb.AddWorksheet("Select Misc");
+            wsSelectMisc.Cell("B2").Select();
+            wsSelectMisc.Range("D2:E2").Select();
+            wsSelectMisc.Ranges("C3, D4:E5").Select();
+
+            wb.SaveAs(filePath);
+        }
+
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/ShiftingRanges.cs b/ClosedXML_Examples/Ranges/ShiftingRanges.cs
new file mode 100644
index 0000000..b01bdb9
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/ShiftingRanges.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class ShiftingRanges : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new BasicTable().Create(tempFile);
+                var workbook = new XLWorkbook(tempFile);
+                var ws = workbook.Worksheet(1);
+
+                // Get a range object
+                var rngHeaders = ws.Range("B3:F3");
+
+                // Insert some rows/columns before the range
+                ws.Row(1).InsertRowsAbove(2);
+                ws.Column(1).InsertColumnsBefore(2);
+
+                // Change the background color of the headers
+                rngHeaders.Style.Fill.BackgroundColor = XLColor.LightSalmon;
+
+                ws.Columns().AdjustToContents();
+
+                workbook.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/SortExample.cs b/ClosedXML_Examples/Ranges/SortExample.cs
new file mode 100644
index 0000000..926a114
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/SortExample.cs
@@ -0,0 +1,233 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class SortExample : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+
+            #region Sort a table
+            var wsTable = wb.Worksheets.Add("Table");
+            AddTestTable(wsTable);
+            var header = wsTable.Row(1).InsertRowsAbove(1).First();
+            for(Int32 co = 1; co <= wsTable.LastColumnUsed().ColumnNumber(); co++)
+            {
+                header.Cell(co).Value = "Column" + co.ToString();
+            }
+            var rangeTable = wsTable.RangeUsed();
+            var table = rangeTable.CopyTo(wsTable.Column(wsTable.LastColumnUsed().ColumnNumber() + 3)).CreateTable();
+
+            table.Sort("Column2, Column3 Desc, Column1 ASC");
+            
+            wsTable.Row(1).InsertRowsAbove(2);
+            wsTable.Cell(1, 1)
+                .SetValue(".Sort(\"Column2, Column3 Desc, Column1 ASC\") = Sort table Top to Bottom, Col 2 Asc, Col 3 Desc, Col 1 Asc, Ignore Blanks, Ignore Case")
+                .Style.Font.SetBold();
+            #endregion
+
+            #region Sort a simple range left to right
+            var wsLeftToRight = wb.Worksheets.Add("Sort Left to Right");
+            AddTestTable(wsLeftToRight);
+            wsLeftToRight.RangeUsed().Transpose(XLTransposeOptions.MoveCells);
+            var rangeLeftToRight = wsLeftToRight.RangeUsed();
+            var copyLeftToRight = rangeLeftToRight.CopyTo(wsLeftToRight.Row(wsLeftToRight.LastRowUsed().RowNumber() + 3));
+
+            copyLeftToRight.SortLeftToRight();
+
+            wsLeftToRight.Row(1).InsertRowsAbove(2);
+            wsLeftToRight.Cell(1, 1)
+                .SetValue(".SortLeftToRight() = Sort Range Left to Right, Ascendingly, Ignore Blanks, Ignore Case")
+                .Style.Font.SetBold();
+            #endregion
+
+            #region Sort a range
+            var wsComplex2 = wb.Worksheets.Add("Complex 2");
+            AddTestTable(wsComplex2);
+            var rangeComplex2 = wsComplex2.RangeUsed();
+            var copyComplex2 = rangeComplex2.CopyTo(wsComplex2.Column(wsComplex2.LastColumnUsed().ColumnNumber() + 3));
+
+            copyComplex2.SortColumns.Add(1, XLSortOrder.Ascending, false, true);
+            copyComplex2.SortColumns.Add(3, XLSortOrder.Descending);
+            copyComplex2.Sort();
+
+            wsComplex2.Row(1).InsertRowsAbove(4);
+            wsComplex2.Cell(1, 1)
+                .SetValue(".SortColumns.Add(1, XLSortOrder.Ascending, false, true) = Sort Col 1 Asc, Match Blanks, Match Case").Style.Font.SetBold();
+            wsComplex2.Cell(2, 1)
+                .SetValue(".SortColumns.Add(3, XLSortOrder.Descending) = Sort Col 3 Desc, Ignore Blanks, Ignore Case").Style.Font.SetBold();
+            wsComplex2.Cell(3, 1)
+                .SetValue(".Sort() = Sort range using the parameters defined in SortColumns").Style.Font.SetBold();
+            #endregion
+
+            #region Sort a range 
+            var wsComplex1 = wb.Worksheets.Add("Complex 1");
+            AddTestTable(wsComplex1);
+            var rangeComplex1 = wsComplex1.RangeUsed();
+            var copyComplex1 = rangeComplex1.CopyTo(wsComplex1.Column(wsComplex1.LastColumnUsed().ColumnNumber() + 3));
+
+            copyComplex1.Sort("2, 1 DESC", XLSortOrder.Ascending, true);
+
+            wsComplex1.Row(1).InsertRowsAbove(2);
+            wsComplex1.Cell(1, 1)
+                .SetValue(".Sort(\"2, 1 DESC\", XLSortOrder.Ascending, true) = Sort Range Top to Bottom, Col 2 Asc, Col 1 Desc, Ignore Blanks, Match Case").Style.Font.SetBold();
+            #endregion
+
+            #region Sort a simple column
+            var wsSimpleColumn = wb.Worksheets.Add("Simple Column");
+            AddTestColumn(wsSimpleColumn);
+            var rangeSimpleColumn = wsSimpleColumn.RangeUsed();
+            var copySimpleColumn = rangeSimpleColumn.CopyTo(wsSimpleColumn.Column(wsSimpleColumn.LastColumnUsed().ColumnNumber() + 3));
+
+            copySimpleColumn.FirstColumn().Sort(XLSortOrder.Descending, true);
+
+            wsSimpleColumn.Row(1).InsertRowsAbove(2);
+            wsSimpleColumn.Cell(1, 1)
+                .SetValue(".Sort(XLSortOrder.Descending, true) = Sort Range Top to Bottom, Descendingly, Ignore Blanks, Match Case").Style.Font.SetBold();
+            #endregion
+
+            #region Sort a simple range
+            var wsSimple = wb.Worksheets.Add("Simple");
+            AddTestTable(wsSimple);
+            var rangeSimple = wsSimple.RangeUsed();
+            var copySimple = rangeSimple.CopyTo(wsSimple.Column(wsSimple.LastColumnUsed().ColumnNumber() + 3));
+            
+            copySimple.Sort();
+
+            wsSimple.Row(1).InsertRowsAbove(2);
+            wsSimple.Cell(1, 1).SetValue(".Sort() = Sort Range Top to Bottom, Ascendingly, Ignore Blanks, Ignore Case").Style.Font.SetBold();
+            #endregion
+
+            wb.SaveAs(filePath);
+        }
+
+        private void AddTestColumnMixed(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(new TimeSpan(9, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumnNumbers(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(1.30).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(1230).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(4.30).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(4.15).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumnTimeSpans(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(new TimeSpan(0, 12, 35, 21)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(new TimeSpan(45, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(new TimeSpan(0, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(new TimeSpan(1, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(new TimeSpan(1, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumnDates(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(new DateTime(2011, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(new DateTime(2011, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(new DateTime(2011, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(new DateTime(2011, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumn(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue("c").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestTable(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+
+            ws.Cell("B1").SetValue("").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("B2").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("B3").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("B4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("B5").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("B6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("B7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("B8").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+
+            ws.Cell("C1").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("C2").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("C3").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("C4").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("C5").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("C6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("C7").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("C8").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/Sorting.cs b/ClosedXML_Examples/Ranges/Sorting.cs
new file mode 100644
index 0000000..4d24204
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/Sorting.cs
@@ -0,0 +1,257 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Misc
+{
+    public class Sorting : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+
+            #region Sort Table
+            var wsTable = wb.Worksheets.Add("Table");
+            AddTestTable(wsTable);
+            var header = wsTable.Row(1).InsertRowsAbove(1);
+            Int32 lastCo = wsTable.LastColumnUsed().ColumnNumber();
+            for (Int32 co = 1; co <= lastCo; co++)
+                wsTable.Cell(1, co).Value = "Column" + co.ToString();
+
+            var table = wsTable.RangeUsed().AsTable();
+            table.Sort("Column2 Desc, 1, 3 Asc");
+            #endregion
+
+            #region Sort Rows
+            var wsRows = wb.Worksheets.Add("Rows");
+            AddTestTable(wsRows);
+            wsRows.Row(1).Sort();
+            wsRows.RangeUsed().Row(2).Sort();
+            wsRows.Rows(3, wsRows.LastRowUsed().RowNumber()).Delete();
+            #endregion
+
+            #region Sort Columns
+            var wsColumns = wb.Worksheets.Add("Columns");
+            AddTestTable(wsColumns);
+            wsColumns.LastColumnUsed().Delete();
+            wsColumns.Column(1).Sort();
+            wsColumns.RangeUsed().Column(2).Sort();
+            #endregion
+
+            #region Sort Mixed
+            var wsMixed = wb.Worksheets.Add("Mixed");
+            AddTestColumnMixed(wsMixed);
+            wsMixed.Sort();
+            #endregion
+
+            #region Sort Numbers
+            var wsNumbers = wb.Worksheets.Add("Numbers");
+            AddTestColumnNumbers(wsNumbers);
+            wsNumbers.Sort();
+            #endregion
+
+            #region Sort TimeSpans
+            var wsTimeSpans = wb.Worksheets.Add("TimeSpans");
+            AddTestColumnTimeSpans(wsTimeSpans);
+            wsTimeSpans.Sort();
+            #endregion
+
+            #region Sort Dates
+            var wsDates = wb.Worksheets.Add("Dates");
+            AddTestColumnDates(wsDates);
+            wsDates.Sort();
+            #endregion
+
+            #region Do Not Ignore Blanks
+            var wsIncludeBlanks = wb.Worksheets.Add("Include Blanks");
+            AddTestTable(wsIncludeBlanks);
+            var rangeIncludeBlanks = wsIncludeBlanks;
+            rangeIncludeBlanks.SortColumns.Add(1, XLSortOrder.Ascending, false, true);
+            rangeIncludeBlanks.SortColumns.Add(2, XLSortOrder.Descending, false, true);
+            rangeIncludeBlanks.Sort();
+
+            var wsIncludeBlanksColumn = wb.Worksheets.Add("Include Blanks Column");
+            AddTestColumn(wsIncludeBlanksColumn);
+            var rangeIncludeBlanksColumn = wsIncludeBlanksColumn;
+            rangeIncludeBlanksColumn.SortColumns.Add(1, XLSortOrder.Ascending, false, true);
+            rangeIncludeBlanksColumn.Sort();
+
+            var wsIncludeBlanksColumnDesc = wb.Worksheets.Add("Include Blanks Column Desc");
+            AddTestColumn(wsIncludeBlanksColumnDesc);
+            var rangeIncludeBlanksColumnDesc = wsIncludeBlanksColumnDesc;
+            rangeIncludeBlanksColumnDesc.SortColumns.Add(1, XLSortOrder.Descending, false, true);
+            rangeIncludeBlanksColumnDesc.Sort();
+            #endregion
+
+            #region Case Sensitive
+            var wsCaseSensitive = wb.Worksheets.Add("Case Sensitive");
+            AddTestTable(wsCaseSensitive);
+            var rangeCaseSensitive = wsCaseSensitive;
+            rangeCaseSensitive.SortColumns.Add(1, XLSortOrder.Ascending, true, true);
+            rangeCaseSensitive.SortColumns.Add(2, XLSortOrder.Descending, true, true);
+            rangeCaseSensitive.Sort();
+
+            var wsCaseSensitiveColumn = wb.Worksheets.Add("Case Sensitive Column");
+            AddTestColumn(wsCaseSensitiveColumn);
+            var rangeCaseSensitiveColumn = wsCaseSensitiveColumn;
+            rangeCaseSensitiveColumn.SortColumns.Add(1, XLSortOrder.Ascending, true, true);
+            rangeCaseSensitiveColumn.Sort();
+
+            var wsCaseSensitiveColumnDesc = wb.Worksheets.Add("Case Sensitive Column Desc");
+            AddTestColumn(wsCaseSensitiveColumnDesc);
+            var rangeCaseSensitiveColumnDesc = wsCaseSensitiveColumnDesc;
+            rangeCaseSensitiveColumnDesc.SortColumns.Add(1, XLSortOrder.Descending, true, true);
+            rangeCaseSensitiveColumnDesc.Sort();
+            #endregion
+
+            #region Simple Sorts
+            var wsSimple = wb.Worksheets.Add("Simple");
+            AddTestTable(wsSimple);
+            wsSimple.Sort();
+
+            var wsSimpleDesc = wb.Worksheets.Add("Simple Desc");
+            AddTestTable(wsSimpleDesc);
+            wsSimpleDesc.Sort("", XLSortOrder.Descending);
+
+            var wsSimpleColumns = wb.Worksheets.Add("Simple Columns");
+            AddTestTable(wsSimpleColumns);
+            wsSimpleColumns.Sort("2, A DESC, 3");
+
+            var wsSimpleColumn = wb.Worksheets.Add("Simple Column");
+            AddTestColumn(wsSimpleColumn);
+            wsSimpleColumn.Sort();
+
+            var wsSimpleColumnDesc = wb.Worksheets.Add("Simple Column Desc");
+            AddTestColumn(wsSimpleColumnDesc);
+            wsSimpleColumnDesc.Sort(1, XLSortOrder.Descending);
+            #endregion
+
+            wb.SaveAs(filePath);
+        }
+
+        private void AddTestColumnMixed(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(new TimeSpan(9, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumnNumbers(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(1.30).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(1.15).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(1230).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(9).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(4.30).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(4.15).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumnTimeSpans(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(new TimeSpan(0, 12, 35, 21)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(new TimeSpan(45, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(new TimeSpan(1, 1, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(new TimeSpan(0, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(new TimeSpan(1, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(new TimeSpan(1, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumnDates(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue(new DateTime(2011, 1, 30)).Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue(new DateTime(2011, 1, 15)).Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue(new DateTime(2011, 12, 30)).Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue(new DateTime(2011, 12, 15)).Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue(new DateTime(2011, 4, 30)).Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue(new DateTime(2011, 4, 15)).Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestColumn(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue("c").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        private void AddTestTable(IXLWorksheet ws)
+        {
+            ws.Cell("A1").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("A2").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("A3").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("A4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("A5").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("A6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("A7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("A8").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+
+            ws.Cell("B1").SetValue("").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("B2").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("B3").SetValue("B").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("B4").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("B5").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("B6").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("B7").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("B8").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+
+            ws.Cell("C1").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.LightGreen);
+            ws.Cell("C2").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DarkTurquoise);
+            ws.Cell("C3").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.BurlyWood);
+            ws.Cell("C4").SetValue("a").Style.Fill.SetBackgroundColor(XLColor.DarkGray);
+            ws.Cell("C5").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.DarkSalmon);
+            ws.Cell("C6").SetValue("b").Style.Fill.SetBackgroundColor(XLColor.DodgerBlue);
+            ws.Cell("C7").SetValue("A").Style.Fill.SetBackgroundColor(XLColor.IndianRed);
+            ws.Cell("C8").SetValue("").Style.Fill.SetBackgroundColor(XLColor.DeepPink);
+        }
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/TransposeRanges.cs b/ClosedXML_Examples/Ranges/TransposeRanges.cs
new file mode 100644
index 0000000..3d1af2d
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/TransposeRanges.cs
@@ -0,0 +1,37 @@
+using System.IO;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class TransposeRanges:IXLExample
+    {
+        public void Create(string filePath)
+        {
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new BasicTable().Create(tempFile);
+                var workbook = new XLWorkbook(tempFile);
+
+                var ws = workbook.Worksheet(1);
+
+                var rngTable = ws.Range("B2:F6");
+
+                rngTable.Transpose(XLTransposeOptions.MoveCells);
+
+                ws.Columns().AdjustToContents();
+
+                workbook.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Ranges/TransposeRangesPlus.cs b/ClosedXML_Examples/Ranges/TransposeRangesPlus.cs
new file mode 100644
index 0000000..9ced0c0
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/TransposeRangesPlus.cs
@@ -0,0 +1,46 @@
+using System.IO;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples
+{
+    public class TransposeRangesPlus : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new BasicTable().Create(tempFile);
+                var workbook = new XLWorkbook(tempFile);
+
+                var ws = workbook.Worksheet(1);
+
+                var rngTable = ws.Range("B2:F6");
+
+                rngTable.Row(rngTable.RowCount() - 1).Delete(XLShiftDeletedCells.ShiftCellsUp);
+
+                // Place some markers
+                var cellNextRow = ws.Cell(rngTable.RangeAddress.LastAddress.RowNumber + 1, rngTable.RangeAddress.LastAddress.ColumnNumber);
+                cellNextRow.Value = "ColumnRight Row";
+                var cellNextColumn = ws.Cell(rngTable.RangeAddress.LastAddress.RowNumber, rngTable.RangeAddress.LastAddress.ColumnNumber + 1);
+                cellNextColumn.Value = "ColumnRight Column";
+
+                rngTable.Transpose(XLTransposeOptions.MoveCells);
+                rngTable.Transpose(XLTransposeOptions.MoveCells);
+                rngTable.Transpose(XLTransposeOptions.ReplaceCells);
+                rngTable.Transpose(XLTransposeOptions.ReplaceCells);
+
+                ws.Columns().AdjustToContents();
+
+                workbook.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Ranges/UsingTables.cs b/ClosedXML_Examples/Ranges/UsingTables.cs
new file mode 100644
index 0000000..045dca9
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/UsingTables.cs
@@ -0,0 +1,106 @@
+using System;
+using System.IO;
+using ClosedXML.Excel;
+using System.Linq;
+
+
+namespace ClosedXML_Examples.Ranges
+{
+    public class UsingTables : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            string tempFile = ExampleHelper.GetTempFilePath(filePath);
+            try
+            {
+                new BasicTable().Create(tempFile);
+                var wb = new XLWorkbook(tempFile);
+                var ws = wb.Worksheet(1);
+                ws.Name = "Contacts Table";
+                var firstCell = ws.FirstCellUsed();
+                var lastCell = ws.LastCellUsed();
+                var range = ws.Range(firstCell.Address, lastCell.Address);
+                range.FirstRow().Delete(); // Deleting the "Contacts" header (we don't need it for our purposes)
+
+                // We want to use a theme for table, not the hard coded format of the BasicTable
+                range.Clear(XLClearOptions.Formats);
+                // Put back the date and number formats
+                range.Column(4).Style.NumberFormat.NumberFormatId = 15;
+                range.Column(5).Style.NumberFormat.Format = "$ #,##0";
+
+                var table = range.CreateTable(); // You can also use range.AsTable() if you want to
+                // manipulate the range as a table but don't want 
+                // to create the table in the worksheet.
+
+                // Let's activate the Totals row and add the sum of Income
+                table.ShowTotalsRow = true;
+                table.Field("Income").TotalsRowFunction = XLTotalsRowFunction.Sum;
+                // Just for fun let's add the text "Sum Of Income" to the totals row
+                table.Field(0).TotalsRowLabel = "Sum Of Income";
+
+                // Copy all the headers
+                Int32 columnWithHeaders = lastCell.Address.ColumnNumber + 2;
+                Int32 currentRow = table.RangeAddress.FirstAddress.RowNumber;
+                ws.Cell(currentRow, columnWithHeaders).Value = "Table Headers";
+                foreach (var cell in table.HeadersRow().Cells())
+                {
+                    currentRow++;
+                    ws.Cell(currentRow, columnWithHeaders).Value = cell.Value;
+                }
+
+                // Format the headers as a table with a different style and no autofilters
+                var htFirstCell = ws.Cell(table.RangeAddress.FirstAddress.RowNumber, columnWithHeaders);
+                var htLastCell = ws.Cell(currentRow, columnWithHeaders);
+                var headersTable = ws.Range(htFirstCell, htLastCell).CreateTable("Headers");
+                headersTable.Theme = XLTableTheme.TableStyleLight10;
+                headersTable.ShowAutoFilter = false;
+
+                // Add a custom formula to the headersTable
+                headersTable.ShowTotalsRow = true;
+                headersTable.Field(0).TotalsRowFormulaA1 = "CONCATENATE(\"Count: \", CountA(Headers[Table Headers]))";
+
+                // Copy the names
+                Int32 columnWithNames = columnWithHeaders + 2;
+                currentRow = table.RangeAddress.FirstAddress.RowNumber; // reset the currentRow
+                ws.Cell(currentRow, columnWithNames).Value = "Names";
+                foreach (var row in table.DataRange.Rows())
+                {
+                    currentRow++;
+                    var fName = row.Field("FName").GetString(); // Notice how we're calling the cell by field name
+                    var lName = row.Field("LName").GetString(); // Notice how we're calling the cell by field name
+                    var name = String.Format("{0} {1}", fName, lName);
+                    ws.Cell(currentRow, columnWithNames).Value = name;
+                }
+
+                // Format the names as a table with a different style and no autofilters
+                var ntFirstCell = ws.Cell(table.RangeAddress.FirstAddress.RowNumber, columnWithNames);
+                var ntLastCell = ws.Cell(currentRow, columnWithNames);
+                var namesTable = ws.Range(ntFirstCell, ntLastCell).CreateTable();
+                namesTable.Theme = XLTableTheme.TableStyleLight12;
+                namesTable.ShowAutoFilter = false;
+
+                ws.Columns().AdjustToContents();
+                ws.Columns("A,G,I").Width = 3;
+
+                wb.SaveAs(filePath);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Ranges/WalkingRanges.cs b/ClosedXML_Examples/Ranges/WalkingRanges.cs
new file mode 100644
index 0000000..e891fbc
--- /dev/null
+++ b/ClosedXML_Examples/Ranges/WalkingRanges.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Ranges
+{
+    public class WalkingRanges : IXLExample
+    {
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Walking Cells");
+
+            var cell = ws.Cell(5, 5).SetValue("(5,5)");
+
+            cell.CellAbove().SetValue("(4,5)").Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
+            cell.CellAbove(2).SetValue("(3,5)").Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
+            cell.CellBelow().SetValue("(6,5)").Style.Fill.SetBackgroundColor(XLColor.Salmon);
+            cell.CellBelow(2).SetValue("(7,5)").Style.Fill.SetBackgroundColor(XLColor.Salmon);
+
+            cell.CellLeft().SetValue("(5,4)").Style.Fill.SetBackgroundColor(XLColor.LightBlue);
+            cell.CellLeft(2).SetValue("(5,3)").Style.Fill.SetBackgroundColor(XLColor.LightBlue);
+            cell.CellRight().SetValue("(5,6)").Style.Fill.SetBackgroundColor(XLColor.BlueBell);
+            cell.CellRight(2).SetValue("(5,7)").Style.Fill.SetBackgroundColor(XLColor.BlueBell);
+
+            var wsWalkRows = wb.Worksheets.Add("Walking rows");
+
+            var row = wsWalkRows.Row(3);
+            row.RowAbove().Style.Fill.SetBackgroundColor(XLColor.Salmon);
+            row.RowAbove(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
+            row.RowBelow().Style.Fill.SetBackgroundColor(XLColor.Blue);
+            row.RowBelow(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
+
+            var rangeRow = wsWalkRows.Range("B8:D12").Row(3);
+            rangeRow.RowAbove().Style.Fill.SetBackgroundColor(XLColor.Salmon);
+            rangeRow.RowAbove(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
+            rangeRow.RowBelow().Style.Fill.SetBackgroundColor(XLColor.Blue);
+            rangeRow.RowBelow(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
+
+            var wsWalkColumns = wb.Worksheets.Add("Walking columns");
+
+            var column = wsWalkColumns.Column(3);
+            column.ColumnLeft().Style.Fill.SetBackgroundColor(XLColor.Salmon);
+            column.ColumnLeft(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
+            column.ColumnRight().Style.Fill.SetBackgroundColor(XLColor.Blue);
+            column.ColumnRight(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
+
+            var rangeColumn = wsWalkColumns.Range("H2:L4").Column(3);
+            rangeColumn.ColumnLeft().Style.Fill.SetBackgroundColor(XLColor.Salmon);
+            rangeColumn.ColumnLeft(2).Style.Fill.SetBackgroundColor(XLColor.LightSalmon);
+            rangeColumn.ColumnRight().Style.Fill.SetBackgroundColor(XLColor.Blue);
+            rangeColumn.ColumnRight(2).Style.Fill.SetBackgroundColor(XLColor.BlueBell);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Rows/InsertRows.cs b/ClosedXML_Examples/Rows/InsertRows.cs
new file mode 100644
index 0000000..8b46171
--- /dev/null
+++ b/ClosedXML_Examples/Rows/InsertRows.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Rows
+{
+    public class InsertRows : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Inserting Rows");
+
+            // Color the entire spreadsheet using rows
+            ws.Rows().Style.Fill.BackgroundColor = XLColor.LightCyan;
+
+            // Put a value in a few cells
+            foreach (var r in Enumerable.Range(1, 5))
+                foreach (var c in Enumerable.Range(1, 5))
+                    ws.Cell(r, c).Value = "X";
+
+            var blueRow = ws.Row(2);
+            var redRow = ws.Row(5);
+
+            blueRow.Style.Fill.BackgroundColor = XLColor.Blue;
+            blueRow.InsertRowsBelow(2);
+
+
+            redRow.Style.Fill.BackgroundColor = XLColor.Red;
+            redRow.InsertRowsAbove(2);
+
+            ws.Columns(3, 4).Style.Fill.BackgroundColor = XLColor.Orange;
+            ws.Range("A2:A4").InsertRowsBelow(2);
+            ws.Range("B2:B4").InsertRowsAbove(2);
+            ws.Range("C2:C4").InsertRowsBelow(2);
+            ws.Range("D2:D4").InsertRowsAbove(2);
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Rows/RowCells.cs b/ClosedXML_Examples/Rows/RowCells.cs
new file mode 100644
index 0000000..369ae43
--- /dev/null
+++ b/ClosedXML_Examples/Rows/RowCells.cs
@@ -0,0 +1,73 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples
+{
+    public class RowCells : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Row Cells");
+
+            var rowFromWorksheet = ws.Row(1);
+            rowFromWorksheet.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
+            rowFromWorksheet.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
+            rowFromWorksheet.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
+            rowFromWorksheet.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
+
+            var rowFromRange = ws.Range("A2:I2").FirstRow();
+
+            rowFromRange.Cell(1).Style.Fill.BackgroundColor = XLColor.Red;
+            rowFromRange.Cells("2").Style.Fill.BackgroundColor = XLColor.Blue;
+            rowFromRange.Cells("3,5:6").Style.Fill.BackgroundColor = XLColor.Red;
+            rowFromRange.Cells(8, 9).Style.Fill.BackgroundColor = XLColor.Blue;
+
+            ws.Columns().Width = 7;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Rows/RowCollection.cs b/ClosedXML_Examples/Rows/RowCollection.cs
new file mode 100644
index 0000000..b4b8817
--- /dev/null
+++ b/ClosedXML_Examples/Rows/RowCollection.cs
@@ -0,0 +1,96 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Rows
+{
+    public class RowCollection : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Rows of a Range");
+
+            // All rows in a range
+            ws.Range("A1:B2").Rows().Style.Fill.BackgroundColor = XLColor.DimGray;
+
+            var bigRange = ws.Range("B4:C17");
+
+            // Contiguous rows by number
+            bigRange.Rows(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
+
+            // Contiguous rows by number
+            bigRange.Rows("4:5").Style.Fill.BackgroundColor = XLColor.Blue;
+
+            // Spread rows by number
+            bigRange.Rows("7:8,10:11").Style.Fill.BackgroundColor = XLColor.Orange;
+
+            // Using a single number
+            bigRange.Rows("13").Style.Fill.BackgroundColor = XLColor.Cyan;
+
+            // Adjust the height
+            ws.Rows().Height = 15;
+
+            var ws2 = workbook.Worksheets.Add("Rows of a Worksheet");
+
+            // Contiguous rows by number
+            ws2.Rows(1, 2).Style.Fill.BackgroundColor = XLColor.Red;
+
+            // Contiguous rows by number
+            ws2.Rows("4:5").Style.Fill.BackgroundColor = XLColor.Blue;
+
+            // Spread rows by number
+            ws2.Rows("7:8,10:11").Style.Fill.BackgroundColor = XLColor.Orange;
+
+            // Using a single number
+            ws2.Rows("13").Style.Fill.BackgroundColor = XLColor.Cyan;
+
+            // Adjust the height
+            ws2.Rows("1:13").Height = 15;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Rows/RowSettings.cs b/ClosedXML_Examples/Rows/RowSettings.cs
new file mode 100644
index 0000000..54798a2
--- /dev/null
+++ b/ClosedXML_Examples/Rows/RowSettings.cs
@@ -0,0 +1,80 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Rows
+{
+    public class RowSettings : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Constructors
+
+        // Public
+        public RowSettings()
+        {
+
+        }
+
+
+        // Private
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Row Settings");
+
+            var row1 = ws.Row(2);
+            row1.Style.Fill.BackgroundColor = XLColor.Red;
+            row1.Height = 30;
+
+            var row2 = ws.Row(4);
+            row2.Style.Fill.BackgroundColor = XLColor.DarkOrange;
+            row2.Height = 3;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/StyleExamples.cs b/ClosedXML_Examples/StyleExamples.cs
new file mode 100644
index 0000000..74717e5
--- /dev/null
+++ b/ClosedXML_Examples/StyleExamples.cs
@@ -0,0 +1,72 @@
+using ClosedXML_Examples.Styles;
+
+namespace ClosedXML_Examples
+{
+    public class StyleExamples
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Constructors
+
+        // Public
+        public StyleExamples()
+        {
+
+        }
+
+
+        // Private
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create()
+        {
+            var path = @"C:\ClosedXML_Tests\Created";
+            new StyleFont().Create(path + @"\styleFont.xlsx");
+            new StyleFill().Create(path + @"\styleFill.xlsx");
+            new StyleBorder().Create(path + @"\styleBorder.xlsx");
+            new StyleAlignment().Create(path + @"\styleAlignment.xlsx");
+            new StyleNumberFormat().Create(path + @"\styleNumberFormat.xlsx");
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Styles/DefaultStyles.cs b/ClosedXML_Examples/Styles/DefaultStyles.cs
new file mode 100644
index 0000000..8c49955
--- /dev/null
+++ b/ClosedXML_Examples/Styles/DefaultStyles.cs
@@ -0,0 +1,29 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+    public class DefaultStyles : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            // Create our workbook
+            var workbook = new XLWorkbook();
+
+            // This worksheet will have the default style, row height, column width, and page setup
+            var ws1 = workbook.Worksheets.Add("Default Style");
+
+            // Change the default row height for all new worksheets in this workbook
+            workbook.RowHeight = 30;
+
+            var ws2 = workbook.Worksheets.Add("Tall Rows");
+
+            // Create a worksheet and change the default row height
+            var ws3 = workbook.Worksheets.Add("Short Rows");
+            ws3.RowHeight = 7.5;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Styles/PurpleWorksheet.cs b/ClosedXML_Examples/Styles/PurpleWorksheet.cs
new file mode 100644
index 0000000..fa4e674
--- /dev/null
+++ b/ClosedXML_Examples/Styles/PurpleWorksheet.cs
@@ -0,0 +1,19 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+    public class PurpleWorksheet : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Purple Worksheet");
+
+            ws.Style.Fill.BackgroundColor = XLColor.Purple;
+            
+            workbook.SaveAs(filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Styles/StyleAlignment.cs b/ClosedXML_Examples/Styles/StyleAlignment.cs
new file mode 100644
index 0000000..8ff3bcf
--- /dev/null
+++ b/ClosedXML_Examples/Styles/StyleAlignment.cs
@@ -0,0 +1,105 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+    public class StyleAlignment : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Constructors
+
+        // Public
+        public StyleAlignment()
+        {
+
+        }
+
+
+        // Private
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Style Alignment");
+
+            var co = 2;
+            var ro = 1;
+
+            ws.Cell(++ro, co).Value = "Horizontal = Right";
+            ws.Cell(ro, co).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
+
+            ws.Cell(++ro, co).Value = "Indent = 2";
+            ws.Cell(ro, co).Style.Alignment.Indent = 2;
+
+            ws.Cell(++ro, co).Value = "JustifyLastLine = true";
+            ws.Cell(ro, co).Style.Alignment.JustifyLastLine = true;
+
+            ws.Cell(++ro, co).Value = "ReadingOrder = ContextDependent";
+            ws.Cell(ro, co).Style.Alignment.ReadingOrder = XLAlignmentReadingOrderValues.ContextDependent;
+
+            ws.Cell(++ro, co).Value = "RelativeIndent = 2";
+            ws.Cell(ro, co).Style.Alignment.RelativeIndent = 2;
+
+            ws.Cell(++ro, co).Value = "ShrinkToFit = true";
+            ws.Cell(ro, co).Style.Alignment.ShrinkToFit = true;
+
+            ws.Cell(++ro, co).Value = "TextRotation = 45";
+            ws.Cell(ro, co).Style.Alignment.TextRotation = 45;
+
+            ws.Cell(++ro, co).Value = "TopToBottom = true";
+            ws.Cell(ro, co).Style.Alignment.TopToBottom = true;
+
+            ws.Cell(++ro, co).Value = "Vertical = Center";
+            ws.Cell(ro, co).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+
+            ws.Cell(++ro, co).Value = "WrapText = true";
+            ws.Cell(ro, co).Style.Alignment.WrapText = true;
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Styles/StyleBorder.cs b/ClosedXML_Examples/Styles/StyleBorder.cs
new file mode 100644
index 0000000..d151b27
--- /dev/null
+++ b/ClosedXML_Examples/Styles/StyleBorder.cs
@@ -0,0 +1,52 @@
+using System;
+
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Styles
+{
+    public class StyleBorder : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Style Border");
+
+            var co = 2;
+            var ro = 1;
+
+            ws.Cell(++ro, co).Value = "BottomBorder = Thick; BottomBorderColor = Red";
+            ws.Cell(ro, co).Style.Border.BottomBorder = XLBorderStyleValues.Thick;
+            ws.Cell(ro, co).Style.Border.BottomBorderColor = XLColor.Red;
+
+            ws.Cell(++ro, co).Value = "LeftBorder = Thick; LeftBorderColor = Blue";
+            ws.Cell(ro, co).Style.Border.LeftBorder = XLBorderStyleValues.Thick;
+            ws.Cell(ro, co).Style.Border.LeftBorderColor = XLColor.Blue;
+
+            ws.Cell(++ro, co).Value = "TopBorder = Thick; TopBorderColor = Yellow";
+            ws.Cell(ro, co).Style.Border.TopBorder = XLBorderStyleValues.Thick;
+            ws.Cell(ro, co).Style.Border.TopBorderColor = XLColor.Yellow;
+
+            ws.Cell(++ro, co).Value = "RightBorder = Thick; RightBorderColor = Black";
+            ws.Cell(ro, co).Style.Border.RightBorder = XLBorderStyleValues.Thick;
+            ws.Cell(ro, co).Style.Border.RightBorderColor = XLColor.Black;
+
+            ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalUp = true";
+            ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin;
+            ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red;
+            ws.Cell(ro, co).Style.Border.DiagonalUp = true;
+
+            ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalDown = true";
+            ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin;
+            ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red;
+            ws.Cell(ro, co).Style.Border.DiagonalDown = true;
+
+            ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalUp = true; DiagonalDown = true";
+            ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin;
+            ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red;
+            ws.Cell(ro, co).Style.Border.DiagonalUp = true;
+            ws.Cell(ro, co).Style.Border.DiagonalDown = true;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Styles/StyleFill.cs b/ClosedXML_Examples/Styles/StyleFill.cs
new file mode 100644
index 0000000..f9edee2
--- /dev/null
+++ b/ClosedXML_Examples/Styles/StyleFill.cs
@@ -0,0 +1,30 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+
+
+    public class StyleFill : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Style Fill");
+
+            var co = 2;
+            var ro = 1;
+
+            ws.Cell(++ro, co + 1).Value = "BackgroundColor = Red";
+            ws.Cell(ro, co).Style.Fill.BackgroundColor = XLColor.Red;
+
+            ws.Cell(++ro, co + 1).Value = "PatternType = DarkTrellis; PatternColor = Orange; PatternBackgroundColor = Blue";
+            ws.Cell(ro, co).Style.Fill.PatternType = XLFillPatternValues.DarkTrellis;
+            ws.Cell(ro, co).Style.Fill.PatternColor = XLColor.Orange;
+            ws.Cell(ro, co).Style.Fill.PatternBackgroundColor = XLColor.Blue;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Styles/StyleFont.cs b/ClosedXML_Examples/Styles/StyleFont.cs
new file mode 100644
index 0000000..43c86a3
--- /dev/null
+++ b/ClosedXML_Examples/Styles/StyleFont.cs
@@ -0,0 +1,52 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+    public class StyleFont : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Style Font");
+
+            var co = 2;
+            var ro = 1;
+            
+            ws.Cell(++ro, co).Value = "Bold";
+            ws.Cell(ro, co).Style.Font.Bold = true;
+
+            ws.Cell(++ro, co).Value = "FontColor - Red";
+            ws.Cell(ro, co).Style.Font.FontColor = XLColor.Red;
+
+            ws.Cell(++ro, co).Value = "FontFamilyNumbering - Script";
+            ws.Cell(ro, co).Style.Font.FontFamilyNumbering = XLFontFamilyNumberingValues.Script;
+
+            ws.Cell(++ro, co).Value = "FontName - Stencil";
+            ws.Cell(ro, co).Style.Font.FontName = "Stencil";
+
+            ws.Cell(++ro, co).Value = "FontSize - 15";
+            ws.Cell(ro, co).Style.Font.FontSize = 15;
+
+            ws.Cell(++ro, co).Value = "Italic - true";
+            ws.Cell(ro, co).Style.Font.Italic = true;
+
+            ws.Cell(++ro, co).Value = "Shadow - true";
+            ws.Cell(ro, co).Style.Font.Shadow = true;
+
+            ws.Cell(++ro, co).Value = "Strikethrough - true";
+            ws.Cell(ro, co).Style.Font.Strikethrough = true;
+
+            ws.Cell(++ro, co).Value = "Underline - Double";
+            ws.Cell(ro, co).Style.Font.Underline = XLFontUnderlineValues.Double;
+
+            ws.Cell(++ro, co).Value = "VerticalAlignment - Superscript";
+            ws.Cell(ro, co).Style.Font.VerticalAlignment = XLFontVerticalTextAlignmentValues.Superscript;
+
+            ws.Column(co).AdjustToContents();
+            
+            workbook.SaveAs(filePath);
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Styles/StyleNumberFormat.cs b/ClosedXML_Examples/Styles/StyleNumberFormat.cs
new file mode 100644
index 0000000..0972de5
--- /dev/null
+++ b/ClosedXML_Examples/Styles/StyleNumberFormat.cs
@@ -0,0 +1,85 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Styles
+{
+    public class StyleNumberFormat : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Constructors
+
+        // Public
+        public StyleNumberFormat()
+        {
+
+        }
+
+
+        // Private
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Style NumberFormat");
+
+            var co = 2;
+            var ro = 1;
+
+            ws.Cell(++ro, co).Value = "123456.789";
+            ws.Cell(ro, co).Style.NumberFormat.Format = "$ #,##0.00";
+
+            ws.Cell(++ro, co).Value = "12.345";
+            ws.Cell(ro, co).Style.NumberFormat.Format = "0000";
+
+            ws.Cell(++ro, co).Value = "12.345";
+            ws.Cell(ro, co).Style.NumberFormat.NumberFormatId = 3;
+
+            ws.Column(co).AdjustToContents();
+
+            workbook.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Styles/StyleRowsColumns.cs b/ClosedXML_Examples/Styles/StyleRowsColumns.cs
new file mode 100644
index 0000000..4681ac9
--- /dev/null
+++ b/ClosedXML_Examples/Styles/StyleRowsColumns.cs
@@ -0,0 +1,34 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+    public class StyleRowsColumns : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Style Rows and Columns");
+
+            //Set the entire worksheet's cells to be bold and with a light cyan background
+            ws.Style.Font.Bold = true;
+            ws.Style.Fill.BackgroundColor = XLColor.LightCyan;
+
+            // Set the width of all columns in the worksheet
+            ws.Columns().Width = 5;
+
+            // Set the height of all rows in the worksheet
+            ws.Rows().Height = 20;
+
+            // Let's play with the rows and columns
+            ws.Rows(2, 3).Style.Fill.BackgroundColor = XLColor.Blue;
+            ws.Columns(3, 4).Style.Fill.BackgroundColor = XLColor.Orange;
+            ws.Rows(5, 5).Style.Fill.BackgroundColor = XLColor.Pink;
+            ws.Row(6).Style.Fill.BackgroundColor = XLColor.Brown;
+            ws.Column("E").Style.Fill.BackgroundColor = XLColor.Gray;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Styles/StyleWorksheet.cs b/ClosedXML_Examples/Styles/StyleWorksheet.cs
new file mode 100644
index 0000000..5669aaf
--- /dev/null
+++ b/ClosedXML_Examples/Styles/StyleWorksheet.cs
@@ -0,0 +1,42 @@
+using System;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+    public class StyleWorksheet : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("Style Worksheet");
+
+            ws.Style.Font.Bold = true;
+            ws.Style.Font.FontColor = XLColor.Red;
+            ws.Style.Fill.BackgroundColor = XLColor.Cyan;
+
+            // The following cells will be bold and red
+            // because we've specified those attributes to the entire worksheet
+            ws.Cell(1, 1).Value = "Test";
+            ws.Cell(1, 2).Value = "Case";
+
+            // Here we'll change the style of a single cell
+            ws.Cell(2, 1).Value = "Default";
+            ws.Cell(2, 1).Style = XLWorkbook.DefaultStyle;
+
+            // Let's play with some rows
+            ws.Row(4).Style = XLWorkbook.DefaultStyle;
+            ws.Row(4).Height = 20;
+            ws.Rows(5, 6).Style = XLWorkbook.DefaultStyle;
+            ws.Rows(5, 6).Height = 20;
+
+            // Let's play with some columns
+            ws.Column(4).Style = XLWorkbook.DefaultStyle;
+            ws.Column(4).Width = 5;
+            ws.Columns(5, 6).Style = XLWorkbook.DefaultStyle;
+            ws.Columns(5, 6).Width = 5;
+
+            workbook.SaveAs(filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Styles/UsingColors.cs b/ClosedXML_Examples/Styles/UsingColors.cs
new file mode 100644
index 0000000..b736cff
--- /dev/null
+++ b/ClosedXML_Examples/Styles/UsingColors.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Drawing;
+using ClosedXML.Excel;
+
+
+namespace ClosedXML_Examples.Styles
+{
+    public class UsingColors : IXLExample
+    {
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Using Colors");
+
+            Int32 ro = 0;
+
+            // From Known color
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.Red;
+            ws.Cell(ro, 2).Value = "XLColor.Red";
+
+            // From Color not so known
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.Byzantine;
+            ws.Cell(ro, 2).Value = "XLColor.Byzantine";
+
+            ro++;
+
+            // FromArgb(Int32 argb) using Hex notation
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(0xFF00FF);
+            ws.Cell(ro, 2).Value = "XLColor.FromArgb(0xFF00FF)";
+
+            // FromArgb(Int32 argb) using an integer (you need to convert the hex value to an int)
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(16711935);
+            ws.Cell(ro, 2).Value = "XLColor.FromArgb(16711935)";
+
+            // FromArgb(Int32 r, Int32 g, Int32 b)
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 0, 255);
+            ws.Cell(ro, 2).Value = "XLColor.FromArgb(255, 0, 255)";
+
+            // FromArgb(Int32 a, Int32 r, Int32 g, Int32 b)
+            // Note: Excel ignores the alpha value
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(0, 255, 0, 255);
+            ws.Cell(ro, 2).Value = "XLColor.FromArgb(0, 255, 0, 255)";
+
+            ro++;
+
+            // FromColor(Color color)
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromColor(Color.Red);
+            ws.Cell(ro, 2).Value = "XLColor.FromColor(Color.Red)";
+
+            ro++;
+
+            // FromHtml(String htmlColor)
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromHtml("#FF996515");
+            ws.Cell(ro, 2).Value = "XLColor.FromHtml(\"#FF996515\")";
+
+            ro++;
+
+            // FromIndex(Int32 indexedColor)
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromIndex(25);
+            ws.Cell(ro, 2).Value = "XLColor.FromIndex(25)";
+
+            ro++;
+
+            // FromKnownColor(KnownColor knownColor)
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromKnownColor(KnownColor.Plum);
+            ws.Cell(ro, 2).Value = "XLColor.FromKnownColor(KnownColor.Plum)";
+
+            ro++;
+
+            // FromName(String colorName)
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromName("PowderBlue");
+            ws.Cell(ro, 2).Value = "XLColor.FromName(\"PowderBlue\")";
+
+            ro++;
+
+            // From Theme color
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1);
+            ws.Cell(ro, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent1)";
+
+            // From Theme color with tint
+            ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1, 0.5);
+            ws.Cell(ro, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent1, 0.5)";
+
+
+            ws.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/Styles/UsingPhonetics.cs b/ClosedXML_Examples/Styles/UsingPhonetics.cs
new file mode 100644
index 0000000..aa727f2
--- /dev/null
+++ b/ClosedXML_Examples/Styles/UsingPhonetics.cs
@@ -0,0 +1,39 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Styles
+{
+    public class UsingPhonetics : IXLExample
+    {
+    
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Using Phonetics");
+
+            var cell = ws.Cell(1, 1);
+
+            // Phonetics are implemented as part of the Rich Text functionality. For more information see [Using Rich Text]
+            // First we add the text.
+            cell.RichText.AddText("みんなさんはお元気ですか。").SetFontSize(16);
+
+            // And then we add the phonetics
+            cell.RichText.Phonetics.SetFontSize(8);
+            cell.RichText.Phonetics.Add("げん", 7, 1);
+            cell.RichText.Phonetics.Add("き", 8, 1);
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/Styles/UsingRichText.cs b/ClosedXML_Examples/Styles/UsingRichText.cs
new file mode 100644
index 0000000..200d1e9
--- /dev/null
+++ b/ClosedXML_Examples/Styles/UsingRichText.cs
@@ -0,0 +1,107 @@
+using System;
+using ClosedXML.Excel;
+
+namespace ClosedXML_Examples.Styles
+{
+    public class UsingRichText : IXLExample
+    {
+        #region Variables
+
+        // Public
+
+        // Private
+
+
+        #endregion
+
+        #region Properties
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Constructors
+
+        // Public
+
+
+
+        // Private
+
+
+        #endregion
+
+        #region Events
+
+        // Public
+
+        // Private
+
+        // Override
+
+
+        #endregion
+
+        #region Methods
+
+        // Public
+        public void Create(String filePath)
+        {
+            var wb = new XLWorkbook();
+            var ws = wb.Worksheets.Add("Rich Text");
+
+            // Let's start with a plain text and then decorate it...
+            var cell1 = ws.Cell(1, 1).SetValue("The show must go on...");
+
+            // We want everything in blue except the word show 
+            // (which we want in red and with Broadway Font)
+            cell1.Style.Font.FontColor = XLColor.Blue; // Set the color for the entire cell
+            cell1.RichText.Substring(4, 4)
+                .SetFontColor(XLColor.Red)
+                .SetFontName("Broadway"); // Set the color and font for the word "show"
+
+            // On the next example we'll start with an empty cell and add the rich text
+            var cell = ws.Cell(3, 1);
+
+            // Add the text parts
+            cell.RichText.AddText("Hello").SetFontColor(XLColor.Red);
+            cell.RichText.AddText(" BIG ").SetFontColor(XLColor.Blue).SetBold();
+            cell.RichText.AddText("World").SetFontColor(XLColor.Red);
+
+            // Here we're showing that even though we added three pieces of text
+            // you can treat then like a single one.
+            cell.RichText.Substring(4, 7).SetUnderline();
+
+            // Right now cell.RichText has the following 5 strings:
+            // 
+            // "Hell"  -> Red
+            // "o"     -> Red, Underlined
+            // " BIG " -> Blue, Underlined, Bold
+            // "W"     -> Red, Underlined
+            // "orld"  -> Red
+
+            // Of course you can loop through each piece of text and check its properties
+            foreach (var richText in cell.RichText)
+            {
+                if(richText.Bold)
+                    ws.Cell(3, 2).Value = String.Format("\"{0}\" is Bold.", richText.Text);
+            }
+            
+            ws.Columns().AdjustToContents();
+
+            wb.SaveAs(filePath);
+        }
+
+        // Private
+
+        // Override
+
+
+        #endregion
+    }
+}
diff --git a/ClosedXML_Examples/app.config b/ClosedXML_Examples/app.config
new file mode 100644
index 0000000..cb2586b
--- /dev/null
+++ b/ClosedXML_Examples/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/ClosedXML_Examples/packages.config b/ClosedXML_Examples/packages.config
new file mode 100644
index 0000000..3a74e72
--- /dev/null
+++ b/ClosedXML_Examples/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/ClosedXML_Net3.5/ClosedXML.snk b/ClosedXML_Net3.5/ClosedXML.snk
new file mode 100644
index 0000000..a17cff7
--- /dev/null
+++ b/ClosedXML_Net3.5/ClosedXML.snk
Binary files differ
diff --git a/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj b/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj
new file mode 100644
index 0000000..f057b4d
--- /dev/null
+++ b/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj
@@ -0,0 +1,906 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5F43B12B-A900-40C6-9924-A0C0B032F791}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ClosedXML</RootNamespace>
+    <AssemblyName>ClosedXML</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\ClosedXML.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml">
+      <HintPath>..\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLAutoFilter.cs">
+      <Link>Excel\AutoFilters\IXLAutoFilter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLBaseAutoFilter.cs">
+      <Link>Excel\AutoFilters\IXLBaseAutoFilter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLCustomFilteredColumn.cs">
+      <Link>Excel\AutoFilters\IXLCustomFilteredColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLFilterColumn.cs">
+      <Link>Excel\AutoFilters\IXLFilterColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLFilterConnector.cs">
+      <Link>Excel\AutoFilters\IXLFilterConnector.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\IXLFilteredColumn.cs">
+      <Link>Excel\AutoFilters\IXLFilteredColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLAutoFilter.cs">
+      <Link>Excel\AutoFilters\XLAutoFilter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLCustomFilteredColumn.cs">
+      <Link>Excel\AutoFilters\XLCustomFilteredColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilter.cs">
+      <Link>Excel\AutoFilters\XLFilter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilterColumn.cs">
+      <Link>Excel\AutoFilters\XLFilterColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilterConnector.cs">
+      <Link>Excel\AutoFilters\XLFilterConnector.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\AutoFilters\XLFilteredColumn.cs">
+      <Link>Excel\AutoFilters\XLFilteredColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\CalcEngine.cs">
+      <Link>Excel\CalcEngine\CalcEngine.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Expression.cs">
+      <Link>Excel\CalcEngine\Expression.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\ExpressionCache.cs">
+      <Link>Excel\CalcEngine\ExpressionCache.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\FunctionDefinition.cs">
+      <Link>Excel\CalcEngine\FunctionDefinition.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Database.cs">
+      <Link>Excel\CalcEngine\Functions\Database.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\DateAndTime.cs">
+      <Link>Excel\CalcEngine\Functions\DateAndTime.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Is.cs">
+      <Link>Excel\CalcEngine\Functions\Is.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Logical.cs">
+      <Link>Excel\CalcEngine\Functions\Logical.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\MathTrig.cs">
+      <Link>Excel\CalcEngine\Functions\MathTrig.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Statistical.cs">
+      <Link>Excel\CalcEngine\Functions\Statistical.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Tally.cs">
+      <Link>Excel\CalcEngine\Functions\Tally.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\Text.cs">
+      <Link>Excel\CalcEngine\Functions\Text.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\XLMath.cs">
+      <Link>Excel\CalcEngine\Functions\XLMath.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Functions\XLMatrix.cs">
+      <Link>Excel\CalcEngine\Functions\XLMatrix.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\Token.cs">
+      <Link>Excel\CalcEngine\Token.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CalcEngine\XLCalcEngine.cs">
+      <Link>Excel\CalcEngine\XLCalcEngine.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Cells\IXLCell.cs">
+      <Link>Excel\Cells\IXLCell.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Cells\IXLCells.cs">
+      <Link>Excel\Cells\IXLCells.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Cells\XLCell.cs">
+      <Link>Excel\Cells\XLCell.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Cells\XLCells.cs">
+      <Link>Excel\Cells\XLCells.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Cells\XLCellsCollection.cs">
+      <Link>Excel\Cells\XLCellsCollection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Charts\IXLChart.cs">
+      <Link>Excel\Charts\IXLChart.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Charts\IXLCharts.cs">
+      <Link>Excel\Charts\IXLCharts.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Charts\XLChart.cs">
+      <Link>Excel\Charts\XLChart.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Charts\XLCharts.cs">
+      <Link>Excel\Charts\XLCharts.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Columns\IXLColumn.cs">
+      <Link>Excel\Columns\IXLColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Columns\IXLColumns.cs">
+      <Link>Excel\Columns\IXLColumns.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Columns\XLColumn.cs">
+      <Link>Excel\Columns\XLColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Columns\XLColumnCollection.cs">
+      <Link>Excel\Columns\XLColumnCollection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Columns\XLColumnParameters.cs">
+      <Link>Excel\Columns\XLColumnParameters.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Columns\XLColumns.cs">
+      <Link>Excel\Columns\XLColumns.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Comments\IXLComment.cs">
+      <Link>Excel\Comments\IXLComment.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Comments\XLComment.cs">
+      <Link>Excel\Comments\XLComment.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFColorScaleMax.cs">
+      <Link>Excel\ConditionalFormats\IXLCFColorScaleMax.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFColorScaleMid.cs">
+      <Link>Excel\ConditionalFormats\IXLCFColorScaleMid.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFColorScaleMin.cs">
+      <Link>Excel\ConditionalFormats\IXLCFColorScaleMin.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFDataBarMax.cs">
+      <Link>Excel\ConditionalFormats\IXLCFDataBarMax.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFDataBarMin.cs">
+      <Link>Excel\ConditionalFormats\IXLCFDataBarMin.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLCFIconSet.cs">
+      <Link>Excel\ConditionalFormats\IXLCFIconSet.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLConditionalFormat.cs">
+      <Link>Excel\ConditionalFormats\IXLConditionalFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\IXLConditionalFormats.cs">
+      <Link>Excel\ConditionalFormats\IXLConditionalFormats.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\IXLCFConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\IXLCFConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFCellIsConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFCellIsConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFColorScaleConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFColorScaleConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFContainsConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFContainsConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFConverters.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFConverters.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFDataBarConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFDataBarConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFEndsWithConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFEndsWithConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFIconSetConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFIconSetConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFIsBlankConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFIsBlankConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFIsErrorConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFIsErrorConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFNotBlankConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFNotBlankConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFNotContainsConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFNotContainsConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFNotErrorConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFNotErrorConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFStartsWithConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFStartsWithConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFTopConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFTopConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\Save\XLCFUniqueConverter.cs">
+      <Link>Excel\ConditionalFormats\Save\XLCFUniqueConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFColorScaleMax.cs">
+      <Link>Excel\ConditionalFormats\XLCFColorScaleMax.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFColorScaleMid.cs">
+      <Link>Excel\ConditionalFormats\XLCFColorScaleMid.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFColorScaleMin.cs">
+      <Link>Excel\ConditionalFormats\XLCFColorScaleMin.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFDataBarMax.cs">
+      <Link>Excel\ConditionalFormats\XLCFDataBarMax.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFDataBarMin.cs">
+      <Link>Excel\ConditionalFormats\XLCFDataBarMin.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLCFIconSet.cs">
+      <Link>Excel\ConditionalFormats\XLCFIconSet.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLConditionalFormat.cs">
+      <Link>Excel\ConditionalFormats\XLConditionalFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\ConditionalFormats\XLConditionalFormats.cs">
+      <Link>Excel\ConditionalFormats\XLConditionalFormats.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Coordinates\IXLAddress.cs">
+      <Link>Excel\Coordinate\IXLAddress.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Coordinates\XLAddress.cs">
+      <Link>Excel\Coordinate\XLAddress.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Coordinates\XLSheetPoint.cs">
+      <Link>Excel\Coordinate\XLSheetPoint.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Coordinates\XLSheetRange.cs">
+      <Link>Excel\Coordinate\XLSheetRange.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CustomProperties\IXLCustomProperties.cs">
+      <Link>Excel\CustomProperties\IXLCustomProperties.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CustomProperties\IXLCustomProperty.cs">
+      <Link>Excel\CustomProperties\IXLCustomProperty.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CustomProperties\XLCustomProperties.cs">
+      <Link>Excel\CustomProperties\XLCustomProperties.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\CustomProperties\XLCustomProperty.cs">
+      <Link>Excel\CustomProperties\XLCustomProperty.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\IXLDataValidation.cs">
+      <Link>Excel\DataValidation\IXLDataValidation.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\IXLDataValidations.cs">
+      <Link>Excel\DataValidation\IXLDataValidations.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\IXLValidationCriteria.cs">
+      <Link>Excel\DataValidation\IXLValidationCriteria.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDataValidation.cs">
+      <Link>Excel\DataValidation\XLDataValidation.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDataValidations.cs">
+      <Link>Excel\DataValidation\XLDataValidations.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDateCriteria.cs">
+      <Link>Excel\DataValidation\XLDateCriteria.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLDecimalCriteria.cs">
+      <Link>Excel\DataValidation\XLDecimalCriteria.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLTextLengthCriteria.cs">
+      <Link>Excel\DataValidation\XLTextLengthCriteria.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLTimeCriteria.cs">
+      <Link>Excel\DataValidation\XLTimeCriteria.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLValidationCriteria.cs">
+      <Link>Excel\DataValidation\XLValidationCriteria.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\DataValidation\XLWholeNumberCriteria.cs">
+      <Link>Excel\DataValidation\XLWholeNumberCriteria.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\IXLDrawing.cs">
+      <Link>Excel\Drawings\IXLDrawing.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\IXLDrawingPosition.cs">
+      <Link>Excel\Drawings\IXLDrawingPosition.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingAlignment.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingAlignment.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingColorsAndLines.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingColorsAndLines.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingFont.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingFont.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingMargins.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingMargins.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingProperties.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingProperties.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingProtection.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingProtection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingSize.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingSize.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingStyle.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingStyle.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\IXLDrawingWeb.cs">
+      <Link>Excel\Drawings\Style\IXLDrawingWeb.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingAlignment.cs">
+      <Link>Excel\Drawings\Style\XLDrawingAlignment.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingColorsAndLines.cs">
+      <Link>Excel\Drawings\Style\XLDrawingColorsAndLines.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingFont.cs">
+      <Link>Excel\Drawings\Style\XLDrawingFont.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingMargins.cs">
+      <Link>Excel\Drawings\Style\XLDrawingMargins.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingProperties.cs">
+      <Link>Excel\Drawings\Style\XLDrawingProperties.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingProtection.cs">
+      <Link>Excel\Drawings\Style\XLDrawingProtection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingSize.cs">
+      <Link>Excel\Drawings\Style\XLDrawingSize.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingStyle.cs">
+      <Link>Excel\Drawings\Style\XLDrawingStyle.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\Style\XLDrawingWeb.cs">
+      <Link>Excel\Drawings\Style\XLDrawingWeb.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\XLDrawing.cs">
+      <Link>Excel\Drawings\XLDrawing.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Drawings\XLDrawingPosition.cs">
+      <Link>Excel\Drawings\XLDrawingPosition.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\EnumConverter.cs">
+      <Link>Excel\EnumConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Hyperlinks\IXLHyperlinks.cs">
+      <Link>Excel\Hyperlinks\IXLHyperlinks.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Hyperlinks\XLHyperlinks.cs">
+      <Link>Excel\Hyperlinks\XLHyperlinks.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Hyperlinks\XLHyperlink_Internal.cs">
+      <Link>Excel\Hyperlinks\XLHyperlink_Internal.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Hyperlinks\XLHyperlink_public.cs">
+      <Link>Excel\Hyperlinks\XLHyperlink_public.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\IXLOutline.cs">
+      <Link>Excel\IXLOutline.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\IXLSheetProtection.cs">
+      <Link>Excel\IXLSheetProtection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\IXLSheetView.cs">
+      <Link>Excel\IXLSheetView.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\IXLTheme.cs">
+      <Link>Excel\IXLTheme.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\IXLWorksheet.cs">
+      <Link>Excel\IXLWorksheet.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\IXLWorksheets.cs">
+      <Link>Excel\IXLWorksheets.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Misc\XLCallbackAction.cs">
+      <Link>Excel\Misc\XLCallbackAction.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Misc\XLDictionary.cs">
+      <Link>Excel\Misc\XLDictionary.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Misc\XLFormula.cs">
+      <Link>Excel\Misc\XLFormula.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Misc\XLIdManager.cs">
+      <Link>Excel\Misc\XLIdManager.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Misc\XLReentrantEnumerableSet.cs">
+      <Link>Excel\Misc\XLReentrantEnumerableSet.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\NamedRanges\IXLNamedRange.cs">
+      <Link>Excel\NamedRanges\IXLNamedRange.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\NamedRanges\IXLNamedRanges.cs">
+      <Link>Excel\NamedRanges\IXLNamedRanges.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\NamedRanges\XLNamedRange.cs">
+      <Link>Excel\NamedRanges\XLNamedRange.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\NamedRanges\XLNamedRanges.cs">
+      <Link>Excel\NamedRanges\XLNamedRanges.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLHeaderFooter.cs">
+      <Link>Excel\PageSetup\IXLHeaderFooter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLHFItem.cs">
+      <Link>Excel\PageSetup\IXLHFItem.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLMargins.cs">
+      <Link>Excel\PageSetup\IXLMargins.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLPageSetup.cs">
+      <Link>Excel\PageSetup\IXLPageSetup.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\IXLPrintAreas.cs">
+      <Link>Excel\PageSetup\IXLPrintAreas.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\XLHeaderFooter.cs">
+      <Link>Excel\PageSetup\XLHeaderFooter.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\XLHFItem.cs">
+      <Link>Excel\PageSetup\XLHFItem.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\XLHFText.cs">
+      <Link>Excel\PageSetup\XLHFText.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\XLMargins.cs">
+      <Link>Excel\PageSetup\XLMargins.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\XLPageSetup.cs">
+      <Link>Excel\PageSetup\XLPageSetup.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PageSetup\XLPrintAreas.cs">
+      <Link>Excel\PageSetup\XLPrintAreas.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotField.cs">
+      <Link>Excel\PivotTables\IXLPivotField.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotFields.cs">
+      <Link>Excel\PivotTables\IXLPivotFields.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotTable.cs">
+      <Link>Excel\PivotTables\IXLPivotTable.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\IXLPivotTables.cs">
+      <Link>Excel\PivotTables\IXLPivotTables.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValue.cs">
+      <Link>Excel\PivotTables\PivotValues\IXLPivotValue.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValueCombination.cs">
+      <Link>Excel\PivotTables\PivotValues\IXLPivotValueCombination.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValueFormat.cs">
+      <Link>Excel\PivotTables\PivotValues\IXLPivotValueFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\IXLPivotValues.cs">
+      <Link>Excel\PivotTables\PivotValues\IXLPivotValues.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValue.cs">
+      <Link>Excel\PivotTables\PivotValues\XLPivotValue.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValueCombination.cs">
+      <Link>Excel\PivotTables\PivotValues\XLPivotValueCombination.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValueFormat.cs">
+      <Link>Excel\PivotTables\PivotValues\XLPivotValueFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\PivotValues\XLPivotValues.cs">
+      <Link>Excel\PivotTables\PivotValues\XLPivotValues.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotField.cs">
+      <Link>Excel\PivotTables\XLPivotField.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotFields.cs">
+      <Link>Excel\PivotTables\XLPivotFields.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotTable.cs">
+      <Link>Excel\PivotTables\XLPivotTable.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\PivotTables\XLPivotTables.cs">
+      <Link>Excel\PivotTables\XLPivotTables.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRange.cs">
+      <Link>Excel\Ranges\IXLRange.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeAddress.cs">
+      <Link>Excel\Ranges\IXLRangeAddress.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeBase.cs">
+      <Link>Excel\Ranges\IXLRangeBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeColumn.cs">
+      <Link>Excel\Ranges\IXLRangeColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeColumns.cs">
+      <Link>Excel\Ranges\IXLRangeColumns.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeRow.cs">
+      <Link>Excel\Ranges\IXLRangeRow.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRangeRows.cs">
+      <Link>Excel\Ranges\IXLRangeRows.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\IXLRanges.cs">
+      <Link>Excel\Ranges\IXLRanges.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\IXLSortElement.cs">
+      <Link>Excel\Ranges\Sort\IXLSortElement.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\IXLSortElements.cs">
+      <Link>Excel\Ranges\Sort\IXLSortElements.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\XLSortElement.cs">
+      <Link>Excel\Ranges\Sort\XLSortElement.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\Sort\XLSortElements.cs">
+      <Link>Excel\Ranges\Sort\XLSortElements.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRange.cs">
+      <Link>Excel\Ranges\XLRange.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeAddress.cs">
+      <Link>Excel\Ranges\XLRangeAddress.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeBase.cs">
+      <Link>Excel\Ranges\XLRangeBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeColumn.cs">
+      <Link>Excel\Ranges\XLRangeColumn.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeColumns.cs">
+      <Link>Excel\Ranges\XLRangeColumns.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeParameters.cs">
+      <Link>Excel\Ranges\XLRangeParameters.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeRow.cs">
+      <Link>Excel\Ranges\XLRangeRow.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRangeRows.cs">
+      <Link>Excel\Ranges\XLRangeRows.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Ranges\XLRanges.cs">
+      <Link>Excel\Ranges\XLRanges.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\IXLFormattedText.cs">
+      <Link>Excel\RichText\IXLFormattedText.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\IXLPhonetic.cs">
+      <Link>Excel\RichText\IXLPhonetic.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\IXLPhonetics.cs">
+      <Link>Excel\RichText\IXLPhonetics.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\IXLRichString.cs">
+      <Link>Excel\RichText\IXLRichString.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\IXLRichText.cs">
+      <Link>Excel\RichText\IXLRichText.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\XLFormattedText.cs">
+      <Link>Excel\RichText\XLFormattedText.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\XLPhonetic.cs">
+      <Link>Excel\RichText\XLPhonetic.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\XLPhonetics.cs">
+      <Link>Excel\RichText\XLPhonetics.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\XLRichString.cs">
+      <Link>Excel\RichText\XLRichString.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\RichText\XLRichText.cs">
+      <Link>Excel\RichText\XLRichText.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Rows\IXLRow.cs">
+      <Link>Excel\Rows\IXLRow.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Rows\IXLRows.cs">
+      <Link>Excel\Rows\IXLRows.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Rows\XLRow.cs">
+      <Link>Excel\Rows\XLRow.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Rows\XLRowCollection.cs">
+      <Link>Excel\Rows\XLRowCollection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Rows\XLRowParameters.cs">
+      <Link>Excel\Rows\XLRowParameters.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Rows\XLRows.cs">
+      <Link>Excel\Rows\XLRows.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\Colors\XLColor_Internal.cs">
+      <Link>Excel\Style\Colors\XLColor_Internal.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\Colors\XLColor_Public.cs">
+      <Link>Excel\Style\Colors\XLColor_Public.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\Colors\XLColor_Static.cs">
+      <Link>Excel\Style\Colors\XLColor_Static.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLAlignment.cs">
+      <Link>Excel\Style\IXLAlignment.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLBorder.cs">
+      <Link>Excel\Style\IXLBorder.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLFill.cs">
+      <Link>Excel\Style\IXLFill.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLFont.cs">
+      <Link>Excel\Style\IXLFont.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLFontBase.cs">
+      <Link>Excel\Style\IXLFontBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLNumberFormat.cs">
+      <Link>Excel\Style\IXLNumberFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLNumberFormatBase.cs">
+      <Link>Excel\Style\IXLNumberFormatBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLProtection.cs">
+      <Link>Excel\Style\IXLProtection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLStyle.cs">
+      <Link>Excel\Style\IXLStyle.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\IXLStylized.cs">
+      <Link>Excel\Style\IXLStylized.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLAlignment.cs">
+      <Link>Excel\Style\XLAlignment.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLBorder.cs">
+      <Link>Excel\Style\XLBorder.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLFill.cs">
+      <Link>Excel\Style\XLFill.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLFont.cs">
+      <Link>Excel\Style\XLFont.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLNumberFormat.cs">
+      <Link>Excel\Style\XLNumberFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLProtection.cs">
+      <Link>Excel\Style\XLProtection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLStyle.cs">
+      <Link>Excel\Style\XLStyle.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Style\XLStylizedContainer.cs">
+      <Link>Excel\Style\XLStylizedContainer.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\IXLTable.cs">
+      <Link>Excel\Tables\IXLTable.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableField.cs">
+      <Link>Excel\Tables\IXLTableField.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableRange.cs">
+      <Link>Excel\Tables\IXLTableRange.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableRow.cs">
+      <Link>Excel\Tables\IXLTableRow.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\IXLTableRows.cs">
+      <Link>Excel\Tables\IXLTableRows.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\IXLTables.cs">
+      <Link>Excel\Tables\IXLTables.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\XLTable.cs">
+      <Link>Excel\Tables\XLTable.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\XLTableField.cs">
+      <Link>Excel\Tables\XLTableField.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\XLTableRange.cs">
+      <Link>Excel\Tables\XLTableRange.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\XLTableRow.cs">
+      <Link>Excel\Tables\XLTableRow.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\XLTableRows.cs">
+      <Link>Excel\Tables\XLTableRows.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\Tables\XLTables.cs">
+      <Link>Excel\Tables\XLTables.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLConstants.cs">
+      <Link>Excel\XLConstants.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLOutline.cs">
+      <Link>Excel\XLOutline.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLSheetProtection.cs">
+      <Link>Excel\XLSheetProtection.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLSheetView.cs">
+      <Link>Excel\XLSheetView.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLTheme.cs">
+      <Link>Excel\XLTheme.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorkbook.cs">
+      <Link>Excel\XLWorkbook.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorkbookProperties.cs">
+      <Link>Excel\XLWorkbookProperties.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorkbook_Load.cs">
+      <Link>Excel\XLWorkbook_Load.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorkbook_Save.cs">
+      <Link>Excel\XLWorkbook_Save.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorkbook_Save.NestedTypes.cs">
+      <Link>Excel\XLWorkbook_Save.NestedTypes.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorksheet.cs">
+      <Link>Excel\XLWorksheet.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorksheetInternals.cs">
+      <Link>Excel\XLWorksheetInternals.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWorksheets.cs">
+      <Link>Excel\XLWorksheets.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Excel\XLWSContentManager.cs">
+      <Link>Excel\XLWSContentManager.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Extensions.cs">
+      <Link>Extensions.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\PathHelper.cs">
+      <Link>PathHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\Utils\GraphicsUtils.cs">
+      <Link>Utils\GraphicsUtils.cs</Link>
+    </Compile>
+    <Compile Include="..\ClosedXML\XLHelper.cs">
+      <Link>XLHelper.cs</Link>
+    </Compile>
+    <Compile Include="Excel\Style\XLStylizedEmpty.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClosedXML.snk" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>IF EXIST $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(SolutionDir)ClosedXML_Package\bin\Release\ClosedXML_Package.exe $(TargetDir)</PostBuildEvent>
+  </PropertyGroup>
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ClosedXML_Net3.5/Excel/Style/XLStylizedEmpty.cs b/ClosedXML_Net3.5/Excel/Style/XLStylizedEmpty.cs
new file mode 100644
index 0000000..9e059f9
--- /dev/null
+++ b/ClosedXML_Net3.5/Excel/Style/XLStylizedEmpty.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML.Excel
+{
+    internal class XLStylizedEmpty: IXLStylized
+    {
+        public XLStylizedEmpty(IXLStyle defaultStyle)
+        {
+            Style = defaultStyle;
+        }
+        public IXLStyle Style { get; set; }
+        
+        public IEnumerable<IXLStyle> Styles
+        {
+            get
+            {
+                UpdatingStyle = true;
+                yield return Style;
+                UpdatingStyle = false;
+            }
+        }
+
+        public bool UpdatingStyle { get; set; }
+
+        public IXLStyle InnerStyle { get; set; }
+
+        public IXLRanges RangesUsed
+        {
+            get { return new XLRanges(); }
+        }
+
+        public bool StyleChanged { get; set; }
+    }
+}
diff --git a/ClosedXML_Net3.5/Properties/AssemblyInfo.cs b/ClosedXML_Net3.5/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..1d41fcd
--- /dev/null
+++ b/ClosedXML_Net3.5/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ClosedXML_Net3.5")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ClosedXML_Net3.5")]
+[assembly: AssemblyCopyright("Copyright © Manuel De Leon 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d627551d-470d-4a39-a5f1-5a71696b8200")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.75.0.0")]
+[assembly: AssemblyFileVersion("0.75.0.0")]
diff --git a/ClosedXML_Package/ClosedXML_Package.csproj b/ClosedXML_Package/ClosedXML_Package.csproj
new file mode 100644
index 0000000..b36f788
--- /dev/null
+++ b/ClosedXML_Package/ClosedXML_Package.csproj
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{69B3BDDF-C359-447C-AEB7-EBD8867DE528}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ClosedXML_Package</RootNamespace>
+    <AssemblyName>ClosedXML_Package</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Ionic.Zip">
+      <HintPath>..\Ionic.Zip.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ClosedXML_Package/Program.cs b/ClosedXML_Package/Program.cs
new file mode 100644
index 0000000..ec8f7c7
--- /dev/null
+++ b/ClosedXML_Package/Program.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
+using Ionic.Zip;
+
+namespace ClosedXML_Package
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+#if DEBUG
+            return;
+#endif
+            try
+            {
+                var targetPath = args[0]; 
+                //if (!targetPath.EndsWith("Release")) return;
+
+                var targetDll = String.Format(@"{0}\ClosedXML.dll", targetPath);
+                var targetXml = String.Format(@"{0}\ClosedXML.XML", targetPath);
+
+                if (!File.Exists(targetDll)) 
+                {
+                    MessageBox.Show("Missing: " + targetDll);
+                    return;
+                }
+                if (!File.Exists(targetXml))
+                {
+                    MessageBox.Show("Missing: " + targetXml);
+                    return;
+                }
+
+                Assembly assembly = Assembly.LoadFrom(targetDll);
+                Version ver = assembly.GetName().Version;
+                var targetZipPath = String.Format(@"{0}\ClosedXML_v{1}.zip", targetPath, ver);
+                var targetZipInfo = new FileInfo(targetZipPath);
+                if (targetZipInfo.Exists) targetZipInfo.Delete();
+
+                using (ZipFile zip = new ZipFile())
+                {
+                    zip.AddFile(targetDll, "");
+                    zip.AddFile(targetXml, "");
+                    zip.Save(targetZipPath);
+                }
+            }
+            catch (Exception ex)
+            {
+                var strMsg = "->" + ex.Message;
+                if (ex.InnerException != null)
+                    strMsg += Environment.NewLine + "=>" + ex.InnerException.Message;
+                MessageBox.Show(strMsg);
+            }
+
+        }
+    }
+}
diff --git a/ClosedXML_Package/Properties/AssemblyInfo.cs b/ClosedXML_Package/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..a7e306e
--- /dev/null
+++ b/ClosedXML_Package/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ClosedXML_Package")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("eCollege")]
+[assembly: AssemblyProduct("ClosedXML_Package")]
+[assembly: AssemblyCopyright("Copyright © eCollege 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0005e3ad-3c3f-4446-a3ab-89fc837fb20f")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ClosedXML_Package/app.config b/ClosedXML_Package/app.config
new file mode 100644
index 0000000..cb2586b
--- /dev/null
+++ b/ClosedXML_Package/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj b/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj
new file mode 100644
index 0000000..9f6d804
--- /dev/null
+++ b/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{38B882F0-E6F2-45C5-9BE9-CDC27FBEB4AB}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ClosedXML_Sandbox</RootNamespace>
+    <AssemblyName>ClosedXML_Sandbox</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="PerformanceRunner.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="OneRow.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
+      <Project>{bd5e6bfe-e837-4a35-bca9-39667d873a20}</Project>
+      <Name>ClosedXML</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ClosedXML_Examples\ClosedXML_Examples.csproj">
+      <Project>{03A518D0-1CB7-488E-861C-C4E782B27A46}</Project>
+      <Name>ClosedXML_Examples</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ClosedXML_Sandbox/OneRow.cs b/ClosedXML_Sandbox/OneRow.cs
new file mode 100644
index 0000000..0dde282
--- /dev/null
+++ b/ClosedXML_Sandbox/OneRow.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.ComponentModel.DataAnnotations;
+
+namespace ClosedXML_Sandbox
+{
+    public class OneRow
+    {
+        [Display(Name = "Col01")]
+        public int Col01 { get; set; }
+
+        [Display(Name = "Col02")]
+        public string Col02 { get; set; }
+
+        [Display(Name = "Col03")]
+        public DateTime? Col03 { get; set; }
+
+        [Display(Name = "Col04")]
+        public TimeSpan? Col04 { get; set; }
+
+        [Display(Name = "Col05")]
+        public TimeSpan? Col05 { get; set; }
+
+        [Display(Name = "Col06")]
+        public TimeSpan? Col06 { get; set; }
+
+        [Display(Name = "Col07")]
+        public TimeSpan? Col07 { get; set; }
+
+        [Display(Name = "Col08")]
+        public TimeSpan? Col08 { get; set; }
+
+        [Display(Name = "Col09")]
+        public string Col09 { get; set; }
+
+        [Display(Name = "Col10")]
+        public decimal Col10 { get; set; }
+
+        [Display(Name = "Col11")]
+        public string Col11 { get; set; }
+
+        [Display(Name = "Col12")]
+        public bool Col12 { get; set; }
+
+        [Display(Name = "Col13")]
+        public bool Col13 { get; set; }
+
+        [Display(Name = "Col14")]
+        public string Col14 { get; set; }
+
+        [Display(Name = "Col15")]
+        public bool Col15 { get; set; }
+
+        [Display(Name = "Col16")]
+        public string Col16 { get; set; }
+
+        [Display(Name = "Col17")]
+        public string Col17 { get; set; }
+
+        [Display(Name = "Col18")]
+        public DateTime? Col18 { get; set; }
+
+        [Display(Name = "Col19")]
+        public string Col19 { get; set; }
+
+        [Display(Name = "Col20")]
+        public string Col20 { get; set; }
+
+        [Display(Name = "Col21")]
+        public string Col21 { get; set; }
+
+        [Display(Name = "Col22")]
+        public string Col22 { get; set; }
+
+        [Display(Name = "Col23")]
+        public string Col23 { get; set; }
+
+        [Display(Name = "Col24")]
+        public bool Col24 { get; set; }
+
+        [Display(Name = "Col25")]
+        public int? Col25 { get; set; }
+
+        [Display(Name = "Col26")]
+        public string Col26 { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Sandbox/PerformanceRunner.cs b/ClosedXML_Sandbox/PerformanceRunner.cs
new file mode 100644
index 0000000..97d3a31
--- /dev/null
+++ b/ClosedXML_Sandbox/PerformanceRunner.cs
@@ -0,0 +1,128 @@
+using ClosedXML.Excel;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace ClosedXML_Sandbox
+{
+    internal class PerformanceRunner
+    {
+        public static void TimeAction(Action action)
+        {
+            var stopwatch = Stopwatch.StartNew();
+            action();
+            Console.WriteLine("Action done in " + stopwatch.Elapsed);
+        }
+
+        const int rowCount = 5000;
+        public static void RunInsertTable()
+        {
+            var rows = new List<OneRow>();
+
+            for (int i = 0; i < rowCount; i++)
+            {
+                var row = GenerateRow<OneRow>();
+                rows.Add(row);
+            }
+
+            var workbook = new XLWorkbook();
+            var worksheet = workbook.Worksheets.Add("Sheet 1");
+            worksheet.Cell(1, 1).InsertTable(rows);
+
+            CreateMergedCell(worksheet);
+
+            worksheet.Columns().AdjustToContents();
+
+            EmulateSave(workbook);
+        }
+
+        private static void CreateMergedCell(IXLWorksheet worksheet)
+        {
+            worksheet.Cell(rowCount + 2, 1).Value = "Merged cell";
+            var range = worksheet.Range(rowCount + 2, 1, rowCount + 2, 2);
+            range.Row(1).Merge();
+        }
+
+        private static void EmulateSave(XLWorkbook workbook)
+        {
+            using (MemoryStream memoryStream = new MemoryStream())
+            {
+                workbook.SaveAs(memoryStream);
+                memoryStream.Seek(0, SeekOrigin.Begin);
+                Console.WriteLine("Total bytes = " + memoryStream.ToArray().Length);
+            }
+        }
+
+        private static Random rnd = new Random();
+
+        private static T GenerateRow<T>() where T : new()
+        {
+            var row = new T();
+
+            var rowProps = row.GetType().GetProperties();
+
+            var strings = rowProps.Where(p => p.PropertyType == typeof(string));
+            var decimals = rowProps.Where(p => p.PropertyType == typeof(decimal));
+            var ints = rowProps.Where(p => p.PropertyType == typeof(int) || p.PropertyType == typeof(int?));
+            var dates = rowProps.Where(p => p.PropertyType == typeof(DateTime?));
+            var timeSpans = rowProps.Where(p => p.PropertyType == typeof(TimeSpan?));
+            var booleans = rowProps.Where(p => p.PropertyType == typeof(bool));
+
+            // Format strings
+            var tmpString = new StringBuilder();
+            var tmpStringLength = rnd.Next(5, 50);
+            for (int x = 0; x <= tmpStringLength; x++)
+            {
+                tmpString.Append((char)(rnd.Next(48, 120)));
+            }
+            foreach (var str in strings)
+            {
+                str.SetValue(row, tmpString.ToString());
+            }
+
+            // Format decimals
+            var tmpDec = (decimal)(rnd.Next(-10000, 100000) / (Math.Pow(10.0, rnd.Next(1, 4))));
+
+            foreach (var dec in decimals)
+            {
+                dec.SetValue(row, tmpDec);
+            }
+
+            // Format ints
+            var tmpInt = rnd.Next(-1000, 10000);
+
+            foreach (var intValue in ints)
+            {
+                intValue.SetValue(row, tmpInt);
+            }
+
+            // Format dates
+            var tmpDate = new DateTime(2012, 1, 1, 1, 1, 1);
+            tmpDate = tmpDate.AddSeconds(rnd.Next(-10000, 100000));
+            foreach (var dt in dates)
+            {
+                dt.SetValue(row, tmpDate);
+            }
+
+            // Format timespans
+            var tmpTimespan = new TimeSpan(rnd.Next(1, 24), rnd.Next(1, 60), rnd.Next(1, 60));
+
+            foreach (var ts in timeSpans)
+            {
+                ts.SetValue(row, tmpTimespan);
+            }
+
+            // Format booleans
+            var tmpBool = (rnd.Next(0, 2) > 0);
+            foreach (var bl in booleans)
+            {
+                bl.SetValue(row, tmpBool);
+            }
+
+            return row;
+        }
+    }
+}
diff --git a/ClosedXML_Sandbox/Program.cs b/ClosedXML_Sandbox/Program.cs
new file mode 100644
index 0000000..f01eb1d
--- /dev/null
+++ b/ClosedXML_Sandbox/Program.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using ClosedXML.Excel;
+using ClosedXML;
+using System.Drawing;
+using System.IO;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+namespace ClosedXML_Sandbox
+{
+    class Program
+    {
+        private static void Main(string[] args)
+        {
+            //var wb = new XLWorkbook();
+            //wb.SaveAs(@"c:\temp\saved.xlsx");
+            //Console.WriteLine("Done");
+            PerformanceRunner.TimeAction(PerformanceRunner.RunInsertTable);
+
+            Console.WriteLine("Press any key to continue");
+            Console.ReadKey();
+        }
+    }
+}
diff --git a/ClosedXML_Sandbox/Properties/AssemblyInfo.cs b/ClosedXML_Sandbox/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..942db94
--- /dev/null
+++ b/ClosedXML_Sandbox/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ClosedXML_Sandbox")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("ClosedXML_Sandbox")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7a3783fd-4e1b-4c17-a745-e6bbb593bd45")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ClosedXML_Sandbox/app.config b/ClosedXML_Sandbox/app.config
new file mode 100644
index 0000000..22c902a
--- /dev/null
+++ b/ClosedXML_Sandbox/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
diff --git a/ClosedXML_Sandbox/packages.config b/ClosedXML_Sandbox/packages.config
new file mode 100644
index 0000000..3a74e72
--- /dev/null
+++ b/ClosedXML_Sandbox/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/ClosedXML_Sandbox_VB/ClosedXML_Sandbox_VB.vbproj b/ClosedXML_Sandbox_VB/ClosedXML_Sandbox_VB.vbproj
new file mode 100644
index 0000000..f5ca4a5
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/ClosedXML_Sandbox_VB.vbproj
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>
+    </SchemaVersion>
+    <ProjectGuid>{E005997D-B192-461F-AA3E-44007A33A3DF}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <StartupObject>ClosedXML_Sandbox_VB.Module1</StartupObject>
+    <RootNamespace>ClosedXML_Sandbox_VB</RootNamespace>
+    <AssemblyName>ClosedXML_Sandbox_VB</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Console</MyType>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>ClosedXML_Sandbox_VB.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\ClosedXML_Sandbox_VB.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Module1.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
+      <Project>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</Project>
+      <Name>ClosedXML</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ClosedXML_Sandbox_VB/Module1.vb b/ClosedXML_Sandbox_VB/Module1.vb
new file mode 100644
index 0000000..1301cf1
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/Module1.vb
@@ -0,0 +1,12 @@
+
+Imports ClosedXML
+Imports ClosedXML.Excel
+Imports System.IO
+Module Module1
+
+    Sub Main()
+        'Use this space to play with ClosedXML
+
+    End Sub
+
+End Module
diff --git a/ClosedXML_Sandbox_VB/My Project/Application.Designer.vb b/ClosedXML_Sandbox_VB/My Project/Application.Designer.vb
new file mode 100644
index 0000000..9478349
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/My Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.1
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
diff --git a/ClosedXML_Sandbox_VB/My Project/Application.myapp b/ClosedXML_Sandbox_VB/My Project/Application.myapp
new file mode 100644
index 0000000..23b627f
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/My Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>2</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>
diff --git a/ClosedXML_Sandbox_VB/My Project/AssemblyInfo.vb b/ClosedXML_Sandbox_VB/My Project/AssemblyInfo.vb
new file mode 100644
index 0000000..c8e6786
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/My Project/AssemblyInfo.vb
@@ -0,0 +1,35 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' General Information about an assembly is controlled through the following 
+' set of attributes. Change these attribute values to modify the information
+' associated with an assembly.
+
+' Review the values of the assembly attributes
+
+<Assembly: AssemblyTitle("ClosedXML_Sandbox_VB")> 
+<Assembly: AssemblyDescription("")> 
+<Assembly: AssemblyCompany("Microsoft")> 
+<Assembly: AssemblyProduct("ClosedXML_Sandbox_VB")> 
+<Assembly: AssemblyCopyright("Copyright © Microsoft 2010")> 
+<Assembly: AssemblyTrademark("")> 
+
+<Assembly: ComVisible(False)>
+
+'The following GUID is for the ID of the typelib if this project is exposed to COM
+<Assembly: Guid("8d4ab706-3b83-4bae-899f-c943a2875d05")> 
+
+' Version information for an assembly consists of the following four values:
+'
+'      Major Version
+'      Minor Version 
+'      Build Number
+'      Revision
+'
+' You can specify all the values or you can default the Build and Revision Numbers 
+' by using the '*' as shown below:
+' <Assembly: AssemblyVersion("1.0.*")> 
+
+<Assembly: AssemblyVersion("1.0.0.0")> 
+<Assembly: AssemblyFileVersion("1.0.0.0")> 
diff --git a/ClosedXML_Sandbox_VB/My Project/Resources.Designer.vb b/ClosedXML_Sandbox_VB/My Project/Resources.Designer.vb
new file mode 100644
index 0000000..f524b67
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/My Project/Resources.Designer.vb
@@ -0,0 +1,62 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.1
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My.Resources
+    
+    'This class was auto-generated by the StronglyTypedResourceBuilder
+    'class via a tool like ResGen or Visual Studio.
+    'To add or remove a member, edit your .ResX file then rerun ResGen
+    'with the /str option, or rebuild your VS project.
+    '''<summary>
+    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
+    Friend Module Resources
+
+        Private resourceMan As Global.System.Resources.ResourceManager
+
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+
+        '''<summary>
+        '''  Returns the cached ResourceManager instance used by this class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ClosedXML_Sandbox_VB.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+
+        '''<summary>
+        '''  Overrides the current thread's CurrentUICulture property for all
+        '''  resource lookups using this strongly typed resource class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set(ByVal value As Global.System.Globalization.CultureInfo)
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
diff --git a/ClosedXML_Sandbox_VB/My Project/Resources.resx b/ClosedXML_Sandbox_VB/My Project/Resources.resx
new file mode 100644
index 0000000..ffecec8
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/My Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/ClosedXML_Sandbox_VB/My Project/Settings.Designer.vb b/ClosedXML_Sandbox_VB/My Project/Settings.Designer.vb
new file mode 100644
index 0000000..5e637d7
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/My Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.1
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"), _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
+
+#Region "My.Settings Auto-Save Functionality"
+#If _MyType = "WindowsForms" Then
+        Private Shared addedHandler As Boolean
+
+        Private Shared addedHandlerLockObject As New Object
+
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+            If My.Application.SaveMySettingsOnExit Then
+                My.Settings.Save()
+            End If
+        End Sub
+#End If
+#End Region
+
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+
+#If _MyType = "WindowsForms" Then
+                   If Not addedHandler Then
+                        SyncLock addedHandlerLockObject
+                            If Not addedHandler Then
+                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                                addedHandler = True
+                            End If
+                        End SyncLock
+                    End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.ClosedXML_Sandbox_VB.My.MySettings
+            Get
+                Return Global.ClosedXML_Sandbox_VB.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
diff --git a/ClosedXML_Sandbox_VB/My Project/Settings.settings b/ClosedXML_Sandbox_VB/My Project/Settings.settings
new file mode 100644
index 0000000..377f56d
--- /dev/null
+++ b/ClosedXML_Sandbox_VB/My Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
diff --git a/ClosedXML_Tests/ClosedXML.snk b/ClosedXML_Tests/ClosedXML.snk
new file mode 100644
index 0000000..a17cff7
--- /dev/null
+++ b/ClosedXML_Tests/ClosedXML.snk
Binary files differ
diff --git a/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML_Tests/ClosedXML_Tests.csproj
new file mode 100644
index 0000000..dbc5325
--- /dev/null
+++ b/ClosedXML_Tests/ClosedXML_Tests.csproj
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ClosedXML_Tests</RootNamespace>
+    <AssemblyName>ClosedXML_Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Examples\AutoFilterTests.cs" />
+    <Compile Include="Examples\CommentsTests.cs" />
+    <Compile Include="Examples\ConditionalFormattingTests.cs" />
+    <Compile Include="Examples\PageSetupTests.cs" />
+    <Compile Include="Examples\RowsTests.cs" />
+    <Compile Include="Examples\StylesTests.cs" />
+    <Compile Include="ExcelDocsComparerTests.cs" />
+    <Compile Include="Excel\CalcEngine\IsTests.cs" />
+    <Compile Include="Excel\CalcEngine\LogicalTests.cs" />
+    <Compile Include="Excel\CalcEngine\TextTests.cs" />
+    <Compile Include="XLHelperTests.cs" />
+    <Compile Include="Excel\AutoFilters\AutoFilterTests.cs" />
+    <Compile Include="Excel\CalcEngine\DateAndTimeTests.cs" />
+    <Compile Include="Excel\CalcEngine\XLMathTests.cs" />
+    <Compile Include="Excel\CalcEngine\FunctionsTests.cs" />
+    <Compile Include="Excel\Cells\XLCellTests.cs" />
+    <Compile Include="Excel\Columns\ColumnTests.cs" />
+    <Compile Include="Excel\Coordinates\XLAddressTests.cs" />
+    <Compile Include="Excel\DataValidations\DataValidationTests.cs" />
+    <Compile Include="Excel\Misc\FormulaTests.cs" />
+    <Compile Include="Excel\Misc\StylesTests.cs" />
+    <Compile Include="Excel\Misc\XLWorkbookTests.cs" />
+    <Compile Include="Excel\Misc\ExtensionsTests.cs" />
+    <Compile Include="Excel\NamedRanges\NamedRangesTests.cs" />
+    <Compile Include="Excel\PivotTables\XLPivotTableTests.cs" />
+    <Compile Include="Excel\Ranges\RangeUsedTests.cs" />
+    <Compile Include="Excel\Ranges\MergedRangesTests.cs" />
+    <Compile Include="Excel\Ranges\CopyingRangesTests.cs" />
+    <Compile Include="Excel\Ranges\XLRangeAddressTests.cs" />
+    <Compile Include="Excel\Ranges\XLRangeBaseTests.cs" />
+    <Compile Include="Excel\Ranges\InsertingRangesTests.cs" />
+    <Compile Include="Excel\Rows\RowTests.cs" />
+    <Compile Include="Excel\Styles\ColorTests.cs" />
+    <Compile Include="Excel\Styles\XLFillTests.cs" />
+    <Compile Include="Excel\Tables\TablesTests.cs" />
+    <Compile Include="Excel\Worksheets\XLWorksheetTests.cs" />
+    <Compile Include="Utils\ExcelDocsComparer.cs" />
+    <Compile Include="Examples\DeleteTests.cs" />
+    <Compile Include="Examples\LoadingTests.cs" />
+    <Compile Include="Examples\MiscTests.cs" />
+    <Compile Include="Excel\Misc\XlHelperTests.cs" />
+    <Compile Include="Examples\ColumnsTests.cs" />
+    <Compile Include="Excel\Misc\CopyContentsTests.cs" />
+    <Compile Include="Examples\RangesTests.cs" />
+    <Compile Include="Utils\PackageHelper.cs" />
+    <Compile Include="Utils\ResourceFileExtractor.cs" />
+    <Compile Include="Utils\StreamHelper.cs" />
+    <Compile Include="TestHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Excel\RichText\XLRichStringTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ClosedXML\ClosedXML.csproj">
+      <Project>{BD5E6BFE-E837-4A35-BCA9-39667D873A20}</Project>
+      <Name>ClosedXML</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ClosedXML_Examples\ClosedXML_Examples.csproj">
+      <Project>{03A518D0-1CB7-488E-861C-C4E782B27A46}</Project>
+      <Name>ClosedXML_Examples</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\Columns\ColumnCells.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Columns\ColumnCollection.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Columns\ColumnSettings.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Columns\DeletingColumns.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Columns\InsertColumns.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Delete\RemoveRows.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Loading\ChangingBasicTable.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\AddingDataSet.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\AddingDataTableAsWorksheet.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\AdjustToContents.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\AutoFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\BlankCells.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\CellValues.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\Collections.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\DataTypes.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\DataValidation.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\Formulas.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\FreezePanes.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\HideSheets.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\HideUnhide.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\Hyperlinks.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\InsertingData.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\InsertingTables.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\LambdaExpressions.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\MergeCells.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\MergeMoves.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\Outline.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\SheetProtection.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\ShiftingFormulas.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\ShowCase.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\TabColors.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Misc\WorkbookProperties.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PageSetup\HeaderFooters.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PageSetup\Margins.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PageSetup\Page.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PageSetup\Sheets.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PageSetup\SheetTab.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PageSetup\TwoPages.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\ClearingRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\CopyingRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\DefiningRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\DeletingRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\InsertingDeletingColumns.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\InsertingDeletingRows.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\MultipleRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\NamedRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\ShiftingRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\SortExample.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\Sorting.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\TransposeRanges.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\TransposeRangesPlus.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Rows\InsertRows.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Rows\RowCells.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Rows\RowCollection.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Rows\RowSettings.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\DefaultStyles.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\StyleAlignment.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\StyleBorder.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\StyleFill.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\StyleFont.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\StyleNumberFormat.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\StyleRowsColumns.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\StyleWorksheet.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\UsingColors.xlsx" />
+    <EmbeddedResource Include="Resource\Misc\CopyRowContents.xlsx" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\Delete\DeleteFewWorksheets.xlsx" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\Misc\CopyingWorksheets.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\UsingTables.xlsx" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\Misc\CopyingRowsAndColumns.xlsx" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\Styles\UsingRichText.xlsx" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\Ranges\WalkingRanges.xlsx" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\Ranges\CurrentRowColumn.xlsx" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClosedXML.snk" />
+    <EmbeddedResource Include="Resource\Examples\Misc\BasicTable.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Styles\PurpleWorksheet.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Comments\EditingComments.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\AutoFilter\TopBottomAutoFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\AutoFilter\DynamicAutoFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\AutoFilter\RegularAutoFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\AutoFilter\CustomAutoFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Comments\AddingComments.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFColorScaleLowHigh.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFColorScaleLowMidHigh.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFContains.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFEndsWith.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFEqualsNumber.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFEqualsString.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFIsBlank.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFIsError.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotBlank.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotContains.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotEqualsNumber.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotEqualsString.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFNotError.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFStartsWith.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFDataBar.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ConditionalFormatting\CFIconSet.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\Ranges\SelectingRanges.xlsx" />
+    <None Include="packages.config" />
+    <None Include="Resource\Misc\WorkbookProperties.xlsx" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/AutoFilterTests.cs b/ClosedXML_Tests/Examples/AutoFilterTests.cs
new file mode 100644
index 0000000..5541af7
--- /dev/null
+++ b/ClosedXML_Tests/Examples/AutoFilterTests.cs
@@ -0,0 +1,33 @@
+using ClosedXML_Examples;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class AutoFilterTests
+    {
+        [Test]
+        public void CustomAutoFilter()
+        {
+            TestHelper.RunTestExample<CustomAutoFilter>(@"AutoFilter\CustomAutoFilter.xlsx");
+        }
+
+        [Test]
+        public void DynamicAutoFilter()
+        {
+            TestHelper.RunTestExample<DynamicAutoFilter>(@"AutoFilter\DynamicAutoFilter.xlsx");
+        }
+
+        [Test]
+        public void RegularAutoFilter()
+        {
+            TestHelper.RunTestExample<RegularAutoFilter>(@"AutoFilter\RegularAutoFilter.xlsx");
+        }
+
+        [Test]
+        public void TopBottomAutoFilter()
+        {
+            TestHelper.RunTestExample<TopBottomAutoFilter>(@"AutoFilter\TopBottomAutoFilter.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/ColumnsTests.cs b/ClosedXML_Tests/Examples/ColumnsTests.cs
new file mode 100644
index 0000000..c523d57
--- /dev/null
+++ b/ClosedXML_Tests/Examples/ColumnsTests.cs
@@ -0,0 +1,34 @@
+using ClosedXML_Examples;
+using ClosedXML_Examples.Columns;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class ColumnsTests
+    {
+        [Test]
+        public void ColumnCells()
+        {
+            TestHelper.RunTestExample<ColumnCells>(@"Columns\ColumnCells.xlsx");
+        }
+
+        [Test]
+        public void ColumnCollections()
+        {
+            TestHelper.RunTestExample<ColumnCollection>(@"Columns\ColumnCollection.xlsx");
+        }
+
+        [Test]
+        public void ColumnSettings()
+        {
+            TestHelper.RunTestExample<ColumnSettings>(@"Columns\ColumnSettings.xlsx");
+        }
+
+        [Test]
+        public void DeletingColumns()
+        {
+            TestHelper.RunTestExample<DeletingColumns>(@"Columns\DeletingColumns.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/CommentsTests.cs b/ClosedXML_Tests/Examples/CommentsTests.cs
new file mode 100644
index 0000000..b4cb1e9
--- /dev/null
+++ b/ClosedXML_Tests/Examples/CommentsTests.cs
@@ -0,0 +1,15 @@
+using ClosedXML_Examples;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class CommentsTests
+    {
+        [Test]
+        public void AddingComments()
+        {
+            TestHelper.RunTestExample<AddingComments>(@"Comments\AddingComments.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/ConditionalFormattingTests.cs b/ClosedXML_Tests/Examples/ConditionalFormattingTests.cs
new file mode 100644
index 0000000..f5e9bcd
--- /dev/null
+++ b/ClosedXML_Tests/Examples/ConditionalFormattingTests.cs
@@ -0,0 +1,130 @@
+using ClosedXML_Examples;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class ConditionalFormattingTests
+    {
+        [Test]
+        public void CFColorScaleLowHigh()
+        {
+            TestHelper.RunTestExample<CFColorScaleLowHigh>(@"ConditionalFormatting\CFColorScaleLowHigh.xlsx");
+        }
+
+        [Test]
+        public void CFColorScaleLowMidHigh()
+        {
+            TestHelper.RunTestExample<CFColorScaleLowMidHigh>(@"ConditionalFormatting\CFColorScaleLowMidHigh.xlsx");
+        }
+
+        [Test]
+        public void CFContains()
+        {
+            TestHelper.RunTestExample<CFContains>(@"ConditionalFormatting\CFContains.xlsx");
+        }
+
+        [Test]
+        public void CFDataBar()
+        {
+            TestHelper.RunTestExample<CFDataBar>(@"ConditionalFormatting\CFDataBar.xlsx");
+        }
+
+        [Test]
+        public void CFEndsWith()
+        {
+            TestHelper.RunTestExample<CFEndsWith>(@"ConditionalFormatting\CFEndsWith.xlsx");
+        }
+
+        [Test]
+        public void CFEqualsNumber()
+        {
+            TestHelper.RunTestExample<CFEqualsNumber>(@"ConditionalFormatting\CFEqualsNumber.xlsx");
+        }
+
+        [Test]
+        public void CFEqualsString()
+        {
+            TestHelper.RunTestExample<CFEqualsString>(@"ConditionalFormatting\CFEqualsString.xlsx");
+        }
+
+        [Test]
+        public void CFIconSet()
+        {
+            TestHelper.RunTestExample<CFIconSet>(@"ConditionalFormatting\CFIconSet.xlsx");
+        }
+
+        [Test]
+        public void CFIsBlank()
+        {
+            TestHelper.RunTestExample<CFIsBlank>(@"ConditionalFormatting\CFIsBlank.xlsx");
+        }
+
+        [Test]
+        public void CFIsError()
+        {
+            TestHelper.RunTestExample<CFIsError>(@"ConditionalFormatting\CFIsError.xlsx");
+        }
+
+        [Test]
+        public void CFNotBlank()
+        {
+            TestHelper.RunTestExample<CFNotBlank>(@"ConditionalFormatting\CFNotBlank.xlsx");
+        }
+
+        [Test]
+        public void CFNotContains()
+        {
+            TestHelper.RunTestExample<CFNotContains>(@"ConditionalFormatting\CFNotContains.xlsx");
+        }
+
+        [Test]
+        public void CFNotEqualsNumber()
+        {
+            TestHelper.RunTestExample<CFNotEqualsNumber>(@"ConditionalFormatting\CFNotEqualsNumber.xlsx");
+        }
+
+        [Test]
+        public void CFNotEqualsString()
+        {
+            TestHelper.RunTestExample<CFNotEqualsString>(@"ConditionalFormatting\CFNotEqualsString.xlsx");
+        }
+
+        [Test]
+        public void CFNotError()
+        {
+            TestHelper.RunTestExample<CFNotError>(@"ConditionalFormatting\CFNotError.xlsx");
+        }
+
+        [Test]
+        public void CFStartsWith()
+        {
+            TestHelper.RunTestExample<CFStartsWith>(@"ConditionalFormatting\CFStartsWith.xlsx");
+        }
+
+        //
+        //[Test]
+        //public void XXX()
+        //{
+        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
+        //}
+        //
+        //[Test]
+        //public void XXX()
+        //{
+        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
+        //}
+        //
+        //[Test]
+        //public void XXX()
+        //{
+        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
+        //}
+        //
+        //[Test]
+        //public void XXX()
+        //{
+        //    TestHelper.RunTestExample<XXX>(@"ConditionalFormatting\XXX.xlsx");
+        //}
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/DeleteTests.cs b/ClosedXML_Tests/Examples/DeleteTests.cs
new file mode 100644
index 0000000..b6e56ee
--- /dev/null
+++ b/ClosedXML_Tests/Examples/DeleteTests.cs
@@ -0,0 +1,21 @@
+using ClosedXML_Examples.Delete;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class DeleteTests
+    {
+        [Test]
+        public void DeleteFewWorksheets()
+        {
+            TestHelper.RunTestExample<DeleteFewWorksheets>(@"Delete\DeleteFewWorksheets.xlsx");
+        }
+
+        [Test]
+        public void RemoveRows()
+        {
+            TestHelper.RunTestExample<DeleteRows>(@"Delete\RemoveRows.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/LoadingTests.cs b/ClosedXML_Tests/Examples/LoadingTests.cs
new file mode 100644
index 0000000..2391d19
--- /dev/null
+++ b/ClosedXML_Tests/Examples/LoadingTests.cs
@@ -0,0 +1,15 @@
+using ClosedXML_Examples;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class LoadingTests
+    {
+        [Test]
+        public void ChangingBasicTable()
+        {
+            TestHelper.RunTestExample<ChangingBasicTable>(@"Loading\ChangingBasicTable.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/MiscTests.cs b/ClosedXML_Tests/Examples/MiscTests.cs
new file mode 100644
index 0000000..2433aab
--- /dev/null
+++ b/ClosedXML_Tests/Examples/MiscTests.cs
@@ -0,0 +1,178 @@
+using ClosedXML_Examples;
+using ClosedXML_Examples.Misc;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class MiscTests
+    {
+        [Test]
+        public void AddingDataSet()
+        {
+            TestHelper.RunTestExample<AddingDataSet>(@"Misc\AddingDataSet.xlsx");
+        }
+
+        [Test]
+        public void AddingDataTableAsWorksheet()
+        {
+            TestHelper.RunTestExample<AddingDataTableAsWorksheet>(@"Misc\AddingDataTableAsWorksheet.xlsx");
+        }
+
+        [Test]
+        public void AdjustToContents()
+        {
+            TestHelper.RunTestExample<AdjustToContents>(@"Misc\AdjustToContents.xlsx");
+        }
+
+        [Test]
+        public void AutoFilter()
+        {
+            TestHelper.RunTestExample<AutoFilter>(@"Misc\AutoFilter.xlsx");
+        }
+
+        [Test]
+        public void BasicTable()
+        {
+            TestHelper.RunTestExample<BasicTable>(@"Misc\BasicTable.xlsx");
+        }
+
+        [Test]
+        public void BlankCells()
+        {
+            TestHelper.RunTestExample<BlankCells>(@"Misc\BlankCells.xlsx");
+        }
+
+        [Test]
+        public void CellValues()
+        {
+            TestHelper.RunTestExample<CellValues>(@"Misc\CellValues.xlsx");
+        }
+
+        [Test]
+        public void Collections()
+        {
+            TestHelper.RunTestExample<Collections>(@"Misc\Collections.xlsx");
+        }
+
+        [Test]
+        public void CopyingRowsAndColumns()
+        {
+            TestHelper.RunTestExample<CopyingRowsAndColumns>(@"Misc\CopyingRowsAndColumns.xlsx");
+        }
+
+        [Test]
+        public void CopyingWorksheets()
+        {
+            TestHelper.RunTestExample<CopyingWorksheets>(@"Misc\CopyingWorksheets.xlsx");
+        }
+
+        [Test]
+        public void DataTypes()
+        {
+            TestHelper.RunTestExample<DataTypes>(@"Misc\DataTypes.xlsx");
+        }
+
+        [Test]
+        public void DataValidation()
+        {
+            TestHelper.RunTestExample<DataValidation>(@"Misc\DataValidation.xlsx");
+        }
+
+        [Test]
+        public void Formulas()
+        {
+            TestHelper.RunTestExample<Formulas>(@"Misc\Formulas.xlsx");
+        }
+
+        [Test]
+        public void FreezePanes()
+        {
+            TestHelper.RunTestExample<FreezePanes>(@"Misc\FreezePanes.xlsx");
+        }
+
+        [Test]
+        public void HideSheets()
+        {
+            TestHelper.RunTestExample<HideSheets>(@"Misc\HideSheets.xlsx");
+        }
+
+        [Test]
+        public void HideUnhide()
+        {
+            TestHelper.RunTestExample<HideUnhide>(@"Misc\HideUnhide.xlsx");
+        }
+
+        [Test]
+        public void Hyperlinks()
+        {
+            TestHelper.RunTestExample<Hyperlinks>(@"Misc\Hyperlinks.xlsx");
+        }
+
+        [Test]
+        public void InsertingData()
+        {
+            TestHelper.RunTestExample<InsertingData>(@"Misc\InsertingData.xlsx");
+        }
+
+        [Test]
+        public void InsertingTables()
+        {
+            TestHelper.RunTestExample<InsertingTables>(@"Misc\InsertingTables.xlsx");
+        }
+
+        [Test]
+        public void LambdaExpressions()
+        {
+            TestHelper.RunTestExample<LambdaExpressions>(@"Misc\LambdaExpressions.xlsx");
+        }
+
+        [Test]
+        public void MergeCells()
+        {
+            TestHelper.RunTestExample<MergeCells>(@"Misc\MergeCells.xlsx");
+        }
+
+        [Test]
+        public void MergeMoves()
+        {
+            TestHelper.RunTestExample<MergeMoves>(@"Misc\MergeMoves.xlsx");
+        }
+
+        [Test]
+        public void Outline()
+        {
+            TestHelper.RunTestExample<Outline>(@"Misc\Outline.xlsx");
+        }
+
+        [Test]
+        public void SheetProtection()
+        {
+            TestHelper.RunTestExample<SheetProtection>(@"Misc\SheetProtection.xlsx");
+        }
+
+        [Test]
+        public void ShiftingFormulas()
+        {
+            TestHelper.RunTestExample<ShiftingFormulas>(@"Misc\ShiftingFormulas.xlsx");
+        }
+
+        [Test]
+        public void ShowCase()
+        {
+            TestHelper.RunTestExample<ShowCase>(@"Misc\ShowCase.xlsx");
+        }
+
+        [Test]
+        public void TabColors()
+        {
+            TestHelper.RunTestExample<TabColors>(@"Misc\TabColors.xlsx");
+        }
+
+        [Test]
+        public void WorkbookProperties()
+        {
+            TestHelper.RunTestExample<WorkbookProperties>(@"Misc\WorkbookProperties.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/PageSetupTests.cs b/ClosedXML_Tests/Examples/PageSetupTests.cs
new file mode 100644
index 0000000..588ef50
--- /dev/null
+++ b/ClosedXML_Tests/Examples/PageSetupTests.cs
@@ -0,0 +1,45 @@
+using ClosedXML_Examples.PageSetup;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class PageSetupTests
+    {
+        [Test]
+        public void HeaderFooters()
+        {
+            TestHelper.RunTestExample<HeaderFooters>(@"PageSetup\HeaderFooters.xlsx");
+        }
+
+        [Test]
+        public void Margins()
+        {
+            TestHelper.RunTestExample<Margins>(@"PageSetup\Margins.xlsx");
+        }
+
+        [Test]
+        public void Page()
+        {
+            TestHelper.RunTestExample<Page>(@"PageSetup\Page.xlsx");
+        }
+
+        [Test]
+        public void SheetTab()
+        {
+            TestHelper.RunTestExample<SheetTab>(@"PageSetup\SheetTab.xlsx");
+        }
+
+        [Test]
+        public void Sheets()
+        {
+            TestHelper.RunTestExample<Sheets>(@"PageSetup\Sheets.xlsx");
+        }
+
+        [Test]
+        public void TwoPages()
+        {
+            TestHelper.RunTestExample<TwoPages>(@"PageSetup\TwoPages.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/RangesTests.cs b/ClosedXML_Tests/Examples/RangesTests.cs
new file mode 100644
index 0000000..07dae9f
--- /dev/null
+++ b/ClosedXML_Tests/Examples/RangesTests.cs
@@ -0,0 +1,113 @@
+using ClosedXML_Examples;
+using ClosedXML_Examples.Misc;
+using ClosedXML_Examples.Ranges;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class RangesTests
+    {
+        [Test]
+        public void ClearingRanges()
+        {
+            TestHelper.RunTestExample<ClearingRanges>(@"Ranges\ClearingRanges.xlsx");
+        }
+
+        [Test]
+        public void CopyingRanges()
+        {
+            TestHelper.RunTestExample<CopyingRanges>(@"Ranges\CopyingRanges.xlsx");
+        }
+
+        [Test]
+        public void CurrentRowColumn()
+        {
+            TestHelper.RunTestExample<CurrentRowColumn>(@"Ranges\CurrentRowColumn.xlsx");
+        }
+
+        [Test]
+        public void DefiningRanges()
+        {
+            TestHelper.RunTestExample<DefiningRanges>(@"Ranges\DefiningRanges.xlsx");
+        }
+
+        [Test]
+        public void DeletingRanges()
+        {
+            TestHelper.RunTestExample<DeletingRanges>(@"Ranges\DeletingRanges.xlsx");
+        }
+
+        [Test]
+        public void InsertingDeletingColumns()
+        {
+            TestHelper.RunTestExample<InsertingDeletingColumns>(@"Ranges\InsertingDeletingColumns.xlsx");
+        }
+
+        [Test]
+        public void InsertingDeletingRows()
+        {
+            TestHelper.RunTestExample<InsertingDeletingRows>(@"Ranges\InsertingDeletingRows.xlsx");
+        }
+
+        [Test]
+        public void MultipleRanges()
+        {
+            TestHelper.RunTestExample<MultipleRanges>(@"Ranges\MultipleRanges.xlsx");
+        }
+
+        [Test]
+        public void NamedRanges()
+        {
+            TestHelper.RunTestExample<NamedRanges>(@"Ranges\NamedRanges.xlsx");
+        }
+
+        [Test]
+        public void SelectingRanges()
+        {
+            TestHelper.RunTestExample<SelectingRanges>(@"Ranges\SelectingRanges.xlsx");
+        }
+
+        [Test]
+        public void ShiftingRanges()
+        {
+            TestHelper.RunTestExample<ShiftingRanges>(@"Ranges\ShiftingRanges.xlsx");
+        }
+
+        [Test]
+        public void SortExample()
+        {
+            TestHelper.RunTestExample<SortExample>(@"Ranges\SortExample.xlsx");
+        }
+
+        [Test]
+        public void Sorting()
+        {
+            TestHelper.RunTestExample<Sorting>(@"Ranges\Sorting.xlsx");
+        }
+
+        [Test]
+        public void TransposeRanges()
+        {
+            TestHelper.RunTestExample<TransposeRanges>(@"Ranges\TransposeRanges.xlsx");
+        }
+
+        [Test]
+        public void TransposeRangesPlus()
+        {
+            TestHelper.RunTestExample<TransposeRangesPlus>(@"Ranges\TransposeRangesPlus.xlsx");
+        }
+
+        [Test]
+        public void UsingTables()
+        {
+            TestHelper.RunTestExample<UsingTables>(@"Ranges\UsingTables.xlsx");
+        }
+
+        [Test]
+        public void WalkingRanges()
+        {
+            TestHelper.RunTestExample<WalkingRanges>(@"Ranges\WalkingRanges.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/RowsTests.cs b/ClosedXML_Tests/Examples/RowsTests.cs
new file mode 100644
index 0000000..917a985
--- /dev/null
+++ b/ClosedXML_Tests/Examples/RowsTests.cs
@@ -0,0 +1,28 @@
+using ClosedXML_Examples;
+using ClosedXML_Examples.Rows;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class RowsTests
+    {
+        [Test]
+        public void RowCells()
+        {
+            TestHelper.RunTestExample<RowCells>(@"Rows\RowCells.xlsx");
+        }
+
+        [Test]
+        public void RowCollection()
+        {
+            TestHelper.RunTestExample<RowCollection>(@"Rows\RowCollection.xlsx");
+        }
+
+        [Test]
+        public void RowSettings()
+        {
+            TestHelper.RunTestExample<RowSettings>(@"Rows\RowSettings.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Examples/StylesTests.cs b/ClosedXML_Tests/Examples/StylesTests.cs
new file mode 100644
index 0000000..77e0bf4
--- /dev/null
+++ b/ClosedXML_Tests/Examples/StylesTests.cs
@@ -0,0 +1,75 @@
+using ClosedXML_Examples.Styles;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Examples
+{
+    [TestFixture]
+    public class StylesTests
+    {
+        [Test]
+        public void DefaultStyles()
+        {
+            TestHelper.RunTestExample<DefaultStyles>(@"Styles\DefaultStyles.xlsx");
+        }
+
+        [Test]
+        public void PurpleWorksheet()
+        {
+            TestHelper.RunTestExample<PurpleWorksheet>(@"Styles\PurpleWorksheet.xlsx");
+        }
+
+        [Test]
+        public void StyleAlignment()
+        {
+            TestHelper.RunTestExample<StyleAlignment>(@"Styles\StyleAlignment.xlsx");
+        }
+
+        [Test]
+        public void StyleBorder()
+        {
+            TestHelper.RunTestExample<StyleBorder>(@"Styles\StyleBorder.xlsx");
+        }
+
+        [Test]
+        public void StyleFill()
+        {
+            TestHelper.RunTestExample<StyleFill>(@"Styles\StyleFill.xlsx");
+        }
+
+        [Test]
+        public void StyleFont()
+        {
+            TestHelper.RunTestExample<StyleFont>(@"Styles\StyleFont.xlsx");
+        }
+
+        [Test]
+        public void StyleNumberFormat()
+        {
+            TestHelper.RunTestExample<StyleNumberFormat>(@"Styles\StyleNumberFormat.xlsx");
+        }
+
+        [Test]
+        public void StyleRowsColumns()
+        {
+            TestHelper.RunTestExample<StyleRowsColumns>(@"Styles\StyleRowsColumns.xlsx");
+        }
+
+        [Test]
+        public void StyleWorksheet()
+        {
+            TestHelper.RunTestExample<StyleWorksheet>(@"Styles\StyleWorksheet.xlsx");
+        }
+
+        [Test]
+        public void UsingColors()
+        {
+            TestHelper.RunTestExample<UsingColors>(@"Styles\UsingColors.xlsx");
+        }
+
+        [Test]
+        public void UsingRichText()
+        {
+            TestHelper.RunTestExample<UsingRichText>(@"Styles\UsingRichText.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs b/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs
new file mode 100644
index 0000000..c4e3e7d
--- /dev/null
+++ b/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class AutoFilterTests
+    {
+        [Test]
+        public void AutoFilterExpandsWithTable()
+        {
+            using (var wb = new XLWorkbook())
+            {
+                using (IXLWorksheet ws = wb.Worksheets.Add("Sheet1"))
+                {
+                    ws.FirstCell().SetValue("Categories")
+                        .CellBelow().SetValue("1")
+                        .CellBelow().SetValue("2");
+
+                    IXLTable table = ws.RangeUsed().CreateTable();
+
+                    var listOfArr = new List<Int32>();
+                    listOfArr.Add(3);
+                    listOfArr.Add(4);
+                    listOfArr.Add(5);
+                    listOfArr.Add(6);
+
+                    table.DataRange.InsertRowsBelow(listOfArr.Count - table.DataRange.RowCount());
+                    table.DataRange.FirstCell().InsertData(listOfArr.AsEnumerable());
+
+                    Assert.AreEqual("A1:A5", table.AutoFilter.Range.RangeAddress.ToStringRelative());
+                }
+            }
+        }
+
+        [Test]
+        public void AutoFilterSortWhenNotInFirstRow()
+        {
+            using (var wb = new XLWorkbook())
+            {
+                using (IXLWorksheet ws = wb.Worksheets.Add("Sheet1"))
+                {
+                    ws.Cell(3, 3).SetValue("Names")
+                        .CellBelow().SetValue("Manuel")
+                        .CellBelow().SetValue("Carlos")
+                        .CellBelow().SetValue("Dominic");
+                    ws.RangeUsed().SetAutoFilter().Sort();
+                    Assert.AreEqual(ws.Cell(4, 3).GetString(), "Carlos");
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/CalcEngine/DateAndTimeTests.cs b/ClosedXML_Tests/Excel/CalcEngine/DateAndTimeTests.cs
new file mode 100644
index 0000000..a5c20dc
--- /dev/null
+++ b/ClosedXML_Tests/Excel/CalcEngine/DateAndTimeTests.cs
@@ -0,0 +1,458 @@
+using System;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.DataValidations
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class DateAndTimeTests
+    {
+        [Test]
+        public void Date()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Date(2008, 1, 1)");
+            Assert.AreEqual(39448, actual);
+        }
+
+        [Test]
+        public void Datevalue()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("DateValue(\"8/22/2008\")");
+            Assert.AreEqual(39682, actual);
+        }
+
+        [Test]
+        public void Day()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Day(\"8/22/2008\")");
+            Assert.AreEqual(22, actual);
+        }
+
+        [Test]
+        public void Days360_Default()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Days360(\"1/30/2008\", \"2/1/2008\")");
+            Assert.AreEqual(1, actual);
+        }
+
+        [Test]
+        public void Days360_Europe1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"1/1/2008\", \"3/31/2008\",TRUE)");
+            Assert.AreEqual(89, actual);
+        }
+
+        [Test]
+        public void Days360_Europe2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"3/31/2008\", \"1/1/2008\",TRUE)");
+            Assert.AreEqual(-89, actual);
+        }
+
+        [Test]
+        public void Days360_US1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"1/1/2008\", \"3/31/2008\",FALSE)");
+            Assert.AreEqual(90, actual);
+        }
+
+        [Test]
+        public void Days360_US2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("DAYS360(\"3/31/2008\", \"1/1/2008\",FALSE)");
+            Assert.AreEqual(-89, actual);
+        }
+
+        [Test]
+        public void EDate_Negative1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/1/2008\", -1)");
+            Assert.AreEqual(new DateTime(2008, 2, 1), actual);
+        }
+
+        [Test]
+        public void EDate_Negative2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/31/2008\", -1)");
+            Assert.AreEqual(new DateTime(2008, 2, 29), actual);
+        }
+
+        [Test]
+        public void EDate_Positive1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/1/2008\", 1)");
+            Assert.AreEqual(new DateTime(2008, 4, 1), actual);
+        }
+
+        [Test]
+        public void EDate_Positive2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("EDate(\"3/31/2008\", 1)");
+            Assert.AreEqual(new DateTime(2008, 4, 30), actual);
+        }
+
+        [Test]
+        public void EOMonth_Negative()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("EOMonth(\"3/1/2008\", -1)");
+            Assert.AreEqual(new DateTime(2008, 2, 29), actual);
+        }
+
+        [Test]
+        public void EOMonth_Positive()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("EOMonth(\"3/31/2008\", 1)");
+            Assert.AreEqual(new DateTime(2008, 4, 30), actual);
+        }
+
+        [Test]
+        public void Hour()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Hour(\"8/22/2008 3:30:45 PM\")");
+            Assert.AreEqual(15, actual);
+        }
+
+        [Test]
+        public void Minute()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Minute(\"8/22/2008 3:30:45 AM\")");
+            Assert.AreEqual(30, actual);
+        }
+
+        [Test]
+        public void Month()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Month(\"8/22/2008\")");
+            Assert.AreEqual(8, actual);
+        }
+
+        [Test]
+        public void Networkdays_MultipleHolidaysGiven()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Date")
+                .CellBelow().SetValue(new DateTime(2008, 10, 1))
+                .CellBelow().SetValue(new DateTime(2009, 3, 1))
+                .CellBelow().SetValue(new DateTime(2008, 11, 26))
+                .CellBelow().SetValue(new DateTime(2008, 12, 4))
+                .CellBelow().SetValue(new DateTime(2009, 1, 21));
+            Object actual = ws.Evaluate("Networkdays(A2,A3,A4:A6)");
+            Assert.AreEqual(105, actual);
+        }
+
+        [Test]
+        public void Networkdays_NoHolidaysGiven()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Networkdays(\"10/01/2008\", \"3/01/2009\")");
+            Assert.AreEqual(108, actual);
+        }
+
+        [Test]
+        public void Networkdays_OneHolidaysGiven()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Networkdays(\"10/01/2008\", \"3/01/2009\", \"11/26/2008\")");
+            Assert.AreEqual(107, actual);
+        }
+
+        [Test]
+        public void Second()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Second(\"8/22/2008 3:30:45 AM\")");
+            Assert.AreEqual(45, actual);
+        }
+
+        [Test]
+        public void Time()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Time(1,2,3)");
+            Assert.AreEqual(new TimeSpan(1, 2, 3), actual);
+        }
+
+        [Test]
+        public void TimeValue1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("TimeValue(\"2:24 AM\")");
+            Assert.IsTrue(XLHelper.AreEqual(0.1, (double) actual));
+        }
+
+        [Test]
+        public void TimeValue2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("TimeValue(\"22-Aug-2008 6:35 AM\")");
+            Assert.IsTrue(XLHelper.AreEqual(0.27430555555555558, (double) actual));
+        }
+
+        [Test]
+        public void Today()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Today()");
+            Assert.AreEqual(DateTime.Now.Date, actual);
+        }
+
+        [Test]
+        public void Weekday_1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\", 1)");
+            Assert.AreEqual(5, actual);
+        }
+
+        [Test]
+        public void Weekday_2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\", 2)");
+            Assert.AreEqual(4, actual);
+        }
+
+        [Test]
+        public void Weekday_3()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\", 3)");
+            Assert.AreEqual(3, actual);
+        }
+
+        [Test]
+        public void Weekday_Omitted()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Weekday(\"2/14/2008\")");
+            Assert.AreEqual(5, actual);
+        }
+
+        [Test]
+        public void Weeknum_1()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2000\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_10()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2004\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_11()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2005\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_12()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2005\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_13()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2006\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_14()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2006\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_15()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2007\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_16()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2007\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_17()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2008\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_18()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2008\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_19()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2009\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_2()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2000\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_20()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2009\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_3()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2001\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_4()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2001\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_5()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2002\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_6()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2002\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_7()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2003\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_8()
+        {
+            Assert.AreEqual(10, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2003\", 2)"));
+        }
+
+        [Test]
+        public void Weeknum_9()
+        {
+            Assert.AreEqual(11, XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2004\", 1)"));
+        }
+
+        [Test]
+        public void Weeknum_Default()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Weeknum(\"3/9/2008\")");
+            Assert.AreEqual(11, actual);
+        }
+
+        [Test]
+        public void Workdays_MultipleHolidaysGiven()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Date")
+                .CellBelow().SetValue(new DateTime(2008, 10, 1))
+                .CellBelow().SetValue(151)
+                .CellBelow().SetValue(new DateTime(2008, 11, 26))
+                .CellBelow().SetValue(new DateTime(2008, 12, 4))
+                .CellBelow().SetValue(new DateTime(2009, 1, 21));
+            Object actual = ws.Evaluate("Workday(A2,A3,A4:A6)");
+            Assert.AreEqual(new DateTime(2009, 5, 5), actual);
+        }
+
+
+        [Test]
+        public void Workdays_NoHolidaysGiven()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Workday(\"10/01/2008\", 151)");
+            Assert.AreEqual(new DateTime(2009, 4, 30), actual);
+        }
+
+        [Test]
+        public void Workdays_OneHolidaysGiven()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Workday(\"10/01/2008\", 152, \"11/26/2008\")");
+            Assert.AreEqual(new DateTime(2009, 5, 4), actual);
+        }
+
+        [Test]
+        public void Year()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Year(\"8/22/2008\")");
+            Assert.AreEqual(2008, actual);
+        }
+
+        [Test]
+        public void Yearfrac_1_base0()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",0)");
+            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_1_base1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",1)");
+            Assert.IsTrue(XLHelper.AreEqual(0.24590163934426229, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_1_base2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",2)");
+            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_1_base3()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",3)");
+            Assert.IsTrue(XLHelper.AreEqual(0.24657534246575341, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_1_base4()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2008\",4)");
+            Assert.IsTrue(XLHelper.AreEqual(0.24722222222222223, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_2_base0()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",0)");
+            Assert.IsTrue(XLHelper.AreEqual(5.25, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_2_base1()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",1)");
+            Assert.IsTrue(XLHelper.AreEqual(5.24452554744526, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_2_base2()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",2)");
+            Assert.IsTrue(XLHelper.AreEqual(5.32222222222222, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_2_base3()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",3)");
+            Assert.IsTrue(XLHelper.AreEqual(5.24931506849315, (double) actual));
+        }
+
+        [Test]
+        public void Yearfrac_2_base4()
+        {
+            Object actual = XLWorkbook.EvaluateExpr("Yearfrac(\"1/1/2008\", \"3/31/2013\",4)");
+            Assert.IsTrue(XLHelper.AreEqual(5.24722222222222, (double) actual));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/CalcEngine/FunctionsTests.cs b/ClosedXML_Tests/Excel/CalcEngine/FunctionsTests.cs
new file mode 100644
index 0000000..f43aa6a
--- /dev/null
+++ b/ClosedXML_Tests/Excel/CalcEngine/FunctionsTests.cs
@@ -0,0 +1,622 @@
+using System;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.CalcEngine
+{
+
+    [TestFixture]
+    public class FunctionsTests
+    {
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            // Make sure tests run on a deterministic culture
+            System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
+        }
+
+        [Test]
+        public void Asc()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Asc(""Text"")");
+            Assert.AreEqual("Text", actual);
+        }
+
+        [Test]
+        public void Clean()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(String.Format(@"Clean(""A{0}B"")", Environment.NewLine));
+            Assert.AreEqual("AB", actual);
+        }
+
+        [Test]
+        public void Combin()
+        {
+            object actual1 = XLWorkbook.EvaluateExpr("Combin(200, 2)");
+            Assert.AreEqual(19900.0, actual1);
+
+            object actual2 = XLWorkbook.EvaluateExpr("Combin(20.1, 2.9)");
+            Assert.AreEqual(190.0, actual2);
+        }
+
+        [Test]
+        public void Degrees()
+        {
+            object actual1 = XLWorkbook.EvaluateExpr("Degrees(180)");
+            Assert.IsTrue(Math.PI - (double) actual1 < XLHelper.Epsilon);
+        }
+
+        [Test]
+        public void Dollar()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Dollar(12345.123)");
+            Assert.AreEqual(TestHelper.CurrencySymbol + "12,345.12", actual);
+
+            actual = XLWorkbook.EvaluateExpr("Dollar(12345.123, 1)");
+            Assert.AreEqual(TestHelper.CurrencySymbol + "12,345.1", actual);
+        }
+
+        [Test]
+        public void Even()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Even(3)");
+            Assert.AreEqual(4, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Even(2)");
+            Assert.AreEqual(2, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Even(-1)");
+            Assert.AreEqual(-2, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Even(-2)");
+            Assert.AreEqual(-2, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Even(0)");
+            Assert.AreEqual(0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Even(1.5)");
+            Assert.AreEqual(2, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Even(2.01)");
+            Assert.AreEqual(4, actual);
+        }
+
+        [Test]
+        public void Exact()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr("Exact(\"A\", \"A\")");
+            Assert.AreEqual(true, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Exact(\"A\", \"a\")");
+            Assert.AreEqual(false, actual);
+        }
+
+        [Test]
+        public void Fact()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Fact(5.9)");
+            Assert.AreEqual(120.0, actual);
+        }
+
+        [Test]
+        public void FactDouble()
+        {
+            object actual1 = XLWorkbook.EvaluateExpr("FactDouble(6)");
+            Assert.AreEqual(48.0, actual1);
+            object actual2 = XLWorkbook.EvaluateExpr("FactDouble(7)");
+            Assert.AreEqual(105.0, actual2);
+        }
+
+        [Test]
+        public void Fixed()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr("Fixed(12345.123)");
+            Assert.AreEqual("12,345.12", actual);
+
+            actual = XLWorkbook.EvaluateExpr("Fixed(12345.123, 1)");
+            Assert.AreEqual("12,345.1", actual);
+
+            actual = XLWorkbook.EvaluateExpr("Fixed(12345.123, 1, FALSE)");
+            Assert.AreEqual("12345.1", actual);
+        }
+
+        [Test]
+        public void Formula_from_another_sheet()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws1 = wb.AddWorksheet("ws1");
+            ws1.FirstCell().SetValue(1).CellRight().SetFormulaA1("A1 + 1");
+            IXLWorksheet ws2 = wb.AddWorksheet("ws2");
+            ws2.FirstCell().SetFormulaA1("ws1!B1 + 1");
+            object v = ws2.FirstCell().Value;
+            Assert.AreEqual(3.0, v);
+        }
+
+        [Test]
+        public void Gcd()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Gcd(24, 36)");
+            Assert.AreEqual(12, actual);
+
+            object actual1 = XLWorkbook.EvaluateExpr("Gcd(5, 0)");
+            Assert.AreEqual(5, actual1);
+
+            object actual2 = XLWorkbook.EvaluateExpr("Gcd(0, 5)");
+            Assert.AreEqual(5, actual2);
+
+            object actual3 = XLWorkbook.EvaluateExpr("Gcd(240, 360, 30)");
+            Assert.AreEqual(30, actual3);
+        }
+
+        [Test]
+        public void Lcm()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Lcm(24, 36)");
+            Assert.AreEqual(72, actual);
+
+            object actual1 = XLWorkbook.EvaluateExpr("Lcm(5, 0)");
+            Assert.AreEqual(0, actual1);
+
+            object actual2 = XLWorkbook.EvaluateExpr("Lcm(0, 5)");
+            Assert.AreEqual(0, actual2);
+
+            object actual3 = XLWorkbook.EvaluateExpr("Lcm(240, 360, 30)");
+            Assert.AreEqual(720, actual3);
+        }
+
+        [Test]
+        public void MDetem()
+        {
+            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
+            ws.Cell("A1").SetValue(2).CellRight().SetValue(4);
+            ws.Cell("A2").SetValue(3).CellRight().SetValue(5);
+
+
+            Object actual;
+
+            ws.Cell("A5").FormulaA1 = "MDeterm(A1:B2)";
+            actual = ws.Cell("A5").Value;
+
+            Assert.IsTrue(XLHelper.AreEqual(-2.0, (double) actual));
+
+            ws.Cell("A6").FormulaA1 = "Sum(A5)";
+            actual = ws.Cell("A6").Value;
+
+            Assert.IsTrue(XLHelper.AreEqual(-2.0, (double) actual));
+
+            ws.Cell("A7").FormulaA1 = "Sum(MDeterm(A1:B2))";
+            actual = ws.Cell("A7").Value;
+
+            Assert.IsTrue(XLHelper.AreEqual(-2.0, (double) actual));
+        }
+
+        [Test]
+        public void MInverse()
+        {
+            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
+            ws.Cell("A1").SetValue(1).CellRight().SetValue(2).CellRight().SetValue(1);
+            ws.Cell("A2").SetValue(3).CellRight().SetValue(4).CellRight().SetValue(-1);
+            ws.Cell("A3").SetValue(0).CellRight().SetValue(2).CellRight().SetValue(0);
+
+
+            Object actual;
+
+            ws.Cell("A5").FormulaA1 = "MInverse(A1:C3)";
+            actual = ws.Cell("A5").Value;
+
+            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
+
+            ws.Cell("A6").FormulaA1 = "Sum(A5)";
+            actual = ws.Cell("A6").Value;
+
+            Assert.IsTrue(XLHelper.AreEqual(0.25, (double) actual));
+
+            ws.Cell("A7").FormulaA1 = "Sum(MInverse(A1:C3))";
+            actual = ws.Cell("A7").Value;
+
+            Assert.IsTrue(XLHelper.AreEqual(0.5, (double) actual));
+        }
+
+        [Test]
+        public void MMult()
+        {
+            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
+            ws.Cell("A1").SetValue(2).CellRight().SetValue(4);
+            ws.Cell("A2").SetValue(3).CellRight().SetValue(5);
+            ws.Cell("A3").SetValue(2).CellRight().SetValue(4);
+            ws.Cell("A4").SetValue(3).CellRight().SetValue(5);
+
+            Object actual;
+
+            ws.Cell("A5").FormulaA1 = "MMult(A1:B2, A3:B4)";
+            actual = ws.Cell("A5").Value;
+
+            Assert.AreEqual(16.0, actual);
+
+            ws.Cell("A6").FormulaA1 = "Sum(A5)";
+            actual = ws.Cell("A6").Value;
+
+            Assert.AreEqual(16.0, actual);
+
+            ws.Cell("A7").FormulaA1 = "Sum(MMult(A1:B2, A3:B4))";
+            actual = ws.Cell("A7").Value;
+
+            Assert.AreEqual(102.0, actual);
+        }
+
+        [Test]
+        public void MRound()
+        {
+            object actual = XLWorkbook.EvaluateExpr("MRound(10, 3)");
+            Assert.AreEqual(9m, actual);
+
+            object actual3 = XLWorkbook.EvaluateExpr("MRound(10.5, 3)");
+            Assert.AreEqual(12m, actual3);
+
+            object actual4 = XLWorkbook.EvaluateExpr("MRound(10.4, 3)");
+            Assert.AreEqual(9m, actual4);
+
+            object actual1 = XLWorkbook.EvaluateExpr("MRound(-10, -3)");
+            Assert.AreEqual(-9m, actual1);
+
+            object actual2 = XLWorkbook.EvaluateExpr("MRound(1.3, 0.2)");
+            Assert.AreEqual(1.4m, actual2);
+        }
+
+        [Test]
+        public void Mod()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Mod(3, 2)");
+            Assert.AreEqual(1, actual);
+
+            object actual1 = XLWorkbook.EvaluateExpr("Mod(-3, 2)");
+            Assert.AreEqual(1, actual1);
+
+            object actual2 = XLWorkbook.EvaluateExpr("Mod(3, -2)");
+            Assert.AreEqual(-1, actual2);
+
+            object actual3 = XLWorkbook.EvaluateExpr("Mod(-3, -2)");
+            Assert.AreEqual(-1, actual3);
+        }
+
+        [Test]
+        public void Multinomial()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Multinomial(2,3,4)");
+            Assert.AreEqual(1260.0, actual);
+        }
+
+        [Test]
+        public void Odd()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Odd(1.5)");
+            Assert.AreEqual(3, actual);
+
+            object actual1 = XLWorkbook.EvaluateExpr("Odd(3)");
+            Assert.AreEqual(3, actual1);
+
+            object actual2 = XLWorkbook.EvaluateExpr("Odd(2)");
+            Assert.AreEqual(3, actual2);
+
+            object actual3 = XLWorkbook.EvaluateExpr("Odd(-1)");
+            Assert.AreEqual(-1, actual3);
+
+            object actual4 = XLWorkbook.EvaluateExpr("Odd(-2)");
+            Assert.AreEqual(-3, actual4);
+
+            actual = XLWorkbook.EvaluateExpr("Odd(0)");
+            Assert.AreEqual(1, actual);
+        }
+
+        [Test]
+        public void Product()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Product(2,3,4)");
+            Assert.AreEqual(24.0, actual);
+        }
+
+        [Test]
+        public void Quotient()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Quotient(5,2)");
+            Assert.AreEqual(2, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Quotient(4.5,3.1)");
+            Assert.AreEqual(1, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Quotient(-10,3)");
+            Assert.AreEqual(-3, actual);
+        }
+
+        [Test]
+        public void Radians()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Radians(270)");
+            Assert.IsTrue(Math.Abs(4.71238898038469 - (double) actual) < XLHelper.Epsilon);
+        }
+
+        [Test]
+        public void Roman()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Roman(3046, 1)");
+            Assert.AreEqual("MMMXLVI", actual);
+
+            actual = XLWorkbook.EvaluateExpr("Roman(270)");
+            Assert.AreEqual("CCLXX", actual);
+
+            actual = XLWorkbook.EvaluateExpr("Roman(3999, true)");
+            Assert.AreEqual("MMMCMXCIX", actual);
+        }
+
+        [Test]
+        public void Round()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Round(2.15, 1)");
+            Assert.AreEqual(2.2, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Round(2.149, 1)");
+            Assert.AreEqual(2.1, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Round(-1.475, 2)");
+            Assert.AreEqual(-1.48, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Round(21.5, -1)");
+            Assert.AreEqual(20.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Round(626.3, -3)");
+            Assert.AreEqual(1000.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Round(1.98, -1)");
+            Assert.AreEqual(0.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("Round(-50.55, -2)");
+            Assert.AreEqual(-100.0, actual);
+        }
+
+        [Test]
+        public void RoundDown()
+        {
+            object actual = XLWorkbook.EvaluateExpr("RoundDown(3.2, 0)");
+            Assert.AreEqual(3.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundDown(76.9, 0)");
+            Assert.AreEqual(76.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundDown(3.14159, 3)");
+            Assert.AreEqual(3.141, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundDown(-3.14159, 1)");
+            Assert.AreEqual(-3.1, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundDown(31415.92654, -2)");
+            Assert.AreEqual(31400.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundDown(0, 3)");
+            Assert.AreEqual(0.0, actual);
+        }
+
+        [Test]
+        public void RoundUp()
+        {
+            object actual = XLWorkbook.EvaluateExpr("RoundUp(3.2, 0)");
+            Assert.AreEqual(4.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundUp(76.9, 0)");
+            Assert.AreEqual(77.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundUp(3.14159, 3)");
+            Assert.AreEqual(3.142, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundUp(-3.14159, 1)");
+            Assert.AreEqual(-3.2, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundUp(31415.92654, -2)");
+            Assert.AreEqual(31500.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr("RoundUp(0, 3)");
+            Assert.AreEqual(0.0, actual);
+        }
+
+        [Test]
+        public void SeriesSum()
+        {
+            object actual = XLWorkbook.EvaluateExpr("SERIESSUM(2,3,4,5)");
+            Assert.AreEqual(40.0, actual);
+
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.Cell("A2").FormulaA1 = "PI()/4";
+            ws.Cell("A3").Value = 1;
+            ws.Cell("A4").FormulaA1 = "-1/FACT(2)";
+            ws.Cell("A5").FormulaA1 = "1/FACT(4)";
+            ws.Cell("A6").FormulaA1 = "-1/FACT(6)";
+
+            actual = ws.Evaluate("SERIESSUM(A2,0,2,A3:A6)");
+            Assert.IsTrue(Math.Abs(0.70710321482284566 - (double) actual) < XLHelper.Epsilon);
+        }
+
+        [Test]
+        public void SqrtPi()
+        {
+            object actual = XLWorkbook.EvaluateExpr("SqrtPi(1)");
+            Assert.IsTrue(Math.Abs(1.7724538509055159 - (double) actual) < XLHelper.Epsilon);
+
+            actual = XLWorkbook.EvaluateExpr("SqrtPi(2)");
+            Assert.IsTrue(Math.Abs(2.5066282746310002 - (double) actual) < XLHelper.Epsilon);
+        }
+
+        [Test]
+        public void SubtotalAverage()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Subtotal(1,2,3)");
+            Assert.AreEqual(2.5, actual);
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(1,""A"",3, 2)");
+            Assert.AreEqual(2.5, actual);
+        }
+
+        [Test]
+        public void SubtotalCount()
+        {
+            object actual = XLWorkbook.EvaluateExpr("Subtotal(2,2,3)");
+            Assert.AreEqual(2.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(2,""A"",3)");
+            Assert.AreEqual(2.0, actual);
+        }
+
+        [Test]
+        public void SubtotalCountA()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr("Subtotal(3,2,3)");
+            Assert.AreEqual(2.0, actual);
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(3,"""",3)");
+            Assert.AreEqual(1.0, actual);
+        }
+
+        [Test]
+        public void SubtotalMax()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(4,2,3,""A"")");
+            Assert.AreEqual(3.0, actual);
+        }
+
+        [Test]
+        public void SubtotalMin()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(5,2,3,""A"")");
+            Assert.AreEqual(2.0, actual);
+        }
+
+        [Test]
+        public void SubtotalProduct()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(6,2,3,""A"")");
+            Assert.AreEqual(6.0, actual);
+        }
+
+        [Test]
+        public void SubtotalStDev()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(7,2,3,""A"")");
+            Assert.IsTrue(Math.Abs(0.70710678118654757 - (double) actual) < XLHelper.Epsilon);
+        }
+
+        [Test]
+        public void SubtotalStDevP()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(8,2,3,""A"")");
+            Assert.AreEqual(0.5, actual);
+        }
+
+        [Test]
+        public void SubtotalSum()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(9,2,3,""A"")");
+            Assert.AreEqual(5.0, actual);
+        }
+
+        [Test]
+        public void SubtotalVar()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(10,2,3,""A"")");
+            Assert.IsTrue(Math.Abs(0.5 - (double) actual) < XLHelper.Epsilon);
+        }
+
+        [Test]
+        public void SubtotalVarP()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"Subtotal(11,2,3,""A"")");
+            Assert.AreEqual(0.25, actual);
+        }
+
+        [Test]
+        public void Sum()
+        {
+            IXLCell cell = new XLWorkbook().AddWorksheet("Sheet1").FirstCell();
+            IXLCell fCell = cell.SetValue(1).CellBelow().SetValue(2).CellBelow();
+            fCell.FormulaA1 = "sum(A1:A2)";
+
+            Assert.AreEqual(3.0, fCell.Value);
+        }
+
+        [Test]
+        public void SumSq()
+        {
+            Object actual;
+
+            actual = XLWorkbook.EvaluateExpr(@"SumSq(3,4)");
+            Assert.AreEqual(25.0, actual);
+        }
+
+        [Test]
+        public void TextConcat()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.Cell("A1").Value = 1;
+            ws.Cell("A2").Value = 1;
+            ws.Cell("B1").Value = 1;
+            ws.Cell("B2").Value = 1;
+
+            ws.Cell("C1").FormulaA1 = "\"The total value is: \" & SUM(A1:B2)";
+
+            object r = ws.Cell("C1").Value;
+            Assert.AreEqual("The total value is: 4", r.ToString());
+        }
+
+        [Test]
+        public void Trim()
+        {
+            Assert.AreEqual("Test", XLWorkbook.EvaluateExpr("Trim(\"Test    \")"));
+
+            //Should not trim non breaking space
+            //See http://office.microsoft.com/en-us/excel-help/trim-function-HP010062581.aspx
+            Assert.AreEqual("Test\u00A0", XLWorkbook.EvaluateExpr("Trim(\"Test\u00A0 \")"));
+        }
+
+        [Test]
+        public void TestEmptyTallyOperations()
+        {
+            //In these test no values have been set
+            XLWorkbook wb = new XLWorkbook();
+            wb.Worksheets.Add("TallyTests");
+            var cell = wb.Worksheet(1).Cell(1, 1).SetFormulaA1("=MAX(D1,D2)");
+            Assert.AreEqual(0, cell.Value); 
+            cell = wb.Worksheet(1).Cell(2, 1).SetFormulaA1("=MIN(D1,D2)");
+            Assert.AreEqual(0, cell.Value);
+            cell = wb.Worksheet(1).Cell(3, 1).SetFormulaA1("=SUM(D1,D2)");
+            Assert.AreEqual(0, cell.Value);
+            cell = wb.Worksheet(1).Cell(3, 1).SetFormulaA1("=AVERAGE(D1,D2)");
+            Assert.AreEqual(0, cell.Value);
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/CalcEngine/IsTests.cs b/ClosedXML_Tests/Excel/CalcEngine/IsTests.cs
new file mode 100644
index 0000000..2d98c68
--- /dev/null
+++ b/ClosedXML_Tests/Excel/CalcEngine/IsTests.cs
@@ -0,0 +1,28 @@
+using System;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.CalcEngine
+{
+
+    [TestFixture]
+    public class IsTests
+    {
+        [Test]
+        public void IsBlank_true()
+        {
+            var ws = new XLWorkbook().AddWorksheet("Sheet");
+            var actual = ws.Evaluate("=IsBlank(A1)");
+            Assert.AreEqual(true, actual);
+        }
+
+        [Test]
+        public void IsBlank_false()
+        {
+            var ws = new XLWorkbook().AddWorksheet("Sheet");
+            ws.Cell("A1").Value = " ";
+            var actual = ws.Evaluate("=IsBlank(A1)");
+            Assert.AreEqual(false, actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/CalcEngine/LogicalTests.cs b/ClosedXML_Tests/Excel/CalcEngine/LogicalTests.cs
new file mode 100644
index 0000000..c3aeee4
--- /dev/null
+++ b/ClosedXML_Tests/Excel/CalcEngine/LogicalTests.cs
@@ -0,0 +1,37 @@
+using System;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.CalcEngine
+{
+
+    [TestFixture]
+    public class LogicalTests
+    {
+        [Test]
+        public void If_2_Params_true()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 1, ""T"")");
+            Assert.AreEqual("T", actual);
+        }
+        [Test]
+        public void If_2_Params_false()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 2, ""T"")");
+            Assert.AreEqual(false, actual);
+        }
+
+        [Test]
+        public void If_3_Params_true()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 1, ""T"", ""F"")");
+            Assert.AreEqual("T", actual);
+        }
+        [Test]
+        public void If_3_Params_false()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"if(1 = 2, ""T"", ""F"")");
+            Assert.AreEqual("F", actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs b/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
new file mode 100644
index 0000000..ebb55e9
--- /dev/null
+++ b/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
@@ -0,0 +1,96 @@
+using System;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.CalcEngine
+{
+    [TestFixture]
+    public class TextTests
+    {
+        [Test]
+        public void Left_Default()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Left(""ABC"")");
+            Assert.AreEqual("A", actual);
+        }
+
+        [Test]
+        public void Left_Value()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Left(""ABC"", 2)");
+            Assert.AreEqual("AB", actual);
+        }
+
+        [Test]
+        public void Left_BiggerThanLength()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Left(""ABC"", 5)");
+            Assert.AreEqual("ABC", actual);
+        }
+
+        [Test]
+        public void Left_Empty()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Left("""")");
+            Assert.AreEqual("", actual);
+        }
+
+        [Test]
+        public void Right_Default()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Right(""ABC"")");
+            Assert.AreEqual("C", actual);
+        }
+
+        [Test]
+        public void Right_Value()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Right(""ABC"", 2)");
+            Assert.AreEqual("BC", actual);
+        }
+
+        [Test]
+        public void Right_BiggerThanLength()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Right(""ABC"", 5)");
+            Assert.AreEqual("ABC", actual);
+        }
+
+        [Test]
+        public void Right_Empty()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Right("""")");
+            Assert.AreEqual("", actual);
+        }
+
+
+        
+        [Test]
+        public void Mid_Value()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Mid(""ABC"", 2, 2)");
+            Assert.AreEqual("BC", actual);
+        }
+
+        [Test]
+        public void Mid_BiggerThanLength()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Mid(""ABC"", 1, 5)");
+            Assert.AreEqual("ABC", actual);
+        }
+
+        [Test]
+        public void Mid_StartAfter()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Mid(""ABC"", 5, 5)");
+            Assert.AreEqual("", actual);
+        }
+
+        [Test]
+        public void Mid_Empty()
+        {
+            Object actual = XLWorkbook.EvaluateExpr(@"Mid("""", 1, 1)");
+            Assert.AreEqual("", actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/CalcEngine/XLMathTests.cs b/ClosedXML_Tests/Excel/CalcEngine/XLMathTests.cs
new file mode 100644
index 0000000..aaade5c
--- /dev/null
+++ b/ClosedXML_Tests/Excel/CalcEngine/XLMathTests.cs
@@ -0,0 +1,26 @@
+using ClosedXML.Excel.CalcEngine.Functions;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.CalcEngine
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class XLMathTests
+    {
+        [Test]
+        public void IsEven()
+        {
+            Assert.IsTrue(XLMath.IsEven(2));
+            Assert.IsFalse(XLMath.IsEven(3));
+        }
+
+        [Test]
+        public void IsOdd()
+        {
+            Assert.IsTrue(XLMath.IsOdd(3));
+            Assert.IsFalse(XLMath.IsOdd(2));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Cells/XLCellTests.cs b/ClosedXML_Tests/Excel/Cells/XLCellTests.cs
new file mode 100644
index 0000000..408d16e
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Cells/XLCellTests.cs
@@ -0,0 +1,331 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class XLCellTests
+    {
+        [Test]
+        public void CellsUsed()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            ws.Cell(1, 1);
+            ws.Cell(2, 2);
+            int count = ws.Range("A1:B2").CellsUsed().Count();
+            Assert.AreEqual(0, count);
+        }
+
+        [Test]
+        public void CellsUsedIncludeStyles1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            ws.Row(3).Style.Fill.BackgroundColor = XLColor.Red;
+            ws.Column(3).Style.Fill.BackgroundColor = XLColor.Red;
+            ws.Cell(2, 2).Value = "ASDF";
+            var range = ws.RangeUsed(true).RangeAddress.ToString();
+            Assert.AreEqual("B2:C3", range);
+        }
+
+        [Test]
+        public void CellsUsedIncludeStyles2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            ws.Row(2).Style.Fill.BackgroundColor = XLColor.Red;
+            ws.Column(2).Style.Fill.BackgroundColor = XLColor.Red;
+            ws.Cell(3, 3).Value = "ASDF";
+            var range = ws.RangeUsed(true).RangeAddress.ToString();
+            Assert.AreEqual("B2:C3", range);
+        }
+
+        [Test]
+        public void CellsUsedIncludeStyles3()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            var range = ws.RangeUsed(true);
+            Assert.AreEqual(null, range);
+        }
+
+        [Test]
+        public void Double_Infinity_is_a_string()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell("A1");
+            var doubleList = new List<Double> {1.0/0.0};
+
+            cell.Value = doubleList.AsEnumerable();
+            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
+        }
+
+        [Test]
+        public void Double_NaN_is_a_string()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell("A1");
+            var doubleList = new List<Double> {0.0/0.0};
+
+            cell.Value = doubleList.AsEnumerable();
+            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
+        }
+
+        [Test]
+        public void InsertData1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRange range = ws.Cell(2, 2).InsertData(new[] {"a", "b", "c"});
+            Assert.AreEqual("'Sheet1'!B2:B4", range.ToString());
+        }
+
+        [Test]
+        public void IsEmpty1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            bool actual = cell.IsEmpty();
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            bool actual = cell.IsEmpty(true);
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty3()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Style.Fill.BackgroundColor = XLColor.Red;
+            bool actual = cell.IsEmpty();
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty4()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Style.Fill.BackgroundColor = XLColor.Red;
+            bool actual = cell.IsEmpty(false);
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty5()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Style.Fill.BackgroundColor = XLColor.Red;
+            bool actual = cell.IsEmpty(true);
+            bool expected = false;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty6()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Value = "X";
+            bool actual = cell.IsEmpty();
+            bool expected = false;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void NaN_is_not_a_number()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell("A1");
+            cell.Value = "NaN";
+
+            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
+        }
+
+        [Test]
+        public void Nan_is_not_a_number()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell("A1");
+            cell.Value = "Nan";
+
+            Assert.AreNotEqual(XLCellValues.Number, cell.DataType);
+        }
+
+        [Test]
+        public void TryGetValue_Boolean_Bad()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            Boolean outValue;
+            IXLCell cell = ws.Cell("A1").SetValue("ABC");
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsFalse(success);
+        }
+
+        [Test]
+        public void TryGetValue_Boolean_False()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            Boolean outValue;
+            IXLCell cell = ws.Cell("A1").SetValue(false);
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.IsFalse(outValue);
+        }
+
+        [Test]
+        public void TryGetValue_Boolean_Good()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            Boolean outValue;
+            IXLCell cell = ws.Cell("A1").SetValue("True");
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.IsTrue(outValue);
+        }
+
+        [Test]
+        public void TryGetValue_Boolean_True()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            Boolean outValue;
+            IXLCell cell = ws.Cell("A1").SetValue(true);
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.IsTrue(outValue);
+        }
+
+        [Test]
+        public void TryGetValue_RichText_Bad()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText outValue;
+            IXLCell cell = ws.Cell("A1").SetValue("Anything");
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.AreEqual(cell.RichText, outValue);
+            Assert.AreEqual("Anything", outValue.ToString());
+        }
+
+        [Test]
+        public void TryGetValue_RichText_Good()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText outValue;
+            IXLCell cell = ws.Cell("A1");
+            cell.RichText.AddText("Anything");
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.AreEqual(cell.RichText, outValue);
+        }
+
+        [Test]
+        public void TryGetValue_TimeSpan_BadString()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            TimeSpan outValue;
+            string timeSpan = "ABC";
+            bool success = ws.Cell("A1").SetValue(timeSpan).TryGetValue(out outValue);
+            Assert.IsFalse(success);
+        }
+
+        [Test]
+        public void TryGetValue_TimeSpan_Good()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            TimeSpan outValue;
+            var timeSpan = new TimeSpan(1, 1, 1);
+            bool success = ws.Cell("A1").SetValue(timeSpan).TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.AreEqual(timeSpan, outValue);
+        }
+
+        [Test]
+        public void TryGetValue_TimeSpan_GoodString()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            TimeSpan outValue;
+            var timeSpan = new TimeSpan(1, 1, 1);
+            bool success = ws.Cell("A1").SetValue(timeSpan.ToString()).TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.AreEqual(timeSpan, outValue);
+        }
+
+        [Test]
+        public void TryGetValue_sbyte_Bad()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            sbyte outValue;
+            IXLCell cell = ws.Cell("A1").SetValue(255);
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsFalse(success);
+        }
+
+        [Test]
+        public void TryGetValue_sbyte_Bad2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            sbyte outValue;
+            IXLCell cell = ws.Cell("A1").SetValue("255");
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsFalse(success);
+        }
+
+        [Test]
+        public void TryGetValue_sbyte_Good()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            sbyte outValue;
+            IXLCell cell = ws.Cell("A1").SetValue(5);
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.AreEqual(5, outValue);
+        }
+
+        [Test]
+        public void TryGetValue_sbyte_Good2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            sbyte outValue;
+            IXLCell cell = ws.Cell("A1").SetValue("5");
+            bool success = cell.TryGetValue(out outValue);
+            Assert.IsTrue(success);
+            Assert.AreEqual(5, outValue);
+        }
+
+        [Test]
+        public void ValueSetToEmptyString()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Value = new DateTime(2000, 1, 2);
+            cell.Value = String.Empty;
+            string actual = cell.GetString();
+            string expected = String.Empty;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void ValueSetToNull()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Value = new DateTime(2000, 1, 2);
+            cell.Value = null;
+            string actual = cell.GetString();
+            string expected = String.Empty;
+            Assert.AreEqual(expected, actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Columns/ColumnTests.cs b/ClosedXML_Tests/Excel/Columns/ColumnTests.cs
new file mode 100644
index 0000000..0a98c4f
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Columns/ColumnTests.cs
@@ -0,0 +1,240 @@
+using System;
+using System.IO;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class ColumnTests
+    {
+        [Test]
+        public void ColumnUsed()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(2, 1).SetValue("Test");
+            ws.Cell(3, 1).SetValue("Test");
+
+            IXLRangeColumn fromColumn = ws.Column(1).ColumnUsed();
+            Assert.AreEqual("A2:A3", fromColumn.RangeAddress.ToStringRelative());
+
+            IXLRangeColumn fromRange = ws.Range("A1:A5").FirstColumn().ColumnUsed();
+            Assert.AreEqual("A2:A3", fromRange.RangeAddress.ToStringRelative());
+        }
+
+        [Test]
+        public void CopyColumn()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Test").Style.Font.SetBold();
+            ws.FirstColumn().CopyTo(ws.Column(2));
+
+            Assert.IsTrue(ws.Cell("B1").Style.Font.Bold);
+        }
+
+        [Test]
+        public void InsertingColumnsBefore1()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+
+            ws.Columns("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
+            ws.Column(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
+            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
+
+            IXLColumn column1 = ws.Column(1);
+            IXLColumn column2 = ws.Column(2);
+            IXLColumn column3 = ws.Column(3);
+
+            IXLColumn columnIns = ws.Column(1).InsertColumnsBefore(1).First();
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Column(3).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", ws.Column(3).Cell(2).GetString());
+
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, columnIns.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, columnIns.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, columnIns.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, column1.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column1.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column1.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, column2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, column2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, column2.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column3.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", column2.Cell(2).GetString());
+        }
+
+        [Test]
+        public void InsertingColumnsBefore2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+
+            ws.Columns("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
+            ws.Column(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
+            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
+
+            IXLColumn column1 = ws.Column(1);
+            IXLColumn column2 = ws.Column(2);
+            IXLColumn column3 = ws.Column(3);
+
+            IXLColumn columnIns = ws.Column(2).InsertColumnsBefore(1).First();
+            string outputPath = Path.Combine(TestHelper.TestsOutputDirectory, @"ForTesting\Sandbox.xlsx");
+            wb.SaveAs(outputPath);
+
+            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(2).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Column(3).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", ws.Column(3).Cell(2).GetString());
+
+
+            Assert.AreEqual(XLColor.Red, columnIns.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, columnIns.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, columnIns.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, column1.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column1.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column1.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, column2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, column2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, column2.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column3.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", column2.Cell(2).GetString());
+        }
+
+        [Test]
+        public void InsertingColumnsBefore3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+
+            ws.Columns("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
+            ws.Column(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
+            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
+
+            IXLColumn column1 = ws.Column(1);
+            IXLColumn column2 = ws.Column(2);
+            IXLColumn column3 = ws.Column(3);
+
+            IXLColumn columnIns = ws.Column(3).InsertColumnsBefore(1).First();
+
+            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Column(2).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Column(2).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Column(2).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Column(3).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Column(3).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Column(4).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", ws.Column(2).Cell(2).GetString());
+
+
+            Assert.AreEqual(XLColor.Yellow, columnIns.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, columnIns.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, columnIns.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, column1.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column1.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column1.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, column2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, column2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, column2.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, column3.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", column2.Cell(2).GetString());
+        }
+
+        [Test]
+        public void NoColumnsUsed()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            Int32 count = 0;
+
+            foreach (IXLColumn row in ws.ColumnsUsed())
+                count++;
+
+            foreach (IXLRangeColumn row in ws.Range("A1:C3").ColumnsUsed())
+                count++;
+
+            Assert.AreEqual(0, count);
+        }
+
+        [Test]
+        public void UngroupFromAll()
+        {
+            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
+            ws.Columns(1, 2).Group();
+            ws.Columns(1, 2).Ungroup(true);
+        }
+
+        [Test]
+        public void LastColumnUsed()
+        {
+            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
+            ws.Cell("A1").Value = "A1";
+            ws.Cell("B1").Value = "B1";
+            ws.Cell("A2").Value = "A2";
+            var lastCoUsed = ws.LastColumnUsed().ColumnNumber();
+            Assert.AreEqual(2, lastCoUsed);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Coordinates/XLAddressTests.cs b/ClosedXML_Tests/Excel/Coordinates/XLAddressTests.cs
new file mode 100644
index 0000000..526ae67
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Coordinates/XLAddressTests.cs
@@ -0,0 +1,32 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class XLAddressTests
+    {
+        [Test]
+        public void ToStringTest()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLAddress address = ws.Cell(1, 1).Address;
+
+            Assert.AreEqual("A1", address.ToString());
+            Assert.AreEqual("A1", address.ToString(XLReferenceStyle.A1));
+            Assert.AreEqual("R1C1", address.ToString(XLReferenceStyle.R1C1));
+            Assert.AreEqual("A1", address.ToString(XLReferenceStyle.Default));
+
+            Assert.AreEqual("A1", address.ToStringRelative());
+            Assert.AreEqual("'Sheet1'!A1", address.ToStringRelative(true));
+
+            Assert.AreEqual("$A$1", address.ToStringFixed());
+            Assert.AreEqual("$A$1", address.ToStringFixed(XLReferenceStyle.A1));
+            Assert.AreEqual("R1C1", address.ToStringFixed(XLReferenceStyle.R1C1));
+            Assert.AreEqual("$A$1", address.ToStringFixed(XLReferenceStyle.Default));
+            Assert.AreEqual("'Sheet1'!$A$1", address.ToStringFixed(XLReferenceStyle.A1, true));
+            Assert.AreEqual("'Sheet1'!R1C1", address.ToStringFixed(XLReferenceStyle.R1C1, true));
+            Assert.AreEqual("'Sheet1'!$A$1", address.ToStringFixed(XLReferenceStyle.Default, true));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/DataValidations/DataValidationTests.cs b/ClosedXML_Tests/Excel/DataValidations/DataValidationTests.cs
new file mode 100644
index 0000000..4a31837
--- /dev/null
+++ b/ClosedXML_Tests/Excel/DataValidations/DataValidationTests.cs
@@ -0,0 +1,159 @@
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.DataValidations
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class DataValidationTests
+    {
+        [Test]
+        public void Validation_1()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Data Validation Issue");
+            IXLCell cell = ws.Cell("E1");
+            cell.SetValue("Value 1");
+            cell = cell.CellBelow();
+            cell.SetValue("Value 2");
+            cell = cell.CellBelow();
+            cell.SetValue("Value 3");
+            cell = cell.CellBelow();
+            cell.SetValue("Value 4");
+            cell = cell.CellBelow();
+
+            ws.Cell("A1").SetValue("Cell below has Validation Only.");
+            cell = ws.Cell("A2");
+            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
+
+            ws.Cell("B1").SetValue("Cell below has Validation with a title.");
+            cell = ws.Cell("B2");
+            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
+            cell.DataValidation.InputTitle = "Title for B2";
+
+            Assert.AreEqual(cell.DataValidation.AllowedValues, XLAllowedValues.List);
+            Assert.AreEqual(cell.DataValidation.Value, "'Data Validation Issue'!$E$1:$E$4");
+            Assert.AreEqual(cell.DataValidation.InputTitle, "Title for B2");
+
+
+            ws.Cell("C1").SetValue("Cell below has Validation with a message.");
+            cell = ws.Cell("C2");
+            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
+            cell.DataValidation.InputMessage = "Message for C2";
+
+            Assert.AreEqual(cell.DataValidation.AllowedValues, XLAllowedValues.List);
+            Assert.AreEqual(cell.DataValidation.Value, "'Data Validation Issue'!$E$1:$E$4");
+            Assert.AreEqual(cell.DataValidation.InputMessage, "Message for C2");
+
+            ws.Cell("D1").SetValue("Cell below has Validation with title and message.");
+            cell = ws.Cell("D2");
+            cell.DataValidation.List(ws.Range("$E$1:$E$4"));
+            cell.DataValidation.InputTitle = "Title for D2";
+            cell.DataValidation.InputMessage = "Message for D2";
+
+            Assert.AreEqual(cell.DataValidation.AllowedValues, XLAllowedValues.List);
+            Assert.AreEqual(cell.DataValidation.Value, "'Data Validation Issue'!$E$1:$E$4");
+            Assert.AreEqual(cell.DataValidation.InputTitle, "Title for D2");
+            Assert.AreEqual(cell.DataValidation.InputMessage, "Message for D2");
+        }
+
+        [Test]
+        public void Validation_2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell("A1").SetValue("A");
+            ws.Cell("B1").SetDataValidation().Custom("Sheet1!A1");
+
+            IXLWorksheet ws2 = wb.AddWorksheet("Sheet2");
+            ws2.Cell("A1").SetValue("B");
+            ws.Cell("B1").CopyTo(ws2.Cell("B1"));
+
+            Assert.AreEqual("Sheet1!A1", ws2.Cell("B1").DataValidation.Value);
+        }
+
+        [Test]
+        public void Validation_3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell("A1").SetValue("A");
+            ws.Cell("B1").SetDataValidation().Custom("A1");
+            ws.FirstRow().InsertRowsAbove(1);
+
+            Assert.AreEqual("A2", ws.Cell("B2").DataValidation.Value);
+        }
+
+        [Test]
+        public void Validation_4()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell("A1").SetValue("A");
+            ws.Cell("B1").SetDataValidation().Custom("A1");
+            ws.Cell("B1").CopyTo(ws.Cell("B2"));
+            Assert.AreEqual("A2", ws.Cell("B2").DataValidation.Value);
+        }
+
+        [Test]
+        public void Validation_5()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell("A1").SetValue("A");
+            ws.Cell("B1").SetDataValidation().Custom("A1");
+            ws.FirstColumn().InsertColumnsBefore(1);
+
+            Assert.AreEqual("B1", ws.Cell("C1").DataValidation.Value);
+        }
+
+        [Test]
+        public void Validation_6()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell("A1").SetValue("A");
+            ws.Cell("B1").SetDataValidation().Custom("A1");
+            ws.Cell("B1").CopyTo(ws.Cell("C1"));
+            Assert.AreEqual("B1", ws.Cell("C1").DataValidation.Value);
+        }
+
+        [Test]
+        public void Validation_persists_on_Cell_DataValidation()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("People");
+
+            ws.FirstCell().SetValue("Categories")
+                .CellBelow().SetValue("A")
+                .CellBelow().SetValue("B");
+
+            IXLTable table = ws.RangeUsed().CreateTable();
+
+            IXLDataValidation dv = table.DataRange.SetDataValidation();
+            dv.ErrorTitle = "Error";
+
+            Assert.AreEqual("Error", table.DataRange.FirstCell().DataValidation.ErrorTitle);
+        }
+
+        [Test]
+        public void Validation_persists_on_Worksheet_DataValidations()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("People");
+
+            ws.FirstCell().SetValue("Categories")
+                .CellBelow().SetValue("A");
+
+            IXLTable table = ws.RangeUsed().CreateTable();
+
+            IXLDataValidation dv = table.DataRange.SetDataValidation();
+            dv.ErrorTitle = "Error";
+
+            Assert.AreEqual("Error", ws.DataValidations.Single().ErrorTitle);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Misc/CopyContentsTests.cs b/ClosedXML_Tests/Excel/Misc/CopyContentsTests.cs
new file mode 100644
index 0000000..ce055cc
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Misc/CopyContentsTests.cs
@@ -0,0 +1,119 @@
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.Misc
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class CopyContentsTests
+    {
+        private static void CopyRowAsRange(IXLWorksheet originalSheet, int originalRowNumber, IXLWorksheet destSheet,
+            int destRowNumber)
+        {
+            {
+                IXLRow destinationRow = destSheet.Row(destRowNumber);
+                destinationRow.Clear();
+
+                IXLRow originalRow = originalSheet.Row(originalRowNumber);
+                int columnNumber = originalRow.LastCellUsed(true).Address.ColumnNumber;
+
+                IXLRange originalRange = originalSheet.Range(originalRowNumber, 1, originalRowNumber, columnNumber);
+                IXLRange destRange = destSheet.Range(destRowNumber, 1, destRowNumber, columnNumber);
+                originalRange.CopyTo(destRange);
+            }
+        }
+
+        [Test]
+        public void CopyConditionalFormatsCount()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().AddConditionalFormat().WhenContains("1").Fill.SetBackgroundColor(XLColor.Blue);
+            ws.Cell("A2").Value = ws.FirstCell();
+            Assert.AreEqual(2, ws.ConditionalFormats.Count());
+        }
+
+        [Test]
+        public void CopyConditionalFormatsFixedNum()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.Cell("A1").Value = "1";
+            ws.Cell("B1").Value = "1";
+            ws.Cell("A1").AddConditionalFormat().WhenEquals(1).Fill.SetBackgroundColor(XLColor.Blue);
+            ws.Cell("A2").Value = ws.Cell("A1");
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
+        }
+
+        [Test]
+        public void CopyConditionalFormatsFixedString()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.Cell("A1").Value = "A";
+            ws.Cell("B1").Value = "B";
+            ws.Cell("A1").AddConditionalFormat().WhenEquals("A").Fill.SetBackgroundColor(XLColor.Blue);
+            ws.Cell("A2").Value = ws.Cell("A1");
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "A" && !v.Value.IsFormula)));
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "A" && !v.Value.IsFormula)));
+        }
+
+        [Test]
+        public void CopyConditionalFormatsFixedStringNum()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.Cell("A1").Value = "1";
+            ws.Cell("B1").Value = "1";
+            ws.Cell("A1").AddConditionalFormat().WhenEquals("1").Fill.SetBackgroundColor(XLColor.Blue);
+            ws.Cell("A2").Value = ws.Cell("A1");
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "1" && !v.Value.IsFormula)));
+        }
+
+        [Test]
+        public void CopyConditionalFormatsRelative()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.Cell("A1").Value = "1";
+            ws.Cell("B1").Value = "1";
+            ws.Cell("A1").AddConditionalFormat().WhenEquals("=B1").Fill.SetBackgroundColor(XLColor.Blue);
+            ws.Cell("A2").Value = ws.Cell("A1");
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "B1" && v.Value.IsFormula)));
+            Assert.IsTrue(ws.ConditionalFormats.Any(cf => cf.Values.Any(v => v.Value.Value == "B2" && v.Value.IsFormula)));
+        }
+
+        [Test]
+        public void TestRowCopyContents()
+        {
+            var workbook = new XLWorkbook();
+            IXLWorksheet originalSheet = workbook.Worksheets.Add("original");
+            IXLWorksheet copyRowSheet = workbook.Worksheets.Add("copy row");
+            IXLWorksheet copyRowAsRangeSheet = workbook.Worksheets.Add("copy row as range");
+            IXLWorksheet copyRangeSheet = workbook.Worksheets.Add("copy range");
+
+            originalSheet.Cell("A2").SetValue("test value");
+            originalSheet.Range("A2:E2").Merge();
+
+            {
+                IXLRange originalRange = originalSheet.Range("A2:E2");
+                IXLRange destinationRange = copyRangeSheet.Range("A2:E2");
+
+                originalRange.CopyTo(destinationRange);
+            }
+            CopyRowAsRange(originalSheet, 2, copyRowAsRangeSheet, 3);
+            {
+                IXLRow originalRow = originalSheet.Row(2);
+                IXLRow destinationRow = copyRowSheet.Row(2);
+                copyRowSheet.Cell("G2").Value = "must be removed after copy";
+                originalRow.CopyTo(destinationRow);
+            }
+            TestHelper.SaveWorkbook(workbook, @"Misc\CopyRowContents.xlsx");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Misc/ExtensionsTests.cs b/ClosedXML_Tests/Excel/Misc/ExtensionsTests.cs
new file mode 100644
index 0000000..ed82689
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Misc/ExtensionsTests.cs
@@ -0,0 +1,37 @@
+using System;
+using ClosedXML.Excel;
+using NUnit.Framework;
+using DocumentFormat.OpenXml;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class ExtensionsTests
+    {
+        [Test]
+        public void FixNewLines()
+        {
+            Assert.AreEqual("\n".FixNewLines(), Environment.NewLine);
+            Assert.AreEqual("\r\n".FixNewLines(), Environment.NewLine);
+            Assert.AreEqual("\rS\n".FixNewLines(), "\rS" + Environment.NewLine);
+            Assert.AreEqual("\r\n\n".FixNewLines(), Environment.NewLine + Environment.NewLine);
+        }
+
+        [Test]
+        public void DoubleSaveRound()
+        {
+            Double value = 1234.1234567;
+            Assert.AreEqual(value.SaveRound(), Math.Round(value, 6));
+        }
+
+        [Test]
+        public void DoubleValueSaveRound()
+        {
+            Double value = 1234.1234567;
+            Assert.AreEqual(new DoubleValue(value).SaveRound().Value, Math.Round(value, 6));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Misc/FormulaTests.cs b/ClosedXML_Tests/Excel/Misc/FormulaTests.cs
new file mode 100644
index 0000000..9d7cc15
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Misc/FormulaTests.cs
@@ -0,0 +1,22 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class FormulaTests
+    {
+        [Test]
+        public void CopyFormula()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell("A1").FormulaA1 = "B1";
+            ws.Cell("A1").CopyTo("A2");
+            Assert.AreEqual("B2", ws.Cell("A2").FormulaA1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Misc/StylesTests.cs b/ClosedXML_Tests/Excel/Misc/StylesTests.cs
new file mode 100644
index 0000000..a00a47e
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Misc/StylesTests.cs
@@ -0,0 +1,67 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.Misc
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class StylesTests
+    {
+        private static void SetupBorders(IXLRange range)
+        {
+            range.FirstRow().Cell(1).Style.Border.TopBorder = XLBorderStyleValues.None;
+            range.FirstRow().Cell(2).Style.Border.TopBorder = XLBorderStyleValues.Thick;
+            range.FirstRow().Cell(3).Style.Border.TopBorder = XLBorderStyleValues.Double;
+
+            range.LastRow().Cell(1).Style.Border.BottomBorder = XLBorderStyleValues.None;
+            range.LastRow().Cell(2).Style.Border.BottomBorder = XLBorderStyleValues.Thick;
+            range.LastRow().Cell(3).Style.Border.BottomBorder = XLBorderStyleValues.Double;
+
+            range.FirstColumn().Cell(1).Style.Border.LeftBorder = XLBorderStyleValues.None;
+            range.FirstColumn().Cell(2).Style.Border.LeftBorder = XLBorderStyleValues.Thick;
+            range.FirstColumn().Cell(3).Style.Border.LeftBorder = XLBorderStyleValues.Double;
+
+            range.LastColumn().Cell(1).Style.Border.RightBorder = XLBorderStyleValues.None;
+            range.LastColumn().Cell(2).Style.Border.RightBorder = XLBorderStyleValues.Thick;
+            range.LastColumn().Cell(3).Style.Border.RightBorder = XLBorderStyleValues.Double;
+        }
+
+        [Test]
+        public void InsideBorderTest()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            IXLRange range = ws.Range("B2:D4");
+
+            SetupBorders(range);
+
+            range.Style.Border.InsideBorder = XLBorderStyleValues.Thin;
+            range.Style.Border.InsideBorderColor = XLColor.Red;
+
+            IXLCell center = range.Cell(2, 2);
+
+            Assert.AreEqual(XLColor.Red, center.Style.Border.TopBorderColor);
+            Assert.AreEqual(XLColor.Red, center.Style.Border.BottomBorderColor);
+            Assert.AreEqual(XLColor.Red, center.Style.Border.LeftBorderColor);
+            Assert.AreEqual(XLColor.Red, center.Style.Border.RightBorderColor);
+
+            Assert.AreEqual(XLBorderStyleValues.None, range.FirstRow().Cell(1).Style.Border.TopBorder);
+            Assert.AreEqual(XLBorderStyleValues.Thick, range.FirstRow().Cell(2).Style.Border.TopBorder);
+            Assert.AreEqual(XLBorderStyleValues.Double, range.FirstRow().Cell(3).Style.Border.TopBorder);
+
+            Assert.AreEqual(XLBorderStyleValues.None, range.LastRow().Cell(1).Style.Border.BottomBorder);
+            Assert.AreEqual(XLBorderStyleValues.Thick, range.LastRow().Cell(2).Style.Border.BottomBorder);
+            Assert.AreEqual(XLBorderStyleValues.Double, range.LastRow().Cell(3).Style.Border.BottomBorder);
+
+            Assert.AreEqual(XLBorderStyleValues.None, range.FirstColumn().Cell(1).Style.Border.LeftBorder);
+            Assert.AreEqual(XLBorderStyleValues.Thick, range.FirstColumn().Cell(2).Style.Border.LeftBorder);
+            Assert.AreEqual(XLBorderStyleValues.Double, range.FirstColumn().Cell(3).Style.Border.LeftBorder);
+
+            Assert.AreEqual(XLBorderStyleValues.None, range.LastColumn().Cell(1).Style.Border.RightBorder);
+            Assert.AreEqual(XLBorderStyleValues.Thick, range.LastColumn().Cell(2).Style.Border.RightBorder);
+            Assert.AreEqual(XLBorderStyleValues.Double, range.LastColumn().Cell(3).Style.Border.RightBorder);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Misc/XLWorkbookTests.cs b/ClosedXML_Tests/Excel/Misc/XLWorkbookTests.cs
new file mode 100644
index 0000000..601bc06
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Misc/XLWorkbookTests.cs
@@ -0,0 +1,259 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class XLWorkbookTests
+    {
+        [Test]
+        public void Cell1()
+        {
+            var wb = new XLWorkbook();
+            IXLCell cell = wb.Cell("ABC");
+            Assert.IsNull(cell);
+        }
+
+        [Test]
+        public void Cell2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
+            IXLCell cell = wb.Cell("Sheet1!Result");
+            Assert.IsNotNull(cell);
+            Assert.AreEqual(1, cell.GetValue<Int32>());
+        }
+
+        [Test]
+        public void Cell3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result");
+            IXLCell cell = wb.Cell("Sheet1!Result");
+            Assert.IsNotNull(cell);
+            Assert.AreEqual(1, cell.GetValue<Int32>());
+        }
+
+        [Test]
+        public void Cells1()
+        {
+            var wb = new XLWorkbook();
+            IXLCells cells = wb.Cells("ABC");
+            Assert.IsNotNull(cells);
+            Assert.AreEqual(0, cells.Count());
+        }
+
+        [Test]
+        public void Cells2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
+            IXLCells cells = wb.Cells("Sheet1!Result, ABC");
+            Assert.IsNotNull(cells);
+            Assert.AreEqual(1, cells.Count());
+            Assert.AreEqual(1, cells.First().GetValue<Int32>());
+        }
+
+        [Test]
+        public void Cells3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result");
+            IXLCells cells = wb.Cells("Sheet1!Result, ABC");
+            Assert.IsNotNull(cells);
+            Assert.AreEqual(1, cells.Count());
+            Assert.AreEqual(1, cells.First().GetValue<Int32>());
+        }
+
+        [Test]
+        public void NamedRange1()
+        {
+            var wb = new XLWorkbook();
+            IXLNamedRange range = wb.NamedRange("ABC");
+            Assert.IsNull(range);
+        }
+
+        [Test]
+        public void NamedRange2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
+            IXLNamedRange range = wb.NamedRange("Sheet1!Result");
+            Assert.IsNotNull(range);
+            Assert.AreEqual(1, range.Ranges.Count);
+            Assert.AreEqual(1, range.Ranges.Cells().Count());
+            Assert.AreEqual(1, range.Ranges.First().FirstCell().GetValue<Int32>());
+        }
+
+        [Test]
+        public void NamedRange3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            IXLNamedRange range = wb.NamedRange("Sheet1!Result");
+            Assert.IsNull(range);
+        }
+
+        [Test]
+        public void NamedRange4()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result");
+            IXLNamedRange range = wb.NamedRange("Sheet1!Result");
+            Assert.IsNotNull(range);
+            Assert.AreEqual(1, range.Ranges.Count);
+            Assert.AreEqual(1, range.Ranges.Cells().Count());
+            Assert.AreEqual(1, range.Ranges.First().FirstCell().GetValue<Int32>());
+        }
+
+        [Test]
+        public void Range1()
+        {
+            var wb = new XLWorkbook();
+            IXLRange range = wb.Range("ABC");
+            Assert.IsNull(range);
+        }
+
+        [Test]
+        public void Range2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
+            IXLRange range = wb.Range("Sheet1!Result");
+            Assert.IsNotNull(range);
+            Assert.AreEqual(1, range.Cells().Count());
+            Assert.AreEqual(1, range.FirstCell().GetValue<Int32>());
+        }
+
+        [Test]
+        public void Range3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result");
+            IXLRange range = wb.Range("Sheet1!Result");
+            Assert.IsNotNull(range);
+            Assert.AreEqual(1, range.Cells().Count());
+            Assert.AreEqual(1, range.FirstCell().GetValue<Int32>());
+        }
+
+        [Test]
+        public void Ranges1()
+        {
+            var wb = new XLWorkbook();
+            IXLRanges ranges = wb.Ranges("ABC");
+            Assert.IsNotNull(ranges);
+            Assert.AreEqual(0, ranges.Count());
+        }
+
+        [Test]
+        public void Ranges2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result", XLScope.Worksheet);
+            IXLRanges ranges = wb.Ranges("Sheet1!Result, ABC");
+            Assert.IsNotNull(ranges);
+            Assert.AreEqual(1, ranges.Cells().Count());
+            Assert.AreEqual(1, ranges.First().FirstCell().GetValue<Int32>());
+        }
+
+        [Test]
+        public void Ranges3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue(1).AddToNamed("Result");
+            IXLRanges ranges = wb.Ranges("Sheet1!Result, ABC");
+            Assert.IsNotNull(ranges);
+            Assert.AreEqual(1, ranges.Cells().Count());
+            Assert.AreEqual(1, ranges.First().FirstCell().GetValue<Int32>());
+        }
+
+        [Test]
+        public void WbNamedCell()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell");
+            Assert.AreEqual("Test", wb.Cell("TestCell").GetString());
+            Assert.AreEqual("Test", ws.Cell("TestCell").GetString());
+        }
+
+        [Test]
+        public void WbNamedCells()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell");
+            ws.Cell(2, 1).SetValue("B").AddToNamed("Test2");
+            IXLCells wbCells = wb.Cells("TestCell, Test2");
+            Assert.AreEqual("Test", wbCells.First().GetString());
+            Assert.AreEqual("B", wbCells.Last().GetString());
+
+            IXLCells wsCells = ws.Cells("TestCell, Test2");
+            Assert.AreEqual("Test", wsCells.First().GetString());
+            Assert.AreEqual("B", wsCells.Last().GetString());
+        }
+
+        [Test]
+        public void WbNamedRange()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("A");
+            ws.Cell(2, 1).SetValue("B");
+            IXLRange original = ws.Range("A1:A2");
+            original.AddToNamed("TestRange");
+            Assert.AreEqual(original.RangeAddress.ToStringFixed(), wb.Range("TestRange").RangeAddress.ToString());
+            Assert.AreEqual(original.RangeAddress.ToStringFixed(), ws.Range("TestRange").RangeAddress.ToString());
+        }
+
+        [Test]
+        public void WbNamedRanges()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("A");
+            ws.Cell(2, 1).SetValue("B");
+            ws.Cell(3, 1).SetValue("C").AddToNamed("Test2");
+            IXLRange original = ws.Range("A1:A2");
+            original.AddToNamed("TestRange");
+            IXLRanges wbRanges = wb.Ranges("TestRange, Test2");
+            Assert.AreEqual(original.RangeAddress.ToStringFixed(), wbRanges.First().RangeAddress.ToString());
+            Assert.AreEqual("$A$3:$A$3", wbRanges.Last().RangeAddress.ToStringFixed());
+
+            IXLRanges wsRanges = wb.Ranges("TestRange, Test2");
+            Assert.AreEqual(original.RangeAddress.ToStringFixed(), wsRanges.First().RangeAddress.ToString());
+            Assert.AreEqual("$A$3:$A$3", wsRanges.Last().RangeAddress.ToStringFixed());
+        }
+
+        [Test]
+        public void WbNamedRangesOneString()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            wb.NamedRanges.Add("TestRange", "Sheet1!$A$1,Sheet1!$A$3");
+
+            IXLRanges wbRanges = ws.Ranges("TestRange");
+            Assert.AreEqual("$A$1:$A$1", wbRanges.First().RangeAddress.ToStringFixed());
+            Assert.AreEqual("$A$3:$A$3", wbRanges.Last().RangeAddress.ToStringFixed());
+
+            IXLRanges wsRanges = ws.Ranges("TestRange");
+            Assert.AreEqual("$A$1:$A$1", wsRanges.First().RangeAddress.ToStringFixed());
+            Assert.AreEqual("$A$3:$A$3", wsRanges.Last().RangeAddress.ToStringFixed());
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Misc/XlHelperTests.cs b/ClosedXML_Tests/Excel/Misc/XlHelperTests.cs
new file mode 100644
index 0000000..98e4685
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Misc/XlHelperTests.cs
@@ -0,0 +1,95 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class XlHelperTests
+    {
+        private static void CheckColumnNumber(int column)
+        {
+            Assert.AreEqual(column, XLHelper.GetColumnNumberFromLetter(XLHelper.GetColumnLetterFromNumber(column)));
+        }
+
+        [Test]
+        public void InvalidA1Addresses()
+        {
+            Assert.IsFalse(XLHelper.IsValidA1Address(""));
+            Assert.IsFalse(XLHelper.IsValidA1Address("A"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("a"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("-1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("AAAA1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("XFG1"));
+
+            Assert.IsFalse(XLHelper.IsValidA1Address("@A1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("@AA1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("@AAA1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("[A1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("[AA1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("[AAA1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("{A1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("{AA1"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("{AAA1"));
+
+            Assert.IsFalse(XLHelper.IsValidA1Address("A1@"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("AA1@"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("AAA1@"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("A1["));
+            Assert.IsFalse(XLHelper.IsValidA1Address("AA1["));
+            Assert.IsFalse(XLHelper.IsValidA1Address("AAA1["));
+            Assert.IsFalse(XLHelper.IsValidA1Address("A1{"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("AA1{"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("AAA1{"));
+
+            Assert.IsFalse(XLHelper.IsValidA1Address("@A1@"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("@AA1@"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("@AAA1@"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("[A1["));
+            Assert.IsFalse(XLHelper.IsValidA1Address("[AA1["));
+            Assert.IsFalse(XLHelper.IsValidA1Address("[AAA1["));
+            Assert.IsFalse(XLHelper.IsValidA1Address("{A1{"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("{AA1{"));
+            Assert.IsFalse(XLHelper.IsValidA1Address("{AAA1{"));
+        }
+
+        [Test]
+        public void PlusAA1_Is_Not_an_address()
+        {
+            Assert.IsFalse(XLHelper.IsValidA1Address("+AA1"));
+        }
+
+        [Test]
+        public void TestConvertColumnLetterToNumberAnd()
+        {
+            CheckColumnNumber(1);
+            CheckColumnNumber(27);
+            CheckColumnNumber(28);
+            CheckColumnNumber(52);
+            CheckColumnNumber(53);
+            CheckColumnNumber(1000);
+        }
+
+        [Test]
+        public void ValidA1Addresses()
+        {
+            Assert.IsTrue(XLHelper.IsValidA1Address("A1"));
+            Assert.IsTrue(XLHelper.IsValidA1Address("A" + XLHelper.MaxRowNumber));
+            Assert.IsTrue(XLHelper.IsValidA1Address("Z1"));
+            Assert.IsTrue(XLHelper.IsValidA1Address("Z" + XLHelper.MaxRowNumber));
+
+            Assert.IsTrue(XLHelper.IsValidA1Address("AA1"));
+            Assert.IsTrue(XLHelper.IsValidA1Address("AA" + XLHelper.MaxRowNumber));
+            Assert.IsTrue(XLHelper.IsValidA1Address("ZZ1"));
+            Assert.IsTrue(XLHelper.IsValidA1Address("ZZ" + XLHelper.MaxRowNumber));
+
+            Assert.IsTrue(XLHelper.IsValidA1Address("AAA1"));
+            Assert.IsTrue(XLHelper.IsValidA1Address("AAA" + XLHelper.MaxRowNumber));
+            Assert.IsTrue(XLHelper.IsValidA1Address(XLHelper.MaxColumnLetter + "1"));
+            Assert.IsTrue(XLHelper.IsValidA1Address(XLHelper.MaxColumnLetter + XLHelper.MaxRowNumber));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/NamedRanges/NamedRangesTests.cs b/ClosedXML_Tests/Excel/NamedRanges/NamedRangesTests.cs
new file mode 100644
index 0000000..be482fb
--- /dev/null
+++ b/ClosedXML_Tests/Excel/NamedRanges/NamedRangesTests.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class NamedRangesTests
+    {
+        [Test]
+        public void MovingRanges()
+        {
+            var wb = new XLWorkbook();
+
+            IXLWorksheet sheet1 = wb.Worksheets.Add("Sheet1");
+            IXLWorksheet sheet2 = wb.Worksheets.Add("Sheet2");
+
+            wb.NamedRanges.Add("wbNamedRange",
+                "Sheet1!$B$2,Sheet1!$B$3:$C$3,Sheet2!$D$3:$D$4,Sheet1!$6:$7,Sheet1!$F:$G");
+            sheet1.NamedRanges.Add("sheet1NamedRange",
+                "Sheet1!$B$2,Sheet1!$B$3:$C$3,Sheet2!$D$3:$D$4,Sheet1!$6:$7,Sheet1!$F:$G");
+            sheet2.NamedRanges.Add("sheet2NamedRange", "Sheet1!A1,Sheet2!A1");
+
+            sheet1.Row(1).InsertRowsAbove(2);
+            sheet1.Row(1).Delete();
+            sheet1.Column(1).InsertColumnsBefore(2);
+            sheet1.Column(1).Delete();
+
+
+            Assert.AreEqual("'Sheet1'!$C$3,'Sheet1'!$C$4:$D$4,Sheet2!$D$3:$D$4,'Sheet1'!$7:$8,'Sheet1'!$G:$H",
+                wb.NamedRanges.First().RefersTo);
+            Assert.AreEqual("'Sheet1'!$C$3,'Sheet1'!$C$4:$D$4,Sheet2!$D$3:$D$4,'Sheet1'!$7:$8,'Sheet1'!$G:$H",
+                sheet1.NamedRanges.First().RefersTo);
+            Assert.AreEqual("'Sheet1'!B2,Sheet2!A1", sheet2.NamedRanges.First().RefersTo);
+        }
+
+        [Test]
+        public void WbContainsWsNamedRange()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().AddToNamed("Name", XLScope.Worksheet);
+
+            Assert.IsTrue(wb.NamedRanges.Contains("Sheet1!Name"));
+            Assert.IsFalse(wb.NamedRanges.Contains("Sheet1!NameX"));
+
+            Assert.IsNotNull(wb.NamedRange("Sheet1!Name"));
+            Assert.IsNull(wb.NamedRange("Sheet1!NameX"));
+
+            IXLNamedRange range1;
+            Boolean result1 = wb.NamedRanges.TryGetValue("Sheet1!Name", out range1);
+            Assert.IsTrue(result1);
+            Assert.IsNotNull(range1);
+
+            IXLNamedRange range2;
+            Boolean result2 = wb.NamedRanges.TryGetValue("Sheet1!NameX", out range2);
+            Assert.IsFalse(result2);
+            Assert.IsNull(range2);
+        }
+
+        [Test]
+        public void WorkbookContainsNamedRange()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().AddToNamed("Name");
+
+            Assert.IsTrue(wb.NamedRanges.Contains("Name"));
+            Assert.IsFalse(wb.NamedRanges.Contains("NameX"));
+
+            Assert.IsNotNull(wb.NamedRange("Name"));
+            Assert.IsNull(wb.NamedRange("NameX"));
+
+            IXLNamedRange range1;
+            Boolean result1 = wb.NamedRanges.TryGetValue("Name", out range1);
+            Assert.IsTrue(result1);
+            Assert.IsNotNull(range1);
+
+            IXLNamedRange range2;
+            Boolean result2 = wb.NamedRanges.TryGetValue("NameX", out range2);
+            Assert.IsFalse(result2);
+            Assert.IsNull(range2);
+        }
+
+        [Test]
+        public void WorksheetContainsNamedRange()
+        {
+            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
+            ws.FirstCell().AddToNamed("Name", XLScope.Worksheet);
+
+            Assert.IsTrue(ws.NamedRanges.Contains("Name"));
+            Assert.IsFalse(ws.NamedRanges.Contains("NameX"));
+
+            Assert.IsNotNull(ws.NamedRange("Name"));
+            Assert.IsNull(ws.NamedRange("NameX"));
+
+            IXLNamedRange range1;
+            Boolean result1 = ws.NamedRanges.TryGetValue("Name", out range1);
+            Assert.IsTrue(result1);
+            Assert.IsNotNull(range1);
+
+            IXLNamedRange range2;
+            Boolean result2 = ws.NamedRanges.TryGetValue("NameX", out range2);
+            Assert.IsFalse(result2);
+            Assert.IsNull(range2);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/PivotTables/XLPivotTableTests.cs b/ClosedXML_Tests/Excel/PivotTables/XLPivotTableTests.cs
new file mode 100644
index 0000000..dadb7f9
--- /dev/null
+++ b/ClosedXML_Tests/Excel/PivotTables/XLPivotTableTests.cs
@@ -0,0 +1,16 @@
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class XLPivotTableTests
+    {
+        //[Test]
+        //public void CreateTable()
+        //{
+        //    var ws = new XLWorkbook().Worksheets.Add("Sheet1");
+
+
+        //}
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Ranges/CopyingRangesTests.cs b/ClosedXML_Tests/Excel/Ranges/CopyingRangesTests.cs
new file mode 100644
index 0000000..99c9aaf
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Ranges/CopyingRangesTests.cs
@@ -0,0 +1,86 @@
+using System.Drawing;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class CopyingRangesTests
+    {
+        [Test]
+        public void CopyingColumns()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+            IXLColumn column1 = ws.Column(1);
+            column1.Cell(1).Style.Fill.SetBackgroundColor(XLColor.Red);
+            column1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.FromArgb(1, 1, 1));
+            column1.Cell(3).Style.Fill.SetBackgroundColor(XLColor.FromHtml("#CCCCCC"));
+            column1.Cell(4).Style.Fill.SetBackgroundColor(XLColor.FromIndex(26));
+            column1.Cell(5).Style.Fill.SetBackgroundColor(XLColor.FromKnownColor(KnownColor.MediumSeaGreen));
+            column1.Cell(6).Style.Fill.SetBackgroundColor(XLColor.FromName("Blue"));
+            column1.Cell(7).Style.Fill.SetBackgroundColor(XLColor.FromTheme(XLThemeColor.Accent3));
+
+            ws.Cell(1, 2).Value = column1;
+            ws.Cell(1, 3).Value = column1.Column(1, 7);
+
+            IXLColumn column2 = ws.Column(2);
+            Assert.AreEqual(XLColor.Red, column2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), column2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), column2.Cell(3).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromIndex(26), column2.Cell(4).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen),
+                column2.Cell(5).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromName("Blue"), column2.Cell(6).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), column2.Cell(7).Style.Fill.BackgroundColor);
+
+            IXLColumn column3 = ws.Column(3);
+            Assert.AreEqual(XLColor.Red, column3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), column3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), column3.Cell(3).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromIndex(26), column3.Cell(4).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen),
+                column3.Cell(5).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromName("Blue"), column3.Cell(6).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), column3.Cell(7).Style.Fill.BackgroundColor);
+        }
+
+        [Test]
+        public void CopyingRows()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+            IXLRow row1 = ws.Row(1);
+            row1.Cell(1).Style.Fill.SetBackgroundColor(XLColor.Red);
+            row1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.FromArgb(1, 1, 1));
+            row1.Cell(3).Style.Fill.SetBackgroundColor(XLColor.FromHtml("#CCCCCC"));
+            row1.Cell(4).Style.Fill.SetBackgroundColor(XLColor.FromIndex(26));
+            row1.Cell(5).Style.Fill.SetBackgroundColor(XLColor.FromKnownColor(KnownColor.MediumSeaGreen));
+            row1.Cell(6).Style.Fill.SetBackgroundColor(XLColor.FromName("Blue"));
+            row1.Cell(7).Style.Fill.SetBackgroundColor(XLColor.FromTheme(XLThemeColor.Accent3));
+
+            ws.Cell(2, 1).Value = row1;
+            ws.Cell(3, 1).Value = row1.Row(1, 7);
+
+            IXLRow row2 = ws.Row(2);
+            Assert.AreEqual(XLColor.Red, row2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), row2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), row2.Cell(3).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromIndex(26), row2.Cell(4).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen), row2.Cell(5).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromName("Blue"), row2.Cell(6).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), row2.Cell(7).Style.Fill.BackgroundColor);
+
+            IXLRow row3 = ws.Row(3);
+            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromArgb(1, 1, 1), row3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromHtml("#CCCCCC"), row3.Cell(3).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromIndex(26), row3.Cell(4).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromKnownColor(KnownColor.MediumSeaGreen), row3.Cell(5).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromName("Blue"), row3.Cell(6).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FromTheme(XLThemeColor.Accent3), row3.Cell(7).Style.Fill.BackgroundColor);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs b/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs
new file mode 100644
index 0000000..dcda221
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs
@@ -0,0 +1,85 @@
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class InsertingRangesTests
+    {
+        [Test]
+        public void InsertingColumnsPreservesFormatting()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+            IXLColumn column1 = ws.Column(1);
+            column1.Style.Fill.SetBackgroundColor(XLColor.FrenchLilac);
+            column1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.Fulvous);
+            IXLColumn column2 = ws.Column(2);
+            column2.Style.Fill.SetBackgroundColor(XLColor.Xanadu);
+            column2.Cell(2).Style.Fill.SetBackgroundColor(XLColor.MacaroniAndCheese);
+
+            column1.InsertColumnsAfter(1);
+            column1.InsertColumnsBefore(1);
+            column2.InsertColumnsBefore(1);
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Column(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FrenchLilac, ws.Column(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FrenchLilac, ws.Column(3).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FrenchLilac, ws.Column(4).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Xanadu, ws.Column(5).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Cell(2, 1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 3).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 4).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.MacaroniAndCheese, ws.Cell(2, 5).Style.Fill.BackgroundColor);
+        }
+
+        [Test]
+        public void InsertingRowsAbove()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+            ws.Cell("B3").SetValue("X")
+                .CellBelow().SetValue("B");
+
+            IXLRangeRow r = ws.Range("B4").InsertRowsAbove(1).First();
+            r.Cell(1).SetValue("A");
+
+            Assert.AreEqual("X", ws.Cell("B3").GetString());
+            Assert.AreEqual("A", ws.Cell("B4").GetString());
+            Assert.AreEqual("B", ws.Cell("B5").GetString());
+        }
+
+        [Test]
+        public void InsertingRowsPreservesFormatting()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+            IXLRow row1 = ws.Row(1);
+            row1.Style.Fill.SetBackgroundColor(XLColor.FrenchLilac);
+            row1.Cell(2).Style.Fill.SetBackgroundColor(XLColor.Fulvous);
+            IXLRow row2 = ws.Row(2);
+            row2.Style.Fill.SetBackgroundColor(XLColor.Xanadu);
+            row2.Cell(2).Style.Fill.SetBackgroundColor(XLColor.MacaroniAndCheese);
+
+            row1.InsertRowsBelow(1);
+            row1.InsertRowsAbove(1);
+            row2.InsertRowsAbove(1);
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FrenchLilac, ws.Row(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FrenchLilac, ws.Row(3).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.FrenchLilac, ws.Row(4).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Xanadu, ws.Row(5).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Cell(1, 2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Fulvous, ws.Cell(2, 2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Fulvous, ws.Cell(3, 2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Fulvous, ws.Cell(4, 2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.MacaroniAndCheese, ws.Cell(5, 2).Style.Fill.BackgroundColor);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs b/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs
new file mode 100644
index 0000000..fad6c2e
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs
@@ -0,0 +1,23 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class MergedRangesTests
+    {
+        [Test]
+        public void LastCellFromMerge()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+            ws.Range("B2:D4").Merge();
+
+            string first = ws.FirstCellUsed(true).Address.ToStringRelative();
+            string last = ws.LastCellUsed(true).Address.ToStringRelative();
+
+            Assert.AreEqual("B2", first);
+            Assert.AreEqual("D4", last);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Ranges/RangeUsedTests.cs b/ClosedXML_Tests/Excel/Ranges/RangeUsedTests.cs
new file mode 100644
index 0000000..5ec0500
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Ranges/RangeUsedTests.cs
@@ -0,0 +1,36 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class RangeUsedTests
+    {
+        [Test]
+        public void CanGetNamedFromAnother()
+        {
+            var wb = new XLWorkbook();
+            var ws1 = wb.Worksheets.Add("Sheet1");
+            ws1.Cell("A1").SetValue(1).AddToNamed("value1");
+            
+            Assert.AreEqual(1, wb.Cell("value1").GetValue<int>());
+            Assert.AreEqual(1, wb.Range("value1").FirstCell().GetValue<int>());
+
+            Assert.AreEqual(1, ws1.Cell("value1").GetValue<int>());
+            Assert.AreEqual(1, ws1.Range("value1").FirstCell().GetValue<int>());
+
+            var ws2 = wb.Worksheets.Add("Sheet2");
+
+            ws2.Cell("A1").SetFormulaA1("=value1").AddToNamed("value2");
+
+            Assert.AreEqual(1, wb.Cell("value2").GetValue<int>());
+            Assert.AreEqual(1, wb.Range("value2").FirstCell().GetValue<int>());
+
+            Assert.AreEqual(1, ws2.Cell("value1").GetValue<int>());
+            Assert.AreEqual(1, ws2.Range("value1").FirstCell().GetValue<int>());
+
+            Assert.AreEqual(1, ws2.Cell("value2").GetValue<int>());
+            Assert.AreEqual(1, ws2.Range("value2").FirstCell().GetValue<int>());
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Ranges/XLRangeAddressTests.cs b/ClosedXML_Tests/Excel/Ranges/XLRangeAddressTests.cs
new file mode 100644
index 0000000..f4e223a
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Ranges/XLRangeAddressTests.cs
@@ -0,0 +1,29 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class XLRangeAddressTests
+    {
+        [Test]
+        public void ToStringTest()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRangeAddress address = ws.Cell(1, 1).AsRange().RangeAddress;
+
+            Assert.AreEqual("A1:A1", address.ToString());
+
+            Assert.AreEqual("A1:A1", address.ToStringRelative());
+            Assert.AreEqual("'Sheet1'!A1:A1", address.ToStringRelative(true));
+
+            Assert.AreEqual("$A$1:$A$1", address.ToStringFixed());
+            Assert.AreEqual("$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.A1));
+            Assert.AreEqual("R1C1:R1C1", address.ToStringFixed(XLReferenceStyle.R1C1));
+            Assert.AreEqual("$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.Default));
+            Assert.AreEqual("'Sheet1'!$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.A1, true));
+            Assert.AreEqual("'Sheet1'!R1C1:R1C1", address.ToStringFixed(XLReferenceStyle.R1C1, true));
+            Assert.AreEqual("'Sheet1'!$A$1:$A$1", address.ToStringFixed(XLReferenceStyle.Default, true));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs b/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs
new file mode 100644
index 0000000..c90f624
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class XLRangeBaseTests
+    {
+        [Test]
+        public void IsEmpty1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            IXLRange range = ws.Range("A1:B2");
+            bool actual = range.IsEmpty();
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            IXLRange range = ws.Range("A1:B2");
+            bool actual = range.IsEmpty(true);
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty3()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Style.Fill.BackgroundColor = XLColor.Red;
+            IXLRange range = ws.Range("A1:B2");
+            bool actual = range.IsEmpty();
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty4()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Style.Fill.BackgroundColor = XLColor.Red;
+            IXLRange range = ws.Range("A1:B2");
+            bool actual = range.IsEmpty(false);
+            bool expected = true;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty5()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Style.Fill.BackgroundColor = XLColor.Red;
+            IXLRange range = ws.Range("A1:B2");
+            bool actual = range.IsEmpty(true);
+            bool expected = false;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void IsEmpty6()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.Value = "X";
+            IXLRange range = ws.Range("A1:B2");
+            bool actual = range.IsEmpty();
+            bool expected = false;
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void SingleCell()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).Value = "Hello World!";
+            wb.NamedRanges.Add("SingleCell", "Sheet1!$A$1");
+            IXLRange range = wb.Range("SingleCell");
+            Assert.AreEqual(1, range.CellsUsed().Count());
+            Assert.AreEqual("Hello World!", range.CellsUsed().Single().GetString());
+        }
+
+        [Test]
+        public void TableRange()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            IXLRangeColumn rangeColumn = ws.Column(1).Column(1, 4);
+            rangeColumn.Cell(1).Value = "FName";
+            rangeColumn.Cell(2).Value = "John";
+            rangeColumn.Cell(3).Value = "Hank";
+            rangeColumn.Cell(4).Value = "Dagny";
+            IXLTable table = rangeColumn.CreateTable();
+            wb.NamedRanges.Add("FNameColumn", String.Format("{0}[{1}]", table.Name, "FName"));
+
+            IXLRange namedRange = wb.Range("FNameColumn");
+            Assert.AreEqual(3, namedRange.Cells().Count());
+            Assert.IsTrue(
+                namedRange.CellsUsed().Select(cell => cell.GetString()).SequenceEqual(new[] {"John", "Hank", "Dagny"}));
+        }
+
+        [Test]
+        public void WsNamedCell()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell", XLScope.Worksheet);
+            Assert.AreEqual("Test", ws.Cell("TestCell").GetString());
+        }
+
+        [Test]
+        public void WsNamedCells()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("Test").AddToNamed("TestCell", XLScope.Worksheet);
+            ws.Cell(2, 1).SetValue("B");
+            IXLCells cells = ws.Cells("TestCell, A2");
+            Assert.AreEqual("Test", cells.First().GetString());
+            Assert.AreEqual("B", cells.Last().GetString());
+        }
+
+        [Test]
+        public void WsNamedRange()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("A");
+            ws.Cell(2, 1).SetValue("B");
+            IXLRange original = ws.Range("A1:A2");
+            original.AddToNamed("TestRange", XLScope.Worksheet);
+            IXLRange named = ws.Range("TestRange");
+            Assert.AreEqual(original.RangeAddress.ToStringFixed(), named.RangeAddress.ToString());
+        }
+
+        [Test]
+        public void WsNamedRanges()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 1).SetValue("A");
+            ws.Cell(2, 1).SetValue("B");
+            ws.Cell(3, 1).SetValue("C");
+            IXLRange original = ws.Range("A1:A2");
+            original.AddToNamed("TestRange", XLScope.Worksheet);
+            IXLRanges namedRanges = ws.Ranges("TestRange, A3");
+            Assert.AreEqual(original.RangeAddress.ToStringFixed(), namedRanges.First().RangeAddress.ToString());
+            Assert.AreEqual("$A$3:$A$3", namedRanges.Last().RangeAddress.ToStringFixed());
+        }
+
+        [Test]
+        public void WsNamedRangesOneString()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.NamedRanges.Add("TestRange", "Sheet1!$A$1,Sheet1!$A$3");
+            IXLRanges namedRanges = ws.Ranges("TestRange");
+
+            Assert.AreEqual("$A$1:$A$1", namedRanges.First().RangeAddress.ToStringFixed());
+            Assert.AreEqual("$A$3:$A$3", namedRanges.Last().RangeAddress.ToStringFixed());
+        }
+
+        //[Test]
+        //public void WsNamedRangeLiteral()
+        //{
+        //    var wb = new XLWorkbook();
+        //    var ws = wb.Worksheets.Add("Sheet1");
+        //    ws.NamedRanges.Add("TestRange", "\"Hello\"");
+        //    using (MemoryStream memoryStream = new MemoryStream())
+        //    {
+        //        wb.SaveAs(memoryStream);
+        //        var wb2 = new XLWorkbook(memoryStream);
+        //        var text = wb2.Worksheet("Sheet1").NamedRanges.First()
+        //        memoryStream.Close();
+        //    }
+
+
+        //}
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/RichText/XLRichStringTests.cs b/ClosedXML_Tests/Excel/RichText/XLRichStringTests.cs
new file mode 100644
index 0000000..062285b
--- /dev/null
+++ b/ClosedXML_Tests/Excel/RichText/XLRichStringTests.cs
@@ -0,0 +1,676 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    /// <summary>
+    ///     This is a test class for XLRichStringTests and is intended
+    ///     to contain all XLRichStringTests Unit Tests
+    /// </summary>
+    [TestFixture]
+    public class XLRichStringTests
+    {
+        [Test]
+        public void AccessRichTextTest1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.RichText.AddText("12");
+            cell.DataType = XLCellValues.Number;
+
+            Assert.AreEqual(12.0, cell.GetDouble());
+
+            IXLRichText richText = cell.RichText;
+
+            Assert.AreEqual("12", richText.ToString());
+
+            richText.AddText("34");
+
+            Assert.AreEqual("1234", cell.GetString());
+
+            Assert.AreEqual(XLCellValues.Number, cell.DataType);
+
+            Assert.AreEqual(1234.0, cell.GetDouble());
+        }
+
+        /// <summary>
+        ///     A test for AddText
+        /// </summary>
+        [Test]
+        public void AddTextTest1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            IXLRichText richString = cell.RichText;
+
+            string text = "Hello";
+            richString.AddText(text).SetBold().SetFontColor(XLColor.Red);
+
+            Assert.AreEqual(cell.GetString(), text);
+            Assert.AreEqual(cell.RichText.First().Bold, true);
+            Assert.AreEqual(cell.RichText.First().FontColor, XLColor.Red);
+
+            Assert.AreEqual(1, richString.Count);
+
+            richString.AddText("World");
+            Assert.AreEqual(richString.First().Text, text, "Item in collection is not the same as the one returned");
+        }
+
+        [Test]
+        public void AddTextTest2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            Int32 number = 123;
+
+            cell.SetValue(number).Style
+                .Font.SetBold()
+                .Font.SetFontColor(XLColor.Red);
+
+            string text = number.ToString();
+
+            Assert.AreEqual(cell.RichText.ToString(), text);
+            Assert.AreEqual(cell.RichText.First().Bold, true);
+            Assert.AreEqual(cell.RichText.First().FontColor, XLColor.Red);
+
+            Assert.AreEqual(1, cell.RichText.Count);
+
+            cell.RichText.AddText("World");
+            Assert.AreEqual(cell.RichText.First().Text, text, "Item in collection is not the same as the one returned");
+        }
+
+        [Test]
+        public void AddTextTest3()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            Int32 number = 123;
+            cell.Value = number;
+            cell.Style
+                .Font.SetBold()
+                .Font.SetFontColor(XLColor.Red);
+
+            string text = number.ToString();
+
+            Assert.AreEqual(cell.RichText.ToString(), text);
+            Assert.AreEqual(cell.RichText.First().Bold, true);
+            Assert.AreEqual(cell.RichText.First().FontColor, XLColor.Red);
+
+            Assert.AreEqual(1, cell.RichText.Count);
+
+            cell.RichText.AddText("World");
+            Assert.AreEqual(cell.RichText.First().Text, text, "Item in collection is not the same as the one returned");
+        }
+
+        /// <summary>
+        ///     A test for Clear
+        /// </summary>
+        [Test]
+        public void ClearTest()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+            richString.AddText(" ");
+            richString.AddText("World!");
+
+            richString.ClearText();
+            String expected = String.Empty;
+            String actual = richString.ToString();
+            Assert.AreEqual(expected, actual);
+
+            Assert.AreEqual(0, richString.Count);
+        }
+
+        [Test]
+        public void CountTest()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+            richString.AddText(" ");
+            richString.AddText("World!");
+
+            Assert.AreEqual(3, richString.Count);
+        }
+
+        [Test]
+        public void HasRichTextTest1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLCell cell = ws.Cell(1, 1);
+            cell.RichText.AddText("123");
+
+            Assert.AreEqual(true, cell.HasRichText);
+
+            cell.DataType = XLCellValues.Text;
+
+            Assert.AreEqual(true, cell.HasRichText);
+
+            cell.DataType = XLCellValues.Number;
+
+            Assert.AreEqual(false, cell.HasRichText);
+
+            cell.RichText.AddText("123");
+
+            Assert.AreEqual(true, cell.HasRichText);
+
+            cell.Value = 123;
+
+            Assert.AreEqual(false, cell.HasRichText);
+
+            cell.RichText.AddText("123");
+
+            Assert.AreEqual(true, cell.HasRichText);
+
+            cell.SetValue("123");
+
+            Assert.AreEqual(false, cell.HasRichText);
+        }
+
+        /// <summary>
+        ///     A test for Characters
+        /// </summary>
+        [Test]
+        public void Substring_All_From_OneString()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(0);
+
+            Assert.AreEqual(richString.First(), actual.First());
+
+            Assert.AreEqual(1, actual.Count);
+
+            actual.First().SetBold();
+
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.First().Bold);
+        }
+
+        [Test]
+        public void Substring_All_From_ThreeStrings()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Good Morning");
+            richString.AddText(" my ");
+            richString.AddText("neighbors!");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(0);
+
+            Assert.AreEqual(richString.ElementAt(0), actual.ElementAt(0));
+            Assert.AreEqual(richString.ElementAt(1), actual.ElementAt(1));
+            Assert.AreEqual(richString.ElementAt(2), actual.ElementAt(2));
+
+            Assert.AreEqual(3, actual.Count);
+            Assert.AreEqual(3, richString.Count);
+
+            actual.First().SetBold();
+
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.First().Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.Last().Bold);
+        }
+
+        [Test]
+        public void Substring_From_OneString_End()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(2);
+
+            Assert.AreEqual(1, actual.Count); // substring was in one piece
+
+            Assert.AreEqual(2, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("llo", actual.First().Text);
+
+            Assert.AreEqual("He", richString.First().Text);
+            Assert.AreEqual("llo", richString.Last().Text);
+
+            actual.First().SetBold();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Bold);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Bold);
+
+            richString.Last().SetItalic();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Italic);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Italic);
+
+            Assert.AreEqual(true, actual.First().Italic);
+
+            richString.SetFontSize(20);
+
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.First().FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.Last().FontSize);
+
+            Assert.AreEqual(20, actual.First().FontSize);
+        }
+
+        [Test]
+        public void Substring_From_OneString_Middle()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(2, 2);
+
+            Assert.AreEqual(1, actual.Count); // substring was in one piece
+
+            Assert.AreEqual(3, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("ll", actual.First().Text);
+
+            Assert.AreEqual("He", richString.First().Text);
+            Assert.AreEqual("ll", richString.ElementAt(1).Text);
+            Assert.AreEqual("o", richString.Last().Text);
+
+            actual.First().SetBold();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Bold);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.Last().Bold);
+
+            richString.Last().SetItalic();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Italic);
+
+            Assert.AreEqual(false, actual.First().Italic);
+
+            richString.SetFontSize(20);
+
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.First().FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.Last().FontSize);
+
+            Assert.AreEqual(20, actual.First().FontSize);
+        }
+
+        [Test]
+        public void Substring_From_OneString_Start()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(0, 2);
+
+            Assert.AreEqual(1, actual.Count); // substring was in one piece
+
+            Assert.AreEqual(2, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("He", actual.First().Text);
+
+            Assert.AreEqual("He", richString.First().Text);
+            Assert.AreEqual("llo", richString.Last().Text);
+
+            actual.First().SetBold();
+
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.First().Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.Last().Bold);
+
+            richString.Last().SetItalic();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.First().Italic);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.Last().Italic);
+
+            Assert.AreEqual(false, actual.First().Italic);
+
+            richString.SetFontSize(20);
+
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.First().FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.Last().FontSize);
+
+            Assert.AreEqual(20, actual.First().FontSize);
+        }
+
+        [Test]
+        public void Substring_From_ThreeStrings_End1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Good Morning");
+            richString.AddText(" my ");
+            richString.AddText("neighbors!");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(21);
+
+            Assert.AreEqual(1, actual.Count); // substring was in one piece
+
+            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("bors!", actual.First().Text);
+
+            Assert.AreEqual("Good Morning", richString.ElementAt(0).Text);
+            Assert.AreEqual(" my ", richString.ElementAt(1).Text);
+            Assert.AreEqual("neigh", richString.ElementAt(2).Text);
+            Assert.AreEqual("bors!", richString.ElementAt(3).Text);
+
+            actual.First().SetBold();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
+
+            richString.Last().SetItalic();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
+
+            Assert.AreEqual(true, actual.First().Italic);
+
+            richString.SetFontSize(20);
+
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
+
+            Assert.AreEqual(20, actual.First().FontSize);
+        }
+
+        [Test]
+        public void Substring_From_ThreeStrings_End2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Good Morning");
+            richString.AddText(" my ");
+            richString.AddText("neighbors!");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(13);
+
+            Assert.AreEqual(2, actual.Count);
+
+            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("my ", actual.ElementAt(0).Text);
+            Assert.AreEqual("neighbors!", actual.ElementAt(1).Text);
+
+            Assert.AreEqual("Good Morning", richString.ElementAt(0).Text);
+            Assert.AreEqual(" ", richString.ElementAt(1).Text);
+            Assert.AreEqual("my ", richString.ElementAt(2).Text);
+            Assert.AreEqual("neighbors!", richString.ElementAt(3).Text);
+
+            actual.ElementAt(1).SetBold();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
+
+            richString.Last().SetItalic();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
+
+            Assert.AreEqual(false, actual.ElementAt(0).Italic);
+            Assert.AreEqual(true, actual.ElementAt(1).Italic);
+
+            richString.SetFontSize(20);
+
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
+
+            Assert.AreEqual(20, actual.ElementAt(0).FontSize);
+            Assert.AreEqual(20, actual.ElementAt(1).FontSize);
+        }
+
+        [Test]
+        public void Substring_From_ThreeStrings_Mid1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Good Morning");
+            richString.AddText(" my ");
+            richString.AddText("neighbors!");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(5, 10);
+
+            Assert.AreEqual(2, actual.Count);
+
+            Assert.AreEqual(5, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("Morning", actual.ElementAt(0).Text);
+            Assert.AreEqual(" my", actual.ElementAt(1).Text);
+
+            Assert.AreEqual("Good ", richString.ElementAt(0).Text);
+            Assert.AreEqual("Morning", richString.ElementAt(1).Text);
+            Assert.AreEqual(" my", richString.ElementAt(2).Text);
+            Assert.AreEqual(" ", richString.ElementAt(3).Text);
+            Assert.AreEqual("neighbors!", richString.ElementAt(4).Text);
+        }
+
+        [Test]
+        public void Substring_From_ThreeStrings_Mid2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Good Morning");
+            richString.AddText(" my ");
+            richString.AddText("neighbors!");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(5, 15);
+
+            Assert.AreEqual(3, actual.Count);
+
+            Assert.AreEqual(5, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("Morning", actual.ElementAt(0).Text);
+            Assert.AreEqual(" my ", actual.ElementAt(1).Text);
+            Assert.AreEqual("neig", actual.ElementAt(2).Text);
+
+            Assert.AreEqual("Good ", richString.ElementAt(0).Text);
+            Assert.AreEqual("Morning", richString.ElementAt(1).Text);
+            Assert.AreEqual(" my ", richString.ElementAt(2).Text);
+            Assert.AreEqual("neig", richString.ElementAt(3).Text);
+            Assert.AreEqual("hbors!", richString.ElementAt(4).Text);
+        }
+
+        [Test]
+        public void Substring_From_ThreeStrings_Start1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Good Morning");
+            richString.AddText(" my ");
+            richString.AddText("neighbors!");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(0, 4);
+
+            Assert.AreEqual(1, actual.Count); // substring was in one piece
+
+            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("Good", actual.First().Text);
+
+            Assert.AreEqual("Good", richString.ElementAt(0).Text);
+            Assert.AreEqual(" Morning", richString.ElementAt(1).Text);
+            Assert.AreEqual(" my ", richString.ElementAt(2).Text);
+            Assert.AreEqual("neighbors!", richString.ElementAt(3).Text);
+
+            actual.First().SetBold();
+
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
+
+            richString.First().SetItalic();
+
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
+
+            Assert.AreEqual(true, actual.First().Italic);
+
+            richString.SetFontSize(20);
+
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
+
+            Assert.AreEqual(20, actual.First().FontSize);
+        }
+
+        [Test]
+        public void Substring_From_ThreeStrings_Start2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Good Morning");
+            richString.AddText(" my ");
+            richString.AddText("neighbors!");
+
+            IXLFormattedText<IXLRichText> actual = richString.Substring(0, 15);
+
+            Assert.AreEqual(2, actual.Count);
+
+            Assert.AreEqual(4, richString.Count); // The text was split because of the substring
+
+            Assert.AreEqual("Good Morning", actual.ElementAt(0).Text);
+            Assert.AreEqual(" my", actual.ElementAt(1).Text);
+
+            Assert.AreEqual("Good Morning", richString.ElementAt(0).Text);
+            Assert.AreEqual(" my", richString.ElementAt(1).Text);
+            Assert.AreEqual(" ", richString.ElementAt(2).Text);
+            Assert.AreEqual("neighbors!", richString.ElementAt(3).Text);
+
+            actual.ElementAt(1).SetBold();
+
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(0).Bold);
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(1).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Bold);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Bold);
+
+            richString.First().SetItalic();
+
+            Assert.AreEqual(true, ws.Cell(1, 1).RichText.ElementAt(0).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(1).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(2).Italic);
+            Assert.AreEqual(false, ws.Cell(1, 1).RichText.ElementAt(3).Italic);
+
+            Assert.AreEqual(true, actual.ElementAt(0).Italic);
+            Assert.AreEqual(false, actual.ElementAt(1).Italic);
+
+            richString.SetFontSize(20);
+
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(0).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(1).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(2).FontSize);
+            Assert.AreEqual(20, ws.Cell(1, 1).RichText.ElementAt(3).FontSize);
+
+            Assert.AreEqual(20, actual.ElementAt(0).FontSize);
+            Assert.AreEqual(20, actual.ElementAt(1).FontSize);
+        }
+
+        [Test]
+        [ExpectedException(typeof (IndexOutOfRangeException))]
+        public void Substring_IndexOutsideRange1()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+
+            IXLFormattedText<IXLRichText> richText = richString.Substring(50);
+        }
+
+        [Test]
+        [ExpectedException(typeof (IndexOutOfRangeException))]
+        public void Substring_IndexOutsideRange2()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+            richString.AddText("World");
+
+            IXLFormattedText<IXLRichText> richText = richString.Substring(50);
+        }
+
+        [Test]
+        [ExpectedException(typeof (IndexOutOfRangeException))]
+        public void Substring_IndexOutsideRange3()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+
+            IXLFormattedText<IXLRichText> richText = richString.Substring(1, 10);
+        }
+
+        [Test]
+        [ExpectedException(typeof (IndexOutOfRangeException))]
+        public void Substring_IndexOutsideRange4()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+            richString.AddText("World");
+
+            IXLFormattedText<IXLRichText> richText = richString.Substring(5, 20);
+        }
+
+        /// <summary>
+        ///     A test for ToString
+        /// </summary>
+        [Test]
+        public void ToStringTest()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            IXLRichText richString = ws.Cell(1, 1).RichText;
+
+            richString.AddText("Hello");
+            richString.AddText(" ");
+            richString.AddText("World");
+            string expected = "Hello World";
+            string actual = richString.ToString();
+            Assert.AreEqual(expected, actual);
+
+            richString.AddText("!");
+            expected = "Hello World!";
+            actual = richString.ToString();
+            Assert.AreEqual(expected, actual);
+
+            richString.ClearText();
+            expected = String.Empty;
+            actual = richString.ToString();
+            Assert.AreEqual(expected, actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Rows/RowTests.cs b/ClosedXML_Tests/Excel/Rows/RowTests.cs
new file mode 100644
index 0000000..2afe01f
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Rows/RowTests.cs
@@ -0,0 +1,227 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class RowTests
+    {
+        [Test]
+        public void CopyRow()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Test").Style.Font.SetBold();
+            ws.FirstRow().CopyTo(ws.Row(2));
+
+            Assert.IsTrue(ws.Cell("A2").Style.Font.Bold);
+        }
+
+        [Test]
+        public void InsertingRowsAbove1()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+
+            ws.Rows("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
+            ws.Row(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
+            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
+
+            IXLRow row1 = ws.Row(1);
+            IXLRow row2 = ws.Row(2);
+            IXLRow row3 = ws.Row(3);
+
+            IXLRow rowIns = ws.Row(1).InsertRowsAbove(1).First();
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, ws.Row(1).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Row(3).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", ws.Row(3).Cell(2).GetString());
+
+
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, rowIns.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, rowIns.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(ws.Style.Fill.BackgroundColor, rowIns.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, row1.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row1.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row1.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, row2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, row2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, row2.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row3.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", row2.Cell(2).GetString());
+        }
+
+        [Test]
+        public void InsertingRowsAbove2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+
+            ws.Rows("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
+            ws.Row(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
+            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
+
+            IXLRow row1 = ws.Row(1);
+            IXLRow row2 = ws.Row(2);
+            IXLRow row3 = ws.Row(3);
+
+            IXLRow rowIns = ws.Row(2).InsertRowsAbove(1).First();
+
+            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(2).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Row(3).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", ws.Row(3).Cell(2).GetString());
+
+
+            Assert.AreEqual(XLColor.Red, rowIns.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, rowIns.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, rowIns.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, row1.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row1.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row1.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, row2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, row2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, row2.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row3.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", row2.Cell(2).GetString());
+        }
+
+        [Test]
+        public void InsertingRowsAbove3()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+
+            ws.Rows("1,3").Style.Fill.SetBackgroundColor(XLColor.Red);
+            ws.Row(2).Style.Fill.SetBackgroundColor(XLColor.Yellow);
+            ws.Cell(2, 2).SetValue("X").Style.Fill.SetBackgroundColor(XLColor.Green);
+
+            IXLRow row1 = ws.Row(1);
+            IXLRow row2 = ws.Row(2);
+            IXLRow row3 = ws.Row(3);
+
+            IXLRow rowIns = ws.Row(3).InsertRowsAbove(1).First();
+
+            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(1).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Row(2).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Row(2).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Row(2).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, ws.Row(3).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, ws.Row(3).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, ws.Row(4).Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", ws.Row(2).Cell(2).GetString());
+
+
+            Assert.AreEqual(XLColor.Yellow, rowIns.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, rowIns.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, rowIns.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, row1.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row1.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row1.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Yellow, row2.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Green, row2.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Yellow, row2.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual(XLColor.Red, row3.Cell(1).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row3.Cell(2).Style.Fill.BackgroundColor);
+            Assert.AreEqual(XLColor.Red, row3.Cell(3).Style.Fill.BackgroundColor);
+
+            Assert.AreEqual("X", row2.Cell(2).GetString());
+        }
+
+        [Test]
+        public void NoRowsUsed()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            Int32 count = 0;
+
+            foreach (IXLRow row in ws.RowsUsed())
+                count++;
+
+            foreach (IXLRangeRow row in ws.Range("A1:C3").RowsUsed())
+                count++;
+
+            Assert.AreEqual(0, count);
+        }
+
+        [Test]
+        public void RowUsed()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            ws.Cell(1, 2).SetValue("Test");
+            ws.Cell(1, 3).SetValue("Test");
+
+            IXLRangeRow fromRow = ws.Row(1).RowUsed();
+            Assert.AreEqual("B1:C1", fromRow.RangeAddress.ToStringRelative());
+
+            IXLRangeRow fromRange = ws.Range("A1:E1").FirstRow().RowUsed();
+            Assert.AreEqual("B1:C1", fromRange.RangeAddress.ToStringRelative());
+        }
+
+
+        [Test]
+        public void UngroupFromAll()
+        {
+            IXLWorksheet ws = new XLWorkbook().AddWorksheet("Sheet1");
+            ws.Rows(1, 2).Group();
+            ws.Rows(1, 2).Ungroup(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Styles/ColorTests.cs b/ClosedXML_Tests/Excel/Styles/ColorTests.cs
new file mode 100644
index 0000000..793c39e
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Styles/ColorTests.cs
@@ -0,0 +1,36 @@
+using System.Drawing;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class ColorTests
+    {
+        [Test]
+        public void ColorEqualOperatorInPlace()
+        {
+            Assert.IsTrue(XLColor.Black == XLColor.Black);
+        }
+
+        [Test]
+        public void ColorNotEqualOperatorInPlace()
+        {
+            Assert.IsFalse(XLColor.Black != XLColor.Black);
+        }
+
+        [Test]
+        public void DefaultColorIndex64isTransparentWhite()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            XLColor color = ws.FirstCell().Style.Fill.BackgroundColor;
+            Assert.AreEqual(XLColorType.Indexed, color.ColorType);
+            Assert.AreEqual(64, color.Indexed);
+            Assert.AreEqual(Color.Transparent, color.Color);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Styles/XLFillTests.cs b/ClosedXML_Tests/Excel/Styles/XLFillTests.cs
new file mode 100644
index 0000000..37d06c7
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Styles/XLFillTests.cs
@@ -0,0 +1,65 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class XLFillTests
+    {
+        [Test]
+        public void BackgroundColorSetsPattern()
+        {
+            var fill = new XLFill {BackgroundColor = XLColor.Blue};
+            Assert.AreEqual(XLFillPatternValues.Solid, fill.PatternType);
+        }
+
+        [Test]
+        public void BackgroundNoColorSetsPatternNone()
+        {
+            var fill = new XLFill {BackgroundColor = XLColor.NoColor};
+            Assert.AreEqual(XLFillPatternValues.None, fill.PatternType);
+        }
+
+        [Test]
+        public void BackgroundPatternEqualCheck()
+        {
+            var fill1 = new XLFill {PatternBackgroundColor = XLColor.Blue};
+            var fill2 = new XLFill {PatternBackgroundColor = XLColor.Blue};
+            Assert.IsTrue(fill1.Equals(fill2));
+        }
+
+        [Test]
+        public void BackgroundPatternNotEqualCheck()
+        {
+            var fill1 = new XLFill {PatternBackgroundColor = XLColor.Blue};
+            var fill2 = new XLFill {PatternBackgroundColor = XLColor.Red};
+            Assert.IsFalse(fill1.Equals(fill2));
+        }
+
+        [Test]
+        public void BackgroundWithConditionalFormat()
+        {
+            var workbook = new XLWorkbook();
+            var worksheet = workbook.AddWorksheet("Test");
+            worksheet.Cell(2, 2).SetValue("Text");
+            var cf = worksheet.Cell(2, 2).AddConditionalFormat();
+            var style = cf.WhenNotBlank();
+            style
+                    .Border.SetOutsideBorder(XLBorderStyleValues.Thick)
+                    .Border.SetOutsideBorderColor(XLColor.Blue);
+
+            Assert.AreEqual(style.Border.BottomBorder, XLBorderStyleValues.Thick);
+            Assert.AreEqual(style.Border.TopBorder, XLBorderStyleValues.Thick);
+            Assert.AreEqual(style.Border.LeftBorder, XLBorderStyleValues.Thick);
+            Assert.AreEqual(style.Border.RightBorder, XLBorderStyleValues.Thick);
+
+            Assert.AreEqual(style.Border.BottomBorderColor, XLColor.Blue);
+            Assert.AreEqual(style.Border.TopBorderColor, XLColor.Blue);
+            Assert.AreEqual(style.Border.LeftBorderColor, XLColor.Blue);
+            Assert.AreEqual(style.Border.RightBorderColor, XLColor.Blue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Tables/TablesTests.cs b/ClosedXML_Tests/Excel/Tables/TablesTests.cs
new file mode 100644
index 0000000..8bd1f63
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Tables/TablesTests.cs
@@ -0,0 +1,336 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel
+{
+    /// <summary>
+    ///     Summary description for UnitTest1
+    /// </summary>
+    [TestFixture]
+    public class TablesTests
+    {
+        public class TestObject
+        {
+            public String Column1 { get; set; }
+            public String Column2 { get; set; }
+        }
+
+        [Test]
+        public void CanSaveTableCreatedFromEmptyDataTable()
+        {
+            var dt = new DataTable("sheet1");
+            dt.Columns.Add("col1", typeof (string));
+            dt.Columns.Add("col2", typeof (double));
+
+            var wb = new XLWorkbook();
+            wb.AddWorksheet(dt);
+
+            using (var ms = new MemoryStream())
+                wb.SaveAs(ms);
+        }
+
+        [Test]
+        public void CanSaveTableCreatedFromSingleRow()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Title");
+            ws.Range("A1").CreateTable();
+
+            using (var ms = new MemoryStream())
+                wb.SaveAs(ms);
+        }
+
+        [Test]
+        public void CreatingATableFromHeadersPushCellsBelow()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Title")
+                .CellBelow().SetValue("X");
+            ws.Range("A1").CreateTable();
+
+            Assert.AreEqual(ws.Cell("A2").GetString(), String.Empty);
+            Assert.AreEqual(ws.Cell("A3").GetString(), "X");
+        }
+
+        [Test]
+        public void Inserting_Column_Sets_Header()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Categories")
+                .CellBelow().SetValue("A")
+                .CellBelow().SetValue("B")
+                .CellBelow().SetValue("C");
+
+            IXLTable table = ws.RangeUsed().CreateTable();
+            table.InsertColumnsAfter(1);
+            Assert.AreEqual("Column2", table.HeadersRow().LastCell().GetString());
+        }
+
+        [Test]
+        public void SavingLoadingTableWithNewLineInHeader()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            string columnName = "Line1" + Environment.NewLine + "Line2";
+            ws.FirstCell().SetValue(columnName)
+                .CellBelow().SetValue("A");
+            ws.RangeUsed().CreateTable();
+            using (var ms = new MemoryStream())
+            {
+                wb.SaveAs(ms);
+                var wb2 = new XLWorkbook(ms);
+                IXLWorksheet ws2 = wb2.Worksheet(1);
+                IXLTable table2 = ws2.Table(0);
+                string fieldName = table2.Field(0).Name;
+                Assert.AreEqual("Line1\nLine2", fieldName);
+            }
+        }
+
+        [Test]
+        public void SavingLoadingTableWithNewLineInHeader2()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Test");
+
+            var dt = new DataTable();
+            string columnName = "Line1" + Environment.NewLine + "Line2";
+            dt.Columns.Add(columnName);
+
+            DataRow dr = dt.NewRow();
+            dr[columnName] = "some text";
+            dt.Rows.Add(dr);
+            ws.Cell(1, 1).InsertTable(dt.AsEnumerable());
+
+            IXLTable table1 = ws.Table(0);
+            string fieldName1 = table1.Field(0).Name;
+            Assert.AreEqual(columnName, fieldName1);
+
+            using (var ms = new MemoryStream())
+            {
+                wb.SaveAs(ms);
+                var wb2 = new XLWorkbook(ms);
+                IXLWorksheet ws2 = wb2.Worksheet(1);
+                IXLTable table2 = ws2.Table(0);
+                string fieldName2 = table2.Field(0).Name;
+                Assert.AreEqual("Line1\nLine2", fieldName2);
+            }
+        }
+
+        [Test]
+        public void TableCreatedFromEmptyDataTable()
+        {
+            var dt = new DataTable("sheet1");
+            dt.Columns.Add("col1", typeof (string));
+            dt.Columns.Add("col2", typeof (double));
+
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().InsertTable(dt);
+            Assert.AreEqual(2, ws.Tables.First().ColumnCount());
+        }
+
+        [Test]
+        public void TableCreatedFromEmptyListOfInt()
+        {
+            var l = new List<Int32>();
+
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().InsertTable(l);
+            Assert.AreEqual(1, ws.Tables.First().ColumnCount());
+        }
+
+        [Test]
+        public void TableCreatedFromEmptyListOfObject()
+        {
+            var l = new List<TestObject>();
+
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().InsertTable(l);
+            Assert.AreEqual(2, ws.Tables.First().ColumnCount());
+        }
+
+        [Test]
+        public void TableInsertAboveFromData()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Value");
+
+            IXLTable table = ws.Range("A1:A2").CreateTable();
+            table.SetShowTotalsRow()
+                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
+
+            IXLTableRow row = table.DataRange.FirstRow();
+            row.Field("Value").Value = 3;
+            row = table.DataRange.InsertRowsAbove(1).First();
+            row.Field("Value").Value = 2;
+            row = table.DataRange.InsertRowsAbove(1).First();
+            row.Field("Value").Value = 1;
+
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
+
+            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
+            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
+            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
+
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
+        }
+
+        [Test]
+        public void TableInsertAboveFromRows()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Value");
+
+            IXLTable table = ws.Range("A1:A2").CreateTable();
+            table.SetShowTotalsRow()
+                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox1.xlsx");
+            IXLTableRow row = table.DataRange.FirstRow();
+            row.Field("Value").Value = 3;
+            row = row.InsertRowsAbove(1).First();
+            row.Field("Value").Value = 2;
+            row = row.InsertRowsAbove(1).First();
+            row.Field("Value").Value = 1;
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox2.xlsx");
+
+            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
+            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
+            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
+
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
+        }
+
+        [Test]
+        public void TableInsertBelowFromData()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Value");
+
+            IXLTable table = ws.Range("A1:A2").CreateTable();
+            table.SetShowTotalsRow()
+                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
+
+            IXLTableRow row = table.DataRange.FirstRow();
+            row.Field("Value").Value = 1;
+            row = table.DataRange.InsertRowsBelow(1).First();
+            row.Field("Value").Value = 2;
+            row = table.DataRange.InsertRowsBelow(1).First();
+            row.Field("Value").Value = 3;
+
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
+
+            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
+            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
+            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
+        }
+
+        [Test]
+        public void TableInsertBelowFromRows()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Value");
+
+            IXLTable table = ws.Range("A1:A2").CreateTable();
+            table.SetShowTotalsRow()
+                .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum;
+
+            IXLTableRow row = table.DataRange.FirstRow();
+            row.Field("Value").Value = 1;
+            row = row.InsertRowsBelow(1).First();
+            row.Field("Value").Value = 2;
+            row = row.InsertRowsBelow(1).First();
+            row.Field("Value").Value = 3;
+
+            Assert.AreEqual(1, ws.Cell(2, 1).GetDouble());
+            Assert.AreEqual(2, ws.Cell(3, 1).GetDouble());
+            Assert.AreEqual(3, ws.Cell(4, 1).GetDouble());
+
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx");
+        }
+
+        [Test]
+        public void TableShowHeader()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().SetValue("Categories")
+                .CellBelow().SetValue("A")
+                .CellBelow().SetValue("B")
+                .CellBelow().SetValue("C");
+
+            ws.RangeUsed().CreateTable().SetShowHeaderRow(false);
+
+            IXLTable table = ws.Tables.First();
+
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox1.xlsx");
+
+            Assert.IsTrue(ws.Cell(1, 1).IsEmpty(true));
+            Assert.AreEqual(null, table.HeadersRow());
+            Assert.AreEqual("A", table.DataRange.FirstRow().Field("Categories").GetString());
+            Assert.AreEqual("C", table.DataRange.LastRow().Field("Categories").GetString());
+            Assert.AreEqual("A", table.DataRange.FirstCell().GetString());
+            Assert.AreEqual("C", table.DataRange.LastCell().GetString());
+
+            table.SetShowHeaderRow();
+            IXLRangeRow headerRow = table.HeadersRow();
+            Assert.AreNotEqual(null, headerRow);
+            Assert.AreEqual("Categories", headerRow.Cell(1).GetString());
+
+
+            table.SetShowHeaderRow(false);
+
+            ws.FirstCell().SetValue("x");
+
+            table.SetShowHeaderRow();
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox2.xlsx");
+
+            //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox3.xlsx");
+
+            Assert.AreEqual("x", ws.FirstCell().GetString());
+            Assert.AreEqual("Categories", ws.Cell("A2").GetString());
+            Assert.AreNotEqual(null, headerRow);
+            Assert.AreEqual("A", table.DataRange.FirstRow().Field("Categories").GetString());
+            Assert.AreEqual("C", table.DataRange.LastRow().Field("Categories").GetString());
+            Assert.AreEqual("A", table.DataRange.FirstCell().GetString());
+            Assert.AreEqual("C", table.DataRange.LastCell().GetString());
+        }
+
+        [Test]
+        public void ChangeFieldName()
+        {
+            XLWorkbook wb = new XLWorkbook(); //( @"c:\temp\test.xlsx");
+
+            var ws = wb.AddWorksheet("Sheet");
+            ws.Cell("A1").SetValue("FName")
+                .CellBelow().SetValue("John");
+
+            ws.Cell("B1").SetValue("LName")
+                .CellBelow().SetValue("Doe");
+
+            var tbl = ws.RangeUsed().CreateTable();
+            var nameBefore = tbl.Field(tbl.Fields.Last().Index).Name;
+            tbl.Field(tbl.Fields.Last().Index).Name = "LastName";
+            var nameAfter = tbl.Field(tbl.Fields.Last().Index).Name;
+
+            var cellValue = ws.Cell("B1").GetString();
+
+            Assert.AreEqual("LName", nameBefore);
+            Assert.AreEqual("LastName", nameAfter);
+            Assert.AreEqual("LastName", cellValue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Worksheets/XLWorksheetTests.cs b/ClosedXML_Tests/Excel/Worksheets/XLWorksheetTests.cs
new file mode 100644
index 0000000..e5bf666
--- /dev/null
+++ b/ClosedXML_Tests/Excel/Worksheets/XLWorksheetTests.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class XLWorksheetTests
+    {
+        [Test]
+        public void ColumnCountTime()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            DateTime start = DateTime.Now;
+            ws.ColumnCount();
+            DateTime end = DateTime.Now;
+            Assert.IsTrue((end - start).TotalMilliseconds < 500);
+        }
+
+        [Test]
+        public void CopyConditionalFormatsCount()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.AddWorksheet("Sheet1");
+            ws.FirstCell().AddConditionalFormat().WhenContains("1").Fill.SetBackgroundColor(XLColor.Blue);
+            IXLWorksheet ws2 = ws.CopyTo("Sheet2");
+            Assert.AreEqual(1, ws2.ConditionalFormats.Count());
+        }
+
+        [Test]
+        public void DeletingSheets1()
+        {
+            var wb = new XLWorkbook();
+            wb.Worksheets.Add("Sheet3");
+            wb.Worksheets.Add("Sheet2");
+            wb.Worksheets.Add("Sheet1", 1);
+
+            wb.Worksheet("Sheet3").Delete();
+
+            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
+            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
+            Assert.AreEqual(2, wb.Worksheets.Count);
+        }
+
+        [Test]
+        public void InsertingSheets1()
+        {
+            var wb = new XLWorkbook();
+            wb.Worksheets.Add("Sheet1");
+            wb.Worksheets.Add("Sheet2");
+            wb.Worksheets.Add("Sheet3");
+
+            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
+            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
+            Assert.AreEqual("Sheet3", wb.Worksheet(3).Name);
+        }
+
+        [Test]
+        public void InsertingSheets2()
+        {
+            var wb = new XLWorkbook();
+            wb.Worksheets.Add("Sheet2");
+            wb.Worksheets.Add("Sheet1", 1);
+            wb.Worksheets.Add("Sheet3");
+
+            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
+            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
+            Assert.AreEqual("Sheet3", wb.Worksheet(3).Name);
+        }
+
+        [Test]
+        public void InsertingSheets3()
+        {
+            var wb = new XLWorkbook();
+            wb.Worksheets.Add("Sheet3");
+            wb.Worksheets.Add("Sheet2", 1);
+            wb.Worksheets.Add("Sheet1", 1);
+
+
+            Assert.AreEqual("Sheet1", wb.Worksheet(1).Name);
+            Assert.AreEqual("Sheet2", wb.Worksheet(2).Name);
+            Assert.AreEqual("Sheet3", wb.Worksheet(3).Name);
+        }
+
+        [Test]
+        public void MergedRanges()
+        {
+            IXLWorksheet ws = new XLWorkbook().Worksheets.Add("Sheet1");
+            ws.Range("A1:B2").Merge();
+            ws.Range("C1:D3").Merge();
+            ws.Range("D2:E2").Merge();
+
+            Assert.AreEqual(2, ws.MergedRanges.Count);
+            Assert.AreEqual("A1:B2", ws.MergedRanges.First().RangeAddress.ToStringRelative());
+            Assert.AreEqual("D2:E2", ws.MergedRanges.Last().RangeAddress.ToStringRelative());
+        }
+
+        [Test]
+        public void RowCountTime()
+        {
+            var wb = new XLWorkbook();
+            IXLWorksheet ws = wb.Worksheets.Add("Sheet1");
+            DateTime start = DateTime.Now;
+            ws.RowCount();
+            DateTime end = DateTime.Now;
+            Assert.IsTrue((end - start).TotalMilliseconds < 500);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/ExcelDocsComparerTests.cs b/ClosedXML_Tests/ExcelDocsComparerTests.cs
new file mode 100644
index 0000000..3397f25
--- /dev/null
+++ b/ClosedXML_Tests/ExcelDocsComparerTests.cs
@@ -0,0 +1,61 @@
+using System.IO;
+using ClosedXML_Examples;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    [TestFixture]
+    public class ExcelDocsComparerTests
+    {
+        [Test]
+        public void CheckEqual()
+        {
+            string left = ExampleHelper.GetTempFilePath("left.xlsx");
+            string right = ExampleHelper.GetTempFilePath("right.xlsx");
+            try
+            {
+                new BasicTable().Create(left);
+                new BasicTable().Create(right);
+                string message;
+                Assert.IsTrue(ExcelDocsComparer.Compare(left, right, out message));
+            }
+            finally
+            {
+                if (File.Exists(left))
+                {
+                    File.Delete(left);
+                }
+                if (File.Exists(right))
+                {
+                    File.Delete(right);
+                }
+            }
+        }
+
+        [Test]
+        public void CheckNonEqual()
+        {
+            string left = ExampleHelper.GetTempFilePath("left.xlsx");
+            string right = ExampleHelper.GetTempFilePath("right.xlsx");
+            try
+            {
+                new BasicTable().Create(left);
+                new HelloWorld().Create(right);
+
+                string message;
+                Assert.IsFalse(ExcelDocsComparer.Compare(left, right, out message));
+            }
+            finally
+            {
+                if (File.Exists(left))
+                {
+                    File.Delete(left);
+                }
+                if (File.Exists(right))
+                {
+                    File.Delete(right);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Properties/AssemblyInfo.cs b/ClosedXML_Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f11097e
--- /dev/null
+++ b/ClosedXML_Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("ClosedXML_Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("ClosedXML_Tests")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly: Guid("a16b867e-6b00-4ccc-a368-c9f9b14e0e6a")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/ClosedXML_Tests/Resource/Examples/AutoFilter/CustomAutoFilter.xlsx b/ClosedXML_Tests/Resource/Examples/AutoFilter/CustomAutoFilter.xlsx
new file mode 100644
index 0000000..bd4afd7
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/AutoFilter/CustomAutoFilter.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/AutoFilter/DynamicAutoFilter.xlsx b/ClosedXML_Tests/Resource/Examples/AutoFilter/DynamicAutoFilter.xlsx
new file mode 100644
index 0000000..ee8699b
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/AutoFilter/DynamicAutoFilter.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/AutoFilter/RegularAutoFilter.xlsx b/ClosedXML_Tests/Resource/Examples/AutoFilter/RegularAutoFilter.xlsx
new file mode 100644
index 0000000..42ca177
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/AutoFilter/RegularAutoFilter.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/AutoFilter/TopBottomAutoFilter.xlsx b/ClosedXML_Tests/Resource/Examples/AutoFilter/TopBottomAutoFilter.xlsx
new file mode 100644
index 0000000..62fcdec
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/AutoFilter/TopBottomAutoFilter.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Columns/ColumnCells.xlsx b/ClosedXML_Tests/Resource/Examples/Columns/ColumnCells.xlsx
new file mode 100644
index 0000000..d7722ef
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Columns/ColumnCells.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Columns/ColumnCollection.xlsx b/ClosedXML_Tests/Resource/Examples/Columns/ColumnCollection.xlsx
new file mode 100644
index 0000000..8f90b9c
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Columns/ColumnCollection.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Columns/ColumnSettings.xlsx b/ClosedXML_Tests/Resource/Examples/Columns/ColumnSettings.xlsx
new file mode 100644
index 0000000..15fc2a2
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Columns/ColumnSettings.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Columns/DeletingColumns.xlsx b/ClosedXML_Tests/Resource/Examples/Columns/DeletingColumns.xlsx
new file mode 100644
index 0000000..749fbec
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Columns/DeletingColumns.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Columns/InsertColumns.xlsx b/ClosedXML_Tests/Resource/Examples/Columns/InsertColumns.xlsx
new file mode 100644
index 0000000..49515b1
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Columns/InsertColumns.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Comments/AddingComments.xlsx b/ClosedXML_Tests/Resource/Examples/Comments/AddingComments.xlsx
new file mode 100644
index 0000000..fc2f06a
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Comments/AddingComments.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Comments/EditingComments.xlsx b/ClosedXML_Tests/Resource/Examples/Comments/EditingComments.xlsx
new file mode 100644
index 0000000..b0bde50
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Comments/EditingComments.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowHigh.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowHigh.xlsx
new file mode 100644
index 0000000..79c8daf
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowHigh.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowMidHigh.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowMidHigh.xlsx
new file mode 100644
index 0000000..dc0fc2f
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFColorScaleLowMidHigh.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFContains.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFContains.xlsx
new file mode 100644
index 0000000..020491e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFContains.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFDataBar.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFDataBar.xlsx
new file mode 100644
index 0000000..7dd6722
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFDataBar.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEndsWith.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEndsWith.xlsx
new file mode 100644
index 0000000..302f55f
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEndsWith.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsNumber.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsNumber.xlsx
new file mode 100644
index 0000000..8bbdeb9
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsNumber.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsString.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsString.xlsx
new file mode 100644
index 0000000..9217bc8
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFEqualsString.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIconSet.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIconSet.xlsx
new file mode 100644
index 0000000..da22b7b
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIconSet.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsBlank.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsBlank.xlsx
new file mode 100644
index 0000000..c6a9610
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsBlank.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsError.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsError.xlsx
new file mode 100644
index 0000000..d273851
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsError.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotBlank.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotBlank.xlsx
new file mode 100644
index 0000000..00671c0
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotBlank.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotContains.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotContains.xlsx
new file mode 100644
index 0000000..b009cb4
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotContains.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsNumber.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsNumber.xlsx
new file mode 100644
index 0000000..414c031
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsNumber.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsString.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsString.xlsx
new file mode 100644
index 0000000..c0e0f9a
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotEqualsString.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotError.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotError.xlsx
new file mode 100644
index 0000000..ed1e46e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotError.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFStartsWith.xlsx b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFStartsWith.xlsx
new file mode 100644
index 0000000..d89fc73
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFStartsWith.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Delete/DeleteFewWorksheets.xlsx b/ClosedXML_Tests/Resource/Examples/Delete/DeleteFewWorksheets.xlsx
new file mode 100644
index 0000000..84e8047
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Delete/DeleteFewWorksheets.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Delete/RemoveRows.xlsx b/ClosedXML_Tests/Resource/Examples/Delete/RemoveRows.xlsx
new file mode 100644
index 0000000..5a6489e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Delete/RemoveRows.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Loading/ChangingBasicTable.xlsx b/ClosedXML_Tests/Resource/Examples/Loading/ChangingBasicTable.xlsx
new file mode 100644
index 0000000..2b7ee46
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Loading/ChangingBasicTable.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx
new file mode 100644
index 0000000..63fc973
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx
new file mode 100644
index 0000000..c23276f
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/AdjustToContents.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/AdjustToContents.xlsx
new file mode 100644
index 0000000..922c70c
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/AdjustToContents.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/AutoFilter.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/AutoFilter.xlsx
new file mode 100644
index 0000000..f32b368
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/AutoFilter.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/BasicTable.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/BasicTable.xlsx
new file mode 100644
index 0000000..3a4a2f7
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/BasicTable.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/BlankCells.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/BlankCells.xlsx
new file mode 100644
index 0000000..cf74d73
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/BlankCells.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/CellValues.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/CellValues.xlsx
new file mode 100644
index 0000000..283b632
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/CellValues.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/Collections.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/Collections.xlsx
new file mode 100644
index 0000000..4270b1f
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/Collections.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/CopyingRowsAndColumns.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/CopyingRowsAndColumns.xlsx
new file mode 100644
index 0000000..9df4b4d
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/CopyingRowsAndColumns.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
new file mode 100644
index 0000000..f18e03a
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/DataTypes.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/DataTypes.xlsx
new file mode 100644
index 0000000..b885488
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/DataTypes.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/DataValidation.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/DataValidation.xlsx
new file mode 100644
index 0000000..817bef8
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/DataValidation.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/Formulas.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/Formulas.xlsx
new file mode 100644
index 0000000..479293f
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/Formulas.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/FreezePanes.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/FreezePanes.xlsx
new file mode 100644
index 0000000..acc3467
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/FreezePanes.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/HideSheets.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/HideSheets.xlsx
new file mode 100644
index 0000000..a33099e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/HideSheets.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/HideUnhide.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/HideUnhide.xlsx
new file mode 100644
index 0000000..d3234d8
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/HideUnhide.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/Hyperlinks.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/Hyperlinks.xlsx
new file mode 100644
index 0000000..d99687a
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/Hyperlinks.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/InsertingData.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/InsertingData.xlsx
new file mode 100644
index 0000000..de32781
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/InsertingData.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx
new file mode 100644
index 0000000..82ab54e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/LambdaExpressions.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/LambdaExpressions.xlsx
new file mode 100644
index 0000000..bf79366
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/LambdaExpressions.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/MergeCells.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/MergeCells.xlsx
new file mode 100644
index 0000000..ef0eac1
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/MergeCells.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/MergeMoves.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/MergeMoves.xlsx
new file mode 100644
index 0000000..411137e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/MergeMoves.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/Outline.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/Outline.xlsx
new file mode 100644
index 0000000..e52b732
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/Outline.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/SheetProtection.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/SheetProtection.xlsx
new file mode 100644
index 0000000..4302e87
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/SheetProtection.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/ShiftingFormulas.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/ShiftingFormulas.xlsx
new file mode 100644
index 0000000..256e407
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/ShiftingFormulas.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx
new file mode 100644
index 0000000..529ee5d
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/TabColors.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/TabColors.xlsx
new file mode 100644
index 0000000..6ea980e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/TabColors.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/WorkbookProperties.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/WorkbookProperties.xlsx
new file mode 100644
index 0000000..4cfdf84
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Misc/WorkbookProperties.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/PageSetup/HeaderFooters.xlsx b/ClosedXML_Tests/Resource/Examples/PageSetup/HeaderFooters.xlsx
new file mode 100644
index 0000000..b351a9b
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/PageSetup/HeaderFooters.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/PageSetup/Margins.xlsx b/ClosedXML_Tests/Resource/Examples/PageSetup/Margins.xlsx
new file mode 100644
index 0000000..8a4297e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/PageSetup/Margins.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/PageSetup/Page.xlsx b/ClosedXML_Tests/Resource/Examples/PageSetup/Page.xlsx
new file mode 100644
index 0000000..9bab088
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/PageSetup/Page.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/PageSetup/SheetTab.xlsx b/ClosedXML_Tests/Resource/Examples/PageSetup/SheetTab.xlsx
new file mode 100644
index 0000000..57dd33e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/PageSetup/SheetTab.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/PageSetup/Sheets.xlsx b/ClosedXML_Tests/Resource/Examples/PageSetup/Sheets.xlsx
new file mode 100644
index 0000000..cea86d2
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/PageSetup/Sheets.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/PageSetup/TwoPages.xlsx b/ClosedXML_Tests/Resource/Examples/PageSetup/TwoPages.xlsx
new file mode 100644
index 0000000..7c0e26f
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/PageSetup/TwoPages.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/ClearingRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/ClearingRanges.xlsx
new file mode 100644
index 0000000..e1e0b66
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/ClearingRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/CopyingRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/CopyingRanges.xlsx
new file mode 100644
index 0000000..1142171
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/CopyingRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/CurrentRowColumn.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/CurrentRowColumn.xlsx
new file mode 100644
index 0000000..151348f
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/CurrentRowColumn.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/DefiningRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/DefiningRanges.xlsx
new file mode 100644
index 0000000..6e1e9b2
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/DefiningRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/DeletingRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/DeletingRanges.xlsx
new file mode 100644
index 0000000..b828455
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/DeletingRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingColumns.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingColumns.xlsx
new file mode 100644
index 0000000..8885e55
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingColumns.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingRows.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingRows.xlsx
new file mode 100644
index 0000000..a22f6eb
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingRows.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/MultipleRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/MultipleRanges.xlsx
new file mode 100644
index 0000000..911dddf
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/MultipleRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/NamedRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/NamedRanges.xlsx
new file mode 100644
index 0000000..efaa38d
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/NamedRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/SelectingRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/SelectingRanges.xlsx
new file mode 100644
index 0000000..a855f67
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/SelectingRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/ShiftingRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/ShiftingRanges.xlsx
new file mode 100644
index 0000000..65d84df
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/ShiftingRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/SortExample.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/SortExample.xlsx
new file mode 100644
index 0000000..10ab6bc
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/SortExample.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/Sorting.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/Sorting.xlsx
new file mode 100644
index 0000000..624b385
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/Sorting.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRanges.xlsx
new file mode 100644
index 0000000..82ee38c
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRangesPlus.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRangesPlus.xlsx
new file mode 100644
index 0000000..87938f5
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/TransposeRangesPlus.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx
new file mode 100644
index 0000000..1a58ba4
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/WalkingRanges.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/WalkingRanges.xlsx
new file mode 100644
index 0000000..585fb9e
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/WalkingRanges.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Rows/InsertRows.xlsx b/ClosedXML_Tests/Resource/Examples/Rows/InsertRows.xlsx
new file mode 100644
index 0000000..8dc30a9
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Rows/InsertRows.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Rows/RowCells.xlsx b/ClosedXML_Tests/Resource/Examples/Rows/RowCells.xlsx
new file mode 100644
index 0000000..9acc1fc
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Rows/RowCells.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Rows/RowCollection.xlsx b/ClosedXML_Tests/Resource/Examples/Rows/RowCollection.xlsx
new file mode 100644
index 0000000..7dce5fb
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Rows/RowCollection.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Rows/RowSettings.xlsx b/ClosedXML_Tests/Resource/Examples/Rows/RowSettings.xlsx
new file mode 100644
index 0000000..1100ecb
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Rows/RowSettings.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/DefaultStyles.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/DefaultStyles.xlsx
new file mode 100644
index 0000000..66d412d
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/DefaultStyles.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/PurpleWorksheet.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/PurpleWorksheet.xlsx
new file mode 100644
index 0000000..69af642
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/PurpleWorksheet.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/StyleAlignment.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/StyleAlignment.xlsx
new file mode 100644
index 0000000..8c58cda
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/StyleAlignment.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/StyleBorder.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/StyleBorder.xlsx
new file mode 100644
index 0000000..35e6214
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/StyleBorder.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/StyleFill.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/StyleFill.xlsx
new file mode 100644
index 0000000..77890c0
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/StyleFill.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/StyleFont.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/StyleFont.xlsx
new file mode 100644
index 0000000..d9f96a6
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/StyleFont.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/StyleNumberFormat.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/StyleNumberFormat.xlsx
new file mode 100644
index 0000000..43d61e1
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/StyleNumberFormat.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/StyleRowsColumns.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/StyleRowsColumns.xlsx
new file mode 100644
index 0000000..9f043d8
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/StyleRowsColumns.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/StyleWorksheet.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/StyleWorksheet.xlsx
new file mode 100644
index 0000000..838a240
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/StyleWorksheet.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/UsingColors.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/UsingColors.xlsx
new file mode 100644
index 0000000..a86b50d
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/UsingColors.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Styles/UsingRichText.xlsx b/ClosedXML_Tests/Resource/Examples/Styles/UsingRichText.xlsx
new file mode 100644
index 0000000..1497f96
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/Styles/UsingRichText.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Misc/CopyRowContents.xlsx b/ClosedXML_Tests/Resource/Misc/CopyRowContents.xlsx
new file mode 100644
index 0000000..ce9e7b1
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Misc/CopyRowContents.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/TestHelper.cs b/ClosedXML_Tests/TestHelper.cs
new file mode 100644
index 0000000..eb02623
--- /dev/null
+++ b/ClosedXML_Tests/TestHelper.cs
@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+using System.Threading;
+using ClosedXML.Excel;
+using ClosedXML_Examples;
+using DocumentFormat.OpenXml.Drawing;
+using NUnit.Framework;
+using Path = System.IO.Path;
+
+namespace ClosedXML_Tests
+{
+    internal static class TestHelper
+    {
+        public static string CurrencySymbol
+        {
+            get { return Thread.CurrentThread.CurrentCulture.NumberFormat.CurrencySymbol; }
+        }
+
+        //Note: Run example tests parameters
+        public static string TestsOutputDirectory
+        {
+            get { 
+                return Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); 
+            }
+
+        }
+
+        public const string ActualTestResultPostFix = "";
+        public static readonly string TestsExampleOutputDirectory = Path.Combine(TestsOutputDirectory, "Examples");
+        
+        private const bool CompareWithResources = true;
+
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(null, ".Resource.Examples.");
+
+        public static void SaveWorkbook(XLWorkbook workbook, string fileName)
+        {
+            workbook.SaveAs(Path.Combine(TestsOutputDirectory, fileName));
+        }
+
+        public static void RunTestExample<T>(string filePartName)
+                where T : IXLExample, new()
+        {
+            // Make sure tests run on a deterministic culture
+            Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
+
+            var example = new T();
+            string filePath1 = Path.Combine(TestsExampleOutputDirectory, filePartName);
+
+            var extension = Path.GetExtension(filePath1);
+            var directory = Path.GetDirectoryName(filePath1);
+
+            var fileName= Path.GetFileNameWithoutExtension(filePath1);
+            fileName += ActualTestResultPostFix;
+            fileName = Path.ChangeExtension(fileName, extension);
+
+            filePath1 = Path.Combine(directory, "z" + fileName);
+            var filePath2 = Path.Combine(directory, fileName);
+            //Run test
+            example.Create(filePath1);
+            new XLWorkbook(filePath1).SaveAs(filePath2);
+            bool success = true;
+#pragma warning disable 162
+            try
+            {
+                //Compare
+                // ReSharper disable ConditionIsAlwaysTrueOrFalse
+                if (CompareWithResources)
+                        // ReSharper restore ConditionIsAlwaysTrueOrFalse
+
+                {
+                    string resourcePath = filePartName.Replace('\\', '.').TrimStart('.');
+                    using (var streamExpected = _extractor.ReadFileFromResToStream(resourcePath))
+                    using (var streamActual = File.OpenRead(filePath2))
+                    {
+                        string message;
+                        success = ExcelDocsComparer.Compare(streamActual, streamExpected, out message);
+                        var formattedMessage =
+                            String.Format(
+                                "Actual file '{0}' is different than the expected file '{1}'. The difference is: '{2}'",
+                                filePath2, resourcePath, message);
+
+                        Assert.IsTrue(success, formattedMessage);
+                    }
+                }
+            }
+            finally
+            {
+                //if (success && File.Exists(filePath)) File.Delete(filePath);
+            }
+#pragma warning restore 162
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Utils/ExcelDocsComparer.cs b/ClosedXML_Tests/Utils/ExcelDocsComparer.cs
new file mode 100644
index 0000000..25dc07f
--- /dev/null
+++ b/ClosedXML_Tests/Utils/ExcelDocsComparer.cs
@@ -0,0 +1,42 @@
+using System;
+using System.IO;
+using System.IO.Packaging;
+
+namespace ClosedXML_Tests
+{
+    internal static class ExcelDocsComparer
+    {
+        public static bool Compare(string left, string right, out string message)
+        {
+            using (FileStream leftStream = File.OpenRead(left))
+            {
+                using (FileStream rightStream = File.OpenRead(right))
+                {
+                    return Compare(leftStream, rightStream, out message);
+                }
+            }
+        }
+
+        public static bool Compare(Stream left, Stream right, out string message)
+        {
+            using (Package leftPackage = Package.Open(left))
+            {
+                using (Package rightPackage = Package.Open(right))
+                {
+                    return PackageHelper.Compare(leftPackage, rightPackage, false, ExcludeMethod, out message);
+                }
+            }
+        }
+
+        private static bool ExcludeMethod(Uri uri)
+        {
+            //Exclude service data
+            if (uri.OriginalString.EndsWith(".rels") ||
+                uri.OriginalString.EndsWith(".psmdcp"))
+            {
+                return true;
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Utils/PackageHelper.cs b/ClosedXML_Tests/Utils/PackageHelper.cs
new file mode 100644
index 0000000..ec92716
--- /dev/null
+++ b/ClosedXML_Tests/Utils/PackageHelper.cs
@@ -0,0 +1,504 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Packaging;
+using System.Linq;
+using System.Net.Mime;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace ClosedXML_Tests
+{
+    public static class PackageHelper
+    {
+        public static void WriteXmlPart(Package package, Uri uri, object content, XmlSerializer serializer)
+        {
+            if (package.PartExists(uri))
+            {
+                package.DeletePart(uri);
+            }
+            PackagePart part = package.CreatePart(uri, MediaTypeNames.Text.Xml, CompressionOption.Fast);
+            using (Stream stream = part.GetStream())
+            {
+                serializer.Serialize(stream, content);
+            }
+        }
+
+        public static object ReadXmlPart(Package package, Uri uri, XmlSerializer serializer)
+        {
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException(string.Format("Package part '{0}' doesn't exists!", uri.OriginalString));
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                return serializer.Deserialize(stream);
+            }
+        }
+
+        public static void WriteBinaryPart(Package package, Uri uri, Stream content)
+        {
+            if (package.PartExists(uri))
+            {
+                package.DeletePart(uri);
+            }
+            PackagePart part = package.CreatePart(uri, MediaTypeNames.Application.Octet, CompressionOption.Fast);
+            using (Stream stream = part.GetStream())
+            {
+                StreamHelper.StreamToStreamAppend(content, stream);
+            }
+        }
+
+        /// <summary>
+        ///     Returns part's stream
+        /// </summary>
+        /// <param name="package"></param>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        public static Stream ReadBinaryPart(Package package, Uri uri)
+        {
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException("Package part doesn't exists!");
+            }
+            PackagePart part = package.GetPart(uri);
+            return part.GetStream();
+        }
+
+        public static void CopyPart(Uri uri, Package source, Package dest)
+        {
+            CopyPart(uri, source, dest, true);
+        }
+
+        public static void CopyPart(Uri uri, Package source, Package dest, bool overwrite)
+        {
+            #region Check
+
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException("uri");
+            }
+            if (ReferenceEquals(source, null))
+            {
+                throw new ArgumentNullException("source");
+            }
+            if (ReferenceEquals(dest, null))
+            {
+                throw new ArgumentNullException("dest");
+            }
+
+            #endregion
+
+            if (dest.PartExists(uri))
+            {
+                if (!overwrite)
+                {
+                    throw new ArgumentException("Specified part already exists", "uri");
+                }
+                dest.DeletePart(uri);
+            }
+
+            PackagePart sourcePart = source.GetPart(uri);
+            PackagePart destPart = dest.CreatePart(uri, sourcePart.ContentType, sourcePart.CompressionOption);
+
+            using (Stream sourceStream = sourcePart.GetStream())
+            {
+                using (Stream destStream = destPart.GetStream())
+                {
+                    StreamHelper.StreamToStreamAppend(sourceStream, destStream);
+                }
+            }
+        }
+
+        public static void WritePart<T>(Package package, PackagePartDescriptor descriptor, T content,
+            Action<Stream, T> serializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException("package");
+            }
+            if (ReferenceEquals(descriptor, null))
+            {
+                throw new ArgumentNullException("descriptor");
+            }
+            if (ReferenceEquals(serializeAction, null))
+            {
+                throw new ArgumentNullException("serializeAction");
+            }
+
+            #endregion
+
+            if (package.PartExists(descriptor.Uri))
+            {
+                package.DeletePart(descriptor.Uri);
+            }
+            PackagePart part = package.CreatePart(descriptor.Uri, descriptor.ContentType, descriptor.CompressOption);
+            using (Stream stream = part.GetStream())
+            {
+                serializeAction(stream, content);
+            }
+        }
+
+        public static void WritePart(Package package, PackagePartDescriptor descriptor, Action<Stream> serializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException("package");
+            }
+            if (ReferenceEquals(descriptor, null))
+            {
+                throw new ArgumentNullException("descriptor");
+            }
+            if (ReferenceEquals(serializeAction, null))
+            {
+                throw new ArgumentNullException("serializeAction");
+            }
+
+            #endregion
+
+            if (package.PartExists(descriptor.Uri))
+            {
+                package.DeletePart(descriptor.Uri);
+            }
+            PackagePart part = package.CreatePart(descriptor.Uri, descriptor.ContentType, descriptor.CompressOption);
+            using (Stream stream = part.GetStream())
+            {
+                serializeAction(stream);
+            }
+        }
+
+        public static T ReadPart<T>(Package package, Uri uri, Func<Stream, T> deserializeFunc)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException("package");
+            }
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException("uri");
+            }
+            if (ReferenceEquals(deserializeFunc, null))
+            {
+                throw new ArgumentNullException("deserializeFunc");
+            }
+
+            #endregion
+
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException(string.Format("Package part '{0}' doesn't exists!", uri.OriginalString));
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                return deserializeFunc(stream);
+            }
+        }
+
+        public static void ReadPart(Package package, Uri uri, Action<Stream> deserializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException("package");
+            }
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException("uri");
+            }
+            if (ReferenceEquals(deserializeAction, null))
+            {
+                throw new ArgumentNullException("deserializeAction");
+            }
+
+            #endregion
+
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException(string.Format("Package part '{0}' doesn't exists!", uri.OriginalString));
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                deserializeAction(stream);
+            }
+        }
+
+        public static bool TryReadPart(Package package, Uri uri, Action<Stream> deserializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException("package");
+            }
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException("uri");
+            }
+            if (ReferenceEquals(deserializeAction, null))
+            {
+                throw new ArgumentNullException("deserializeAction");
+            }
+
+            #endregion
+
+            if (!package.PartExists(uri))
+            {
+                return false;
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                deserializeAction(stream);
+            }
+            return true;
+        }
+
+        /// <summary>
+        ///     Compare to packages by parts like streams
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <param name="compareToFirstDifference"></param>
+        /// <param name="excludeMethod"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        public static bool Compare(Package left, Package right, bool compareToFirstDifference, out string message)
+        {
+            return Compare(left, right, compareToFirstDifference, null, out message);
+        }
+
+        /// <summary>
+        ///     Compare to packages by parts like streams
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <param name="compareToFirstDifference"></param>
+        /// <param name="excludeMethod"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        public static bool Compare(Package left, Package right, bool compareToFirstDifference,
+            Func<Uri, bool> excludeMethod, out string message)
+        {
+            #region Check
+
+            if (left == null)
+            {
+                throw new ArgumentNullException("left");
+            }
+            if (right == null)
+            {
+                throw new ArgumentNullException("right");
+            }
+
+            #endregion
+
+            excludeMethod = excludeMethod ?? (uri => false);
+            PackagePartCollection leftParts = left.GetParts();
+            PackagePartCollection rightParts = right.GetParts();
+
+            var pairs = new Dictionary<Uri, PartPair>();
+            foreach (PackagePart part in leftParts)
+            {
+                if (excludeMethod(part.Uri))
+                {
+                    continue;
+                }
+                pairs.Add(part.Uri, new PartPair(part.Uri, CompareStatus.OnlyOnLeft));
+            }
+            foreach (PackagePart part in rightParts)
+            {
+                if (excludeMethod(part.Uri))
+                {
+                    continue;
+                }
+                PartPair pair;
+                if (pairs.TryGetValue(part.Uri, out pair))
+                {
+                    pair.Status = CompareStatus.Equal;
+                }
+                else
+                {
+                    pairs.Add(part.Uri, new PartPair(part.Uri, CompareStatus.OnlyOnRight));
+                }
+            }
+
+            if (compareToFirstDifference && pairs.Any(pair => pair.Value.Status != CompareStatus.Equal))
+            {
+                goto EXIT;
+            }
+
+            foreach (PartPair pair in pairs.Values)
+            {
+                if (pair.Status != CompareStatus.Equal)
+                {
+                    continue;
+                }
+                using (Stream oneStream = left.GetPart(pair.Uri).GetStream(FileMode.Open, FileAccess.Read))
+                using (Stream otherStream = right.GetPart(pair.Uri).GetStream(FileMode.Open, FileAccess.Read))
+                {
+                    if (!StreamHelper.Compare(oneStream, otherStream))
+                    {
+                        pair.Status = CompareStatus.NonEqual;
+                        if (compareToFirstDifference)
+                        {
+                            goto EXIT;
+                        }
+                    }
+                }
+            }
+
+            EXIT:
+            List<PartPair> sortedPairs = pairs.Values.ToList();
+            sortedPairs.Sort((one, other) => one.Uri.OriginalString.CompareTo(other.Uri.OriginalString));
+            var sbuilder = new StringBuilder();
+            foreach (PartPair pair in sortedPairs)
+            {
+                if (pair.Status == CompareStatus.Equal)
+                {
+                    continue;
+                }
+                sbuilder.AppendFormat("{0} :{1}", pair.Uri, pair.Status);
+                sbuilder.AppendLine();
+            }
+            message = sbuilder.ToString();
+            return message.Length == 0;
+        }
+
+        #region Nested type: PackagePartDescriptor
+
+        public sealed class PackagePartDescriptor
+        {
+            #region Private fields
+
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly CompressionOption _compressOption;
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly string _contentType;
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly Uri _uri;
+
+            #endregion
+
+            #region Constructor
+
+            /// <summary>
+            ///     Instance constructor
+            /// </summary>
+            /// <param name="uri">Part uri</param>
+            /// <param name="contentType">Content type from <see cref="MediaTypeNames" /></param>
+            /// <param name="compressOption"></param>
+            public PackagePartDescriptor(Uri uri, string contentType, CompressionOption compressOption)
+            {
+                #region Check
+
+                if (ReferenceEquals(uri, null))
+                {
+                    throw new ArgumentNullException("uri");
+                }
+                if (string.IsNullOrEmpty(contentType))
+                {
+                    throw new ArgumentNullException("contentType");
+                }
+
+                #endregion
+
+                _uri = uri;
+                _contentType = contentType;
+                _compressOption = compressOption;
+            }
+
+            #endregion
+
+            #region Public properties
+
+            public Uri Uri
+            {
+                [DebuggerStepThrough] get { return _uri; }
+            }
+
+            public string ContentType
+            {
+                [DebuggerStepThrough] get { return _contentType; }
+            }
+
+            public CompressionOption CompressOption
+            {
+                [DebuggerStepThrough] get { return _compressOption; }
+            }
+
+            #endregion
+
+            #region Public methods
+
+            public override string ToString()
+            {
+                return string.Format("Uri:{0} ContentType: {1}, Compression: {2}", _uri, _contentType, _compressOption);
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region Nested type: CompareStatus
+
+        private enum CompareStatus
+        {
+            OnlyOnLeft,
+            OnlyOnRight,
+            Equal,
+            NonEqual
+        }
+
+        #endregion
+
+        #region Nested type: PartPair
+
+        private sealed class PartPair
+        {
+            #region Private fields
+
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly Uri _uri;
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)] private CompareStatus _status;
+
+            #endregion
+
+            #region Constructor
+
+            public PartPair(Uri uri, CompareStatus status)
+            {
+                _uri = uri;
+                _status = status;
+            }
+
+            #endregion
+
+            #region Public properties
+
+            public Uri Uri
+            {
+                [DebuggerStepThrough] get { return _uri; }
+            }
+
+            public CompareStatus Status
+            {
+                [DebuggerStepThrough] get { return _status; }
+                [DebuggerStepThrough] set { _status = value; }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        //--
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Utils/ResourceFileExtractor.cs b/ClosedXML_Tests/Utils/ResourceFileExtractor.cs
new file mode 100644
index 0000000..0083f5a
--- /dev/null
+++ b/ClosedXML_Tests/Utils/ResourceFileExtractor.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace ClosedXML_Tests
+{
+    /// <summary>
+    /// Summary description for ResourceFileExtractor.
+    /// </summary>
+    public sealed class ResourceFileExtractor
+    {
+        #region Static
+        #region Private fields
+        private static readonly Dictionary<string, ResourceFileExtractor> ms_defaultExtractors =
+                new Dictionary<string, ResourceFileExtractor>();
+        #endregion
+        #region Public properties
+        /// <summary>Instance of resource extractor for executing assembly </summary>
+        public static ResourceFileExtractor Instance
+        {
+            get
+            {
+                ResourceFileExtractor _return;
+                Assembly _assembly = Assembly.GetCallingAssembly();
+                string _key = _assembly.GetName().FullName;
+                if (!ms_defaultExtractors.TryGetValue(_key, out _return))
+                {
+                    lock (ms_defaultExtractors)
+                    {
+                        if (!ms_defaultExtractors.TryGetValue(_key, out _return))
+                        {
+                            _return = new ResourceFileExtractor(_assembly, true, null);
+                            ms_defaultExtractors.Add(_key, _return);
+                        }
+                    }
+                }
+                return _return;
+            }
+        }
+        #endregion
+        #region Public methods
+        #endregion
+        #endregion
+        #region Private fields
+        private readonly Assembly m_assembly;
+        private readonly ResourceFileExtractor m_baseExtractor;
+        private readonly string m_assemblyName;
+
+        private bool m_isStatic;
+        private string m_resourceFilePath;
+        #endregion
+        #region Constructors
+        /// <summary>
+        /// Create instance
+        /// </summary>
+        /// <param name="resourceFilePath"><c>ResourceFilePath</c> in assembly. Example: .Properties.Scripts.</param>
+        /// <param name="baseExtractor"></param>
+        public ResourceFileExtractor(string resourceFilePath, ResourceFileExtractor baseExtractor)
+                : this(Assembly.GetCallingAssembly(), baseExtractor)
+        {
+            m_resourceFilePath = resourceFilePath;
+        }
+        /// <summary>
+        /// Create instance
+        /// </summary>
+        /// <param name="baseExtractor"></param>
+        public ResourceFileExtractor(ResourceFileExtractor baseExtractor)
+                : this(Assembly.GetCallingAssembly(), baseExtractor)
+        {
+        }
+        /// <summary>
+        /// Create instance
+        /// </summary>
+        /// <param name="resourcePath"><c>ResourceFilePath</c> in assembly. Example: .Properties.Scripts.</param>
+        public ResourceFileExtractor(string resourcePath)
+                : this(Assembly.GetCallingAssembly(), resourcePath)
+        {
+        }
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <param name="resourcePath"></param>
+        public ResourceFileExtractor(Assembly assembly, string resourcePath)
+                : this(assembly ?? Assembly.GetCallingAssembly())
+        {
+            m_resourceFilePath = resourcePath;
+        }
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        public ResourceFileExtractor()
+                : this(Assembly.GetCallingAssembly())
+        {
+        }
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        public ResourceFileExtractor(Assembly assembly)
+                : this(assembly ?? Assembly.GetCallingAssembly(), (ResourceFileExtractor) null)
+        {
+        }
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <param name="baseExtractor"></param>
+        public ResourceFileExtractor(Assembly assembly, ResourceFileExtractor baseExtractor)
+                : this(assembly ?? Assembly.GetCallingAssembly(), false, baseExtractor)
+        {
+        }
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <param name="isStatic"></param>
+        /// <param name="baseExtractor"></param>
+        /// <exception cref="ArgumentNullException">Argument is null.</exception>
+        private ResourceFileExtractor(Assembly assembly, bool isStatic, ResourceFileExtractor baseExtractor)
+        {
+            #region Check
+            if (ReferenceEquals(assembly, null))
+            {
+                throw new ArgumentNullException("assembly");
+            }
+            #endregion
+            m_assembly = assembly;
+            m_baseExtractor = baseExtractor;
+            m_assemblyName = Assembly.GetName().Name;
+            IsStatic = isStatic;
+            m_resourceFilePath = ".Resources.";
+        }
+        #endregion
+        #region Public properties
+        /// <summary> Work assembly </summary>
+        public Assembly Assembly
+        {
+            [DebuggerStepThrough]
+            get { return m_assembly; }
+        }
+        /// <summary> Work assembly name </summary>
+        public string AssemblyName
+        {
+            [DebuggerStepThrough]
+            get { return m_assemblyName; }
+        }
+        /// <summary>
+        /// Path to read resource files. Example: .Resources.Upgrades.
+        /// </summary>
+        public string ResourceFilePath
+        {
+            [DebuggerStepThrough]
+            get { return m_resourceFilePath; }
+            [DebuggerStepThrough]
+            set { m_resourceFilePath = value; }
+        }
+        public bool IsStatic
+        {
+            [DebuggerStepThrough]
+            get { return m_isStatic; }
+            [DebuggerStepThrough]
+            set { m_isStatic = value; }
+        }
+        public IEnumerable<string> GetFileNames()
+        {
+            string _path = AssemblyName + m_resourceFilePath;
+            foreach (string _resourceName in Assembly.GetManifestResourceNames())
+            {
+                if (_resourceName.StartsWith(_path))
+                {
+                    yield return _resourceName.Replace(_path, string.Empty);
+                }
+            }
+        }
+        #endregion
+        #region Public methods
+        public string ReadFileFromRes(string fileName)
+        {
+            Stream _stream = ReadFileFromResToStream(fileName);
+            string _result;
+            StreamReader sr = new StreamReader(_stream);
+            try
+            {
+                _result = sr.ReadToEnd();
+            }
+            finally
+            {
+                sr.Close();
+            }
+            return _result;
+        }
+
+        public string ReadFileFromResFormat(string fileName, params object[] formatArgs)
+        {
+            return string.Format(ReadFileFromRes(fileName), formatArgs);
+        }
+
+        /// <summary>
+        /// Read file in current assembly by specific path
+        /// </summary>
+        /// <param name="specificPath">Specific path</param>
+        /// <param name="fileName">Read file name</param>
+        /// <returns></returns>
+        public string ReadSpecificFileFromRes(string specificPath, string fileName)
+        {
+            ResourceFileExtractor _ext = new ResourceFileExtractor(Assembly, specificPath);
+            return _ext.ReadFileFromRes(fileName);
+        }
+        /// <summary>
+        /// Read file in current assembly by specific file name
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        /// <exception cref="ApplicationException"><c>ApplicationException</c>.</exception>
+        public Stream ReadFileFromResToStream(string fileName)
+        {
+            string _nameResFile = AssemblyName + m_resourceFilePath + fileName;
+            Stream _stream = Assembly.GetManifestResourceStream(_nameResFile);
+            #region Not found
+            if (ReferenceEquals(_stream, null))
+            {
+                #region Get from base extractor
+                if (!ReferenceEquals(m_baseExtractor, null))
+                {
+                    return m_baseExtractor.ReadFileFromResToStream(fileName);
+                }
+                #endregion
+                throw new ApplicationException("Can't find resource file " + _nameResFile);
+            }
+            #endregion
+            return _stream;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Utils/StreamHelper.cs b/ClosedXML_Tests/Utils/StreamHelper.cs
new file mode 100644
index 0000000..30b8d08
--- /dev/null
+++ b/ClosedXML_Tests/Utils/StreamHelper.cs
@@ -0,0 +1,141 @@
+using System;
+using System.IO;
+
+namespace ClosedXML_Tests
+{
+    /// <summary>
+    ///     Help methods for work with streams
+    /// </summary>
+    public static class StreamHelper
+    {
+        /// <summary>
+        ///     Convert stream to byte array
+        /// </summary>
+        /// <param name="pStream">Stream</param>
+        /// <returns>Byte array</returns>
+        public static byte[] StreamToArray(Stream pStream)
+        {
+            long iLength = pStream.Length;
+            var bytes = new byte[iLength];
+            for (int i = 0; i < iLength; i++)
+            {
+                bytes[i] = (byte) pStream.ReadByte();
+            }
+            pStream.Close();
+            return bytes;
+        }
+
+        /// <summary>
+        ///     Convert byte array to stream
+        /// </summary>
+        /// <param name="pBynaryArray">Byte array</param>
+        /// <param name="pStream">Open stream</param>
+        /// <returns></returns>
+        public static Stream ArrayToStreamAppend(byte[] pBynaryArray, Stream pStream)
+        {
+            #region Check params
+
+            if (ReferenceEquals(pBynaryArray, null))
+            {
+                throw new ArgumentNullException("pBynaryArray");
+            }
+            if (ReferenceEquals(pStream, null))
+            {
+                throw new ArgumentNullException("pStream");
+            }
+            if (!pStream.CanWrite)
+            {
+                throw new ArgumentException("Can't write to stream", "pStream");
+            }
+
+            #endregion
+
+            foreach (byte b in pBynaryArray)
+            {
+                pStream.WriteByte(b);
+            }
+            return pStream;
+        }
+
+        public static void StreamToStreamAppend(Stream streamIn, Stream streamToWrite)
+        {
+            StreamToStreamAppend(streamIn, streamToWrite, 0);
+        }
+
+        public static void StreamToStreamAppend(Stream streamIn, Stream streamToWrite, long dataLength)
+        {
+            #region Check params
+
+            if (ReferenceEquals(streamIn, null))
+            {
+                throw new ArgumentNullException("streamIn");
+            }
+            if (ReferenceEquals(streamToWrite, null))
+            {
+                throw new ArgumentNullException("streamToWrite");
+            }
+            if (!streamIn.CanRead)
+            {
+                throw new ArgumentException("Can't read from stream", "streamIn");
+            }
+            if (!streamToWrite.CanWrite)
+            {
+                throw new ArgumentException("Can't write to stream", "streamToWrite");
+            }
+
+            #endregion
+
+            var buf = new byte[512];
+            long length;
+            if (dataLength == 0)
+            {
+                length = streamIn.Length - streamIn.Position;
+            }
+            else
+            {
+                length = dataLength;
+            }
+            long rest = length;
+            while (rest > 0)
+            {
+                int len1 = streamIn.Read(buf, 0, rest >= 512 ? 512 : (int) rest);
+                streamToWrite.Write(buf, 0, len1);
+                rest -= len1;
+            }
+        }
+
+        /// <summary>
+        ///     Compare two streams by converting them to strings and comparing the strings
+        /// </summary>
+        /// <param name="one"></param>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        public static bool Compare(Stream one, Stream other)
+        {
+            #region Check
+
+            if (one == null)
+            {
+                throw new ArgumentNullException("one");
+            }
+            if (other == null)
+            {
+                throw new ArgumentNullException("other");
+            }
+            if (one.Position != 0)
+            {
+                throw new ArgumentException("Must be in position 0", "one");
+            }
+            if (other.Position != 0)
+            {
+                throw new ArgumentException("Must be in position 0", "other");
+            }
+
+            #endregion
+
+            var stringOne = new StreamReader(one).ReadToEnd();
+            var stringOther = new StreamReader(other).ReadToEnd();
+            return stringOne == stringOther;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/XLHelperTests.cs b/ClosedXML_Tests/XLHelperTests.cs
new file mode 100644
index 0000000..a73cc75
--- /dev/null
+++ b/ClosedXML_Tests/XLHelperTests.cs
@@ -0,0 +1,152 @@
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests
+{
+    /// <summary>
+    ///     This is a test class for XLHelperTests and is intended
+    ///     to contain all XLHelperTests Unit Tests
+    /// </summary>
+    [TestFixture]
+    public class XLHelperTests
+    {
+        /// <summary>
+        ///     Gets or sets the test context which provides
+        ///     information about and functionality for the current test run.
+        /// </summary>
+        public TestContext TestContext { get; set; }
+
+        // 
+        //You can use the following additional attributes as you write your tests:
+        //
+        //Use ClassInitialize to run code before running the first test in the class
+        //[ClassInitialize()]
+        //public static void MyClassInitialize(TestContext testContext)
+        //{
+        //}
+        //
+        //Use ClassCleanup to run code after all tests in a class have run
+        //[ClassCleanup()]
+        //public static void MyClassCleanup()
+        //{
+        //}
+        //
+        //Use TestInitialize to run code before running each test
+        //[TestInitialize()]
+        //public void MyTestInitialize()
+        //{
+        //}
+        //
+        //Use TestCleanup to run code after each test has run
+        //[TestCleanup()]
+        //public void MyTestCleanup()
+        //{
+        //}
+        //
+
+        /// <summary>
+        ///     A test for IsValidColumn
+        /// </summary>
+        [Test]
+        public void IsValidColumnTest()
+        {
+            Assert.AreEqual(false, XLHelper.IsValidColumn(""));
+            Assert.AreEqual(false, XLHelper.IsValidColumn("1"));
+            Assert.AreEqual(false, XLHelper.IsValidColumn("A1"));
+            Assert.AreEqual(false, XLHelper.IsValidColumn("AA1"));
+            Assert.AreEqual(true, XLHelper.IsValidColumn("A"));
+            Assert.AreEqual(true, XLHelper.IsValidColumn("AA"));
+            Assert.AreEqual(true, XLHelper.IsValidColumn("AAA"));
+            Assert.AreEqual(true, XLHelper.IsValidColumn("Z"));
+            Assert.AreEqual(true, XLHelper.IsValidColumn("ZZ"));
+            Assert.AreEqual(true, XLHelper.IsValidColumn("XFD"));
+            Assert.AreEqual(false, XLHelper.IsValidColumn("ZAA"));
+            Assert.AreEqual(false, XLHelper.IsValidColumn("XZA"));
+            Assert.AreEqual(false, XLHelper.IsValidColumn("XFZ"));
+        }
+
+        [Test]
+        public void ReplaceRelative1()
+        {
+            string result = XLHelper.ReplaceRelative("A1", 2, "B");
+            Assert.AreEqual("B2", result);
+        }
+
+        [Test]
+        public void ReplaceRelative2()
+        {
+            string result = XLHelper.ReplaceRelative("$A1", 2, "B");
+            Assert.AreEqual("$A2", result);
+        }
+
+        [Test]
+        public void ReplaceRelative3()
+        {
+            string result = XLHelper.ReplaceRelative("A$1", 2, "B");
+            Assert.AreEqual("B$1", result);
+        }
+
+        [Test]
+        public void ReplaceRelative4()
+        {
+            string result = XLHelper.ReplaceRelative("$A$1", 2, "B");
+            Assert.AreEqual("$A$1", result);
+        }
+
+        [Test]
+        public void ReplaceRelative5()
+        {
+            string result = XLHelper.ReplaceRelative("1:1", 2, "B");
+            Assert.AreEqual("2:2", result);
+        }
+
+        [Test]
+        public void ReplaceRelative6()
+        {
+            string result = XLHelper.ReplaceRelative("$1:1", 2, "B");
+            Assert.AreEqual("$1:2", result);
+        }
+
+        [Test]
+        public void ReplaceRelative7()
+        {
+            string result = XLHelper.ReplaceRelative("1:$1", 2, "B");
+            Assert.AreEqual("2:$1", result);
+        }
+
+        [Test]
+        public void ReplaceRelative8()
+        {
+            string result = XLHelper.ReplaceRelative("$1:$1", 2, "B");
+            Assert.AreEqual("$1:$1", result);
+        }
+
+        [Test]
+        public void ReplaceRelative9()
+        {
+            string result = XLHelper.ReplaceRelative("A:A", 2, "B");
+            Assert.AreEqual("B:B", result);
+        }
+
+        [Test]
+        public void ReplaceRelativeA()
+        {
+            string result = XLHelper.ReplaceRelative("$A:A", 2, "B");
+            Assert.AreEqual("$A:B", result);
+        }
+
+        [Test]
+        public void ReplaceRelativeB()
+        {
+            string result = XLHelper.ReplaceRelative("A:$A", 2, "B");
+            Assert.AreEqual("B:$A", result);
+        }
+
+        [Test]
+        public void ReplaceRelativeC()
+        {
+            string result = XLHelper.ReplaceRelative("$A:$A", 2, "B");
+            Assert.AreEqual("$A:$A", result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/packages.config b/ClosedXML_Tests/packages.config
new file mode 100644
index 0000000..d47c16a
--- /dev/null
+++ b/ClosedXML_Tests/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<packages>
+  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net40" />
+  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/DocumentFormat.OpenXml.dll b/DocumentFormat.OpenXml.dll
new file mode 100644
index 0000000..a3249c1
--- /dev/null
+++ b/DocumentFormat.OpenXml.dll
Binary files differ
diff --git a/Ionic.Zip.dll b/Ionic.Zip.dll
new file mode 100644
index 0000000..95fa928
--- /dev/null
+++ b/Ionic.Zip.dll
Binary files differ