diff --git a/unit/unit.sln b/unit/unit.sln
new file mode 100644
index 00000000..ddbbba56
--- /dev/null
+++ b/unit/unit.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit", "unit.vcxproj", "{270BB952-FCB2-4FA8-821E-BB750E83C902}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.ActiveCfg = Debug|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.Build.0 = Debug|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|x64.ActiveCfg = Debug|x64
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|x64.Build.0 = Debug|x64
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.ActiveCfg = Release|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.Build.0 = Release|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|x64.ActiveCfg = Release|x64
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/unit/unit.vcxproj b/unit/unit.vcxproj
new file mode 100644
index 00000000..1bca63b5
--- /dev/null
+++ b/unit/unit.vcxproj
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{270BB952-FCB2-4FA8-821E-BB750E83C902}</ProjectGuid>
+    <RootNamespace>unit</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\IPhreeqc.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\IPhreeqc.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\IPhreeqc.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\IPhreeqc.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/unit.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_1_10)/include;../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CPPUNIT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/unit.pch</PrecompiledHeaderOutputFile>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>cppunitd.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(DEV_CPPUNIT_1_10)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/unit.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_1_10)/include;../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CPPUNIT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(DEV_CPPUNIT_1_10)/libx64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/unit.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_1_10)/include;../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CPPUNIT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeaderOutputFile>.\Release/unit.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>cppunit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(DEV_CPPUNIT_1_10)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\Release/unit.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/unit.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_1_10)/include;../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CPPUNIT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(DEV_CPPUNIT_1_10)/libx64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TestCVar.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="TestIPhreeqc.cpp" />
+    <ClCompile Include="TestIPhreeqcLib.cpp" />
+    <ClCompile Include="TestSelectedOutput.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="TestVar.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="unit.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\src\IPhreeqc.cpp" />
+    <ClCompile Include="..\src\IPhreeqcLib.cpp" />
+    <ClCompile Include="..\src\SelectedOutput.cpp" />
+    <ClCompile Include="..\src\Var.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\class_main.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\cxxKinetics.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\cxxMix.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Dictionary.cxx">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\dumper.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\Exchange.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\ExchComp.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\GasComp.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\GasPhase.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\ISolution.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\ISolutionComp.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Keywords.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\KineticsComp.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\NameDouble.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\NumKeyword.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Parser.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\PBasic.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\Phreeqc.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\PHRQ_base.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\PHRQ_io.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\PPassemblage.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\PPassemblageComp.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Pressure.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Reaction.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\ReadClass.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\runner.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\SAXPhreeqc.cxx">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Solution.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\SolutionIsotope.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\SolutionIsotopeList.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\SS.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\SSassemblage.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\SScomp.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\StorageBin.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\StorageBinList.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\Surface.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\SurfaceCharge.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\SurfaceComp.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\System.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Temperature.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Use.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\Utils.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\advection.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\basicsubs.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1mp.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvdense.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvode.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\dense.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\dw.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\gases.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\input.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\integrate.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\inverse.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\isotopes.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\kinetics.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\mainsubs.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\model.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector_serial.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\parse.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\phqalloc.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\PHRQ_io_output.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer_structures.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\prep.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\print.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\read.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\readtr.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\sit.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\smalldense.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\spread.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\step.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\structures.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\sundialsmath.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\tally.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\tidy.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\transport.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\utilities.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="TestCVar.h" />
+    <ClInclude Include="TestIPhreeqc.h" />
+    <ClInclude Include="TestIPhreeqcLib.h" />
+    <ClInclude Include="TestSelectedOutput.h" />
+    <ClInclude Include="TestVar.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/unit/unit.vcxproj.filters b/unit/unit.vcxproj.filters
new file mode 100644
index 00000000..e3a8a46e
--- /dev/null
+++ b/unit/unit.vcxproj.filters
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{9217165c-b467-45d4-af88-71f6cb27dc8a}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp</Extensions>
+    </Filter>
+    <Filter Include="Source Files\src">
+      <UniqueIdentifier>{7cbe522d-4dd4-4474-972e-e5dda1569bcf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\src\phreeqcpp">
+      <UniqueIdentifier>{2b87fae0-9021-449c-ab6c-2462b25f8451}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\src\phreeqcpp\phreeqc">
+      <UniqueIdentifier>{21c6e9cb-086c-4892-a2cd-eecbc33251a1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{af607a11-f999-462d-a895-27b23d9837d7}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{669fe4ce-b3a3-4cf3-9041-941eea1eff9b}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TestCVar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TestIPhreeqc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TestIPhreeqcLib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TestSelectedOutput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TestVar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="unit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\IPhreeqc.cpp">
+      <Filter>Source Files\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\IPhreeqcLib.cpp">
+      <Filter>Source Files\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\SelectedOutput.cpp">
+      <Filter>Source Files\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Var.c">
+      <Filter>Source Files\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\class_main.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\cxxKinetics.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\cxxMix.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Dictionary.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\dumper.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Exchange.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\ExchComp.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\GasComp.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\GasPhase.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\ISolution.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\ISolutionComp.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Keywords.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\KineticsComp.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\NameDouble.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\NumKeyword.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Parser.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\PBasic.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Phreeqc.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\PHRQ_base.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\PHRQ_io.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\PPassemblage.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\PPassemblageComp.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Pressure.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Reaction.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\ReadClass.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\runner.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SAXPhreeqc.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Solution.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SolutionIsotope.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SolutionIsotopeList.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SS.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SSassemblage.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SScomp.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\StorageBin.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\StorageBinList.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Surface.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SurfaceCharge.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SurfaceComp.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\System.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Temperature.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Use.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Utils.cxx">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\advection.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\basicsubs.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1mp.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvdense.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvode.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\dense.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\dw.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\gases.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\input.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\integrate.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\inverse.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\isotopes.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\kinetics.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\mainsubs.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\model.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector_serial.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\parse.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\phqalloc.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\PHRQ_io_output.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer_structures.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\prep.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\print.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\read.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\readtr.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\sit.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\smalldense.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\spread.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\step.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\structures.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\sundialsmath.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\tally.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\tidy.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\transport.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phreeqc\utilities.cpp">
+      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="TestCVar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TestIPhreeqc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TestIPhreeqcLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TestSelectedOutput.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TestVar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file