48 files changed, 2539 insertions, 135 deletions
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 808886e..9b8cc87 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
@@ -98,6 +98,12 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Main.cs">
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 316ebb3..ae1e889 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -28,6 +28,7 @@
                <include name="../bin/OpenSim.Servers.dll" />
                <include name="../bin/libsecondlife.dll" />
                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/XMLRPC.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index fcf6362..888b62d 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -98,6 +98,12 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Main.cs">
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 6319d9e..8dd9443 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -27,6 +27,7 @@
                <include name="../bin/OpenSim.Servers.dll" />
                <include name="../bin/libsecondlife.dll" />
                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/XMLRPC.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index cabefc9..35c27d9 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -4,6 +4,7 @@ using System.Text;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
 namespace OpenSim.Framework.Inventory
 {
@@ -114,9 +115,9 @@ namespace OpenSim.Framework.Inventory
            Console.WriteLine("updating inventory item details");
            if (this.InventoryItems.ContainsKey(itemID))
            {
-                Console.WriteLine("changing name to "+ Helpers.FieldToString(packet.Name));
+                Console.WriteLine("changing name to "+ Util.FieldToString(packet.Name));
                InventoryItem Item = this.InventoryItems[itemID];
-                Item.Name = Helpers.FieldToString(packet.Name);
+                Item.Name = Util.FieldToString(packet.Name);
                Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated());
                //TODO need to update the rest of the info
            }
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index ea4817e..0061140 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -76,6 +76,12 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="AgentInventory.cs">
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 8048de5..2ed5643 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -50,6 +50,7 @@
                <include name="System.Xml.dll" />
                <include name="../bin/libsecondlife.dll" />
                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/XMLRPC.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.Framework/Util.cs b/OpenSim.Framework/Util.cs
index 695cac9..17ca611 100644
--- a/OpenSim.Framework/Util.cs
+++ b/OpenSim.Framework/Util.cs
@@ -36,6 +36,95 @@ namespace OpenSim.Framework.Utilities
            return id;
        }
+        public static int fast_distance2d(int x, int y)
+        {
+            x = System.Math.Abs(x);
+            y = System.Math.Abs(y);
+            int min = System.Math.Min(x, y);
+            return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
+        }
+        public static string FieldToString(byte[] bytes)
+        {
+            return FieldToString(bytes, String.Empty);
+        }
+        /// <summary>
+        /// Convert a variable length field (byte array) to a string, with a
+        /// field name prepended to each line of the output
+        /// </summary>
+        /// <remarks>If the byte array has unprintable characters in it, a 
+        /// hex dump will be put in the string instead</remarks>
+        /// <param name="bytes">The byte array to convert to a string</param>
+        /// <param name="fieldName">A field name to prepend to each line of output</param>
+        /// <returns>An ASCII string or a string containing a hex dump, minus 
+        /// the null terminator</returns>
+        public static string FieldToString(byte[] bytes, string fieldName)
+        {
+            // Check for a common case
+            if (bytes.Length == 0) return String.Empty;
+            StringBuilder output = new StringBuilder();
+            bool printable = true;
+            for (int i = 0; i < bytes.Length; ++i)
+            {
+                // Check if there are any unprintable characters in the array
+                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
+                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
+                {
+                    printable = false;
+                    break;
+                }
+            }
+            if (printable)
+            {
+                if (fieldName.Length > 0)
+                {
+                    output.Append(fieldName);
+                    output.Append(": ");
+                }
+                if (bytes[bytes.Length - 1] == 0x00)
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
+                else
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes));
+            }
+            else
+            {
+                for (int i = 0; i < bytes.Length; i += 16)
+                {
+                    if (i != 0)
+                        output.Append(Environment.NewLine);
+                    if (fieldName.Length > 0)
+                    {
+                        output.Append(fieldName);
+                        output.Append(": ");
+                    }
+                    for (int j = 0; j < 16; j++)
+                    {
+                        if ((i + j) < bytes.Length)
+                            output.Append(String.Format("{0:X2} ", bytes[i + j]));
+                        else
+                            output.Append("   ");
+                    }
+                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
+                    {
+                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
+                            output.Append((char)bytes[i + j]);
+                        else
+                            output.Append(".");
+                    }
+                }
+            }
+            return output.ToString();
+        }
        public Util()
        {
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index 2b80456..b004c10 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
@@ -84,6 +84,12 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\..\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="AssemblyInfo.cs">
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index dd6db18..96272dd 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -25,6 +25,7 @@
                <include name="../../bin/libsecondlife.dll" />
                <include name="../../bin/OpenSim.Framework.dll" />
                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/XMLRPC.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 26b9565..b886f46 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -109,31 +109,31 @@ namespace OpenSim.Physics.BasicPhysicsPlugin
                                {*/
                                        actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1;
                                //}
-                                // This code needs sorting out - border crossings etc
+                                // This code needs sorting out - border crossings etc
 /*                              if(actor.Position.X<0)
                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
                                        actor.Position.X = 0;
                                        actor.Velocity.X = 0;
                                }
                                if(actor.Position.Y < 0)
                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
                                        actor.Position.Y = 0;
                                        actor.Velocity.Y = 0;
                                }
                                if(actor.Position.X > 255)
                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
                                        actor.Position.X = 255;
                                        actor.Velocity.X = 0;
                                }
                                if(actor.Position.Y > 255) 
                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
                                        actor.Position.Y = 255;
                                        actor.Velocity.X = 0;
                                }*/
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index 258bda0..071ea63 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -196,8 +196,8 @@ namespace OpenSim
            if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
            {
                AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];
-                trans.Asset.Description = Helpers.FieldToString(packet.InventoryBlock.Description);
+                trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
-                trans.Asset.Name = Helpers.FieldToString(packet.InventoryBlock.Name);
+                trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
                trans.Asset.Type = packet.InventoryBlock.Type;
                trans.Asset.InvType = packet.InventoryBlock.InvType;
                if (trans.UploadComplete)
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index ae391a9..a473a3c 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -116,6 +116,12 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="AgentAssetUpload.cs">
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index abd7776..982f45c 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -58,6 +58,7 @@
                <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
                <include name="../bin/OpenSim.Physics.Manager.dll" />
                <include name="../bin/OpenSim.Servers.dll" />
+                <include name="../bin/XMLRPC.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index dc6a363..bc062b2 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -374,7 +374,7 @@ namespace OpenSim
                    this.gridLocalAsset = Convert.ToBoolean(attri);
                }
-                 // Grid mode hack to use local asset server
+                // Grid mode hack to use local asset server
                attri = "";
                attri = configData.GetAttribute("PhysicsEngine");
                if (attri == "")
@@ -437,6 +437,7 @@ namespace OpenSim
            Packet packet = null;
            int numBytes = Server.EndReceiveFrom(result, ref epSender);
            int packetEnd = numBytes - 1;
            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
            // This is either a new client or a packet to send to an old one
@@ -509,6 +510,7 @@ namespace OpenSim
            { // invalid client
                Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
            }
            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
        }
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index d17e1fd..2f8bfa1 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -17,6 +17,8 @@ namespace OpenSim
        public uint RegionLocX;
        public uint RegionLocY;
        public ulong RegionHandle;
+        public ushort RegionWaterHeight = 20;
+        public bool RegionTerraform = true;
        public int IPListenPort;
        public string IPListenAddr;
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 9a0a6eb..c5108ac 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -491,7 +491,7 @@ namespace OpenSim
                        break;
                    case PacketType.CreateInventoryFolder:
                        CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
-                        m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Helpers.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
+                        m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
                        //Console.WriteLine(Pack.ToString());
                        break;
                    case PacketType.CreateInventoryItem:
@@ -603,7 +603,7 @@ namespace OpenSim
                                                {
                                                    if (ent is OpenSim.world.Primitive)
                                                    {
-                                                        this.m_world.AddScript(ent, Helpers.FieldToString(assBase.Data));
+                                                        this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
                                                    }
                                                }
                                            }
@@ -1081,8 +1081,8 @@ namespace OpenSim
            {
                //lets try this out with creating a notecard
                AssetBase asset = new AssetBase();
-                asset.Name = Helpers.FieldToString(packet.InventoryBlock.Name);
+                asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
-                asset.Description = Helpers.FieldToString(packet.InventoryBlock.Description);
+                asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
                asset.InvType = packet.InventoryBlock.InvType;
                asset.Type = packet.InventoryBlock.Type;
                asset.FullID = LLUUID.Random();
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index 54043fc..df7d5ba 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -32,14 +32,18 @@ namespace OpenSim.world
        private ulong m_regionHandle;
        private Dictionary<uint, SimClient> m_clientThreads;
        private string m_regionName;
+        private ushort m_regionWaterHeight;
+        private bool m_regionTerraform;
        //private bool childShadowAvatar = false;
-        public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle)
+        public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater)
        {
            m_world = world;
            m_clientThreads = clientThreads;
            m_regionName = regionName;
            m_regionHandle = regionHandle;
+            m_regionTerraform = regionTerraform;
+            m_regionWaterHeight = regionWater;
            OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)");
            ControllingClient = TheClient;
@@ -139,7 +143,7 @@ namespace OpenSim.world
        public void HandleUpdate(AgentUpdatePacket pack)
        {
-            if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_FLY) != 0)
+            if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0)
            {
                if (this._physActor.Flying == false)
                {
@@ -160,7 +164,7 @@ namespace OpenSim.world
                }
                this._physActor.Flying = false;
            }
-            if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_POS) != 0)
+            if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
            {
                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
                if (((movementflag & 1) == 0) || (q != this.bodyRot))
@@ -194,7 +198,7 @@ namespace OpenSim.world
                    this.bodyRot = q;
                }
            }
-            else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_UP_POS) != 0) && (PhysicsEngineFlying))
+            else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0) && (PhysicsEngineFlying))
            {
                if (((movementflag & 2) == 0) && this._physActor.Flying)
                {
@@ -214,7 +218,7 @@ namespace OpenSim.world
                    movementflag = 2;
                }
            }
-            else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_UP_NEG) != 0) && (PhysicsEngineFlying))
+            else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && (PhysicsEngineFlying))
            {
                if (((movementflag & 4) == 0) && this._physActor.Flying)
                {
@@ -235,7 +239,7 @@ namespace OpenSim.world
                    movementflag = 4;
                }
            }
-            else if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_NEG) != 0)
+            else if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
            {
                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
                if (((movementflag & 8) == 0) || (q != this.bodyRot))
@@ -287,7 +291,7 @@ namespace OpenSim.world
            }
        }
-        //really really should be moved somewhere else
+        //really really should be moved somewhere else (RegionInfo.cs ?)
        public void SendRegionHandshake(World RegionInfo)
        {
            OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
@@ -306,8 +310,13 @@ namespace OpenSim.world
            handshake.RegionInfo.TerrainStartHeight10 = 10;
            handshake.RegionInfo.TerrainStartHeight11 = 10;
            handshake.RegionInfo.SimAccess = 13;
-            handshake.RegionInfo.WaterHeight = 20;
+            handshake.RegionInfo.WaterHeight = m_regionWaterHeight;
-            handshake.RegionInfo.RegionFlags = 72458694 - 32;
+            uint regionFlags = 72458694;
+            if (this.m_regionTerraform)
+            {
+                regionFlags -= 64;
+            }
+            handshake.RegionInfo.RegionFlags = regionFlags;
            handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0");
            handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
            handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 34e32f8..24fc6da 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -272,7 +272,7 @@ namespace OpenSim.world
            PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;
            PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
            objupdate.ObjectData[0].ID = (uint)(localID);
-            objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000"));
+            objupdate.ObjectData[0].FullID = LLUUID.Random();
            LLVector3 pos1 = addPacket.ObjectData.RayEnd;
            //update position
            byte[] pb = pos1.GetBytes();
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 69a6494..5bada2b 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -542,7 +542,7 @@ namespace OpenSim.world
            try
            {
                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
-                Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle);
+                Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20);
                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
                newAvatar.SendRegionHandshake(this);
diff --git a/OpenSim.RegionServer/world/WorldPacketHandlers.cs b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
index 70cbc6b..f4213d0 100644
--- a/OpenSim.RegionServer/world/WorldPacketHandlers.cs
+++ b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
@@ -8,6 +8,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Terrain;
 using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
 namespace OpenSim.world
@@ -44,7 +45,7 @@ namespace OpenSim.world
        {
            System.Text.Encoding enc = System.Text.Encoding.ASCII;
            ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)packet;
-            if (Helpers.FieldToString(inchatpack.ChatData.Message) == "")
+            if (Util.FieldToString(inchatpack.ChatData.Message) == "")
            {
                //empty message so don't bother with it
                return true;
@@ -53,7 +54,7 @@ namespace OpenSim.world
            libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
            reply.ChatData.Audible = 1;
            reply.ChatData.Message = inchatpack.ChatData.Message;
-            reply.ChatData.ChatType = 1;
+            reply.ChatData.ChatType = inchatpack.ChatData.Type;
            reply.ChatData.SourceType = 1;
            reply.ChatData.Position = simClient.ClientAvatar.Pos;
            reply.ChatData.FromName = enc.GetBytes(simClient.ClientAvatar.firstname + " " + simClient.ClientAvatar.lastname + "\0");
@@ -61,7 +62,31 @@ namespace OpenSim.world
            reply.ChatData.SourceID = simClient.AgentID;
            foreach (SimClient client in m_clientThreads.Values)
            {
-                client.OutPacket(reply);
+                switch (inchatpack.ChatData.Type)
+                {
+                    case 0:
+                        int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X),(int)( client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
+                        if ((dis < 10) && (dis > -10))
+                        {
+                            client.OutPacket(reply);
+                        }
+                        break;
+                    case 1:
+                         dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
+                        if ((dis < 30) && (dis > -30))
+                        {
+                            client.OutPacket(reply);
+                        }
+                        break;
+                    case 2:
+                        dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X),(int)( client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
+                        if ((dis < 100) && (dis > -100))
+                        {
+                            client.OutPacket(reply);
+                        }
+                        break;
+                }
+                
            }
            return true;
        }
diff --git a/OpenSim.Servers/OpenSim.Servers.csproj b/OpenSim.Servers/OpenSim.Servers.csproj
index be0220a..cacdb5d 100644
--- a/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/OpenSim.Servers/OpenSim.Servers.csproj
@@ -84,6 +84,12 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="BaseHttpServer.cs">
diff --git a/OpenSim.Servers/OpenSim.Servers.dll.build b/OpenSim.Servers/OpenSim.Servers.dll.build
index ebe1750..61475ec 100644
--- a/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -30,6 +30,7 @@
                <include name="../bin/OpenSim.Framework.dll" />
                <include name="../bin/OpenSim.Framework.Console.dll" />
                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/XMLRPC.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.build b/OpenSim.build
index 71e631e..06743ed 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -54,22 +54,24 @@
        <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
+        <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" />
    </target>
    <target name="build" depends="init" description="">
+        <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="build" />
        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="build" />
@@ -109,19 +111,20 @@
        <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
+        <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" />
    </target>
 </project>
diff --git a/OpenSim.sln b/OpenSim.sln
index aefeb45..aa84470 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"
@@ -16,21 +16,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim.Scripting\EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}"
 EndProject
@@ -38,102 +38,156 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorag
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim.Scripting\EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
 EndProject
 Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
+    Debug|Any CPU = Debug|Any CPU
-                Release|Any CPU = Release|Any CPU
+    Release|Any CPU = Release|Any CPU
-        EndGlobalSection
+  EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+  GlobalSection(ProjectDependencies) = postSolution
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({66591469-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({66591469-0000-0000-0000-000000000000}).8 = ({8E81D43C-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
-                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
-                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({21BFC8E2-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
-                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({21BFC8E2-0000-0000-0000-000000000000}).8 = ({8E81D43C-0000-0000-0000-000000000000})
-                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
-                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
-                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+  EndGlobalSection
-                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        GlobalSection(SolutionProperties) = preSolution
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                HideSolutionNode = FALSE
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        EndGlobalSection
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/XmlRpcCS/Logger.cs b/XmlRpcCS/Logger.cs
new file mode 100644
index 0000000..ebf804b
--- /dev/null
+++ b/XmlRpcCS/Logger.cs
@@ -0,0 +1,46 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    /// <summary>Define levels of logging.</summary><remarks> This duplicates
+    /// similar enumerations in System.Diagnostics.EventLogEntryType. The 
+    /// duplication was merited because .NET Compact Framework lacked the EventLogEntryType enum.</remarks>
+    public enum LogLevel
+    {
+        /// <summary>Information level, log entry for informational reasons only.</summary>
+        Information,
+        /// <summary>Warning level, indicates a possible problem.</summary>
+        Warning,
+        /// <summary>Error level, implies a significant problem.</summary>
+        Error
+    }
+    ///<summary>
+    ///Logging singleton with swappable output delegate.
+    ///</summary>
+    ///<remarks>
+    ///This singleton provides a centralized log. The actual WriteEntry calls are passed
+    ///off to a delegate however. Having a delegate do the actual logginh allows you to
+    ///implement different logging mechanism and have them take effect throughout the system.
+    ///</remarks>
+    public class Logger
+    {
+        ///<summary>Delegate definition for logging.</summary>
+        ///<param name="message">The message <c>String</c> to log.</param>
+        ///<param name="level">The <c>LogLevel</c> of your message.</param>
+        public delegate void LoggerDelegate(String message, LogLevel level);
+        ///<summary>The LoggerDelegate that will recieve WriteEntry requests.</summary>
+        static public LoggerDelegate Delegate = null;
+        ///<summary>
+        ///Method logging events are sent to.
+        ///</summary>
+        ///<param name="message">The message <c>String</c> to log.</param>
+        ///<param name="level">The <c>LogLevel</c> of your message.</param>
+        static public void WriteEntry(String message, LogLevel level)
+        {
+            if (Delegate != null)
+                Delegate(message, level);
+        }
+    }
+}
diff --git a/XmlRpcCS/SimpleHttpRequest.cs b/XmlRpcCS/SimpleHttpRequest.cs
new file mode 100644
index 0000000..e5326c3
--- /dev/null
+++ b/XmlRpcCS/SimpleHttpRequest.cs
@@ -0,0 +1,204 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.IO;
+    using System.Net.Sockets;
+    using System.Collections;
+    ///<summary>Very basic HTTP request handler.</summary>
+    ///<remarks>This class is designed to accept a TcpClient and treat it as an HTTP request.
+    /// It will do some basic header parsing and manage the input and output streams associated
+    /// with the request.</remarks>
+    public class SimpleHttpRequest
+    {
+        private String _httpMethod = null;
+        private String _protocol;
+        private String _filePathFile = null;
+        private String _filePathDir = null;
+        private String __filePath;
+        private TcpClient _client;
+        private StreamReader _input;
+        private StreamWriter _output;
+        private Hashtable _headers;
+        /// <summary>A constructor which accepts the TcpClient.</summary>
+        /// <remarks>It creates the associated input and output streams, determines the request type,
+        /// and parses the remaining HTTP header.</remarks>
+        /// <param name="client">The <c>TcpClient</c> associated with the HTTP connection.</param>
+        public SimpleHttpRequest(TcpClient client)
+        {
+            _client = client;
+            _output = new StreamWriter(client.GetStream());
+            _input = new StreamReader(client.GetStream());
+            GetRequestMethod();
+            GetRequestHeaders();
+        }
+        /// <summary>The output <c>StreamWriter</c> associated with the request.</summary>
+        public StreamWriter Output
+        {
+            get { return _output; }
+        }
+        /// <summary>The input <c>StreamReader</c> associated with the request.</summary>
+        public StreamReader Input
+        {
+            get { return _input; }
+        }
+        /// <summary>The <c>TcpClient</c> with the request.</summary>
+        public TcpClient Client
+        {
+            get { return _client; }
+        }
+        private String _filePath
+        {
+            get { return __filePath; }
+            set
+            {
+                __filePath = value;
+                _filePathDir = null;
+                _filePathFile = null;
+            }
+        }
+        /// <summary>The type of HTTP request (i.e. PUT, GET, etc.).</summary>
+        public String HttpMethod
+        {
+            get { return _httpMethod; }
+        }
+        /// <summary>The level of the HTTP protocol.</summary>
+        public String Protocol
+        {
+            get { return _protocol; }
+        }
+        /// <summary>The "path" which is part of any HTTP request.</summary>
+        public String FilePath
+        {
+            get { return _filePath; }
+        }
+        /// <summary>The file portion of the "path" which is part of any HTTP request.</summary>
+        public String FilePathFile
+        {
+            get
+            {
+                if (_filePathFile != null)
+                    return _filePathFile;
+                int i = FilePath.LastIndexOf("/");
+                if (i == -1)
+                    return "";
+                i++;
+                _filePathFile = FilePath.Substring(i, FilePath.Length - i);
+                return _filePathFile;
+            }
+        }
+        /// <summary>The directory portion of the "path" which is part of any HTTP request.</summary>
+        public String FilePathDir
+        {
+            get
+            {
+                if (_filePathDir != null)
+                    return _filePathDir;
+                int i = FilePath.LastIndexOf("/");
+                if (i == -1)
+                    return "";
+                i++;
+                _filePathDir = FilePath.Substring(0, i);
+                return _filePathDir;
+            }
+        }
+        private void GetRequestMethod()
+        {
+            string req = _input.ReadLine();
+            if (req == null)
+                throw new ApplicationException("Void request.");
+            if (0 == String.Compare("GET ", req.Substring(0, 4), true))
+                _httpMethod = "GET";
+            else if (0 == String.Compare("POST ", req.Substring(0, 5), true))
+                _httpMethod = "POST";
+            else
+                throw new InvalidOperationException("Unrecognized method in query: " + req);
+            req = req.TrimEnd();
+            int idx = req.IndexOf(' ') + 1;
+            if (idx >= req.Length)
+                throw new ApplicationException("What do you want?");
+            string page_protocol = req.Substring(idx);
+            int idx2 = page_protocol.IndexOf(' ');
+            if (idx2 == -1)
+                idx2 = page_protocol.Length;
+            _filePath = page_protocol.Substring(0, idx2).Trim();
+            _protocol = page_protocol.Substring(idx2).Trim();
+        }
+        private void GetRequestHeaders()
+        {
+            String line;
+            int idx;
+            _headers = new Hashtable();
+            while ((line = _input.ReadLine()) != "")
+            {
+                if (line == null)
+                {
+                    break;
+                }
+                idx = line.IndexOf(':');
+                if (idx == -1 || idx == line.Length - 1)
+                {
+                    Logger.WriteEntry("Malformed header line: " + line, LogLevel.Information);
+                    continue;
+                }
+                String key = line.Substring(0, idx);
+                String value = line.Substring(idx + 1);
+                try
+                {
+                    _headers.Add(key, value);
+                }
+                catch (Exception)
+                {
+                    Logger.WriteEntry("Duplicate header key in line: " + line, LogLevel.Information);
+                }
+            }
+        }
+        /// <summary>
+        /// Format the object contents into a useful string representation.
+        /// </summary>
+        ///<returns><c>String</c> representation of the <c>SimpleHttpRequest</c> as the <i>HttpMethod FilePath Protocol</i>.</returns>
+        override public String ToString()
+        {
+            return HttpMethod + " " + FilePath + " " + Protocol;
+        }
+        /// <summary>
+        /// Close the <c>SimpleHttpRequest</c>. This flushes and closes all associated io streams.
+        /// </summary>
+        public void Close()
+        {
+            _output.Flush();
+            _output.Close();
+            _input.Close();
+            _client.Close();
+        }
+    }
+}
diff --git a/XmlRpcCS/XMLRPC.csproj b/XmlRpcCS/XMLRPC.csproj
new file mode 100644
index 0000000..2c7ef94
--- /dev/null
+++ b/XmlRpcCS/XMLRPC.csproj
@@ -0,0 +1,138 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8E81D43C-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>XMLRPC</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>XMLRPC</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Logger.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimpleHttpRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcBoxcarRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcClientProxy.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcDeserializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcErrorCodes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcExposedAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcRequestDeserializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcRequestSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcResponder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcResponseDeserializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcResponseSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcSystemObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcXmlTokens.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/XmlRpcCS/XMLRPC.dll.build b/XmlRpcCS/XMLRPC.dll.build
new file mode 100644
index 0000000..d734d19
--- /dev/null
+++ b/XmlRpcCS/XMLRPC.dll.build
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<project name="XMLRPC" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="XMLRPC" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Logger.cs" />
+                <include name="SimpleHttpRequest.cs" />
+                <include name="XmlRpcBoxcarRequest.cs" />
+                <include name="XmlRpcClientProxy.cs" />
+                <include name="XmlRpcDeserializer.cs" />
+                <include name="XmlRpcErrorCodes.cs" />
+                <include name="XmlRpcException.cs" />
+                <include name="XmlRpcExposedAttribute.cs" />
+                <include name="XmlRpcRequest.cs" />
+                <include name="XmlRpcRequestDeserializer.cs" />
+                <include name="XmlRpcRequestSerializer.cs" />
+                <include name="XmlRpcResponder.cs" />
+                <include name="XmlRpcResponse.cs" />
+                <include name="XmlRpcResponseDeserializer.cs" />
+                <include name="XmlRpcResponseSerializer.cs" />
+                <include name="XmlRpcSerializer.cs" />
+                <include name="XmlRpcServer.cs" />
+                <include name="XmlRpcSystemObject.cs" />
+                <include name="XmlRpcXmlTokens.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <copy todir="${project::get-base-directory()}/../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/XmlRpcCS/XmlRpcBoxcarRequest.cs b/XmlRpcCS/XmlRpcBoxcarRequest.cs
new file mode 100644
index 0000000..f87f7a5
--- /dev/null
+++ b/XmlRpcCS/XmlRpcBoxcarRequest.cs
@@ -0,0 +1,51 @@
+namespace Nwc.XmlRpc
+{
+  using System;
+  using System.Collections;
+  using System.IO;
+  using System.Xml;
+  using System.Net;
+  using System.Text;
+  using System.Reflection;
+  /// <summary>Class that collects individual <c>XmlRpcRequest</c> objects and submits them as a <i>boxcarred</i> request.</summary>
+  /// <remarks>A boxcared request is when a number of request are collected before being sent via XML-RPC, and then are sent via
+  /// a single HTTP connection. This results in a speed up from reduced connection time.  The results are then retuned collectively
+  /// as well.
+  ///</remarks>
+  /// <seealso cref="XmlRpcRequest"/>
+  public class XmlRpcBoxcarRequest : XmlRpcRequest
+  {
+    /// <summary>ArrayList to collect the requests to boxcar.</summary>
+    public IList Requests = new ArrayList();
+    /// <summary>Basic constructor.</summary>
+    public XmlRpcBoxcarRequest()
+      {
+      }
+    /// <summary>Returns the <c>String</c> "system.multiCall" which is the server method that handles boxcars.</summary>
+    public override String MethodName
+      {
+        get { return  "system.multiCall";  }
+      }
+    /// <summary>The <c>ArrayList</c> of boxcarred <paramref>Requests</paramref> as properly formed parameters.</summary>
+    public override IList Params
+      {
+        get {
+          _params.Clear();
+          ArrayList reqArray = new ArrayList();
+          foreach (XmlRpcRequest request in Requests)
+            {
+              Hashtable requestEntry = new Hashtable();
+              requestEntry.Add(XmlRpcXmlTokens.METHOD_NAME, request.MethodName);
+              requestEntry.Add(XmlRpcXmlTokens.PARAMS, request.Params);
+              reqArray.Add(requestEntry);
+            }
+          _params.Add(reqArray);
+          return _params;
+        }
+      }
+  }
+}
diff --git a/XmlRpcCS/XmlRpcClientProxy.cs b/XmlRpcCS/XmlRpcClientProxy.cs
new file mode 100644
index 0000000..f52273a
--- /dev/null
+++ b/XmlRpcCS/XmlRpcClientProxy.cs
@@ -0,0 +1,61 @@
+namespace Nwc.XmlRpc
+{
+  using System;
+  using System.Runtime.Remoting.Proxies;
+  using System.Runtime.Remoting.Messaging;
+  /// <summary>This class provides support for creating local proxies of XML-RPC remote objects</summary>
+  /// <remarks>
+  /// To create a local proxy you need to create a local C# interface and then, via <i>createProxy</i>
+  /// associate that interface with a remote object at a given URL.
+  /// </remarks>
+public class XmlRpcClientProxy : RealProxy
+{
+  private String _remoteObjectName;
+  private String _url;
+  private XmlRpcRequest _client = new XmlRpcRequest();
+  /// <summary>Factory method to create proxies.</summary>
+  /// <remarks>
+  /// To create a local proxy you need to create a local C# interface with methods that mirror those of the server object.
+  /// Next, pass that interface into <c>createProxy</c> along with the object name and URL of the remote object and 
+  /// cast the resulting object to the specifice interface.
+  /// </remarks>
+  /// <param name="remoteObjectName"><c>String</c> The name of the remote object.</param>
+  /// <param name="url"><c>String</c> The URL of the remote object.</param>
+  /// <param name="anInterface"><c>Type</c> The typeof() of a C# interface.</param>
+  /// <returns><c>Object</c> A proxy for your specified interface. Cast to appropriate type.</returns>
+  public static Object createProxy(String remoteObjectName, String url, Type anInterface)
+    {
+      return new XmlRpcClientProxy(remoteObjectName, url, anInterface).GetTransparentProxy();
+    }
+  private XmlRpcClientProxy(String remoteObjectName, String url, Type t) : base(t)
+    {
+      _remoteObjectName = remoteObjectName;
+      _url = url;
+    }
+  /// <summary>The local method dispatcher - do not invoke.</summary>
+  override public IMessage Invoke(IMessage msg)
+    {
+      IMethodCallMessage methodMessage = (IMethodCallMessage)msg;
+      _client.MethodName = _remoteObjectName + "." + methodMessage.MethodName;
+      _client.Params.Clear();
+      foreach (Object o in methodMessage.Args)
+        _client.Params.Add(o);
+      try
+        {
+          Object ret = _client.Invoke(_url);
+          return new ReturnMessage(ret,null,0,
+                                   methodMessage.LogicalCallContext, methodMessage);
+        }
+      catch (Exception e)
+        {
+          return new ReturnMessage(e, methodMessage);
+        }
+    }
+}
+}
diff --git a/XmlRpcCS/XmlRpcDeserializer.cs b/XmlRpcCS/XmlRpcDeserializer.cs
new file mode 100644
index 0000000..bd736c0
--- /dev/null
+++ b/XmlRpcCS/XmlRpcDeserializer.cs
@@ -0,0 +1,195 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.IO;
+    using System.Xml;
+    using System.Globalization;
+    /// <summary>Parser context, we maintain contexts in a stack to avoiding recursion. </summary>
+    struct Context
+    {
+        public String Name;
+        public Object Container;
+    }
+    /// <summary>Basic XML-RPC data deserializer.</summary>
+    /// <remarks>Uses <c>XmlTextReader</c> to parse the XML data. This level of the class 
+    /// only handles the tokens common to both Requests and Responses. This class is not useful in and of itself
+    /// but is designed to be subclassed.</remarks>
+    public class XmlRpcDeserializer : XmlRpcXmlTokens
+    {
+        private static DateTimeFormatInfo _dateFormat = new DateTimeFormatInfo();
+        private Object _container;
+        private Stack _containerStack;
+        /// <summary>Protected reference to last text.</summary>
+        protected String _text;
+        /// <summary>Protected reference to last deserialized value.</summary>
+        protected Object _value;
+        /// <summary>Protected reference to last name field.</summary>
+        protected String _name;
+        /// <summary>Basic constructor.</summary>
+        public XmlRpcDeserializer()
+        {
+            Reset();
+            _dateFormat.FullDateTimePattern = ISO_DATETIME;
+        }
+        /// <summary>Static method that parses XML data into a response using the Singleton.</summary>
+        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC response.</param>
+        /// <returns><c>Object</c> object resulting from the deserialization.</returns>
+        virtual public Object Deserialize(TextReader xmlData)
+        {
+            return null;
+        }
+        /// <summary>Protected method to parse a node in an XML-RPC XML stream.</summary>
+        /// <remarks>Method deals with elements common to all XML-RPC data, subclasses of 
+        /// this object deal with request/response spefic elements.</remarks>
+        /// <param name="reader"><c>XmlTextReader</c> of the in progress parsing data stream.</param>
+        protected void DeserializeNode(XmlTextReader reader)
+        {
+            switch (reader.NodeType)
+            {
+                case XmlNodeType.Element:
+                    if (Logger.Delegate != null)
+                        Logger.WriteEntry("START " + reader.Name, LogLevel.Information);
+                    switch (reader.Name)
+                    {
+                        case VALUE:
+                            _value = null;
+                            _text = null;
+                            break;
+                        case STRUCT:
+                            PushContext();
+                            _container = new Hashtable();
+                            break;
+                        case ARRAY:
+                            PushContext();
+                            _container = new ArrayList();
+                            break;
+                    }
+                    break;
+                case XmlNodeType.EndElement:
+                    if (Logger.Delegate != null)
+                        Logger.WriteEntry("END " + reader.Name, LogLevel.Information);
+                    switch (reader.Name)
+                    {
+                        case BASE64:
+                            _value = Convert.FromBase64String(_text);
+                            break;
+                        case BOOLEAN:
+                            int val = Int16.Parse(_text);
+                            if (val == 0)
+                                _value = false;
+                            else if (val == 1)
+                                _value = true;
+                            break;
+                        case STRING:
+                            _value = _text;
+                            break;
+                        case DOUBLE:
+                            _value = Double.Parse(_text);
+                            break;
+                        case INT:
+                        case ALT_INT:
+                            _value = Int32.Parse(_text);
+                            break;
+                        case DATETIME:
+#if __MONO__
+                    _value = DateParse(_text);
+#else
+                            _value = DateTime.ParseExact(_text, "F", _dateFormat);
+#endif
+                            break;
+                        case NAME:
+                            _name = _text;
+                            break;
+                        case VALUE:
+                            if (_value == null)
+                                _value = _text; // some kits don't use <string> tag, they just do <value>
+                            if ((_container != null) && (_container is IList)) // in an array?  If so add value to it.
+                                ((IList)_container).Add(_value);
+                            break;
+                        case MEMBER:
+                            if ((_container != null) && (_container is IDictionary)) // in an struct?  If so add value to it.
+                                ((IDictionary)_container).Add(_name, _value);
+                            break;
+                        case ARRAY:
+                        case STRUCT:
+                            _value = _container;
+                            PopContext();
+                            break;
+                    }
+                    break;
+                case XmlNodeType.Text:
+                    if (Logger.Delegate != null)
+                        Logger.WriteEntry("Text " + reader.Value, LogLevel.Information);
+                    _text = reader.Value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        /// <summary>Static method that parses XML in a <c>String</c> into a 
+        /// request using the Singleton.</summary>
+        /// <param name="xmlData"><c>String</c> containing an XML-RPC request.</param>
+        /// <returns><c>XmlRpcRequest</c> object resulting from the parse.</returns>
+        public Object Deserialize(String xmlData)
+        {
+            StringReader sr = new StringReader(xmlData);
+            return Deserialize(sr);
+        }
+        /// <summary>Pop a Context of the stack, an Array or Struct has closed.</summary>
+        private void PopContext()
+        {
+            Context c = (Context)_containerStack.Pop();
+            _container = c.Container;
+            _name = c.Name;
+        }
+        /// <summary>Push a Context on the stack, an Array or Struct has opened.</summary>
+        private void PushContext()
+        {
+            Context context;
+            context.Container = _container;
+            context.Name = _name;
+            _containerStack.Push(context);
+        }
+        /// <summary>Reset the internal state of the deserializer.</summary>
+        protected void Reset()
+        {
+            _text = null;
+            _value = null;
+            _name = null;
+            _container = null;
+            _containerStack = new Stack();
+        }
+#if __MONO__
+    private DateTime DateParse(String str)
+      {
+        int year = Int32.Parse(str.Substring(0,4));
+        int month = Int32.Parse(str.Substring(4,2));
+        int day = Int32.Parse(str.Substring(6,2));
+        int hour = Int32.Parse(str.Substring(9,2));
+        int min = Int32.Parse(str.Substring(12,2));
+        int sec = Int32.Parse(str.Substring(15,2));
+        return new DateTime(year,month,day,hour,min,sec);
+      }
+#endif
+    }
+}
diff --git a/XmlRpcCS/XmlRpcErrorCodes.cs b/XmlRpcCS/XmlRpcErrorCodes.cs
new file mode 100644
index 0000000..6dec57d
--- /dev/null
+++ b/XmlRpcCS/XmlRpcErrorCodes.cs
@@ -0,0 +1,51 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    /// <summary>Standard XML-RPC error codes.</summary>
+    public class XmlRpcErrorCodes
+    {
+        /// <summary></summary>
+        public const int PARSE_ERROR_MALFORMED = -32700;
+        /// <summary></summary>
+        public const String PARSE_ERROR_MALFORMED_MSG = "Parse Error, not well formed";
+        /// <summary></summary>
+        public const int PARSE_ERROR_ENCODING = -32701;
+        /// <summary></summary>
+        public const String PARSE_ERROR_ENCODING_MSG = "Parse Error, unsupported encoding";
+        //
+        // -32702 ---> parse error. invalid character for encoding
+        // -32600 ---> server error. invalid xml-rpc. not conforming to spec.
+        //
+        /// <summary></summary>
+        public const int SERVER_ERROR_METHOD = -32601;
+        /// <summary></summary>
+        public const String SERVER_ERROR_METHOD_MSG = "Server Error, requested method not found";
+        /// <summary></summary>
+        public const int SERVER_ERROR_PARAMS = -32602;
+        /// <summary></summary>
+        public const String SERVER_ERROR_PARAMS_MSG = "Server Error, invalid method parameters";
+        //
+        // -32603 ---> server error. internal xml-rpc error
+        //
+        /// <summary></summary>
+        public const int APPLICATION_ERROR = -32500;
+        /// <summary></summary>
+        public const String APPLICATION_ERROR_MSG = "Application Error";
+        //
+        // -32400 ---> system error
+        //
+        /// <summary></summary>
+        public const int TRANSPORT_ERROR = -32300;
+        /// <summary></summary>
+        public const String TRANSPORT_ERROR_MSG = "Transport Layer Error";
+    }
+}
diff --git a/XmlRpcCS/XmlRpcException.cs b/XmlRpcCS/XmlRpcException.cs
new file mode 100644
index 0000000..fd1f4ae
--- /dev/null
+++ b/XmlRpcCS/XmlRpcException.cs
@@ -0,0 +1,39 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    /// <summary>An XML-RPC Exception.</summary>
+    /// <remarks>Maps a C# exception to an XML-RPC fault. Normal exceptions
+    /// include a message so this adds the code needed by XML-RPC.</remarks>
+    public class XmlRpcException : Exception
+    {
+        private int _code;
+        /// <summary>Instantiate an <c>XmlRpcException</c> with a code and message.</summary>
+        /// <param name="code"><c>Int</c> faultCode associated with this exception.</param>
+        /// <param name="message"><c>String</c> faultMessage associated with this exception.</param>
+        public XmlRpcException(int code, String message)
+            : base(message)
+        {
+            _code = code;
+        }
+        /// <summary>The value of the faults message, i.e. the faultString.</summary>
+        public String FaultString
+        {
+            get { return Message; }
+        }
+        /// <summary>The value of the faults code, i.e. the faultCode.</summary>
+        public int FaultCode
+        {
+            get { return _code; }
+        }
+        /// <summary>Format the message to include the code.</summary>
+        override public String ToString()
+        {
+            return "Code: " + FaultCode + " Message: " + base.ToString();
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcExposedAttribute.cs b/XmlRpcCS/XmlRpcExposedAttribute.cs
new file mode 100644
index 0000000..67b27ae
--- /dev/null
+++ b/XmlRpcCS/XmlRpcExposedAttribute.cs
@@ -0,0 +1,60 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Reflection;
+    /// <summary>
+    /// Simple tagging attribute to indicate participation is XML-RPC exposure.
+    /// </summary>
+    /// <remarks>
+    /// If present at the class level it indicates that this class does explicitly 
+    /// expose methods. If present at the method level it denotes that the method
+    /// is exposed.
+    /// </remarks>
+    [AttributeUsage(
+          AttributeTargets.Class | AttributeTargets.Method,
+          AllowMultiple = false,
+          Inherited = true
+      )]
+    public class XmlRpcExposedAttribute : Attribute
+    {
+        /// <summary>Check if <paramref>obj</paramref> is an object utilizing the XML-RPC exposed Attribute.</summary>
+        /// <param name="obj"><c>Object</c> of a class or method to check for attribute.</param>
+        /// <returns><c>Boolean</c> true if attribute present.</returns>
+        public static Boolean ExposedObject(Object obj)
+        {
+            return IsExposed(obj.GetType());
+        }
+        /// <summary>Check if <paramref>obj</paramref>.<paramref>methodName</paramref> is an XML-RPC exposed method.</summary>
+        /// <remarks>A method is considered to be exposed if it exists and, either, the object does not use the XmlRpcExposed attribute,
+        /// or the object does use the XmlRpcExposed attribute and the method has the XmlRpcExposed attribute as well.</remarks>
+        /// <returns><c>Boolean</c> true if the  method is exposed.</returns>
+        public static Boolean ExposedMethod(Object obj, String methodName)
+        {
+            Type type = obj.GetType();
+            MethodInfo method = type.GetMethod(methodName);
+            if (method == null)
+                throw new MissingMethodException("Method " + methodName + " not found.");
+            if (!IsExposed(type))
+                return true;
+            return IsExposed(method);
+        }
+        /// <summary>Check if <paramref>mi</paramref> is XML-RPC exposed.</summary>
+        /// <param name="mi"><c>MemberInfo</c> of a class or method to check for attribute.</param>
+        /// <returns><c>Boolean</c> true if attribute present.</returns>
+        public static Boolean IsExposed(MemberInfo mi)
+        {
+            foreach (Attribute attr in mi.GetCustomAttributes(true))
+            {
+                if (attr is XmlRpcExposedAttribute)
+                    return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcRequest.cs b/XmlRpcCS/XmlRpcRequest.cs
new file mode 100644
index 0000000..18d2182
--- /dev/null
+++ b/XmlRpcCS/XmlRpcRequest.cs
@@ -0,0 +1,150 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.IO;
+    using System.Xml;
+    using System.Net;
+    using System.Text;
+    using System.Reflection;
+    using System.Net.Security;
+    using System.Security.Cryptography.X509Certificates;
+    internal class AcceptAllCertificatePolicy : ICertificatePolicy
+    {
+        public AcceptAllCertificatePolicy()
+        {
+        }
+        public bool CheckValidationResult(ServicePoint sPoint,
+            System.Security.Cryptography.X509Certificates.X509Certificate cert,
+            WebRequest wRequest, int certProb)
+        {
+            // Always accept
+            return true;
+        }
+    }
+    /// <summary>Class supporting the request side of an XML-RPC transaction.</summary>
+    public class XmlRpcRequest
+    {
+        private String _methodName = null;
+        private Encoding _encoding = new ASCIIEncoding();
+        private XmlRpcRequestSerializer _serializer = new XmlRpcRequestSerializer();
+        private XmlRpcResponseDeserializer _deserializer = new XmlRpcResponseDeserializer();
+        /// <summary><c>ArrayList</c> containing the parameters.</summary>
+        protected IList _params = null;
+        /// <summary>Instantiate an <c>XmlRpcRequest</c></summary>
+        public XmlRpcRequest()
+        {
+            _params = new ArrayList();
+        }
+        /// <summary>Instantiate an <c>XmlRpcRequest</c> for a specified method and parameters.</summary>
+        /// <param name="methodName"><c>String</c> designating the <i>object.method</i> on the server the request
+        /// should be directed to.</param>
+        /// <param name="parameters"><c>ArrayList</c> of XML-RPC type parameters to invoke the request with.</param>
+        public XmlRpcRequest(String methodName, IList parameters)
+        {
+            MethodName = methodName;
+            _params = parameters;
+        }
+        /// <summary><c>ArrayList</c> conntaining the parameters for the request.</summary>
+        public virtual IList Params
+        {
+            get { return _params; }
+        }
+        /// <summary><c>String</c> conntaining the method name, both object and method, that the request will be sent to.</summary>
+        public virtual String MethodName
+        {
+            get { return _methodName; }
+            set { _methodName = value; }
+        }
+        /// <summary><c>String</c> object name portion of the method name.</summary>
+        public String MethodNameObject
+        {
+            get
+            {
+                int index = MethodName.IndexOf(".");
+                if (index == -1)
+                    return MethodName;
+                return MethodName.Substring(0, index);
+            }
+        }
+        /// <summary><c>String</c> method name portion of the object.method name.</summary>
+        public String MethodNameMethod
+        {
+            get
+            {
+                int index = MethodName.IndexOf(".");
+                if (index == -1)
+                    return MethodName;
+                return MethodName.Substring(index + 1, MethodName.Length - index - 1);
+            }
+        }
+        /// <summary>Invoke this request on the server.</summary>
+        /// <param name="url"><c>String</c> The url of the XML-RPC server.</param>
+        /// <returns><c>Object</c> The value returned from the method invocation on the server.</returns>
+        /// <exception cref="XmlRpcException">If an exception generated on the server side.</exception>
+        public Object Invoke(String url)
+        {
+            XmlRpcResponse res = Send(url, 10000);
+            if (res.IsFault)
+                throw new XmlRpcException(res.FaultCode, res.FaultString);
+            return res.Value;
+        }
+        /// <summary>Send the request to the server.</summary>
+        /// <param name="url"><c>String</c> The url of the XML-RPC server.</param>
+        /// <param name="timeout">Milliseconds before the connection times out.</param>
+        /// <returns><c>XmlRpcResponse</c> The response generated.</returns>
+        public XmlRpcResponse Send(String url, int timeout)
+        {
+            // Override SSL authentication mechanisms
+            ServicePointManager.CertificatePolicy = new AcceptAllCertificatePolicy();
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+            if (request == null)
+                throw new XmlRpcException(XmlRpcErrorCodes.TRANSPORT_ERROR,
+                              XmlRpcErrorCodes.TRANSPORT_ERROR_MSG + ": Could not create request with " + url);
+            request.Method = "POST";
+            request.ContentType = "text/xml";
+            request.AllowWriteStreamBuffering = true;
+            request.Timeout = timeout;
+            Stream stream = request.GetRequestStream();
+            XmlTextWriter xml = new XmlTextWriter(stream, _encoding);
+            _serializer.Serialize(xml, this);
+            xml.Flush();
+            xml.Close();
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+            StreamReader input = new StreamReader(response.GetResponseStream());
+            XmlRpcResponse resp = (XmlRpcResponse)_deserializer.Deserialize(input);
+            input.Close();
+            response.Close();
+            return resp;
+        }
+        /// <summary>Produce <c>String</c> representation of the object.</summary>
+        /// <returns><c>String</c> representation of the object.</returns>
+        override public String ToString()
+        {
+            return _serializer.Serialize(this);
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcRequestDeserializer.cs b/XmlRpcCS/XmlRpcRequestDeserializer.cs
new file mode 100644
index 0000000..0770b7e
--- /dev/null
+++ b/XmlRpcCS/XmlRpcRequestDeserializer.cs
@@ -0,0 +1,64 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Xml;
+    /// <summary>Class to deserialize XML data representing a request.</summary>
+    public class XmlRpcRequestDeserializer : XmlRpcDeserializer
+    {
+        static private XmlRpcRequestDeserializer _singleton;
+        /// <summary>A static singleton instance of this deserializer.</summary>
+        [Obsolete("This object is now thread safe, just use an instance.", false)]
+        static public XmlRpcRequestDeserializer Singleton
+        {
+            get
+            {
+                if (_singleton == null)
+                    _singleton = new XmlRpcRequestDeserializer();
+                return _singleton;
+            }
+        }
+        /// <summary>Static method that parses XML data into a request using the Singleton.</summary>
+        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC request.</param>
+        /// <returns><c>XmlRpcRequest</c> object resulting from the parse.</returns>
+        override public Object Deserialize(TextReader xmlData)
+        {
+            XmlTextReader reader = new XmlTextReader(xmlData);
+            XmlRpcRequest request = new XmlRpcRequest();
+            bool done = false;
+            lock (this)
+            {
+                Reset();
+                while (!done && reader.Read())
+                {
+                    DeserializeNode(reader); // Parent parse...
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.EndElement:
+                            switch (reader.Name)
+                            {
+                                case METHOD_NAME:
+                                    request.MethodName = _text;
+                                    break;
+                                case METHOD_CALL:
+                                    done = true;
+                                    break;
+                                case PARAM:
+                                    request.Params.Add(_value);
+                                    _text = null;
+                                    break;
+                            }
+                            break;
+                    }
+                }
+            }
+            return request;
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcRequestSerializer.cs b/XmlRpcCS/XmlRpcRequestSerializer.cs
new file mode 100644
index 0000000..8099bdb
--- /dev/null
+++ b/XmlRpcCS/XmlRpcRequestSerializer.cs
@@ -0,0 +1,51 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.Xml;
+    using System.IO;
+    /// <summary>Class responsible for serializing an XML-RPC request.</summary>
+    /// <remarks>This class handles the request envelope, depending on <c>XmlRpcSerializer</c>
+    /// to serialize the payload.</remarks>
+    /// <seealso cref="XmlRpcSerializer"/>
+    public class XmlRpcRequestSerializer : XmlRpcSerializer
+    {
+        static private XmlRpcRequestSerializer _singleton;
+        /// <summary>A static singleton instance of this deserializer.</summary>
+        static public XmlRpcRequestSerializer Singleton
+        {
+            get
+            {
+                if (_singleton == null)
+                    _singleton = new XmlRpcRequestSerializer();
+                return _singleton;
+            }
+        }
+        /// <summary>Serialize the <c>XmlRpcRequest</c> to the output stream.</summary>
+        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
+        /// <param name="obj">An <c>XmlRpcRequest</c> to serialize.</param>
+        /// <seealso cref="XmlRpcRequest"/>
+        override public void Serialize(XmlTextWriter output, Object obj)
+        {
+            XmlRpcRequest request = (XmlRpcRequest)obj;
+            output.WriteStartDocument();
+            output.WriteStartElement(METHOD_CALL);
+            output.WriteElementString(METHOD_NAME, request.MethodName);
+            output.WriteStartElement(PARAMS);
+            foreach (Object param in request.Params)
+            {
+                output.WriteStartElement(PARAM);
+                output.WriteStartElement(VALUE);
+                SerializeObject(output, param);
+                output.WriteEndElement();
+                output.WriteEndElement();
+            }
+            output.WriteEndElement();
+            output.WriteEndElement();
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcResponder.cs b/XmlRpcCS/XmlRpcResponder.cs
new file mode 100644
index 0000000..0412568
--- /dev/null
+++ b/XmlRpcCS/XmlRpcResponder.cs
@@ -0,0 +1,98 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Xml;
+    using System.Net.Sockets;
+    /// <summary>The class is a container of the context of an XML-RPC dialog on the server side.</summary>
+    /// <remarks>Instances of this class maintain the context for an individual XML-RPC server
+    /// side dialog. Namely they manage an inbound deserializer and an outbound serializer. </remarks>
+    public class XmlRpcResponder
+    {
+        private XmlRpcRequestDeserializer _deserializer = new XmlRpcRequestDeserializer();
+        private XmlRpcResponseSerializer _serializer = new XmlRpcResponseSerializer();
+        private XmlRpcServer _server;
+        private TcpClient _client;
+        private SimpleHttpRequest _httpReq;
+        /// <summary>The SimpleHttpRequest based on the TcpClient.</summary>
+        public SimpleHttpRequest HttpReq
+        {
+            get { return _httpReq; }
+        }
+        /// <summary>Basic constructor.</summary>
+        /// <param name="server">XmlRpcServer that this XmlRpcResponder services.</param>
+        /// <param name="client">TcpClient with the connection.</param>
+        public XmlRpcResponder(XmlRpcServer server, TcpClient client)
+        {
+            _server = server;
+            _client = client;
+            _httpReq = new SimpleHttpRequest(_client);
+        }
+        /// <summary>Call close to insure proper shutdown.</summary>
+        ~XmlRpcResponder()
+        {
+            Close();
+        }
+        ///<summary>Respond using this responders HttpReq.</summary>
+        public void Respond()
+        {
+            Respond(HttpReq);
+        }
+        /// <summary>Handle an HTTP request containing an XML-RPC request.</summary>
+        /// <remarks>This method deserializes the XML-RPC request, invokes the 
+        /// described method, serializes the response (or fault) and sends the XML-RPC response
+        /// back as a valid HTTP page.
+        /// </remarks>
+        /// <param name="httpReq"><c>SimpleHttpRequest</c> containing the request.</param>
+        public void Respond(SimpleHttpRequest httpReq)
+        {
+            XmlRpcRequest xmlRpcReq = (XmlRpcRequest)_deserializer.Deserialize(httpReq.Input);
+            XmlRpcResponse xmlRpcResp = new XmlRpcResponse();
+            try
+            {
+                xmlRpcResp.Value = _server.Invoke(xmlRpcReq);
+            }
+            catch (XmlRpcException e)
+            {
+                xmlRpcResp.SetFault(e.FaultCode, e.FaultString);
+            }
+            catch (Exception e2)
+            {
+                xmlRpcResp.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,
+                      XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);
+            }
+            if (Logger.Delegate != null)
+                Logger.WriteEntry(xmlRpcResp.ToString(), LogLevel.Information);
+            XmlRpcServer.HttpHeader(httpReq.Protocol, "text/xml", 0, " 200 OK", httpReq.Output);
+            httpReq.Output.Flush();
+            XmlTextWriter xml = new XmlTextWriter(httpReq.Output);
+            _serializer.Serialize(xml, xmlRpcResp);
+            xml.Flush();
+            httpReq.Output.Flush();
+        }
+        ///<summary>Close all contained resources, both the HttpReq and client.</summary>
+        public void Close()
+        {
+            if (_httpReq != null)
+            {
+                _httpReq.Close();
+                _httpReq = null;
+            }
+            if (_client != null)
+            {
+                _client.Close();
+                _client = null;
+            }
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcResponse.cs b/XmlRpcCS/XmlRpcResponse.cs
new file mode 100644
index 0000000..8ff8354
--- /dev/null
+++ b/XmlRpcCS/XmlRpcResponse.cs
@@ -0,0 +1,85 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.IO;
+    using System.Xml;
+    /// <summary>Class designed to represent an XML-RPC response.</summary>
+    public class XmlRpcResponse
+    {
+        private Object _value;
+        /// <summary><c>bool</c> indicating if this response represents a fault.</summary>
+        public bool IsFault;
+        /// <summary>Basic constructor</summary>
+        public XmlRpcResponse()
+        {
+            Value = null;
+            IsFault = false;
+        }
+        /// <summary>Constructor for a fault.</summary>
+        /// <param name="code"><c>int</c> the numeric faultCode value.</param>
+        /// <param name="message"><c>String</c> the faultString value.</param>
+        public XmlRpcResponse(int code, String message)
+            : this()
+        {
+            SetFault(code, message);
+        }
+        /// <summary>The data value of the response, may be fault data.</summary>
+        public Object Value
+        {
+            get { return _value; }
+            set
+            {
+                IsFault = false;
+                _value = value;
+            }
+        }
+        /// <summary>The faultCode if this is a fault.</summary>
+        public int FaultCode
+        {
+            get
+            {
+                if (!IsFault)
+                    return 0;
+                else
+                    return (int)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_CODE];
+            }
+        }
+        /// <summary>The faultString if this is a fault.</summary>
+        public String FaultString
+        {
+            get
+            {
+                if (!IsFault)
+                    return "";
+                else
+                    return (String)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_STRING];
+            }
+        }
+        /// <summary>Set this response to be a fault.</summary>
+        /// <param name="code"><c>int</c> the numeric faultCode value.</param>
+        /// <param name="message"><c>String</c> the faultString value.</param>
+        public void SetFault(int code, String message)
+        {
+            Hashtable fault = new Hashtable();
+            fault.Add("faultCode", code);
+            fault.Add("faultString", message);
+            Value = fault;
+            IsFault = true;
+        }
+        /// <summary>Form a useful string representation of the object, in this case the XML response.</summary>
+        /// <returns><c>String</c> The XML serialized XML-RPC response.</returns>
+        override public String ToString()
+        {
+            return XmlRpcResponseSerializer.Singleton.Serialize(this);
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcResponseDeserializer.cs b/XmlRpcCS/XmlRpcResponseDeserializer.cs
new file mode 100644
index 0000000..032d8a3
--- /dev/null
+++ b/XmlRpcCS/XmlRpcResponseDeserializer.cs
@@ -0,0 +1,65 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.IO;
+    using System.Xml;
+    /// <summary>Class to deserialize XML data representing a response.</summary>
+    public class XmlRpcResponseDeserializer : XmlRpcDeserializer
+    {
+        static private XmlRpcResponseDeserializer _singleton;
+        /// <summary>A static singleton instance of this deserializer.</summary>
+        [Obsolete("This object is now thread safe, just use an instance.", false)]
+        static public XmlRpcResponseDeserializer Singleton
+        {
+            get
+            {
+                if (_singleton == null)
+                    _singleton = new XmlRpcResponseDeserializer();
+                return _singleton;
+            }
+        }
+        /// <summary>Static method that parses XML data into a response using the Singleton.</summary>
+        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC response.</param>
+        /// <returns><c>XmlRpcResponse</c> object resulting from the parse.</returns>
+        override public Object Deserialize(TextReader xmlData)
+        {
+            XmlTextReader reader = new XmlTextReader(xmlData);
+            XmlRpcResponse response = new XmlRpcResponse();
+            bool done = false;
+            lock (this)
+            {
+                Reset();
+                while (!done && reader.Read())
+                {
+                    DeserializeNode(reader); // Parent parse...
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.EndElement:
+                            switch (reader.Name)
+                            {
+                                case FAULT:
+                                    response.Value = _value;
+                                    response.IsFault = true;
+                                    break;
+                                case PARAM:
+                                    response.Value = _value;
+                                    _value = null;
+                                    _text = null;
+                                    break;
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+            return response;
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcResponseSerializer.cs b/XmlRpcCS/XmlRpcResponseSerializer.cs
new file mode 100644
index 0000000..72ca568
--- /dev/null
+++ b/XmlRpcCS/XmlRpcResponseSerializer.cs
@@ -0,0 +1,57 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.Xml;
+    /// <summary>Class responsible for serializing an XML-RPC response.</summary>
+    /// <remarks>This class handles the response envelope, depending on XmlRpcSerializer
+    /// to serialize the payload.</remarks>
+    /// <seealso cref="XmlRpcSerializer"/>
+    public class XmlRpcResponseSerializer : XmlRpcSerializer
+    {
+        static private XmlRpcResponseSerializer _singleton;
+        /// <summary>A static singleton instance of this deserializer.</summary>
+        static public XmlRpcResponseSerializer Singleton
+        {
+            get
+            {
+                if (_singleton == null)
+                    _singleton = new XmlRpcResponseSerializer();
+                return _singleton;
+            }
+        }
+        /// <summary>Serialize the <c>XmlRpcResponse</c> to the output stream.</summary>
+        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
+        /// <param name="obj">An <c>Object</c> to serialize.</param>
+        /// <seealso cref="XmlRpcResponse"/>
+        override public void Serialize(XmlTextWriter output, Object obj)
+        {
+            XmlRpcResponse response = (XmlRpcResponse)obj;
+            output.WriteStartDocument();
+            output.WriteStartElement(METHOD_RESPONSE);
+            if (response.IsFault)
+                output.WriteStartElement(FAULT);
+            else
+            {
+                output.WriteStartElement(PARAMS);
+                output.WriteStartElement(PARAM);
+            }
+            output.WriteStartElement(VALUE);
+            SerializeObject(output, response.Value);
+            output.WriteEndElement();
+            output.WriteEndElement();
+            if (!response.IsFault)
+                output.WriteEndElement();
+            output.WriteEndElement();
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcSerializer.cs b/XmlRpcCS/XmlRpcSerializer.cs
new file mode 100644
index 0000000..0643d38
--- /dev/null
+++ b/XmlRpcCS/XmlRpcSerializer.cs
@@ -0,0 +1,109 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.IO;
+    using System.Xml;
+    /// <summary>Base class of classes serializing data to XML-RPC's XML format.</summary>
+    /// <remarks>This class handles the basic type conversions like Integer to &lt;i4&gt;. </remarks>
+    /// <seealso cref="XmlRpcXmlTokens"/>
+    public class XmlRpcSerializer : XmlRpcXmlTokens
+    {
+        /// <summary>Serialize the <c>XmlRpcRequest</c> to the output stream.</summary>
+        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
+        /// <param name="obj">An <c>Object</c> to serialize.</param>
+        /// <seealso cref="XmlRpcRequest"/>
+        virtual public void Serialize(XmlTextWriter output, Object obj)
+        {
+        }
+        /// <summary>Serialize the <c>XmlRpcRequest</c> to a String.</summary>
+        /// <remarks>Note this may represent a real memory hog for a large request.</remarks>
+        /// <param name="obj">An <c>Object</c> to serialize.</param>
+        /// <returns><c>String</c> containing XML-RPC representation of the request.</returns>
+        /// <seealso cref="XmlRpcRequest"/>
+        public String Serialize(Object obj)
+        {
+            StringWriter strBuf = new StringWriter();
+            XmlTextWriter xml = new XmlTextWriter(strBuf);
+            xml.Formatting = Formatting.Indented;
+            xml.Indentation = 4;
+            Serialize(xml, obj);
+            xml.Flush();
+            String returns = strBuf.ToString();
+            xml.Close();
+            return returns;
+        }
+        /// <remarks>Serialize the object to the output stream.</remarks>
+        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
+        /// <param name="obj">An <c>Object</c> to serialize.</param>
+        public void SerializeObject(XmlTextWriter output, Object obj)
+        {
+            if (obj == null)
+                return;
+            if (obj is byte[])
+            {
+                byte[] ba = (byte[])obj;
+                output.WriteStartElement(BASE64);
+                output.WriteBase64(ba, 0, ba.Length);
+                output.WriteEndElement();
+            }
+            else if (obj is String)
+            {
+                output.WriteElementString(STRING, obj.ToString());
+            }
+            else if (obj is Int32)
+            {
+                output.WriteElementString(INT, obj.ToString());
+            }
+            else if (obj is DateTime)
+            {
+                output.WriteElementString(DATETIME, ((DateTime)obj).ToString(ISO_DATETIME));
+            }
+            else if (obj is Double)
+            {
+                output.WriteElementString(DOUBLE, obj.ToString());
+            }
+            else if (obj is Boolean)
+            {
+                output.WriteElementString(BOOLEAN, ((((Boolean)obj) == true) ? "1" : "0"));
+            }
+            else if (obj is IList)
+            {
+                output.WriteStartElement(ARRAY);
+                output.WriteStartElement(DATA);
+                if (((ArrayList)obj).Count > 0)
+                {
+                    foreach (Object member in ((IList)obj))
+                    {
+                        output.WriteStartElement(VALUE);
+                        SerializeObject(output, member);
+                        output.WriteEndElement();
+                    }
+                }
+                output.WriteEndElement();
+                output.WriteEndElement();
+            }
+            else if (obj is IDictionary)
+            {
+                IDictionary h = (IDictionary)obj;
+                output.WriteStartElement(STRUCT);
+                foreach (String key in h.Keys)
+                {
+                    output.WriteStartElement(MEMBER);
+                    output.WriteElementString(NAME, key);
+                    output.WriteStartElement(VALUE);
+                    SerializeObject(output, h[key]);
+                    output.WriteEndElement();
+                    output.WriteEndElement();
+                }
+                output.WriteEndElement();
+            }
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcServer.cs b/XmlRpcCS/XmlRpcServer.cs
new file mode 100644
index 0000000..1c226c1
--- /dev/null
+++ b/XmlRpcCS/XmlRpcServer.cs
@@ -0,0 +1,239 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.IO;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Text;
+    using System.Threading;
+    using System.Xml;
+    /// <summary>A restricted HTTP server for use with XML-RPC.</summary>
+    /// <remarks>It only handles POST requests, and only POSTs representing XML-RPC calls.
+    /// In addition to dispatching requests it also provides a registry for request handlers. 
+    /// </remarks>
+    public class XmlRpcServer : IEnumerable
+    {
+#pragma warning disable 0414 // disable "private field assigned but not used"
+        const int RESPONDER_COUNT = 10;
+        private TcpListener _myListener;
+        private int _port;
+        private IPAddress _address;
+        private IDictionary _handlers;
+        private XmlRpcSystemObject _system;
+        private WaitCallback _wc;
+#pragma warning restore 0414
+        ///<summary>Constructor with port and address.</summary>
+        ///<remarks>This constructor sets up a TcpListener listening on the
+        ///given port and address. It also calls a Thread on the method StartListen().</remarks>
+        ///<param name="address"><c>IPAddress</c> value of the address to listen on.</param>
+        ///<param name="port"><c>Int</c> value of the port to listen on.</param>
+        public XmlRpcServer(IPAddress address, int port)
+        {
+            _port = port;
+            _address = address;
+            _handlers = new Hashtable();
+            _system = new XmlRpcSystemObject(this);
+            _wc = new WaitCallback(WaitCallback);
+        }
+        ///<summary>Basic constructor.</summary>
+        ///<remarks>This constructor sets up a TcpListener listening on the
+        ///given port. It also calls a Thread on the method StartListen(). IPAddress.Any
+        ///is assumed as the address here.</remarks>
+        ///<param name="port"><c>Int</c> value of the port to listen on.</param>
+        public XmlRpcServer(int port) : this(IPAddress.Any, port) { }
+        /// <summary>Start the server.</summary>
+        public void Start()
+        {
+            try
+            {
+                Stop();
+                //start listing on the given port
+                //          IPAddress addr = IPAddress.Parse("127.0.0.1");
+                lock (this)
+                {
+                    _myListener = new TcpListener(IPAddress.Any, _port);
+                    _myListener.Start();
+                    //start the thread which calls the method 'StartListen'
+                    Thread th = new Thread(new ThreadStart(StartListen));
+                    th.Start();
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.WriteEntry("An Exception Occurred while Listening :" + e.ToString(), LogLevel.Error);
+            }
+        }
+        /// <summary>Stop the server.</summary>
+        public void Stop()
+        {
+            try
+            {
+                if (_myListener != null)
+                {
+                    lock (this)
+                    {
+                        _myListener.Stop();
+                        _myListener = null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.WriteEntry("An Exception Occurred while stopping :" +
+                      e.ToString(), LogLevel.Error);
+            }
+        }
+        /// <summary>Get an enumeration of my XML-RPC handlers.</summary>
+        /// <returns><c>IEnumerable</c> the handler enumeration.</returns>
+        public IEnumerator GetEnumerator()
+        {
+            return _handlers.GetEnumerator();
+        }
+        /// <summary>Retrieve a handler by name.</summary>
+        /// <param name="name"><c>String</c> naming a handler</param>
+        /// <returns><c>Object</c> that is the handler.</returns>
+        public Object this[String name]
+        {
+            get { return _handlers[name]; }
+        }
+        ///<summary>
+        ///This method Accepts new connections and dispatches them when appropriate.
+        ///</summary>
+        public void StartListen()
+        {
+            while (true && _myListener != null)
+            {
+                //Accept a new connection
+                XmlRpcResponder responder = new XmlRpcResponder(this, _myListener.AcceptTcpClient());
+                ThreadPool.QueueUserWorkItem(_wc, responder);
+            }
+        }
+        ///<summary>
+        ///Add an XML-RPC handler object by name.
+        ///</summary>
+        ///<param name="name"><c>String</c> XML-RPC dispatch name of this object.</param>
+        ///<param name="obj"><c>Object</c> The object that is the XML-RPC handler.</param>
+        public void Add(String name, Object obj)
+        {
+            _handlers.Add(name, obj);
+        }
+        ///<summary>Return a C# object.method name for and XML-RPC object.method name pair.</summary>
+        ///<param name="methodName">The XML-RPC object.method.</param>
+        ///<returns><c>String</c> of form object.method for the underlying C# method.</returns>
+        public String MethodName(String methodName)
+        {
+            int dotAt = methodName.LastIndexOf('.');
+            if (dotAt == -1)
+            {
+                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
+                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Bad method name " + methodName);
+            }
+            String objectName = methodName.Substring(0, dotAt);
+            Object target = _handlers[objectName];
+            if (target == null)
+            {
+                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
+                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");
+            }
+            return target.GetType().FullName + "." + methodName.Substring(dotAt + 1);
+        }
+        ///<summary>Invoke a method described in a request.</summary>
+        ///<param name="req"><c>XmlRpcRequest</c> containing a method descriptions.</param>
+        /// <seealso cref="XmlRpcSystemObject.Invoke"/>
+        /// <seealso cref="XmlRpcServer.Invoke(String,String,IList)"/>
+        public Object Invoke(XmlRpcRequest req)
+        {
+            return Invoke(req.MethodNameObject, req.MethodNameMethod, req.Params);
+        }
+        ///<summary>Invoke a method on a named handler.</summary>
+        ///<param name="objectName"><c>String</c> The name of the handler.</param>
+        ///<param name="methodName"><c>String</c> The name of the method to invoke on the handler.</param>
+        ///<param name="parameters"><c>IList</c> The parameters to invoke the method with.</param>
+        /// <seealso cref="XmlRpcSystemObject.Invoke"/>
+        public Object Invoke(String objectName, String methodName, IList parameters)
+        {
+            Object target = _handlers[objectName];
+            if (target == null)
+            {
+                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
+                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");
+            }
+            return XmlRpcSystemObject.Invoke(target, methodName, parameters);
+        }
+        /// <summary>The method the thread pool invokes when a thread is available to handle an HTTP request.</summary>
+        /// <param name="responder">TcpClient from the socket accept.</param>
+        public void WaitCallback(object responder)
+        {
+            XmlRpcResponder resp = (XmlRpcResponder)responder;
+            if (resp.HttpReq.HttpMethod == "POST")
+            {
+                try
+                {
+                    resp.Respond();
+                }
+                catch (Exception e)
+                {
+                    Logger.WriteEntry("Failed on post: " + e, LogLevel.Error);
+                }
+            }
+            else
+            {
+                Logger.WriteEntry("Only POST methods are supported: " + resp.HttpReq.HttpMethod +
+                          " ignored", LogLevel.Error);
+            }
+            resp.Close();
+        }
+        /// <summary>
+        /// This function send the Header Information to the client (Browser)
+        /// </summary>
+        /// <param name="sHttpVersion">HTTP Version</param>
+        /// <param name="sMIMEHeader">Mime Type</param>
+        /// <param name="iTotBytes">Total Bytes to be sent in the body</param>
+        /// <param name="sStatusCode"></param>
+        /// <param name="output">Socket reference</param>
+        static public void HttpHeader(string sHttpVersion, string sMIMEHeader, long iTotBytes, string sStatusCode, TextWriter output)
+        {
+            String sBuffer = "";
+            // if Mime type is not provided set default to text/html
+            if (sMIMEHeader.Length == 0)
+            {
+                sMIMEHeader = "text/html";  // Default Mime Type is text/html
+            }
+            sBuffer += sHttpVersion + sStatusCode + "\r\n";
+            sBuffer += "Connection: close\r\n";
+            if (iTotBytes > 0)
+                sBuffer += "Content-Length: " + iTotBytes + "\r\n";
+            sBuffer += "Server: XmlRpcServer \r\n";
+            sBuffer += "Content-Type: " + sMIMEHeader + "\r\n";
+            sBuffer += "\r\n";
+            output.Write(sBuffer);
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcSystemObject.cs b/XmlRpcCS/XmlRpcSystemObject.cs
new file mode 100644
index 0000000..5f79951
--- /dev/null
+++ b/XmlRpcCS/XmlRpcSystemObject.cs
@@ -0,0 +1,252 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    using System.Collections;
+    using System.Reflection;
+    /// <summary> XML-RPC System object implementation of extended specifications.</summary>
+    [XmlRpcExposed]
+    public class XmlRpcSystemObject
+    {
+        private XmlRpcServer _server;
+        static private IDictionary _methodHelp = new Hashtable();
+        /// <summary>Static <c>IDictionary</c> to hold mappings of method name to associated documentation String</summary>
+        static public IDictionary MethodHelp
+        {
+            get { return _methodHelp; }
+        }
+        /// <summary>Constructor.</summary>
+        /// <param name="server"><c>XmlRpcServer</c> server to be the system object for.</param>
+        public XmlRpcSystemObject(XmlRpcServer server)
+        {
+            _server = server;
+            server.Add("system", this);
+            _methodHelp.Add(this.GetType().FullName + ".methodHelp", "Return a string description.");
+        }
+        /// <summary>Invoke a method on a given object.</summary>
+        /// <remarks>Using reflection, and respecting the <c>XmlRpcExposed</c> attribute,
+        /// invoke the <paramref>methodName</paramref> method on the <paramref>target</paramref>
+        /// instance with the <paramref>parameters</paramref> provided. All this packages other <c>Invoke</c> methods 
+        /// end up calling this.</remarks>
+        /// <returns><c>Object</c> the value the invoked method returns.</returns>
+        /// <exception cref="XmlRpcException">If method does not exist, is not exposed, parameters invalid, or invocation
+        /// results in an exception. Note, the <c>XmlRpcException.Code</c> will indicate cause.</exception>
+        static public Object Invoke(Object target, String methodName, IList parameters)
+        {
+            if (target == null)
+                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
+                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Invalid target object.");
+            Type type = target.GetType();
+            MethodInfo method = type.GetMethod(methodName);
+            try
+            {
+                if (!XmlRpcExposedAttribute.ExposedMethod(target, methodName))
+                    throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
+                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Method " + methodName + " is not exposed.");
+            }
+            catch (MissingMethodException me)
+            {
+                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
+                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": " + me.Message);
+            }
+            Object[] args = new Object[parameters.Count];
+            int index = 0;
+            foreach (Object arg in parameters)
+            {
+                args[index] = arg;
+                index++;
+            }
+            try
+            {
+                Object retValue = method.Invoke(target, args);
+                if (retValue == null)
+                    throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,
+                              XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": Method returned NULL.");
+                return retValue;
+            }
+            catch (XmlRpcException e)
+            {
+                throw e;
+            }
+            catch (ArgumentException ae)
+            {
+                Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + ae.Message,
+                          LogLevel.Information);
+                String call = methodName + "( ";
+                foreach (Object o in args)
+                {
+                    call += o.GetType().Name;
+                    call += " ";
+                }
+                call += ")";
+                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,
+                              XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement type mismatch invoking " + call);
+            }
+            catch (TargetParameterCountException tpce)
+            {
+                Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + tpce.Message,
+                          LogLevel.Information);
+                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,
+                              XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement count mismatch invoking " + methodName);
+            }
+            catch (TargetInvocationException tie)
+            {
+                throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,
+                              XmlRpcErrorCodes.APPLICATION_ERROR_MSG + " Invoked method " + methodName + ": " + tie.Message);
+            }
+        }
+        /// <summary>List methods available on all handlers of this server.</summary>
+        /// <returns><c>IList</c> An array of <c>Strings</c>, each <c>String</c> will have form "object.method".</returns>
+        [XmlRpcExposed]
+        public IList listMethods()
+        {
+            IList methods = new ArrayList();
+            Boolean considerExposure;
+            foreach (DictionaryEntry handlerEntry in _server)
+            {
+                considerExposure = XmlRpcExposedAttribute.IsExposed(handlerEntry.Value.GetType());
+                foreach (MemberInfo mi in handlerEntry.Value.GetType().GetMembers())
+                {
+                    if (mi.MemberType != MemberTypes.Method)
+                        continue;
+                    if (!((MethodInfo)mi).IsPublic)
+                        continue;
+                    if (considerExposure && !XmlRpcExposedAttribute.IsExposed(mi))
+                        continue;
+                    methods.Add(handlerEntry.Key + "." + mi.Name);
+                }
+            }
+            return methods;
+        }
+        /// <summary>Given a method name return the possible signatures for it.</summary>
+        /// <param name="name"><c>String</c> The object.method name to look up.</param>
+        /// <returns><c>IList</c> Of arrays of signatures.</returns>
+        [XmlRpcExposed]
+        public IList methodSignature(String name)
+        {
+            IList signatures = new ArrayList();
+            int index = name.IndexOf('.');
+            if (index < 0)
+                return signatures;
+            String oName = name.Substring(0, index);
+            Object obj = _server[oName];
+            if (obj == null)
+                return signatures;
+            MemberInfo[] mi = obj.GetType().GetMember(name.Substring(index + 1));
+            if (mi == null || mi.Length != 1) // for now we want a single signature
+                return signatures;
+            MethodInfo method;
+            try
+            {
+                method = (MethodInfo)mi[0];
+            }
+            catch (Exception e)
+            {
+                Logger.WriteEntry("Attempted methodSignature call on " + mi[0] + " caused: " + e,
+                          LogLevel.Information);
+                return signatures;
+            }
+            if (!method.IsPublic)
+                return signatures;
+            IList signature = new ArrayList();
+            signature.Add(method.ReturnType.Name);
+            foreach (ParameterInfo param in method.GetParameters())
+            {
+                signature.Add(param.ParameterType.Name);
+            }
+            signatures.Add(signature);
+            return signatures;
+        }
+        /// <summary>Help for given method signature. Not implemented yet.</summary>
+        /// <param name="name"><c>String</c> The object.method name to look up.</param>
+        /// <returns><c>String</c> help text. Rich HTML text.</returns>
+        [XmlRpcExposed]
+        public String methodHelp(String name)
+        {
+            String help = null;
+            try
+            {
+                help = (String)_methodHelp[_server.MethodName(name)];
+            }
+            catch (XmlRpcException e)
+            {
+                throw e;
+            }
+            catch (Exception) { /* ignored */ };
+            if (help == null)
+                help = "No help available for: " + name;
+            return help;
+        }
+        /// <summary>Boxcarring support method.</summary>
+        /// <param name="calls"><c>IList</c> of calls</param>
+        /// <returns><c>ArrayList</c> of results/faults.</returns>
+        [XmlRpcExposed]
+        public IList multiCall(IList calls)
+        {
+            IList responses = new ArrayList();
+            XmlRpcResponse fault = new XmlRpcResponse();
+            foreach (IDictionary call in calls)
+            {
+                try
+                {
+                    XmlRpcRequest req = new XmlRpcRequest((String)call[XmlRpcXmlTokens.METHOD_NAME],
+                                          (ArrayList)call[XmlRpcXmlTokens.PARAMS]);
+                    Object results = _server.Invoke(req);
+                    IList response = new ArrayList();
+                    response.Add(results);
+                    responses.Add(response);
+                }
+                catch (XmlRpcException e)
+                {
+                    fault.SetFault(e.FaultCode, e.FaultString);
+                    responses.Add(fault.Value);
+                }
+                catch (Exception e2)
+                {
+                    fault.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,
+                               XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);
+                    responses.Add(fault.Value);
+                }
+            }
+            return responses;
+        }
+    }
+}
diff --git a/XmlRpcCS/XmlRpcXmlTokens.cs b/XmlRpcCS/XmlRpcXmlTokens.cs
new file mode 100644
index 0000000..50788bd
--- /dev/null
+++ b/XmlRpcCS/XmlRpcXmlTokens.cs
@@ -0,0 +1,76 @@
+namespace Nwc.XmlRpc
+{
+    using System;
+    /// <summary>Class collecting <c>String</c> tokens that are part of XML-RPC files.</summary>
+    public class XmlRpcXmlTokens
+    {
+        /// <summary>C# formatting string to describe an ISO 8601 date.</summary>
+        public const String ISO_DATETIME = "yyyyMMdd\\THH\\:mm\\:ss";
+        /// <summary>Base64 field indicator.</summary>
+        /// <remarks>Corresponds to the &lt;base64&gt; tag.</remarks>
+        public const String BASE64 = "base64";
+        /// <summary>String field indicator.</summary>
+        /// <remarks>Corresponds to the &lt;string&gt; tag.</remarks>
+        public const String STRING = "string";
+        /// <summary>Integer field integer.</summary>
+        /// <remarks>Corresponds to the &lt;i4&gt; tag.</remarks>
+        public const String INT = "i4";
+        /// <summary>Alternate integer field indicator.</summary>
+        /// <remarks>Corresponds to the &lt;int&gt; tag.</remarks>
+        public const String ALT_INT = "int";
+        /// <summary>Date field indicator.</summary>
+        /// <remarks>Corresponds to the &lt;dateTime.iso8601&gt; tag.</remarks>
+        public const String DATETIME = "dateTime.iso8601";
+        /// <summary>Boolean field indicator.</summary>
+        /// <remarks>Corresponds to the &lt;boolean&gt; tag.</remarks>
+        public const String BOOLEAN = "boolean";
+        /// <summary>Value token.</summary>
+        /// <remarks>Corresponds to the &lt;value&gt; tag.</remarks>
+        public const String VALUE = "value";
+        /// <summary>Name token.</summary>
+        /// <remarks>Corresponds to the &lt;name&gt; tag.</remarks>
+        public const String NAME = "name";
+        /// <summary>Array field indicator..</summary>
+        /// <remarks>Corresponds to the &lt;array&gt; tag.</remarks>
+        public const String ARRAY = "array";
+        /// <summary>Data token.</summary>
+        /// <remarks>Corresponds to the &lt;data&gt; tag.</remarks>
+        public const String DATA = "data";
+        /// <summary>Member token.</summary>
+        /// <remarks>Corresponds to the &lt;member&gt; tag.</remarks>
+        public const String MEMBER = "member";
+        /// <summary>Stuct field indicator.</summary>
+        /// <remarks>Corresponds to the &lt;struct&gt; tag.</remarks>
+        public const String STRUCT = "struct";
+        /// <summary>Double field indicator.</summary>
+        /// <remarks>Corresponds to the &lt;double&gt; tag.</remarks>
+        public const String DOUBLE = "double";
+        /// <summary>Param token.</summary>
+        /// <remarks>Corresponds to the &lt;param&gt; tag.</remarks>
+        public const String PARAM = "param";
+        /// <summary>Params token.</summary>
+        /// <remarks>Corresponds to the &lt;params&gt; tag.</remarks>
+        public const String PARAMS = "params";
+        /// <summary>MethodCall token.</summary>
+        /// <remarks>Corresponds to the &lt;methodCall&gt; tag.</remarks>
+        public const String METHOD_CALL = "methodCall";
+        /// <summary>MethodName token.</summary>
+        /// <remarks>Corresponds to the &lt;methodName&gt; tag.</remarks>
+        public const String METHOD_NAME = "methodName";
+        /// <summary>MethodResponse token</summary>
+        /// <remarks>Corresponds to the &lt;methodResponse&gt; tag.</remarks>
+        public const String METHOD_RESPONSE = "methodResponse";
+        /// <summary>Fault response token.</summary>
+        /// <remarks>Corresponds to the &lt;fault&gt; tag.</remarks>
+        public const String FAULT = "fault";
+        /// <summary>FaultCode token.</summary>
+        /// <remarks>Corresponds to the &lt;faultCode&gt; tag.</remarks>
+        public const String FAULT_CODE = "faultCode";
+        /// <summary>FaultString token.</summary>
+        /// <remarks>Corresponds to the &lt;faultString&gt; tag.</remarks>
+        public const String FAULT_STRING = "faultString";
+    }
+}
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
index 89d692a..5d6a82e 100644
--- a/bin/libsecondlife.dll
+++ b/bin/libsecondlife.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 73c8f4c..741fc6d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -32,6 +32,28 @@
      </Options>
    </Configuration>
+    <!-- XML-RPC -->
+     <Project name="XMLRPC" path="XmlRpcCS" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <ReferencePath>../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
    <!-- Core OpenSim Projects -->
    <Project name="OpenSim.Framework" path="OpenSim.Framework" type="Library">
@@ -51,6 +73,7 @@
      <Reference name="System.Xml"/>
      <Reference name="libsecondlife.dll"/>
      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="XMLRPC"/>
      <Files>
        <Match pattern="*.cs" recurse="true"/>
      </Files>
@@ -93,6 +116,7 @@
     <Reference name="OpenSim.Framework"/>
     <Reference name="OpenSim.Framework.Console"/>
     <Reference name="libsecondlife.dll"/>
+     <Reference name="XMLRPC"/>
      <Files>
        <Match pattern="*.cs" recurse="true"/>
@@ -122,6 +146,7 @@
      <Reference name="OpenSim.Servers"/>
      <Reference name="libsecondlife.dll"/>
     <Reference name="Db4objects.Db4o.dll"/>
+     <Reference name="XMLRPC"/>
     <Files>
       <Match pattern="*.cs" recurse="true"/>
@@ -149,6 +174,7 @@
      <Reference name="OpenSim.Servers"/>
      <Reference name="libsecondlife.dll"/>
     <Reference name="Db4objects.Db4o.dll"/>
+     <Reference name="XMLRPC"/>
     <Files>
       <Match pattern="*.cs" recurse="true"/>
@@ -272,6 +298,7 @@
      <Reference name="libsecondlife.dll"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="XMLRPC"/>
      <Files>
        <Match pattern="*.cs" recurse="true"/>
      </Files>
@@ -439,6 +466,7 @@
      <Reference name="OpenSim.GenericConfig.Xml"/>
      <Reference name="OpenSim.Physics.Manager"/>
      <Reference name="OpenSim.Servers"/>
+      <Reference name="XMLRPC"/>
      <Files>
        <Match pattern="*.cs" recurse="true"/>