diff --git a/All.2005.sln b/All.2005.sln
index 7e0f45ac..a7e3ad61 100644
--- a/All.2005.sln
+++ b/All.2005.sln
@@ -4,29 +4,54 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit", "unit\unit.vcproj", "{270BB952-FCB2-4FA8-821E-BB750E83C902}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_c", "tests\test_c.vcproj", "{6F2B675D-2585-4AD6-866D-4DDA00279B00}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE} = {B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cxx", "tests\test_cxx.vcproj", "{3102214A-D304-48FC-B2DF-94D838DC4B2A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE} = {B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}
+	EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_f90", "tests\test_f90.vfproj", "{003309EE-36BE-493B-87D4-FE68918DA9AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE} = {B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}
+	EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_f", "tests\test_f.vfproj", "{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE} = {B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}
+	EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "memory_leak_f", "memory_leak_f\memory_leak_f.vfproj", "{941BC4D5-7D05-4786-BC65-38914514EA9B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advect_c", "examples\c\advect\advect_c.vcproj", "{BD883425-1DD0-466A-911B-32AD6D4CE262}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "advect", "examples\fortran\advect\advect.vfproj", "{28459FF2-3C6C-469E-B0C3-2E4D483E7025}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE} = {B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IPhreeqc", "IPhreeqc.2005.vcproj", "{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advect_c", "all\c\advect_c.2005.vcproj", "{BD883425-1DD0-466A-911B-32AD6D4CE262}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE} = {B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}
+	EndProjectSection
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "advect", "all\fortran\advect.vfproj", "{28459FF2-3C6C-469E-B0C3-2E4D483E7025}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE} = {B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		DebugCLR|Win32 = DebugCLR|Win32
+		DebugCLR|x64 = DebugCLR|x64
 		DebugDll|Win32 = DebugDll|Win32
 		DebugDll|x64 = DebugDll|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		ReleaseCLR|Win32 = ReleaseCLR|Win32
+		ReleaseCLR|x64 = ReleaseCLR|x64
 		ReleaseDll|Win32 = ReleaseDll|Win32
 		ReleaseDll|x64 = ReleaseDll|x64
 	EndGlobalSection
@@ -35,13 +60,22 @@ Global
 		{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}.DebugDll|Win32.ActiveCfg = Debug|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugCLR|Win32.ActiveCfg = Debug|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugCLR|Win32.Build.0 = Debug|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugCLR|x64.ActiveCfg = Debug|x64
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugCLR|x64.Build.0 = Debug|x64
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.ActiveCfg = Debug|x64
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.Build.0 = Debug|x64
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|x64.ActiveCfg = Debug|x64
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|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
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseCLR|Win32.ActiveCfg = Release|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseCLR|Win32.Build.0 = Release|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseCLR|x64.ActiveCfg = Release|x64
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseCLR|x64.Build.0 = Release|x64
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.ActiveCfg = Release|Win32
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.Build.0 = Release|Win32
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|x64.ActiveCfg = Release|x64
@@ -50,6 +84,10 @@ Global
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|Win32.Build.0 = Debug|Win32
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|x64.ActiveCfg = Debug|x64
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|x64.Build.0 = Debug|x64
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugCLR|Win32.ActiveCfg = DebugCLR|Win32
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugCLR|Win32.Build.0 = DebugCLR|Win32
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugCLR|x64.ActiveCfg = DebugCLR|x64
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugCLR|x64.Build.0 = DebugCLR|x64
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|Win32.Build.0 = DebugDll|Win32
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|x64.ActiveCfg = DebugDll|x64
@@ -58,6 +96,10 @@ Global
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|Win32.Build.0 = Release|Win32
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|x64.ActiveCfg = Release|x64
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|x64.Build.0 = Release|x64
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseCLR|Win32.ActiveCfg = ReleaseCLR|Win32
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseCLR|Win32.Build.0 = ReleaseCLR|Win32
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseCLR|x64.ActiveCfg = ReleaseCLR|x64
+		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseCLR|x64.Build.0 = ReleaseCLR|x64
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
 		{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
@@ -66,6 +108,10 @@ Global
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|Win32.Build.0 = Debug|Win32
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|x64.ActiveCfg = Debug|x64
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|x64.Build.0 = Debug|x64
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugCLR|Win32.ActiveCfg = DebugCLR|Win32
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugCLR|Win32.Build.0 = DebugCLR|Win32
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugCLR|x64.ActiveCfg = DebugCLR|x64
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugCLR|x64.Build.0 = DebugCLR|x64
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|Win32.Build.0 = DebugDll|Win32
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|x64.ActiveCfg = DebugDll|x64
@@ -74,6 +120,10 @@ Global
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|Win32.Build.0 = Release|Win32
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|x64.ActiveCfg = Release|x64
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|x64.Build.0 = Release|x64
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseCLR|Win32.ActiveCfg = ReleaseCLR|Win32
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseCLR|Win32.Build.0 = ReleaseCLR|Win32
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseCLR|x64.ActiveCfg = ReleaseCLR|x64
+		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseCLR|x64.Build.0 = ReleaseCLR|x64
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
 		{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
@@ -82,6 +132,10 @@ Global
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|Win32.Build.0 = Debug|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|x64.ActiveCfg = Debug|x64
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|x64.Build.0 = Debug|x64
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugCLR|Win32.ActiveCfg = DebugCLR|Win32
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugCLR|Win32.Build.0 = DebugCLR|Win32
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugCLR|x64.ActiveCfg = DebugCLR|x64
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugCLR|x64.Build.0 = DebugCLR|x64
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|Win32.Build.0 = DebugDll|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|x64.ActiveCfg = DebugDll|x64
@@ -90,6 +144,10 @@ Global
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|Win32.Build.0 = Release|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|x64.ActiveCfg = Release|x64
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|x64.Build.0 = Release|x64
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseCLR|Win32.ActiveCfg = ReleaseCLR|Win32
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseCLR|Win32.Build.0 = ReleaseCLR|Win32
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseCLR|x64.ActiveCfg = ReleaseCLR|x64
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseCLR|x64.Build.0 = ReleaseCLR|x64
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
@@ -98,6 +156,10 @@ Global
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Debug|Win32.Build.0 = Debug|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Debug|x64.ActiveCfg = Debug|x64
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Debug|x64.Build.0 = Debug|x64
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugCLR|Win32.ActiveCfg = DebugCLR|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugCLR|Win32.Build.0 = DebugCLR|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugCLR|x64.ActiveCfg = DebugCLR|x64
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugCLR|x64.Build.0 = DebugCLR|x64
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|Win32.Build.0 = DebugDll|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|x64.ActiveCfg = DebugDll|x64
@@ -106,54 +168,46 @@ Global
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Release|Win32.Build.0 = Release|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Release|x64.ActiveCfg = Release|x64
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Release|x64.Build.0 = Release|x64
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseCLR|Win32.ActiveCfg = ReleaseCLR|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseCLR|Win32.Build.0 = ReleaseCLR|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseCLR|x64.ActiveCfg = ReleaseCLR|x64
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseCLR|x64.Build.0 = ReleaseCLR|x64
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Debug|Win32.Build.0 = Debug|Win32
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Debug|x64.ActiveCfg = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Debug|x64.Build.0 = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugCLR|Win32.ActiveCfg = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugCLR|Win32.Build.0 = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugCLR|x64.ActiveCfg = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugCLR|x64.Build.0 = Debug|Win32
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugDll|Win32.ActiveCfg = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugDll|Win32.Build.0 = Debug|Win32
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugDll|x64.ActiveCfg = Debug|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugDll|x64.Build.0 = Debug|Win32
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Release|Win32.ActiveCfg = Release|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Release|Win32.Build.0 = Release|Win32
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Release|x64.ActiveCfg = Release|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.Release|x64.Build.0 = Release|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseCLR|Win32.ActiveCfg = Release|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseCLR|Win32.Build.0 = Release|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseCLR|x64.ActiveCfg = Release|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseCLR|x64.Build.0 = Release|Win32
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseDll|Win32.ActiveCfg = Release|Win32
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseDll|Win32.Build.0 = Release|Win32
 		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseDll|x64.ActiveCfg = Release|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|Win32.Build.0 = Debug|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|x64.ActiveCfg = Debug|x64
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|x64.Build.0 = Debug|x64
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|Win32.Build.0 = DebugDll|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|x64.ActiveCfg = DebugDll|x64
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|x64.Build.0 = DebugDll|x64
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|Win32.ActiveCfg = Release|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|Win32.Build.0 = Release|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|x64.ActiveCfg = Release|x64
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|x64.Build.0 = Release|x64
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
-		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|Win32.ActiveCfg = Debug|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|Win32.Build.0 = Debug|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|x64.ActiveCfg = Debug|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|x64.Build.0 = Debug|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|Win32.Build.0 = DebugDll|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|x64.ActiveCfg = DebugDll|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|x64.Build.0 = DebugDll|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|Win32.ActiveCfg = Release|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|Win32.Build.0 = Release|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|x64.ActiveCfg = Release|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|x64.Build.0 = Release|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
-		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
+		{941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseDll|x64.Build.0 = Release|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.Debug|Win32.Build.0 = Debug|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.Debug|x64.ActiveCfg = Debug|x64
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.Debug|x64.Build.0 = Debug|x64
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.DebugCLR|Win32.ActiveCfg = DebugCLR|Win32
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.DebugCLR|Win32.Build.0 = DebugCLR|Win32
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.DebugCLR|x64.ActiveCfg = DebugCLR|x64
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.DebugCLR|x64.Build.0 = DebugCLR|x64
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.DebugDll|Win32.Build.0 = DebugDll|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.DebugDll|x64.ActiveCfg = DebugDll|x64
@@ -162,10 +216,62 @@ Global
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.Release|Win32.Build.0 = Release|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.Release|x64.ActiveCfg = Release|x64
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.Release|x64.Build.0 = Release|x64
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseCLR|Win32.ActiveCfg = ReleaseCLR|Win32
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseCLR|Win32.Build.0 = ReleaseCLR|Win32
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseCLR|x64.ActiveCfg = ReleaseCLR|x64
+		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseCLR|x64.Build.0 = ReleaseCLR|x64
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
 		{B0A40DC6-D218-4028-9FF1-3E25EF0FF5FE}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|Win32.Build.0 = Debug|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|x64.ActiveCfg = Debug|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Debug|x64.Build.0 = Debug|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugCLR|Win32.ActiveCfg = DebugCLR|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugCLR|Win32.Build.0 = DebugCLR|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugCLR|x64.ActiveCfg = DebugCLR|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugCLR|x64.Build.0 = DebugCLR|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|Win32.Build.0 = DebugDll|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|x64.ActiveCfg = DebugDll|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.DebugDll|x64.Build.0 = DebugDll|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|Win32.ActiveCfg = Release|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|Win32.Build.0 = Release|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|x64.ActiveCfg = Release|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.Release|x64.Build.0 = Release|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseCLR|Win32.ActiveCfg = ReleaseCLR|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseCLR|Win32.Build.0 = ReleaseCLR|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseCLR|x64.ActiveCfg = ReleaseCLR|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseCLR|x64.Build.0 = ReleaseCLR|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
+		{BD883425-1DD0-466A-911B-32AD6D4CE262}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|Win32.ActiveCfg = Debug|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|Win32.Build.0 = Debug|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|x64.ActiveCfg = Debug|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|x64.Build.0 = Debug|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugCLR|Win32.ActiveCfg = DebugCLR|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugCLR|Win32.Build.0 = DebugCLR|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugCLR|x64.ActiveCfg = DebugCLR|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugCLR|x64.Build.0 = DebugCLR|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|Win32.Build.0 = DebugDll|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|x64.ActiveCfg = DebugDll|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|x64.Build.0 = DebugDll|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|Win32.ActiveCfg = Release|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|Win32.Build.0 = Release|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|x64.ActiveCfg = Release|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|x64.Build.0 = Release|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseCLR|Win32.ActiveCfg = ReleaseCLR|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseCLR|Win32.Build.0 = ReleaseCLR|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseCLR|x64.ActiveCfg = ReleaseCLR|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseCLR|x64.Build.0 = ReleaseCLR|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
+		{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IPhreeqc.2005.vcproj b/IPhreeqc.2005.vcproj
index 18510322..6589c68e 100644
--- a/IPhreeqc.2005.vcproj
+++ b/IPhreeqc.2005.vcproj
@@ -642,8 +642,363 @@
 				CommandLine="mkdir dllx64 > NUL
copy "$(OutDir)\$(ProjectName)d.dll" "dllx64\$(ProjectName)d.dll"
copy "$(TargetDir)$(TargetName).lib" "dllx64\$(TargetName).lib"
copy "$(TargetDir)vc80.pdb" "dllx64\vc80.pdb"
"
 			/>
 		</Configuration>
+		<Configuration
+			Name="DebugCLR|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\IPhreeqc.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MULTICHART"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=""
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)d.dll"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				ImportLibrary="$(TargetDir)$(TargetName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=clr&#x0D;&#x0A;mkdir %DEST% &gt; NUL&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc80.pdb&quot; &quot;%DEST%\vc80.pdb&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\IPhreeqc.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MULTICHART"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=""
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)d.dll"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				ImportLibrary="$(TargetDir)$(TargetName).lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=clrx64&#x0D;&#x0A;mkdir %DEST% &gt; NUL&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc80.pdb&quot; &quot;%DEST%\vc80.pdb&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\IPhreeqc.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;MULTICHART"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=""
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				SubSystem="0"
+				ImportLibrary="$(TargetDir)$(TargetName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=clr&#x0D;&#x0A;mkdir %DEST% &gt; NUL&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\IPhreeqc.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;MULTICHART"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=""
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				SubSystem="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=clrx64&#x0D;&#x0A;mkdir %DEST% &gt; NUL&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
+		<AssemblyReference
+			RelativePath=".\src\phreeqcpp\phreeqc\ZedGraph.dll"
+			AssemblyName="ZedGraph, Version=5.1.5.28844, PublicKeyToken=02a83cbd123fcd60, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"
+			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
 	</References>
 	<Files>
 		<Filter
@@ -721,6 +1076,22 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugCLR|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseCLR|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\IPhreeqcLib.cpp"
@@ -765,6 +1136,38 @@
 						CompileAs="2"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugCLR|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugCLR|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseCLR|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseCLR|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
 			</File>
 			<Filter
 				Name="phreeqcpp"
@@ -932,10 +1335,22 @@
 						RelativePath=".\src\phreeqcpp\phreeqc\basicsubs.cpp"
 						>
 					</File>
+					<File
+						RelativePath=".\src\phreeqcpp\ChartHandler.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\phreeqcpp\ChartObject.cpp"
+						>
+					</File>
 					<File
 						RelativePath=".\src\phreeqcpp\phreeqc\cl1.cpp"
 						>
 					</File>
+					<File
+						RelativePath=".\src\phreeqcpp\CurveObject.cpp"
+						>
+					</File>
 					<File
 						RelativePath=".\src\phreeqcpp\phreeqc\cvdense.cpp"
 						>
@@ -1119,6 +1534,10 @@
 				RelativePath=".\src\phreeqcpp\ExchComp.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\Form1.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\fwrap.h"
 				>
diff --git a/tests/test_c.vcproj b/tests/test_c.vcproj
index ba0b37fc..f13ab09d 100644
--- a/tests/test_c.vcproj
+++ b/tests/test_c.vcproj
@@ -263,6 +263,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
+			ManagedExtensions="0"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -658,6 +659,332 @@
 				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqc.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../dll"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqc.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../clrx64"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqcd.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../dll"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqcd.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../clrx64"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -670,6 +997,38 @@
 			<File
 				RelativePath=".\test_c.c"
 				>
+				<FileConfiguration
+					Name="ReleaseCLR|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseCLR|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugCLR|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugCLR|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
diff --git a/tests/test_c.vcproj.GS.charlton.user b/tests/test_c.vcproj.GS.charlton.user
index c6c7324a..96ec2607 100644
--- a/tests/test_c.vcproj.GS.charlton.user
+++ b/tests/test_c.vcproj.GS.charlton.user
@@ -229,5 +229,117 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|x64"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor="0"
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|x64"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
diff --git a/tests/test_cxx.vcproj b/tests/test_cxx.vcproj
index 979e30da..30cf4844 100644
--- a/tests/test_cxx.vcproj
+++ b/tests/test_cxx.vcproj
@@ -654,6 +654,327 @@
 				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqc.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\clr"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqc.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\clrx64"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqcd.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\clr"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;copy ..\ReleaseCLR\IPhreeqcd.dll $(OutDir)\.&#x0D;&#x0A;copy ..\src\phreeqcpp\phreeqc\ZedGraph.dll $(OutDir)\.&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../src;../src/phreeqcpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqcd.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\clrx64"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/tests/test_cxx.vcproj.GS.charlton.user b/tests/test_cxx.vcproj.GS.charlton.user
index c6c7324a..a414b0dc 100644
--- a/tests/test_cxx.vcproj.GS.charlton.user
+++ b/tests/test_cxx.vcproj.GS.charlton.user
@@ -229,5 +229,117 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseCLR|x64"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugCLR|x64"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="IGSKAHHWWSNY5H1"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
diff --git a/tests/test_f.vfproj b/tests/test_f.vfproj
index 44dfc9e5..f810abed 100644
--- a/tests/test_f.vfproj
+++ b/tests/test_f.vfproj
@@ -90,6 +90,50 @@ copy ex2.in ex2"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
 				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="DebugCLR|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../src" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../clr" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="DebugCLR|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../src" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dllx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="ReleaseCLR|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../src" RuntimeLibrary="rtMultiThreadedDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../clr" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="ReleaseCLR|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../src" RuntimeLibrary="rtMultiThreadedDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dllx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
 copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
 	<Files>
diff --git a/tests/test_f90.vfproj b/tests/test_f90.vfproj
index 04ab1e9f..54e3f73c 100644
--- a/tests/test_f90.vfproj
+++ b/tests/test_f90.vfproj
@@ -90,6 +90,50 @@ copy ex2.in ex2"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
 				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="ReleaseCLR|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../src" RuntimeLibrary="rtMultiThreadedDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../clr" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="ReleaseCLR|x64">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../src"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../clrx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="DebugCLR|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../src" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../clr" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="DebugCLR|x64">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../src" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../clrx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
 copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
 	<Files>