From 5f999cec1a6882b47c6657882b153ba6da0ed62e Mon Sep 17 00:00:00 2001
From: codekaizen <codekaizen@users.noreply.github.com>
Date: Fri, 18 Jan 2008 23:22:11 +0000
Subject: [PATCH] Getting SharpMap.SimpleGeometries to build. Project file
 reorganization to use Common.msbuild during solution for using project
 references or binary references. Updating to use WktEncoder and WkbEncoder

---
 Common.msbuild                                |  15 +
 .../CoordinateSystemFactory.cs                | 132 +++++++-
 Proj.Net/ProjNet/ProjNet.csproj               |  71 +++--
 ...ons.cs => BoundingBoxSpatialOperations.cs} |  32 +-
 ...ions.cs => BoundingBoxSpatialRelations.cs} |  43 +--
 SharpMap.SimpleGeometries/Curve.cs            |   3 +-
 SharpMap.SimpleGeometries/Extents.cs          | 223 +++++++++++--
 .../FakeSpatialOperations.cs                  |  25 --
 .../Geometries3D/Point3D.cs                   |  19 +-
 SharpMap.SimpleGeometries/Geometry.cs         |  46 ++-
 .../GeometryCollection.cs                     |   3 +-
 .../GeometryCollection`1.cs                   |   5 +
 SharpMap.SimpleGeometries/IGeometry.cs        | 210 ------------
 .../IGeometryCollection.cs                    |  41 ---
 SharpMap.SimpleGeometries/LineString.cs       |  20 +-
 SharpMap.SimpleGeometries/LinearRing.cs       | 301 ++++++++++--------
 SharpMap.SimpleGeometries/MultiCurve.cs       |   5 +-
 SharpMap.SimpleGeometries/MultiLineString.cs  |  20 +-
 SharpMap.SimpleGeometries/MultiPoint.cs       |  26 +-
 SharpMap.SimpleGeometries/MultiPolygon.cs     |  19 +-
 SharpMap.SimpleGeometries/MultiSurface.cs     |   5 +-
 SharpMap.SimpleGeometries/Point.cs            |  18 +-
 SharpMap.SimpleGeometries/Polygon.cs          | 101 ++++--
 .../SharpMap.SimpleGeometries.csproj          |  73 ++++-
 SharpMap.SimpleGeometries/Surface.cs          |   7 +-
 .../Rendering/BasicGeometryRenderer2DTests.cs |   3 +-
 SharpMap.Tests/SharpMap.Tests.csproj          |  91 ++++--
 .../BufferedCoordinateSequenceFactory.cs      |  93 ++++++
 .../GeometryProvider/GeometryProvider.cs      |   4 +-
 .../Providers/Shapefile/ShapeFileProvider.cs  |   2 +-
 SharpMap/SharpMap.csproj                      |  79 +++--
 SharpMapV2_2008.sln                           |  67 +---
 32 files changed, 1073 insertions(+), 729 deletions(-)
 create mode 100644 Common.msbuild
 rename SharpMap.SimpleGeometries/{BoundingBoxOperations.cs => BoundingBoxSpatialOperations.cs} (72%)
 rename SharpMap.SimpleGeometries/{SpatialRelations.cs => BoundingBoxSpatialRelations.cs} (76%)
 delete mode 100644 SharpMap.SimpleGeometries/FakeSpatialOperations.cs
 delete mode 100644 SharpMap.SimpleGeometries/IGeometry.cs
 delete mode 100644 SharpMap.SimpleGeometries/IGeometryCollection.cs
 create mode 100644 SharpMap/Coordinates/BufferedCoordinateSequenceFactory.cs

diff --git a/Common.msbuild b/Common.msbuild
new file mode 100644
index 00000000..3cee60d2
--- /dev/null
+++ b/Common.msbuild
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net20|AnyCPU' ">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Net20|AnyCPU' ">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net35|AnyCPU' ">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Net35|AnyCPU' ">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystemFactory.cs b/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystemFactory.cs
index dbe7d659..85e76ea1 100644
--- a/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystemFactory.cs
+++ b/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystemFactory.cs
@@ -91,7 +91,7 @@ public ICoordinateSystem<TCoordinate> CreateFromXml(String xml)
         /// </returns>
         public ICoordinateSystem<TCoordinate> CreateFromWkt(String Wkt)
         {
-            return CoordinateSystemWktReader.Parse(Wkt, this) as ICoordinateSystem<TCoordinate>;
+            return WktEncoder.ToCoordinateSystemInfo(Wkt, this) as ICoordinateSystem<TCoordinate>;
         }
 
         /// <summary>
@@ -704,9 +704,135 @@ public IVerticalDatum CreateVerticalDatum(DatumType datumType, String name, Stri
             throw new NotImplementedException();
         }
 
-        IGeocentricCoordinateSystem ICoordinateSystemFactory.CreateWgs84CoordinateSystem()
+        #endregion
+
+        #region ICoordinateSystemFactory Members
+
+
+        public IAngularUnit CreateAngularUnit(CommonAngularUnits angularUnitType)
         {
-            throw new NotImplementedException();
+            switch (angularUnitType)
+            {
+                case CommonAngularUnits.Radian:
+                    return AngularUnit.Radian;
+                case CommonAngularUnits.Degree:
+                    return AngularUnit.Degrees;
+                case CommonAngularUnits.Grad:
+                    return AngularUnit.Grad;
+                case CommonAngularUnits.Gon:
+                    return AngularUnit.Gon;
+                default:
+                    throw new ArgumentException("Unknown angular unit: " + angularUnitType);
+            }
+        }
+
+        public IEllipsoid CreateEllipsoid(CommonEllipsoids ellipsoidType)
+        {
+            switch (ellipsoidType)
+            {
+                case CommonEllipsoids.Wgs84:
+                    return Ellipsoid.Wgs84;
+                case CommonEllipsoids.Wgs72:
+                    return Ellipsoid.Wgs72;
+                case CommonEllipsoids.Grs80:
+                    return Ellipsoid.Grs80;
+                case CommonEllipsoids.International1924:
+                    return Ellipsoid.International1924;
+                case CommonEllipsoids.Clarke1880:
+                    return Ellipsoid.Clarke1880;
+                case CommonEllipsoids.Clarke1866:
+                    return Ellipsoid.Clarke1866;
+                case CommonEllipsoids.Grs80AuthalicSphere:
+                    return Ellipsoid.Sphere;
+                default:
+                    throw new ArgumentException("Unknown ellipsoid: " + ellipsoidType);
+            }
+        }
+
+        public IGeographicCoordinateSystem CreateGeographicCoordinateSystem(CommonGeographicCoordinateSystems coordSystemType)
+        {
+            switch (coordSystemType)
+            {
+                case CommonGeographicCoordinateSystems.Wgs84:
+                    return GeographicCoordinateSystem<TCoordinate>.Wgs84;
+                default:
+                    throw new ArgumentException(
+                        "Unknown geographic coordinate system: " + coordSystemType);
+            }
+        }
+
+        public IHorizontalDatum CreateHorizontalDatum(CommonHorizontalDatums datumType)
+        {
+            switch (datumType)
+            {
+                case CommonHorizontalDatums.Wgs84:
+                    return HorizontalDatum.Wgs84;
+                case CommonHorizontalDatums.Wgs72:
+                    return HorizontalDatum.Wgs72;
+                case CommonHorizontalDatums.Etrf89:
+                    return HorizontalDatum.Etrf89;
+                case CommonHorizontalDatums.ED50:
+                    return HorizontalDatum.ED50;
+                case CommonHorizontalDatums.Nad27:
+                case CommonHorizontalDatums.Nad83:
+                case CommonHorizontalDatums.Harn:
+                default:
+                    throw new ArgumentException("Unknown datum: " + datumType);
+            }
+        }
+
+        public ILinearUnit CreateLinearUnit(CommonLinearUnits linearUnitType)
+        {
+            switch (linearUnitType)
+            {
+                case CommonLinearUnits.Meter:
+                    return LinearUnit.Meter;
+                case CommonLinearUnits.USSurveyFoot:
+                    return LinearUnit.USSurveyFoot;
+                case CommonLinearUnits.NauticalMile:
+                    return LinearUnit.NauticalMile;
+                case CommonLinearUnits.ClarkesFoot:
+                    return LinearUnit.ClarkesFoot;
+                case CommonLinearUnits.InternationalFoot:
+                default:
+                    throw new ArgumentException("Unknown linear unit: " + linearUnitType);
+            }
+        }
+
+        public IPrimeMeridian CreatePrimeMeridian(CommonPrimeMeridians primeMeridian)
+        {
+            switch (primeMeridian)
+            {
+                case CommonPrimeMeridians.Greenwich:
+                    return PrimeMeridian.Greenwich;
+                case CommonPrimeMeridians.Lisbon:
+                    return PrimeMeridian.Lisbon;
+                case CommonPrimeMeridians.Paris:
+                    return PrimeMeridian.Paris;
+                case CommonPrimeMeridians.Bogota:
+                    return PrimeMeridian.Bogota;
+                case CommonPrimeMeridians.Madrid:
+                    return PrimeMeridian.Madrid;
+                case CommonPrimeMeridians.Rome:
+                    return PrimeMeridian.Rome;
+                case CommonPrimeMeridians.Bern:
+                    return PrimeMeridian.Bern;
+                case CommonPrimeMeridians.Jakarta:
+                    return PrimeMeridian.Jakarta;
+                case CommonPrimeMeridians.Ferro:
+                    return PrimeMeridian.Ferro;
+                case CommonPrimeMeridians.Brussels:
+                    return PrimeMeridian.Brussels;
+                case CommonPrimeMeridians.Stockholm:
+                    return PrimeMeridian.Stockholm;
+                case CommonPrimeMeridians.Athens:
+                    return PrimeMeridian.Athens;
+                case CommonPrimeMeridians.Oslo:
+                    return PrimeMeridian.Oslo;
+                case CommonPrimeMeridians.Antwerp:
+                default:
+                    throw new ArgumentException("Unknown prime meridian: " + primeMeridian);
+            }
         }
 
         #endregion
diff --git a/Proj.Net/ProjNet/ProjNet.csproj b/Proj.Net/ProjNet/ProjNet.csproj
index a8474fdd..d4e195de 100644
--- a/Proj.Net/ProjNet/ProjNet.csproj
+++ b/Proj.Net/ProjNet/ProjNet.csproj
@@ -1,4 +1,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <Import Condition="Exists('..\..\Common.msbuild')" Project="..\..\Common.msbuild" />
+  <PropertyGroup Condition="!Exists('..\..\Common.msbuild')">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,18 +15,6 @@
     <AssemblyName>ProjNet</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>projnetkey.snk</AssemblyOriginatorKeyFile>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net20|AnyCPU' ">
@@ -107,19 +99,48 @@
   <ItemGroup>
     <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
-    </Reference>
-    <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\ExternalReferences\$(Configuration)\GeoAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core"
-               Condition="'$(Configuration)' == 'Release_Net35' Or '$(Configuration)' == 'Debug_Net35'" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectReference)' == 'false'">
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+        <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\GeoAPI.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+      <ItemGroup>
+        <ProjectReference Include="..\..\..\GeoAPI\src\GeoAPI\GeoAPINoTFS.csproj">
+          <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+          <Name>GeoAPINoTFS</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <Choose>
+    <When Condition="'$(Configuration)' == 'Release_Net35' Or '$(Configuration)' == 'Debug_Net35'">
+      <ItemGroup>
+        <Reference Include="System" />
+        <Reference Include="System.Core" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="System" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SharpMap.SimpleGeometries/BoundingBoxOperations.cs b/SharpMap.SimpleGeometries/BoundingBoxSpatialOperations.cs
similarity index 72%
rename from SharpMap.SimpleGeometries/BoundingBoxOperations.cs
rename to SharpMap.SimpleGeometries/BoundingBoxSpatialOperations.cs
index f265b509..ef934be7 100644
--- a/SharpMap.SimpleGeometries/BoundingBoxOperations.cs
+++ b/SharpMap.SimpleGeometries/BoundingBoxSpatialOperations.cs
@@ -1,4 +1,5 @@
-// Copyright 2006, 2007 - Rory Plaire (codekaizen@gmail.com)
+// Portions copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2006, 2007 - Rory Plaire (codekaizen@gmail.com)
 //
 // This file is part of SharpMap.
 // SharpMap is free software; you can redistribute it and/or modify
@@ -17,10 +18,11 @@
 
 using System;
 using System.Collections.Generic;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
-    internal static class BoundingBoxOperations
+    internal static class BoundingBoxSpatialOperations
     {
         internal static Geometry Difference(Extents lhs, Extents rhs)
         {
@@ -52,9 +54,10 @@ internal static Geometry Difference(Extents lhs, Extents rhs)
             }
         }
 
-        internal static Geometry Intersection(Extents lhs, Extents rhs)
+        internal static Geometry Union(Extents lhs, Extents rhs)
         {
-            return Extents.Intersection(lhs, rhs).ToGeometry();
+            Extents union = new Extents(lhs, rhs);
+            return union.ToGeometry();
         }
 
         internal static Geometry Union(Geometry lhs, Geometry rhs)
@@ -85,9 +88,28 @@ internal static Geometry Union(Geometry lhs, Geometry rhs)
             return new Extents(lhs.Extents, rhs.Extents).ToGeometry();
         }
 
+        internal static IGeometry Union(IGeometry lhs, IGeometry rhs)
+        {
+            return Union(
+                ((Geometry)lhs).ExtentsInternal,
+                ((Geometry)rhs).ExtentsInternal);
+        }
+
+        internal static Geometry Intersection(Extents lhs, Extents rhs)
+        {
+            return Extents.Intersection(lhs, rhs).ToGeometry();
+        }
+
         internal static Geometry Intersection(Geometry lhs, Geometry rhs)
         {
-            return BoundingBoxOperations.Intersection(lhs.ExtentsInternal, rhs.ExtentsInternal);
+            return Intersection(lhs.ExtentsInternal, rhs.ExtentsInternal);
+        }
+
+        internal static IGeometry Intersection(IGeometry lhs, IGeometry rhs)
+        {
+            return Intersection(
+                ((Geometry)lhs).ExtentsInternal, 
+                ((Geometry)rhs).ExtentsInternal);
         }
     }
 }
diff --git a/SharpMap.SimpleGeometries/SpatialRelations.cs b/SharpMap.SimpleGeometries/BoundingBoxSpatialRelations.cs
similarity index 76%
rename from SharpMap.SimpleGeometries/SpatialRelations.cs
rename to SharpMap.SimpleGeometries/BoundingBoxSpatialRelations.cs
index e1fab427..d8a8f218 100644
--- a/SharpMap.SimpleGeometries/SpatialRelations.cs
+++ b/SharpMap.SimpleGeometries/BoundingBoxSpatialRelations.cs
@@ -1,4 +1,5 @@
-// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2006, 2007 - Rory Plaire (codekaizen@gmail.com)
 //
 // This file is part of SharpMap.
 // SharpMap is free software; you can redistribute it and/or modify
@@ -16,13 +17,14 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 using System;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
 	/// <summary>
 	/// Class defining a set of named spatial relationship operators for geometric shape objects.
 	/// </summary>
-	public class SpatialRelations
+	public class BoundingBoxSpatialRelations
 	{
 		/// <summary>
 		/// Returns true if otherGeometry is wholly contained within the source geometry. This is the same as
@@ -41,21 +43,18 @@ public static Boolean Contains(Geometry sourceGeometry, Geometry otherGeometry)
 		/// the maximum dimension of the two geometries and the intersection geometry is not equal to either.
 		/// geometry.
 		/// </summary>
-		/// <param name="g1"></param>
-		/// <param name="g2"></param>
-		/// <returns></returns>
 		public static Boolean Crosses(Geometry g1, Geometry g2)
 		{
-			Geometry g = g2.Intersection(g1);
-			return (g.Intersection(g1).Dimension < Math.Max(g1.Dimension, g2.Dimension) && !g.Equals(g1) && !g.Equals(g2));
+			IGeometry g = g2.Intersection(g1);
+		    Int32 maxDimension = Math.Max((Int32) g1.Dimension, (Int32) g2.Dimension);
+
+            return ((Int32)g.Intersection(g1).Dimension < maxDimension 
+                && !g.Equals(g1) && !g.Equals(g2));
 		}
 
 		/// <summary>
 		/// Returns true if otherGeometry is disjoint from the source geometry.
 		/// </summary>
-		/// <param name="g1"></param>
-		/// <param name="g2"></param>
-		/// <returns></returns>
 		public static Boolean Disjoint(Geometry g1, Geometry g2)
 		{
 			return !g2.Intersects(g1);
@@ -66,7 +65,6 @@ public static Boolean Disjoint(Geometry g1, Geometry g2)
 		/// </summary>
 		/// <param name="g1">source geometry</param>
 		/// <param name="g2">other Geometry</param>
-		/// <returns></returns>
 		public static Boolean Equals(Geometry g1, Geometry g2)
 		{
 			if (ReferenceEquals(g1, null) && ReferenceEquals(g2, null))
@@ -110,12 +108,12 @@ public static Boolean Equals(Geometry g1, Geometry g2)
 			}
 			else if (g1 is GeometryCollection)
 			{
-				if ((g1 as GeometryCollection).Collection.Count != (g2 as GeometryCollection).Collection.Count)
+				if ((g1 as GeometryCollection).Count != (g2 as GeometryCollection).Count)
 				{
 					return false;
 				}
 
-				for (Int32 i = 0; i < (g1 as GeometryCollection).Collection.Count; i++)
+				for (Int32 i = 0; i < (g1 as GeometryCollection).Count; i++)
 				{
 					if (!Equals((g1 as GeometryCollection)[i], (g2 as GeometryCollection)[i]))
 					{
@@ -135,13 +133,8 @@ public static Boolean Equals(Geometry g1, Geometry g2)
 		/// <summary>
 		/// Returns true if there is any intersection between the two geometries.
 		/// </summary>
-		/// <param name="g1"></param>
-		/// <param name="g2"></param>
-		/// <returns></returns>
 		public static Boolean Intersects(Geometry g1, Geometry g2)
 		{
-#warning BoundingBox intersection is wrong, wrong, wrong, but it won't be fixed until we use NTS
-
 			if (g1 == null || g2 == null)
 			{
 				return false;
@@ -152,16 +145,13 @@ public static Boolean Intersects(Geometry g1, Geometry g2)
 				return true;
 			}
 
-			return g1.GetBoundingBox().Intersects(g2.GetBoundingBox());
+            return g1.ExtentsInternal.Intersects(g2.ExtentsInternal);
 		}
 
 		/// <summary>
 		/// Returns true if the intersection of the two geometries results in an object of the same dimension as the
 		/// input geometries and the intersection geometry is not equal to either geometry.
 		/// </summary>
-		/// <param name="g1"></param>
-		/// <param name="g2"></param>
-		/// <returns></returns>
 		public static Boolean Overlaps(Geometry g1, Geometry g2)
 		{
 			throw new NotImplementedException();
@@ -170,9 +160,6 @@ public static Boolean Overlaps(Geometry g1, Geometry g2)
 		/// <summary>
 		/// Returns true if the only points in common between the two geometries lie in the union of their boundaries.
 		/// </summary>
-		/// <param name="g1"></param>
-		/// <param name="g2"></param>
-		/// <returns></returns>
 		public static Boolean Touches(Geometry g1, Geometry g2)
 		{
 			throw new NotImplementedException();
@@ -182,16 +169,12 @@ public static Boolean Touches(Geometry g1, Geometry g2)
 		/// Returns true if the primary geometry is wholly contained 
 		/// within the comparison geometry.
 		/// </summary>
-		/// <param name="g1"></param>
-		/// <param name="g2"></param>
-		/// <returns></returns>
 		public static Boolean Within(Geometry g1, Geometry g2)
 		{
 		    if (g1 == null) throw new ArgumentNullException("g1");
 		    if (g2 == null) throw new ArgumentNullException("g2");
 
-#warning fake spatial relation using BoundingBox instances. Shhh...
-		    return g2.GetBoundingBox().Contains(g1.GetBoundingBox());
+            return g2.ExtentsInternal.Contains(g1.ExtentsInternal);
 		}
 	}
 }
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/Curve.cs b/SharpMap.SimpleGeometries/Curve.cs
index 319d9a90..5714c6e2 100644
--- a/SharpMap.SimpleGeometries/Curve.cs
+++ b/SharpMap.SimpleGeometries/Curve.cs
@@ -1,4 +1,5 @@
-// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2006, 2007 - Rory Plaire (codekaizen@gmail.com)
 //
 // This file is part of SharpMap.
 // SharpMap is free software; you can redistribute it and/or modify
diff --git a/SharpMap.SimpleGeometries/Extents.cs b/SharpMap.SimpleGeometries/Extents.cs
index 3f43e6d0..9d7e8549 100644
--- a/SharpMap.SimpleGeometries/Extents.cs
+++ b/SharpMap.SimpleGeometries/Extents.cs
@@ -21,6 +21,8 @@
 using System.Globalization;
 using GeoAPI.Coordinates;
 using GeoAPI.Geometries;
+using NPack;
+using NPack.Interfaces;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -28,11 +30,11 @@ namespace SharpMap.SimpleGeometries
     /// Bounding extents type with Double precision.
     /// </summary>
     /// <remarks>
-    /// The BoundingBox represents a 2D extents whose sides are parallel to the 
-    /// two axes of the coordinate system.
+    /// The <see cref="Extents"/> represents a 2D extents whose sides 
+    /// are parallel to the two axes of the coordinate system.
     /// </remarks>
     [Serializable]
-    public struct Extents : IExtents, IEquatable<Extents>
+    public struct Extents : IExtents2D, IEquatable<Extents>
     {
         private static readonly Extents _empty = new Extents();
 
@@ -78,7 +80,8 @@ public Extents(Double minX, Double minY, Double maxX, Double maxY)
         public Extents(Point lowerLeft, Point upperRight)
             : this(0, 0, 0, 0)
         {
-            if (lowerLeft == null || lowerLeft.IsEmpty() || upperRight == null || upperRight.IsEmpty())
+            if (lowerLeft == null || lowerLeft.IsEmpty 
+                || upperRight == null || upperRight.IsEmpty)
             {
                 _hasValue = false;
                 return;
@@ -211,8 +214,8 @@ private set
                     return;
                 }
 
-                _xMax = value.X;
-                _yMax = value.Y;
+                _xMax = value[Ordinates.X];
+                _yMax = value[Ordinates.Y];
             }
         }
 
@@ -221,7 +224,7 @@ private set
         /// </summary>
         public Point LowerLeft
         {
-            get { return Min; }
+            get { return new Point(Min); }
         }
 
         /// <summary>
@@ -261,7 +264,7 @@ public Point UpperLeft
         /// </summary>
         public Point UpperRight
         {
-            get { return Max; }
+            get { return new Point(Max); }
         }
 
         /// <summary>
@@ -460,7 +463,7 @@ public Boolean Contains(Point p)
         /// </returns>
         public Boolean Contains(Point p, Tolerance tolerance)
         {
-            if (p == null || IsEmpty || p.IsEmpty())
+            if (p == null || IsEmpty || p.IsEmpty)
             {
                 return false;
             }
@@ -720,12 +723,12 @@ public Boolean Overlaps(Point p)
         /// </returns>
         public Boolean Overlaps(Point p, Tolerance tolerance)
         {
-            if (p == null || p.IsEmpty())
+            if (p == null || p.IsEmpty)
             {
                 return false;
             }
 
-            return Overlaps(p.GetBoundingBox());
+            return Overlaps(p.Extents);
         }
 
         /// <summary>
@@ -873,7 +876,7 @@ public Boolean Touches(Point p)
         /// </returns>
         public Boolean Touches(Point p, Tolerance tolerance)
         {
-            if (p == null || p.IsEmpty())
+            if (p == null || p.IsEmpty)
             {
                 return false;
             }
@@ -1004,7 +1007,7 @@ public Boolean Within(Point p)
         /// </returns>
         public Boolean Within(Point p, Tolerance tolerance)
         {
-            if (p == null || IsEmpty || p.IsEmpty())
+            if (p == null || IsEmpty || p.IsEmpty)
             {
                 return false;
             }
@@ -1419,7 +1422,7 @@ public Double Distance(Extents extents)
         /// <returns>Minimum distance.</returns>
         public Double Distance(Point p)
         {
-            return Distance(p.GetBoundingBox());
+            return Distance(p.Extents);
         }
 
         #endregion
@@ -1436,7 +1439,7 @@ public Point GetCentroid()
                 return Point.Empty;
             }
 
-            return (Min + Max) * 0.5f;
+            return (LowerLeft + UpperRight) * 0.5f;
         }
 
         #endregion
@@ -1509,11 +1512,11 @@ public Boolean Equals(Extents other, Tolerance tolerance)
         #region Object Overrides
 
         /// <summary>
-        /// Indicates whether the current object is equal to another object of the same type.
+        /// Indicates whether the current Object is equal to another Object of the same type.
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public override Boolean Equals(object obj)
+        public override Boolean Equals(Object obj)
         {
             if (obj == null)
             {
@@ -1530,9 +1533,9 @@ public override Boolean Equals(object obj)
         }
 
         /// <summary>
-        /// Returns a hash code for the specified object
+        /// Returns a hash code for the specified Object
         /// </summary>
-        /// <returns>A hash code for the specified object</returns>
+        /// <returns>A hash code for the specified Object</returns>
         public override Int32 GetHashCode()
         {
             return (Int32)(_xMin + _yMin + _xMax + _yMax);
@@ -1619,5 +1622,187 @@ private void checkMinMax()
         }
 
         #endregion Private Helper Methods
+
+        #region IExtents Members
+
+        public Boolean Borders(IExtents other, Tolerance tolerance)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Borders(IExtents other)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinate Center
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public Boolean Contains(ICoordinate other, Tolerance tolerance)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Contains(Tolerance tolerance, params Double[] coordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Contains(ICoordinate other)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Contains(params Double[] coordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Double Distance(IExtents extents)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void ExpandToInclude(IGeometry other)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void ExpandToInclude(params Double[] coordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Double GetMax(Ordinates ordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Double GetMin(Ordinates ordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Double GetSize(params Ordinates[] axes)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Double GetSize(Ordinates axis1, Ordinates axis2, Ordinates axis3)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Double GetSize(Ordinates axis1, Ordinates axis2)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Double GetSize(Ordinates axis)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IExtents Intersection(IExtents extents)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Intersects(Tolerance tolerance, params Double[] coordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Intersects(params Double[] coordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Overlaps(ICoordinate other)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Boolean Overlaps(params Double[] coordinate)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Scale(Double factor, Ordinates axis)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Scale(Double factor)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Scale(params Double[] vector)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SetToEmpty()
+        {
+            throw new NotImplementedException();
+        }
+
+        IGeometry IExtents.ToGeometry()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Transform(IMatrix<DoubleComponent> transformMatrix)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Translate(params Double[] vector)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IExtents Union(IExtents box)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IExtents Union(IPoint point)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region IComparable Members
+
+        public Int32 CompareTo(Object obj)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region IEquatable<IExtents> Members
+
+        public Boolean Equals(IExtents other)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        Object ICloneable.Clone()
+        {
+            // value type copies and boxes for a deep copy
+            return this;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/FakeSpatialOperations.cs b/SharpMap.SimpleGeometries/FakeSpatialOperations.cs
deleted file mode 100644
index 5fc20902..00000000
--- a/SharpMap.SimpleGeometries/FakeSpatialOperations.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
-//
-// This file is part of SharpMap.
-// SharpMap is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// SharpMap is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public License
-// along with SharpMap; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-
-using System;
-
-namespace SharpMap.Geometries
-{
-    internal static class FakeSpatialOperations
-    {
-    }
-}
diff --git a/SharpMap.SimpleGeometries/Geometries3D/Point3D.cs b/SharpMap.SimpleGeometries/Geometries3D/Point3D.cs
index 35dc9376..bafd623d 100644
--- a/SharpMap.SimpleGeometries/Geometries3D/Point3D.cs
+++ b/SharpMap.SimpleGeometries/Geometries3D/Point3D.cs
@@ -1,4 +1,5 @@
-// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2006, 2007 - Rory Plaire (codekaizen@gmail.com)
 //
 // This file is part of SharpMap.
 // SharpMap is free software; you can redistribute it and/or modify
@@ -69,7 +70,7 @@ public Double Z
 		{
 			get
 			{
-				if (!IsEmpty())
+				if (!IsEmpty)
 					return _z;
 				else
 					throw new InvalidOperationException("Point is empty");
@@ -92,7 +93,7 @@ public override Double this[UInt32 index]
 			{
 				if (index == 2)
 				{
-					if (IsEmpty())
+					if (IsEmpty)
 						throw new InvalidOperationException("Point is empty");
 
 					return Z;
@@ -112,14 +113,6 @@ public override Double this[UInt32 index]
 			}
 		}
 
-		/// <summary>
-		/// Returns the number of ordinates for this point
-		/// </summary>
-		public override Int32 NumOrdinates
-		{
-			get { return 3; }
-		}
-
 		#region Operators
 
 		/// <summary>
@@ -186,9 +179,9 @@ public override Int32 GetHashCode()
 		/// </summary>
 		/// <param name="geom"></param>
 		/// <returns></returns>
-		public override Double Distance(Geometry geom)
+		public Double Distance(Geometry geom)
 		{
-			if (geom.GetType() == typeof (Point3D))
+			if (geom is Point3D)
 			{
 				Point3D p = geom as Point3D;
 				return Math.Sqrt(Math.Pow(X - p.X, 2) + Math.Pow(Y - p.Y, 2) + Math.Pow(Z - p.Z, 2));
diff --git a/SharpMap.SimpleGeometries/Geometry.cs b/SharpMap.SimpleGeometries/Geometry.cs
index 18565cb5..ba58b717 100644
--- a/SharpMap.SimpleGeometries/Geometry.cs
+++ b/SharpMap.SimpleGeometries/Geometry.cs
@@ -246,7 +246,7 @@ public IGeometry Envelope
         /// </summary>
         public String AsText()
         {
-            return GeometryToWkt.Write(this);
+            return WktEncoder.ToWkt(this);
         }
 
         /// <summary>
@@ -255,7 +255,7 @@ public String AsText()
         /// </summary>
         public Byte[] AsBinary()
         {
-            return GeometryToWkb.Write(this);
+            return WkbEncoder.ToWkb(this);
         }
 
         /// <summary>
@@ -291,7 +291,9 @@ public Boolean Contains(IGeometry g, Tolerance tolerance)
         /// </summary>
         public virtual Boolean Contains(IGeometry geom)
         {
-            return SpatialRelations.Contains(this, geom);
+            Geometry g = checkParameterType(geom);
+
+            return BoundingBoxSpatialRelations.Contains(this, g);
         }
 
         /// <summary>
@@ -299,7 +301,9 @@ public virtual Boolean Contains(IGeometry geom)
         /// </summary>
         public virtual Boolean Crosses(IGeometry geom)
         {
-            return SpatialRelations.Crosses(this, geom);
+            Geometry g = checkParameterType(geom);
+
+            return BoundingBoxSpatialRelations.Crosses(this, g);
         }
 
         public Boolean Covers(IGeometry g, Tolerance tolerance)
@@ -322,7 +326,9 @@ public Boolean Crosses(IGeometry g, Tolerance tolerance)
         /// </summary>
         public virtual Boolean Disjoint(IGeometry geom)
         {
-            return SpatialRelations.Disjoint(this, geom);
+            Geometry g = checkParameterType(geom);
+
+            return BoundingBoxSpatialRelations.Disjoint(this, g);
         }
 
         public Boolean Disjoint(IGeometry g, Tolerance tolerance)
@@ -351,7 +357,7 @@ public Boolean Equals(IGeometry other)
         /// </summary>
         public virtual Boolean Equals(Geometry other)
         {
-            return SpatialRelations.Equals(this, other);
+            return BoundingBoxSpatialRelations.Equals(this, other);
         }
 
         /// <summary>
@@ -435,7 +441,9 @@ public override Boolean Equals(Object obj)
         /// </summary>
         public virtual Boolean Intersects(IGeometry geom)
         {
-            return SpatialRelations.Intersects(this, geom);
+            Geometry g = checkParameterType(geom);
+
+            return BoundingBoxSpatialRelations.Intersects(this, g);
         }
 
         public Boolean Intersects(IGeometry g, Tolerance tolerance)
@@ -473,7 +481,9 @@ public Boolean Overlaps(IGeometry g, Tolerance tolerance)
         /// </summary>
         public virtual Boolean Overlaps(IGeometry geom)
         {
-            return SpatialRelations.Overlaps(this, geom);
+            Geometry g = checkParameterType(geom);
+
+            return BoundingBoxSpatialRelations.Overlaps(this, g);
         }
 
         /// <summary>
@@ -520,7 +530,9 @@ public Boolean Touches(IGeometry g, Tolerance tolerance)
         /// </summary>
         public virtual Boolean Touches(IGeometry geom)
         {
-            return SpatialRelations.Touches(this, geom);
+            Geometry g = checkParameterType(geom);
+
+            return BoundingBoxSpatialRelations.Touches(this, g);
         }
 
         /// <summary>
@@ -528,7 +540,9 @@ public virtual Boolean Touches(IGeometry geom)
         /// </summary>
         public virtual Boolean Within(IGeometry geom)
         {
-            return SpatialRelations.Within(this, geom);
+            Geometry g = checkParameterType(geom);
+
+            return BoundingBoxSpatialRelations.Within(this, g);
         }
 
         public Boolean Within(IGeometry g, Tolerance tolerance)
@@ -678,5 +692,17 @@ public IEnumerable<Point> GetVertexes()
         }
 
         #endregion
+
+
+        private static Geometry checkParameterType(IGeometry geom)
+        {
+            if (!(geom is Geometry))
+            {
+                throw new ArgumentException(
+                    "Parameter must be a SharpMap.SimpleGeometries.Geometry instance");
+            }
+
+            return geom as Geometry;
+        }
     }
 }
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/GeometryCollection.cs b/SharpMap.SimpleGeometries/GeometryCollection.cs
index 2e456d80..de89a1a5 100644
--- a/SharpMap.SimpleGeometries/GeometryCollection.cs
+++ b/SharpMap.SimpleGeometries/GeometryCollection.cs
@@ -1,4 +1,5 @@
-// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
+// Portions copyright 2006, 2007 - Rory Plaire (codekaizen@gmail.com)
 //
 // This file is part of SharpMap.
 // SharpMap is free software; you can redistribute it and/or modify
diff --git a/SharpMap.SimpleGeometries/GeometryCollection`1.cs b/SharpMap.SimpleGeometries/GeometryCollection`1.cs
index a7d13f06..7f4149ea 100644
--- a/SharpMap.SimpleGeometries/GeometryCollection`1.cs
+++ b/SharpMap.SimpleGeometries/GeometryCollection`1.cs
@@ -475,5 +475,10 @@ IEnumerator<IGeometry> IEnumerable<IGeometry>.GetEnumerator()
         }
 
         #endregion
+
+        public override int PointCount
+        {
+            get { throw new NotImplementedException(); }
+        }
     }
 }
diff --git a/SharpMap.SimpleGeometries/IGeometry.cs b/SharpMap.SimpleGeometries/IGeometry.cs
deleted file mode 100644
index 435d09a1..00000000
--- a/SharpMap.SimpleGeometries/IGeometry.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
-//
-// This file is part of SharpMap.
-// SharpMap is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// SharpMap is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public License
-// along with SharpMap; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharpMap.Geometries
-{
-	/// <summary>
-	/// Defines basic interface for a Geometry
-	/// </summary>
-	public interface IGeometry
-	{
-		#region "Basic Methods on Geometry"
-
-		/// <summary>
-		/// Gets or sets the spatial reference system associated with the <see cref="Geometry"/>.
-		/// A <see cref="Geometry"/> may not have had a spatial reference system defined for
-		/// it, in which case *spatialRef will be NULL.
-		/// </summary>
-		SharpMap.CoordinateSystems.ICoordinateSystem SpatialReference { get; set; }
-
-		/// <summary>
-		///  The inherent dimension of this <see cref="Geometry"/> object, which must be less than or equal to the coordinate dimension.
-		/// </summary>
-		Int32 Dimension { get; }
-
-        /// <summary>
-		/// The minimum bounding box for this Geometry, returned as a <see cref="Geometry"/>. The
-        /// polygon is defined by the corner points of the bounding box ((MINX, MINY), (MAXX, MINY), (MAXX,
-        /// MAXY), (MINX, MAXY), (MINX, MINY)).
-        /// </summary>
-        Geometry Envelope();
-
-		/// <summary>
-		/// The minimum <see cref="BoundingBox"/> for this <see cref="Geometry"/>.
-		/// </summary>
-		/// <returns><see cref="BoundingBox"/> for this <see cref="Geometry"/></returns>
-		Extents GetBoundingBox();
-
-        /// <summary>
-		/// Exports this <see cref="Geometry"/> to a specific well-known text representation of <see cref="Geometry"/>.
-        /// </summary>
-		String AsText();
-
-		/// <summary>
-		/// Exports this <see cref="Geometry"/> to a specific well-known binary representation of <see cref="Geometry"/>.
-		/// </summary>
-		Byte[] AsBinary();
-
-		/// <summary>
-		/// Returns a WellKnownText representation of the <see cref="Geometry"/>
-		/// </summary>
-		/// <returns>Well-known text</returns>
-		String ToString();
-
-		/// <summary>
-		/// If true, then this <see cref="Geometry"/> represents the empty point set, Ø, for the coordinate space. 
-		/// </summary>
-		/// <returns>Returns 'true' if this <see cref="Geometry"/> is the empty geometry</returns>
-		Boolean IsEmpty();
-
-		/// <summary>
-		///  Returns 'true' if this <see cref="Geometry"/> has no anomalous geometric points, such as self
-		/// intersection or self tangency. The description of each instantiable geometric class will include the specific
-		/// conditions that cause an instance of that class to be classified as not simple.
-		/// </summary>
-		/// <returns>true if the <see cref="Geometry"/> is simple</returns>
-		Boolean IsSimple();
-
-        /// <summary>
-		/// Returns the closure of the combinatorial boundary of this <see cref="Geometry"/>. The
-        /// combinatorial boundary is defined as described in section 3.12.3.2 of [1]. Because the result of this function
-        /// is a closure, and hence topologically closed, the resulting boundary can be represented using
-        /// representational geometry primitives
-        /// </summary>
-		/// <returns>Closure of the combinatorial boundary of this <see cref="Geometry"/></returns>
-		Geometry Boundary();
-
-		/// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> is spatially related to another <see cref="Geometry"/>, by testing
-		/// for intersections between the Interior, Boundary and Exterior of the two geometries
-		/// as specified by the values in the intersectionPatternMatrix
-		/// </summary>
-		/// <param name="other"><see cref="Geometry"/> to relate to</param>
-		/// <param name="intersectionPattern">Intersection Pattern</param>
-		/// <returns>True if spatially related</returns>
-		Boolean Relate(Geometry other, String intersectionPattern);
-
-
-        #endregion
-
-        #region "Methods for testing Spatial Relations between geometric objects"
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> is 'spatially equal' to another <see cref="Geometry"/>
-        /// </summary>
-		Boolean Equals(Geometry geom);
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> is 'spatially disjoint' from another <see cref="Geometry"/>
-        /// </summary>
-		Boolean Disjoint(Geometry geom);
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> 'spatially intersects' another <see cref="Geometry"/>
-        /// </summary>
-		Boolean Intersects(Geometry geom);
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> 'spatially touches' another <see cref="Geometry"/>.
-        /// </summary>
-		Boolean Touches(Geometry geom);
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> 'spatially crosses' another <see cref="Geometry"/>.
-        /// </summary>
-		Boolean Crosses(Geometry geom);
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> is 'spatially within' another <see cref="Geometry"/>.
-        /// </summary>
-		Boolean Within(Geometry geom);
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> 'spatially contains' another <see cref="Geometry"/>.
-        /// </summary>
-		Boolean Contains(Geometry geom);
-
-        /// <summary>
-		/// Returns 'true' if this <see cref="Geometry"/> 'spatially overlaps' another <see cref="Geometry"/>.
-        /// </summary>
-		Boolean Overlaps(Geometry geom);
-
-
-        #endregion
-
-        #region "Methods that support Spatial Analysis"
-
-        /// <summary>
-        /// Returns the shortest distance between any two points in the two geometries
-		/// as calculated in the spatial reference system of this <see cref="Geometry"/>.
-        /// </summary>
-		/// <param name="geom"><see cref="Geometry"/> to calculate distance to</param>
-		/// <returns>Shortest distance between any two points in the two geometries</returns>
-		Double Distance(Geometry geom);
-
-        /// <summary>
-		/// Returns a <see cref="Geometry"/> that represents all points whose distance from this <see cref="Geometry"/>
-        /// is less than or equal to distance. Calculations are in the Spatial Reference
-		/// System of this <see cref="Geometry"/>.
-        /// </summary>
-		/// <param name="d">Buffer distance</param>
-		/// <returns>Buffer around <see cref="Geometry"/></returns>
-		Geometry Buffer(Double d);
-
-
-        /// <summary>
-		/// Returns a <see cref="Geometry"/> that represents the convex hull of this <see cref="Geometry"/>.
-        /// </summary>
-		/// <returns>The convex hull</returns>
-		Geometry ConvexHull();
-
-		/// <summary>
-		/// Returns a <see cref="Geometry"/> that represents the point set intersection of this <see cref="Geometry"/>
-		/// with another <see cref="Geometry"/>.
-		/// </summary>
-		/// <param name="geom"><see cref="Geometry"/> to intersect with</param>
-		/// <returns>Returns a <see cref="Geometry"/> that represents the point set intersection of this <see cref="Geometry"/> with another <see cref="Geometry"/>.</returns>
-		Geometry Intersection(Geometry geom);
-
-		/// <summary>
-		/// Returns a <see cref="Geometry"/> that represents the point set union of this <see cref="Geometry"/> with anotherGeometry.
-		/// </summary>
-		/// <param name="geom">Geometry to union with</param>
-		/// <returns>Unioned <see cref="Geometry"/></returns>
-		Geometry Union(Geometry geom);
-
-        /// <summary>
-		/// Returns a <see cref="Geometry"/> that represents the point set difference of this <see cref="Geometry"/> with anotherGeometry.
-        /// </summary>
-		/// <param name="geom"><see cref="Geometry"/> to compare to</param>
-		/// <returns><see cref="Geometry"/></returns>
-		Geometry Difference(Geometry geom);
-
-        /// <summary>
-		/// Returns a geometry that represents the point set symmetric difference of this <see cref="Geometry"/> with anotherGeometry.
-        /// </summary>
-		/// <param name="geom"><see cref="Geometry"/> to compare to</param>
-		/// <returns><see cref="Geometry"/></returns>
-		Geometry SymDifference(Geometry geom);
-
-		#endregion
-	}
-}
diff --git a/SharpMap.SimpleGeometries/IGeometryCollection.cs b/SharpMap.SimpleGeometries/IGeometryCollection.cs
deleted file mode 100644
index 0a944e74..00000000
--- a/SharpMap.SimpleGeometries/IGeometryCollection.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
-//
-// This file is part of SharpMap.
-// SharpMap is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// SharpMap is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public License
-// along with SharpMap; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-
-using System;
-using System.Collections;
-
-namespace SharpMap.Geometries
-{
-    /// <summary>
-    /// Interface for a GeometryCollection.
-    /// A GeometryCollection is a collection of 1 or more geometries.
-    /// </summary>
-    public interface IGeometryCollection : IGeometry, IEnumerable
-    {
-        /// <summary>
-        /// Returns the number of geometries in the collection.
-        /// </summary>
-        Int32 NumGeometries { get; }
-
-        /// <summary>
-        /// Returns an indexed geometry in the collection
-        /// </summary>
-        /// <param name="N">Geometry index</param>
-        /// <returns>Geometry at index N</returns>
-        Geometry Geometry(Int32 N);
-    }
-}
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/LineString.cs b/SharpMap.SimpleGeometries/LineString.cs
index 3ae6bf65..9567c749 100644
--- a/SharpMap.SimpleGeometries/LineString.cs
+++ b/SharpMap.SimpleGeometries/LineString.cs
@@ -18,6 +18,7 @@
 using System;
 using System.Collections.Generic;
 using GeoAPI.Geometries;
+using GeoAPI.Utilities;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -26,7 +27,7 @@ namespace SharpMap.SimpleGeometries
     /// Each consecutive pair of points defines a line segment.
     /// </summary>
     [Serializable]
-    public class LineString : Curve
+    public class LineString : Curve, ILineString
     {
         private readonly List<IPoint> _vertices = new List<IPoint>();
         private Extents _extents = new Extents();
@@ -35,11 +36,11 @@ public class LineString : Curve
         /// Initializes an instance of a LineString from a set of vertices.
         /// </summary>
         /// <param name="vertices"></param>
-        public LineString(IEnumerable<Point> vertices)
+        public LineString(IEnumerable<IPoint> vertices)
         {
-            foreach (Point p in vertices)
+            foreach (IPoint p in vertices)
             {
-                _vertices.Add(p.Clone() as Point);
+                _vertices.Add(p.Clone() as IPoint);
             }
         }
 
@@ -230,7 +231,7 @@ public override IGeometry Intersection(IGeometry geom)
         public override IGeometry Union(IGeometry geom)
         {
 #warning fake the union using a GeometryCollection
-            return BoundingBoxOperations.Union(this, geom as Geometry);
+            return BoundingBoxSpatialOperations.Union(this, geom as Geometry);
         }
 
         /// <summary>
@@ -382,5 +383,14 @@ public override Geometry Clone()
         }
 
         #endregion
+
+        #region ILineString Members
+
+        public ILineString Reverse()
+        {
+            return new LineString(Slice.Reverse(_vertices));
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/LinearRing.cs b/SharpMap.SimpleGeometries/LinearRing.cs
index 8a845579..d4f9b455 100644
--- a/SharpMap.SimpleGeometries/LinearRing.cs
+++ b/SharpMap.SimpleGeometries/LinearRing.cs
@@ -17,29 +17,27 @@
 
 using System;
 using System.Collections.Generic;
+using GeoAPI.Coordinates;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
-	/// <summary>
-	/// A LinearRing is a LineString that is both closed and simple.
-	/// </summary>
-	public class LinearRing : LineString
-	{
-		/// <summary>
-		/// Initializes an instance of a LinearRing from a set of vertices
-		/// </summary>
-		/// <param name="vertices"></param>
-		public LinearRing(IEnumerable<Point> vertices)
-			: base(vertices)
-		{
-		}
-
-		/// <summary>
-		/// Initializes an instance of a LinearRing
-		/// </summary>
-		public LinearRing()
-		{
-		}
+    /// <summary>
+    /// A LinearRing is a LineString that is both closed and simple.
+    /// </summary>
+    public class LinearRing : LineString, ILinearRing
+    {
+        /// <summary>
+        /// Initializes an instance of a LinearRing from a set of vertices
+        /// </summary>
+        /// <param name="vertices"></param>
+        public LinearRing(IEnumerable<IPoint> vertices)
+            : base(vertices) { }
+
+        /// <summary>
+        /// Initializes an instance of a LinearRing
+        /// </summary>
+        public LinearRing() { }
 
         /// <summary>
         /// Creates a deep copy of the LinearRing.
@@ -51,118 +49,153 @@ public override Geometry Clone()
             return ring;
         }
 
-		/// <summary>
-		/// Tests whether a ring is oriented counter-clockwise.
-		/// </summary>
-		/// <returns>Returns true if ring is oriented counter-clockwise.</returns>
-		public Boolean IsCcw()
-		{
-			Point hip, p, prev, next;
-			Int32 hii, i;
-			Int32 nPts = Vertices.Count;
-
-			// check that this is a valid ring - if not, simply return a dummy value
-			if (nPts < 4)
-			{
-				return false;
-			}
-
-			// algorithm to check if a Ring is stored in CCW order
-			// find highest point
-			hip = Vertices[0];
-			hii = 0;
-			for (i = 1; i < nPts; i++)
-			{
-				p = Vertices[i];
-				if (p.Y > hip.Y)
-				{
-					hip = p;
-					hii = i;
-				}
-			}
-
-			// find points on either side of highest
-			Int32 iPrev = hii - 1;
-			if (iPrev < 0) iPrev = nPts - 2;
-			Int32 iNext = hii + 1;
-			if (iNext >= nPts) iNext = 1;
-			prev = Vertices[iPrev];
-			next = Vertices[iNext];
-
-			// translate so that hip is at the origin.
-			// This will not affect the area calculation, and will avoid
-			// finite-accuracy errors (i.e very small vectors with very large coordinates)
-			// This also simplifies the discriminant calculation.
-			Double prev2x = prev.X - hip.X;
-			Double prev2y = prev.Y - hip.Y;
-			Double next2x = next.X - hip.X;
-			Double next2y = next.Y - hip.Y;
-
-			// compute cross-product of vectors hip->next and hip->prev
-			// (e.g. area of parallelogram they enclose)
-			Double disc = next2x * prev2y - next2y * prev2x;
-
-			// If disc is exactly 0, lines are collinear.  There are two possible cases:
-			//	(1) the lines lie along the x axis in opposite directions
-			//	(2) the line lie on top of one another
-			//  (2) should never happen, so we're going to ignore it!
-			//	(Might want to assert this)
-			//  (1) is handled by checking if next is left of prev ==> CCW
-			if (disc == 0.0)
-			{
-				// poly is CCW if prev x is right of next x
-				return (prev.X > next.X);
-			}
-			else
-			{
-				// if area is positive, points are ordered CCW
-				return (disc > 0.0);
-			}
-		}
-
-		/// <summary>
-		/// Returns the area of the LinearRing
-		/// </summary>
-		public Double Area
-		{
-			get
-			{
-				if (Vertices.Count < 3)
-					return 0;
-				Double sum = 0;
-				Double ax = Vertices[0].X;
-				Double ay = Vertices[0].Y;
-				for (Int32 i = 1; i < Vertices.Count - 1; i++)
-				{
-					Double bx = Vertices[i].X;
-					Double by = Vertices[i].Y;
-					Double cx = Vertices[i + 1].X;
-					Double cy = Vertices[i + 1].Y;
-					sum += ax * by - ay * bx +
-						   ay * cx - ax * cy +
-						   bx * cy - cx * by;
-				}
-				return Math.Abs(-sum / 2);
-			}
-		}
-
-		/// <summary>
-		/// Returns true of the Point 'p' is within the instance of this ring
-		/// </summary>
-		/// <param name="p"></param>
-		/// <returns></returns>
-		public Boolean IsPointWithin(Point p)
-		{
-			Boolean c = false;
-			for (Int32 i = 0; i < Vertices.Count; i++)
-				for (Int32 j = i + 1; j < Vertices.Count - 1; j++)
-				{
-					if ((((Vertices[i].Y <= p.Y) && (p.Y < Vertices[j].Y)) ||
-						 ((Vertices[j].Y <= p.Y) && (p.Y < Vertices[i].Y))) &&
-						(p.X < (Vertices[j].X - Vertices[i].X) * (p.Y - Vertices[i].Y) / (Vertices[j].Y - Vertices[i].Y) + Vertices[i].X))
-						c = !c;
-				}
-			return c;
-		}
-	}
+        /// <summary>
+        /// Tests whether a ring is oriented counter-clockwise.
+        /// </summary>
+        /// <returns>Returns true if ring is oriented counter-clockwise.</returns>
+        public Boolean IsCcw()
+        {
+            IPoint hip, p, prev, next;
+            Int32 hii, i;
+            Int32 nPts = Vertices.Count;
+
+            // check that this is a valid ring - if not, simply return a dummy value
+            if (nPts < 4)
+            {
+                return false;
+            }
+
+            // algorithm to check if a Ring is stored in CCW order
+            // find highest point
+            hip = Vertices[0];
+            hii = 0;
+
+            for (i = 1; i < nPts; i++)
+            {
+                p = Vertices[i];
+
+                if (p[Ordinates.Y] > hip[Ordinates.Y])
+                {
+                    hip = p;
+                    hii = i;
+                }
+            }
+
+            // find points on either side of highest
+            Int32 iPrev = hii - 1;
+
+            if (iPrev < 0)
+            {
+                iPrev = nPts - 2;
+            }
+
+            Int32 iNext = hii + 1;
+
+            if (iNext >= nPts)
+            {
+                iNext = 1;
+            }
+
+            prev = Vertices[iPrev];
+            next = Vertices[iNext];
+
+            // translate so that hip is at the origin.
+            // This will not affect the area calculation, and will avoid
+            // finite-accuracy errors (i.e very small vectors with very large coordinates)
+            // This also simplifies the discriminant calculation.
+            Double prev2x = prev[Ordinates.X] - hip[Ordinates.X];
+            Double prev2y = prev[Ordinates.Y] - hip[Ordinates.Y];
+            Double next2x = next[Ordinates.X] - hip[Ordinates.X];
+            Double next2y = next[Ordinates.Y] - hip[Ordinates.Y];
+
+            // compute determinant of vectors hip->next and hip->prev
+            // (e.g. area of parallelogram they enclose)
+            Double disc = next2x * prev2y - next2y * prev2x;
+
+            // If disc is exactly 0, lines are collinear.  There are two possible cases:
+            //	(1) the lines lie along the x axis in opposite directions
+            //	(2) the line lie on top of one another
+            //  (2) should never happen, so we're going to ignore it!
+            //	(Might want to assert this)
+            //  (1) is handled by checking if next is left of prev ==> CCW
+            if (disc == 0.0)
+            {
+                // poly is CCW if prev x is right of next x
+                return (prev[Ordinates.X] > next[Ordinates.X]);
+            }
+            else
+            {
+                // if area is positive, points are ordered CCW
+                return (disc > 0.0);
+            }
+        }
+
+        /// <summary>
+        /// Returns the area of the LinearRing
+        /// </summary>
+        public Double Area
+        {
+            get
+            {
+                if (Vertices.Count < 3)
+                {
+                    return 0;
+                }
+
+                Double sum = 0;
+                Double ax = Vertices[0][Ordinates.X];
+                Double ay = Vertices[0][Ordinates.Y];
+
+                for (Int32 i = 1; i < Vertices.Count - 1; i++)
+                {
+                    Double bx = Vertices[i][Ordinates.X];
+                    Double by = Vertices[i][Ordinates.Y];
+                    Double cx = Vertices[i + 1][Ordinates.X];
+                    Double cy = Vertices[i + 1][Ordinates.Y];
+
+                    sum += ax * by - ay * bx +
+                           ay * cx - ax * cy +
+                           bx * cy - cx * by;
+                }
+
+                return Math.Abs(-sum / 2);
+            }
+        }
+
+        /// <summary>
+        /// Returns true of the Point 'p' is within the instance of this ring
+        /// </summary>
+        /// <param name="p"></param>
+        /// <returns></returns>
+        public Boolean IsPointWithin(Point p)
+        {
+            Boolean c = false;
+            for (Int32 i = 0; i < Vertices.Count; i++)
+            {
+                for (Int32 j = i + 1; j < Vertices.Count - 1; j++)
+                {
+                    // this is horrible code to read. If the unit tests were working,
+                    // I could fix it without worrying I'd break something!
+                    if ((((Vertices[i][Ordinates.Y] <= p.Y) && (p.Y < Vertices[j][Ordinates.Y])) ||
+                         ((Vertices[j][Ordinates.Y] <= p.Y) && (p.Y < Vertices[i][Ordinates.Y]))) &&
+                        (p.X < (Vertices[j][Ordinates.X] - Vertices[i][Ordinates.X]) 
+                            * (p.Y - Vertices[i][Ordinates.Y]) / (Vertices[j][Ordinates.Y] 
+                            - Vertices[i][Ordinates.Y]) + Vertices[i][Ordinates.X]))
+                    {
+                        c = !c;
+                    }
+                }
+            }
+            return c;
+        }
+
+        #region ILinearRing Members
+
+        Boolean ILinearRing.IsCcw
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/MultiCurve.cs b/SharpMap.SimpleGeometries/MultiCurve.cs
index 8059f280..86de1ec4 100644
--- a/SharpMap.SimpleGeometries/MultiCurve.cs
+++ b/SharpMap.SimpleGeometries/MultiCurve.cs
@@ -17,6 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 using System;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -38,9 +39,9 @@ protected MultiCurve(Int32 initialCapacity)
 		/// The inherent dimension of this Geometry object, 
 		/// which must be less than or equal to the coordinate dimension.
 		/// </summary>
-		public override Int32 Dimension
+		public override Dimensions Dimension
 		{
-			get { return 1; }
+            get { return Dimensions.Curve; }
 		}
 
 		/// <summary>
diff --git a/SharpMap.SimpleGeometries/MultiLineString.cs b/SharpMap.SimpleGeometries/MultiLineString.cs
index 7ff5aee4..8ff771a8 100644
--- a/SharpMap.SimpleGeometries/MultiLineString.cs
+++ b/SharpMap.SimpleGeometries/MultiLineString.cs
@@ -35,14 +35,14 @@ public MultiLineString() { }
         public MultiLineString(Int32 initialCapacity)
             : base(initialCapacity) { }
 
-        /// <summary>
-        /// Collection of <see cref="LineString">LineStrings</see> 
-        /// in the <see cref="MultiLineString"/>
-        /// </summary>
-        public IList<LineString> LineStrings
-        {
-            get { return Collection; }
-        }
+        ///// <summary>
+        ///// Collection of <see cref="LineString">LineStrings</see> 
+        ///// in the <see cref="MultiLineString"/>
+        ///// </summary>
+        //public IList<LineString> LineStrings
+        //{
+        //    get { return Collection; }
+        //}
 
         /// <summary>
         /// Creates a copy of this geometry.
@@ -52,9 +52,9 @@ public override Geometry Clone()
         {
             MultiLineString multiLineString = new MultiLineString();
 
-            foreach (LineString lineString in Collection)
+            foreach (LineString lineString in this)
             {
-                multiLineString.LineStrings.Add(lineString.Clone() as LineString);
+                multiLineString.Add(lineString.Clone() as LineString);
             }
 
             return multiLineString;
diff --git a/SharpMap.SimpleGeometries/MultiPoint.cs b/SharpMap.SimpleGeometries/MultiPoint.cs
index 489807dc..27fb0b23 100644
--- a/SharpMap.SimpleGeometries/MultiPoint.cs
+++ b/SharpMap.SimpleGeometries/MultiPoint.cs
@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -36,29 +37,12 @@ public MultiPoint() { }
 		public MultiPoint(Int32 initialCapacity)
             : base(initialCapacity) { }
 
-		/// <summary>
-		/// Gets or sets the MultiPoint collection
-		/// </summary>
-		public IList<Point> Points
-		{
-			get { return Collection; }
-		}
-
 		/// <summary>
 		///  The inherent dimension of this Geometry object, which must be less than or equal to the coordinate dimension.
 		/// </summary>
-		public override Int32 Dimension
-		{
-			get { return 0; }
-		}
-
-		/// <summary>
-		/// The boundary of a MultiPoint is the empty set (null).
-		/// </summary>
-		/// <returns></returns>
-		public override Geometry Boundary()
+		public override Dimensions Dimension
 		{
-			return null;
+            get { return Dimensions.Point; }
 		}
 
 		/// <summary>
@@ -69,9 +53,9 @@ public override Geometry Clone()
 		{
 			MultiPoint multiPoint = new MultiPoint();
 
-			foreach (Point p in Points)
+			foreach (Point p in this)
 			{
-				multiPoint.Points.Add(p.Clone() as Point);
+				multiPoint.Add(p.Clone() as Point);
 			}
 
 			return multiPoint;
diff --git a/SharpMap.SimpleGeometries/MultiPolygon.cs b/SharpMap.SimpleGeometries/MultiPolygon.cs
index e2a4abc9..4c0bfaa2 100644
--- a/SharpMap.SimpleGeometries/MultiPolygon.cs
+++ b/SharpMap.SimpleGeometries/MultiPolygon.cs
@@ -16,7 +16,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 using System;
-using System.Collections.Generic;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -34,13 +33,13 @@ public MultiPolygon() { }
 		public MultiPolygon(Int32 initialCapacity) :
             base(initialCapacity) { }
 
-		/// <summary>
-		/// Collection of polygons in the multipolygon
-		/// </summary>
-		public IList<Polygon> Polygons
-		{
-			get { return Collection; }
-		}
+        ///// <summary>
+        ///// Collection of polygons in the multipolygon
+        ///// </summary>
+        //public IList<Polygon> Polygons
+        //{
+        //    get { return Collection; }
+        //}
 
 		/// <summary>
 		/// The mathematical centroid for the surfaces as a Point.
@@ -67,9 +66,9 @@ public override Geometry Clone()
 		{
 			MultiPolygon multiPolygon = new MultiPolygon();
 
-			foreach (Polygon poly in Polygons)
+			foreach (Polygon poly in this)
 			{
-				multiPolygon.Polygons.Add(poly.Clone() as Polygon);
+				multiPolygon.Add(poly.Clone() as Polygon);
 			}
 
 			return multiPolygon;
diff --git a/SharpMap.SimpleGeometries/MultiSurface.cs b/SharpMap.SimpleGeometries/MultiSurface.cs
index 81ac8569..8f7959b0 100644
--- a/SharpMap.SimpleGeometries/MultiSurface.cs
+++ b/SharpMap.SimpleGeometries/MultiSurface.cs
@@ -16,6 +16,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 using System;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -76,9 +77,9 @@ public virtual Double Area
 		/// Gets the inherent dimension of this Geometry object, 
 		/// which must be less than or equal to the coordinate dimension.
 		/// </summary>
-		public override Int32 Dimension
+		public override Dimensions Dimension
 		{
-			get { return 2; }
+            get { return Dimensions.Curve; }
         }
 	}
 }
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/Point.cs b/SharpMap.SimpleGeometries/Point.cs
index a85dd9b0..3795aac3 100644
--- a/SharpMap.SimpleGeometries/Point.cs
+++ b/SharpMap.SimpleGeometries/Point.cs
@@ -52,6 +52,17 @@ public Point(Double x, Double y)
             SetNotEmpty();
         }
 
+        /// <summary>
+        /// Initializes a new Point
+        /// </summary>
+        /// <param name="coordinate">The coordinate used to define the point.</param>
+        public Point(ICoordinate coordinate)
+        {
+            _x = coordinate[Ordinates.X];
+            _y = coordinate[Ordinates.Y];
+            SetNotEmpty();
+        }
+
         /// <summary>
         /// Initializes a new empty Point
         /// </summary>
@@ -426,7 +437,7 @@ public override IGeometry Union(IGeometry geometry)
             }
 
             GeometryCollection union = new GeometryCollection();
-            union.Collection.Add(this);
+            union.Add(this);
             return union;
         }
 
@@ -1281,5 +1292,10 @@ Int32 IComparable<IVector<DoubleComponent>>.CompareTo(IVector<DoubleComponent> o
         }
 
         #endregion
+
+        public override Int32 PointCount
+        {
+            get { return 1; }
+        }
     }
 }
diff --git a/SharpMap.SimpleGeometries/Polygon.cs b/SharpMap.SimpleGeometries/Polygon.cs
index a2a99b1a..79227c46 100644
--- a/SharpMap.SimpleGeometries/Polygon.cs
+++ b/SharpMap.SimpleGeometries/Polygon.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -30,7 +31,7 @@ namespace SharpMap.SimpleGeometries
     /// are in the opposite direction of the exterior ring.
     /// </remarks>
     [Serializable]
-    public class Polygon : Surface
+    public class Polygon : Surface, IPolygon
     {
         private LinearRing _exteriorRing;
         private List<LinearRing> _interiorRings = new List<LinearRing>();
@@ -194,9 +195,12 @@ public override Int32 GetHashCode()
         /// If true, then this Geometry represents the empty point set, Ø, for the coordinate space. 
         /// </summary>
         /// <returns>Returns 'true' if this Geometry is the empty geometry</returns>
-        public override Boolean IsEmpty()
+        public override Boolean IsEmpty
         {
-            return (ExteriorRing == null) || (ExteriorRing.Vertices.Count == 0);
+            get
+            {
+                return (ExteriorRing == null) || (ExteriorRing.Vertices.Count == 0);
+            }
         }
 
         /// <summary>
@@ -204,9 +208,12 @@ public override Boolean IsEmpty()
         /// intersection or self tangency. The description of each instantiable geometric class will include the specific
         /// conditions that cause an instance of that class to be classified as not simple.
         /// </summary>
-        public override Boolean IsSimple()
+        public override Boolean IsSimple
         {
-            throw new NotImplementedException();
+            get
+            {
+                throw new NotImplementedException();
+            }
         }
 
         /// <summary>
@@ -215,16 +222,16 @@ public override Boolean IsSimple()
         /// is a closure, and hence topologically closed, the resulting boundary can be represented using
         /// representational geometry primitives
         /// </summary>
-        public override Geometry Boundary()
+        public override IGeometry Boundary
         {
-            throw new NotImplementedException();
+            get { throw new NotImplementedException(); }
         }
 
         /// <summary>
         /// Returns the shortest distance between any two points in the two geometries
         /// as calculated in the spatial reference system of this Geometry.
         /// </summary>
-        public override Double Distance(Geometry geom)
+        public override Double Distance(IGeometry geom)
         {
             throw new NotImplementedException();
         }
@@ -234,7 +241,7 @@ public override Double Distance(Geometry geom)
         /// is less than or equal to distance. Calculations are in the Spatial Reference
         /// System of this Geometry.
         /// </summary>
-        public override Geometry Buffer(Double d)
+        public override IGeometry Buffer(Double d)
         {
             throw new NotImplementedException();
         }
@@ -242,7 +249,7 @@ public override Geometry Buffer(Double d)
         /// <summary>
         /// Geometry—Returns a geometry that represents the convex hull of this Geometry.
         /// </summary>
-        public override Geometry ConvexHull()
+        public override IGeometry ConvexHull()
         {
             throw new NotImplementedException();
         }
@@ -251,46 +258,45 @@ public override Geometry ConvexHull()
         /// Returns a geometry that represents the point set intersection of this Geometry
         /// with anotherGeometry.
         /// </summary>
-        public override Geometry Intersection(Geometry geom)
+        public override IGeometry Intersection(IGeometry geom)
         {
-            return FakeSpatialOperations.Intersection(this, geom);
+            return BoundingBoxSpatialOperations.Intersection(this, geom);
         }
 
         /// <summary>
         /// Returns a geometry that represents the point set union 
         /// of this Geometry with another Geometry.
         /// </summary>
-        public override Geometry Union(Geometry geometry)
+        public override IGeometry Union(IGeometry geometry)
         {
 #warning fake the union using a GeometryCollection
-            return FakeSpatialOperations.Union(this, geometry);
+            return BoundingBoxSpatialOperations.Union(this, geometry);
         }
 
         /// <summary>
         /// Returns a geometry that represents the point set difference of this Geometry with anotherGeometry.
         /// </summary>
-        public override Geometry Difference(Geometry geometry)
+        public override IGeometry Difference(IGeometry geometry)
         {
             if (geometry == null) throw new ArgumentNullException("geometry");
 
-#warning fake the difference by using bounding boxes. Broken until we go to NTS in Beta 2
-            if (IsEmpty())
+            if (IsEmpty)
             {
                 return geometry;
             }
 
-            if (geometry.IsEmpty())
+            if (geometry.IsEmpty)
             {
                 return this;
             }
 
-            return BoundingBoxOperations.Difference(GetBoundingBox(), geometry.GetBoundingBox());
+            return BoundingBoxSpatialOperations.Difference(ExtentsInternal, new Extents(geometry.Extents));
         }
 
         /// <summary>
         /// Returns a geometry that represents the point set symmetric difference of this Geometry with anotherGeometry.
         /// </summary>
-        public override Geometry SymDifference(Geometry geom)
+        public override IGeometry SymmetricDifference(IGeometry geom)
         {
             throw new NotImplementedException();
         }
@@ -331,13 +337,13 @@ public override Double Area
         /// </summary>
         public override Point Centroid
         {
-            get { return ExteriorRing.GetBoundingBox().GetCentroid(); }
+            get { return ExteriorRing.ExtentsInternal.GetCentroid(); }
         }
 
         /// <summary>
         /// A point guaranteed to be on this Surface.
         /// </summary>
-        public override Point PointOnSurface
+        public override IPoint PointOnSurface
         {
             get { throw new NotImplementedException(); }
         }
@@ -346,15 +352,18 @@ public override Point PointOnSurface
         /// Returns the bounding box of the object
         /// </summary>
         /// <returns>bounding box</returns>
-        public override Extents GetBoundingBox()
+        public override IExtents Extents
         {
-            if (_exteriorRing == null || _exteriorRing.IsEmpty())
-            {
-                return Extents.Empty;
-            }
-            else
+            get
             {
-                return _exteriorRing.GetBoundingBox();
+                if (_exteriorRing == null || _exteriorRing.IsEmpty)
+                {
+                    return new Extents();
+                }
+                else
+                {
+                    return _exteriorRing.ExtentsInternal;
+                }
             }
         }
 
@@ -394,5 +403,39 @@ public override Geometry Clone()
         }
 
         #endregion
+
+        #region IPolygon Members
+
+        ILineString IPolygon.ExteriorRing
+        {
+            get { return ExteriorRing; }
+        }
+
+        public Int32 InteriorRingsCount
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        IList<ILineString> IPolygon.InteriorRings
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        #endregion
+
+        public override Int32 PointCount
+        {
+            get
+            {
+                Int32 pointCount = ExteriorRing.PointCount;
+
+                foreach (LinearRing ring in _interiorRings)
+                {
+                    pointCount += ring.PointCount;
+                }
+
+                return pointCount;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SharpMap.SimpleGeometries/SharpMap.SimpleGeometries.csproj b/SharpMap.SimpleGeometries/SharpMap.SimpleGeometries.csproj
index 60320640..5ac39b22 100644
--- a/SharpMap.SimpleGeometries/SharpMap.SimpleGeometries.csproj
+++ b/SharpMap.SimpleGeometries/SharpMap.SimpleGeometries.csproj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Condition="Exists('..\Common.msbuild')" Project="..\Common.msbuild" />
+  <PropertyGroup Condition="!Exists('..\Common.msbuild')">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Net20</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -13,26 +17,43 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net20|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\Debug_Net20\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Net20|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\Release_Net20\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net35|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug_Net35\</OutputPath>
+    <DefineConstants>DOTNET35;DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Net35|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release_Net35\</OutputPath>
+    <DefineConstants>DOTNET35;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Extents.cs" />
-    <Compile Include="BoundingBoxOperations.cs" />
+    <Compile Include="BoundingBoxSpatialOperations.cs" />
     <Compile Include="Curve.cs" />
     <Compile Include="Geometries3D\Point3D.cs" />
     <Compile Include="Geometry.cs" />
@@ -48,19 +69,37 @@
     <Compile Include="Point.cs" />
     <Compile Include="Polygon.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SpatialRelations.cs" />
+    <Compile Include="BoundingBoxSpatialRelations.cs" />
     <Compile Include="Surface.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ExternalReferences\Debug_Net20\GeoAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ExternalReferences\Debug_Net20\NPack.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectReference)' == 'false'">
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+        <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\GeoAPI.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+      <ItemGroup>
+        <ProjectReference Include="..\..\GeoAPI\src\GeoAPI\GeoAPINoTFS.csproj">
+          <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+          <Name>GeoAPINoTFS</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SharpMap.SimpleGeometries/Surface.cs b/SharpMap.SimpleGeometries/Surface.cs
index a0c2eef6..4dbd8ff5 100644
--- a/SharpMap.SimpleGeometries/Surface.cs
+++ b/SharpMap.SimpleGeometries/Surface.cs
@@ -18,6 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using GeoAPI.Geometries;
 
 namespace SharpMap.SimpleGeometries
 {
@@ -48,16 +49,16 @@ public virtual Point Centroid
 		/// <summary>
 		/// A point guaranteed to be on this Surface.
 		/// </summary>
-		public abstract Point PointOnSurface { get; }
+		public abstract IPoint PointOnSurface { get; }
 
 		/// <summary>
 		///  The inherent dimension of this Geometry object, which must be less than or equal
 		///  to the coordinate dimension. This specification is restricted to geometries in two-dimensional coordinate
 		///  space.
 		/// </summary>
-		public override Int32 Dimension
+		public override Dimensions Dimension
 		{
-			get { return 2; }
+			get { return Dimensions.Curve; }
 		}
 	}
 }
\ No newline at end of file
diff --git a/SharpMap.Tests/Rendering/BasicGeometryRenderer2DTests.cs b/SharpMap.Tests/Rendering/BasicGeometryRenderer2DTests.cs
index 50d70a07..4cde8931 100644
--- a/SharpMap.Tests/Rendering/BasicGeometryRenderer2DTests.cs
+++ b/SharpMap.Tests/Rendering/BasicGeometryRenderer2DTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using GeoAPI.Geometries;
 using NUnit.Framework;
 using SharpMap.Data;
 using SharpMap.Rendering;
@@ -151,7 +152,7 @@ public void RenderFeatureTest()
 
             foreach (FeatureDataRow feature in features)
             {
-                Geometry g = feature.Geometry;
+                IGeometry g = feature.Geometry;
                 List<RenderObject> renderedObjects = new List<RenderObject>(geometryRenderer.RenderFeature(feature));
 
                 for (Int32 i = 0; i < renderedObjects.Count; i++)
diff --git a/SharpMap.Tests/SharpMap.Tests.csproj b/SharpMap.Tests/SharpMap.Tests.csproj
index 16b646fa..2f742ced 100644
--- a/SharpMap.Tests/SharpMap.Tests.csproj
+++ b/SharpMap.Tests/SharpMap.Tests.csproj
@@ -1,4 +1,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <Import Condition="Exists('..\Common.msbuild')" Project="..\Common.msbuild" />
+  <PropertyGroup Condition="!Exists('..\Common.msbuild')">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,10 +13,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpMap.Tests</RootNamespace>
     <AssemblyName>SharpMap.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net20|AnyCPU' ">
@@ -54,28 +54,67 @@
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
-    </Reference>
-    <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ExternalReferences\$(Configuration)\GeoAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.0.2, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ExternalReferences\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.1.0.584, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ExternalReferences\Rhino.Mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" Condition="'$(Configuration)' == 'Release_Net35' Or '$(Configuration)' == 'Debug_Net35'" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectReference)' == 'false'">
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+        <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\GeoAPI.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+      <ItemGroup>
+        <ProjectReference Include="..\..\GeoAPI\src\GeoAPI\GeoAPINoTFS.csproj">
+          <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+          <Name>GeoAPINoTFS</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <Choose>
+    <When Condition="'$(Configuration)' == 'Release_Net35' Or '$(Configuration)' == 'Debug_Net35'">
+      <ItemGroup>
+        <Reference Include="nunit.framework, Version=2.4.0.2, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\nunit.framework.dll</HintPath>
+        </Reference>
+        <Reference Include="Rhino.Mocks, Version=3.1.0.584, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\Rhino.Mocks.dll</HintPath>
+        </Reference>
+        <Reference Include="System" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Xml" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="nunit.framework, Version=2.4.0.2, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\nunit.framework.dll</HintPath>
+        </Reference>
+        <Reference Include="Rhino.Mocks, Version=3.1.0.584, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\ExternalReferences\Rhino.Mocks.dll</HintPath>
+        </Reference>
+        <Reference Include="System" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Xml" />
+        <Reference Include="System.Core" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
   <ItemGroup>
     <Compile Include="DataSourceHelper.cs" />
     <Compile Include="DataTableHelper.cs" />
diff --git a/SharpMap/Coordinates/BufferedCoordinateSequenceFactory.cs b/SharpMap/Coordinates/BufferedCoordinateSequenceFactory.cs
new file mode 100644
index 00000000..4713f435
--- /dev/null
+++ b/SharpMap/Coordinates/BufferedCoordinateSequenceFactory.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using GeoAPI.Coordinates;
+
+namespace SharpMap.Coordinates
+{
+    public class BufferedCoordinateSequenceFactory : ICoordinateSequenceFactory<BufferedCoordinate2D>
+    {
+        #region ICoordinateSequenceFactory<BufferedCoordinate2D> Members
+
+        public ICoordinateFactory<BufferedCoordinate2D> CoordinateFactory
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(int dimension)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(int size, int dimension)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(ICoordinateSequence<BufferedCoordinate2D> coordSeq)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(Func<double, double> componentTransform, IEnumerable<BufferedCoordinate2D> coordinates, bool allowRepeated, bool direction)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(IEnumerable<BufferedCoordinate2D> coordinates, bool allowRepeated, bool direction)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(Func<double, double> componentTransform, IEnumerable<BufferedCoordinate2D> coordinates, bool allowRepeated)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(IEnumerable<BufferedCoordinate2D> coordinates, bool allowRepeated)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(Func<double, double> componentTransform, IEnumerable<BufferedCoordinate2D> coordinates)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(IEnumerable<BufferedCoordinate2D> coordinates)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence<BufferedCoordinate2D> Create(params BufferedCoordinate2D[] coordinates)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region ICoordinateSequenceFactory Members
+
+        ICoordinateSequence ICoordinateSequenceFactory.Create(int dimension)
+        {
+            throw new NotImplementedException();
+        }
+
+        ICoordinateSequence ICoordinateSequenceFactory.Create(int size, int dimension)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence Create(ICoordinateSequence coordSeq)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICoordinateSequence Create(IEnumerable<ICoordinate> coordinates)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+}
diff --git a/SharpMap/Data/Providers/GeometryProvider/GeometryProvider.cs b/SharpMap/Data/Providers/GeometryProvider/GeometryProvider.cs
index 3437060d..fe7b3fd6 100644
--- a/SharpMap/Data/Providers/GeometryProvider/GeometryProvider.cs
+++ b/SharpMap/Data/Providers/GeometryProvider/GeometryProvider.cs
@@ -133,7 +133,7 @@ public GeometryProvider(IEnumerable<FeatureDataRow> features)
 		/// to add to this datasource.
 		/// </param>
 		public GeometryProvider(Byte[] wellKnownBinaryGeometry, IGeometryFactory factory)
-            : this(GeometryFromWkb.Parse(wellKnownBinaryGeometry, factory))
+            : this(WkbEncoder.ToGeometry(wellKnownBinaryGeometry, factory))
 		{
 		}
 
@@ -145,7 +145,7 @@ public GeometryProvider(Byte[] wellKnownBinaryGeometry, IGeometryFactory factory
 		/// to add to this datasource.
 		/// </param>
         public GeometryProvider(String wellKnownTextGeometry, IGeometryFactory factory)
-            : this(GeometryFromWkt.Parse(wellKnownTextGeometry, factory))
+            : this(WktEncoder.ToGeometry(wellKnownTextGeometry, factory))
 		{
 		}
 
diff --git a/SharpMap/Data/Providers/Shapefile/ShapeFileProvider.cs b/SharpMap/Data/Providers/Shapefile/ShapeFileProvider.cs
index 8dd6462b..66a1e085 100644
--- a/SharpMap/Data/Providers/Shapefile/ShapeFileProvider.cs
+++ b/SharpMap/Data/Providers/Shapefile/ShapeFileProvider.cs
@@ -2290,7 +2290,7 @@ private void parseProjection()
                 try
                 {
                     String wkt = File.ReadAllText(projfile);
-                    _coordinateSystem = (ICoordinateSystem)CoordinateSystemWktReader.Parse(wkt, _coordSysFactory);
+                    _coordinateSystem = (ICoordinateSystem)WktEncoder.ToCoordinateSystemInfo(wkt, _coordSysFactory);
                     _geoFactory.SpatialReference = _coordinateSystem;
                     _coordsysReadFromFile = true;
                 }
diff --git a/SharpMap/SharpMap.csproj b/SharpMap/SharpMap.csproj
index 6a982b57..0dc9cae1 100644
--- a/SharpMap/SharpMap.csproj
+++ b/SharpMap/SharpMap.csproj
@@ -1,6 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <Import Condition="Exists('..\Common.msbuild')" Project="..\Common.msbuild" />
+  <PropertyGroup Condition="!Exists('..\Common.msbuild')">
+    <UseProjectReference>false</UseProjectReference>
+  </PropertyGroup>
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Net20</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -9,20 +13,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpMap</RootNamespace>
     <AssemblyName>SharpMap</AssemblyName>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>SharpMap.snk</AssemblyOriginatorKeyFile>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net20|AnyCPU' ">
@@ -67,21 +59,51 @@
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
-    </Reference>
-    <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\ExternalReferences\$(Configuration)\GeoAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core"
-               Condition="'$(Configuration)' == 'Release_Net35' Or '$(Configuration)' == 'Debug_Net35'" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectReference)' == 'false'">
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+        <Reference Include="GeoAPI, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\ExternalReferences\$(Configuration)\GeoAPI.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="NPack, Version=0.7.13341.0, Culture=neutral, PublicKeyToken=56f174b1685ddc6a, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\ExternalReferences\$(Configuration)\NPack.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+      <ItemGroup>
+        <ProjectReference Include="..\..\GeoAPI\src\GeoAPI\GeoAPINoTFS.csproj">
+          <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+          <Name>GeoAPINoTFS</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <Choose>
+    <When Condition="'$(Configuration)' == 'Release_Net35' Or '$(Configuration)' == 'Debug_Net35'">
+      <ItemGroup>
+        <Reference Include="System" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Xml" />
+        <Reference Include="System.Core" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="System" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Xml" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
   <ItemGroup>
     <Compile Include="Coordinates\BufferedCoordinate2D.cs">
       <SubType>Code</SubType>
@@ -92,6 +114,7 @@
     <Compile Include="Coordinates\BufferedCoordinateSequence.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Coordinates\BufferedCoordinateSequenceFactory.cs" />
     <Compile Include="Coordinates\IndexedCoordinateBuffer.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/SharpMapV2_2008.sln b/SharpMapV2_2008.sln
index 542133c4..f97c42af 100644
--- a/SharpMapV2_2008.sln
+++ b/SharpMapV2_2008.sln
@@ -27,162 +27,121 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetTopologySuite", "..\NTS\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpMap.SimpleGeometries", "SharpMap.SimpleGeometries\SharpMap.SimpleGeometries.csproj", "{7F258589-6452-4B7B-8884-8965A42C1D9E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FED87E4D-DC1A-4D5F-BF0D-185B428469FB}"
+	ProjectSection(SolutionItems) = preProject
+		Common.msbuild = Common.msbuild
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_Net20|Any CPU = Debug_Net20|Any CPU
 		Debug_Net35|Any CPU = Debug_Net35|Any CPU
-		Debug|Any CPU = Debug|Any CPU
 		Release_Net20|Any CPU = Release_Net20|Any CPU
 		Release_Net35|Any CPU = Release_Net35|Any CPU
-		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{C83777FC-AABB-47D9-911F-D76255D4D541}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
-		{C83777FC-AABB-47D9-911F-D76255D4D541}.Debug|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{C83777FC-AABB-47D9-911F-D76255D4D541}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{C83777FC-AABB-47D9-911F-D76255D4D541}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
-		{C83777FC-AABB-47D9-911F-D76255D4D541}.Release|Any CPU.Build.0 = Release_Net20|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
-		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Debug|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
-		{EC29E6E4-CE31-4989-BAA7-0125F1F8910A}.Release|Any CPU.Build.0 = Release_Net20|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
-		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Debug|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
-		{E7E3A53F-6B4D-423B-A10E-F0580B87FB81}.Release|Any CPU.Build.0 = Release_Net20|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
-		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Debug|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
-		{96AD10C7-AAB9-49AB-B7F6-F7AD15778F0D}.Release|Any CPU.Build.0 = Release_Net20|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
-		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Debug|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
-		{C8C6AF1D-5BF0-4A25-A641-68F9EEB61153}.Release|Any CPU.Build.0 = Release_Net20|Any CPU
 		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Debug_Net20|Any CPU.ActiveCfg = Debug|Any CPU
 		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Debug_Net20|Any CPU.Build.0 = Debug|Any CPU
 		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Debug_Net35|Any CPU.ActiveCfg = Debug|Any CPU
-		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Release_Net20|Any CPU.ActiveCfg = Release|Any CPU
 		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Release_Net20|Any CPU.Build.0 = Release|Any CPU
 		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Release_Net35|Any CPU.ActiveCfg = Release|Any CPU
-		{73A45373-6307-4D39-9FE9-E8803F95FAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{087DA4FD-AC7E-4F42-B6E2-2859FDA07BCA}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{718106C8-DE9D-421B-AD9B-4BF58CCC887C}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{141AB64A-46F5-4FA8-BD57-4284AB47C4AD}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
-		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Debug|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
-		{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}.Release|Any CPU.Build.0 = Release_Net20|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug|Any CPU.ActiveCfg = Debug_Net35|Any CPU
-		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug|Any CPU.Build.0 = Debug_Net35|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release|Any CPU.ActiveCfg = Release_Net35|Any CPU
-		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release|Any CPU.Build.0 = Release_Net35|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
-		{5770DAA9-84E5-4770-AF43-F6B815894368}.Debug|Any CPU.ActiveCfg = Debug_Net20|Any CPU
-		{5770DAA9-84E5-4770-AF43-F6B815894368}.Debug|Any CPU.Build.0 = Debug_Net20|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
 		{5770DAA9-84E5-4770-AF43-F6B815894368}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
-		{5770DAA9-84E5-4770-AF43-F6B815894368}.Release|Any CPU.ActiveCfg = Release_Net20|Any CPU
-		{5770DAA9-84E5-4770-AF43-F6B815894368}.Release|Any CPU.Build.0 = Release_Net20|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net20|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net20|Any CPU.Build.0 = Debug|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net35|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net35|Any CPU.Build.0 = Debug|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net20|Any CPU.ActiveCfg = Release|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net20|Any CPU.Build.0 = Release|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net35|Any CPU.ActiveCfg = Release|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net35|Any CPU.Build.0 = Release|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net20|Any CPU.ActiveCfg = Debug_Net20|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net20|Any CPU.Build.0 = Debug_Net20|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net35|Any CPU.ActiveCfg = Debug_Net35|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Debug_Net35|Any CPU.Build.0 = Debug_Net35|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net20|Any CPU.ActiveCfg = Release_Net20|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net20|Any CPU.Build.0 = Release_Net20|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net35|Any CPU.ActiveCfg = Release_Net35|Any CPU
+		{7F258589-6452-4B7B-8884-8965A42C1D9E}.Release_Net35|Any CPU.Build.0 = Release_Net35|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE