diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 58ece345b8..79e31c1184 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -265,9 +265,9 @@ namespace OpenSim
                                           LoadOar);
 
             m_console.Commands.AddCommand("region", false, "save oar",
-                                          "save oar [-v|version=N] [<OAR path>]",
+                                          "save oar [-v|--version=N] [<OAR path>]",
                                           "Save a region's data to an OAR archive.",
-                                          "-v|version=N generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine
+                                          "-v|--version=N generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine
                                           + "The OAR path must be a filesystem path."
                                           + "  If this is not given then the oar is saved to region.oar in the current directory.",
                                           SaveOar);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 1f85278863..702eab9e1d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// The maximum major version of OAR that we can read.  Minor versions shouldn't need a max number since version
         /// bumps here should be compatible.
         /// </summary>
-        public static int MAX_MAJOR_VERSION = 0;
+        public static int MAX_MAJOR_VERSION = 1;
 
         protected Scene m_scene;
         protected Stream m_loadStream;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 0567a82825..b987b5ac82 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -49,7 +49,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     public class ArchiveWriteRequestPreparation
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+                
+        /// <summary>
+        /// The minimum major version of OAR that we can write.
+        /// </summary>
+        public static int MIN_MAJOR_VERSION = 0;       
+                
+        /// <summary>
+        /// The maximum major version of OAR that we can write.
+        /// </summary>
+        public static int MAX_MAJOR_VERSION = 1;        
+        
         protected Scene m_scene;
         protected Stream m_saveStream;
         protected Guid m_requestId;
@@ -101,110 +111,137 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <exception cref="System.IO.IOException">if there was an io problem with creating the file</exception>
         public void ArchiveRegion(Dictionary<string, object> options)
         {
-            Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
-
-            EntityBase[] entities = m_scene.GetEntities();
-            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
-
-            /*
-                foreach (ILandObject lo in m_scene.LandChannel.AllParcels())
-                {
-                    if (name == lo.LandData.Name)
+            try
+            {
+                Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
+    
+                EntityBase[] entities = m_scene.GetEntities();
+                List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+    
+                /*
+                    foreach (ILandObject lo in m_scene.LandChannel.AllParcels())
                     {
-                        // This is the parcel we want
+                        if (name == lo.LandData.Name)
+                        {
+                            // This is the parcel we want
+                        }
+                    }
+                    */
+         
+                // Filter entities so that we only have scene objects.
+                // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods
+                // end up having to do this
+                foreach (EntityBase entity in entities)
+                {
+                    if (entity is SceneObjectGroup)
+                    {
+                        SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
+                        
+                        if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
+                            sceneObjects.Add((SceneObjectGroup)entity);
                     }
                 }
-                */
-     
-            // Filter entities so that we only have scene objects.
-            // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods
-            // end up having to do this
-            foreach (EntityBase entity in entities)
-            {
-                if (entity is SceneObjectGroup)
+                
+                UuidGatherer assetGatherer = new UuidGatherer(m_scene.AssetService);
+    
+                foreach (SceneObjectGroup sceneObject in sceneObjects)
                 {
-                    SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
-                    
-                    if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
-                        sceneObjects.Add((SceneObjectGroup)entity);
+                    assetGatherer.GatherAssetUuids(sceneObject, assetUuids);
                 }
+    
+                m_log.DebugFormat(
+                    "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
+                    sceneObjects.Count, assetUuids.Count);
+                
+                // Make sure that we also request terrain texture assets
+                RegionSettings regionSettings = m_scene.RegionInfo.RegionSettings;
+    
+                if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
+                    assetUuids[regionSettings.TerrainTexture1] = AssetType.Texture;
+                
+                if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
+                    assetUuids[regionSettings.TerrainTexture2] = AssetType.Texture;
+                
+                if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
+                    assetUuids[regionSettings.TerrainTexture3] = AssetType.Texture;
+                
+                if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
+                    assetUuids[regionSettings.TerrainTexture4] = AssetType.Texture;
+    
+                TarArchiveWriter archiveWriter = new TarArchiveWriter(m_saveStream);
+                
+                // Asynchronously request all the assets required to perform this archive operation
+                ArchiveWriteRequestExecution awre
+                    = new ArchiveWriteRequestExecution(
+                        sceneObjects,
+                        m_scene.RequestModuleInterface<ITerrainModule>(),
+                        m_scene.RequestModuleInterface<IRegionSerialiserModule>(),
+                        m_scene,
+                        archiveWriter,
+                        m_requestId,
+                        options);
+    
+                m_log.InfoFormat("[ARCHIVER]: Creating archive file.  This may take some time.");
+    
+                // Write out control file.  This has to be done first so that subsequent loaders will see this file first
+                // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this
+                archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(options));
+                m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
+                
+                new AssetsRequest(
+                    new AssetsArchiver(archiveWriter), assetUuids, 
+                    m_scene.AssetService, awre.ReceivedAllAssets).Execute();
             }
-            
-            UuidGatherer assetGatherer = new UuidGatherer(m_scene.AssetService);
-
-            foreach (SceneObjectGroup sceneObject in sceneObjects)
+            catch (Exception) 
             {
-                assetGatherer.GatherAssetUuids(sceneObject, assetUuids);
-            }
-
-            m_log.DebugFormat(
-                "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
-                sceneObjects.Count, assetUuids.Count);
-            
-            // Make sure that we also request terrain texture assets
-            RegionSettings regionSettings = m_scene.RegionInfo.RegionSettings;
-
-            if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
-                assetUuids[regionSettings.TerrainTexture1] = AssetType.Texture;
-            
-            if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
-                assetUuids[regionSettings.TerrainTexture2] = AssetType.Texture;
-            
-            if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
-                assetUuids[regionSettings.TerrainTexture3] = AssetType.Texture;
-            
-            if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
-                assetUuids[regionSettings.TerrainTexture4] = AssetType.Texture;
-
-            TarArchiveWriter archiveWriter = new TarArchiveWriter(m_saveStream);
-            
-            // Asynchronously request all the assets required to perform this archive operation
-            ArchiveWriteRequestExecution awre
-                = new ArchiveWriteRequestExecution(
-                    sceneObjects,
-                    m_scene.RequestModuleInterface<ITerrainModule>(),
-                    m_scene.RequestModuleInterface<IRegionSerialiserModule>(),
-                    m_scene,
-                    archiveWriter,
-                    m_requestId,
-                    options);
-
-            m_log.InfoFormat("[ARCHIVER]: Creating archive file.  This may take some time.");
-
-            // Write out control file.  This has to be done first so that subsequent loaders will see this file first
-            // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this
-            archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p2ControlFile(options));
-            m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
-            
-            new AssetsRequest(
-                new AssetsArchiver(archiveWriter), assetUuids, 
-                m_scene.AssetService, awre.ReceivedAllAssets).Execute();
+                m_saveStream.Close();
+                throw;
+            }    
         }
-        
+
         /// <summary>
         /// Create the control file for the most up to date archive
         /// </summary>
         /// <returns></returns>
-        public static string Create0p2ControlFile(Dictionary<string, object> options)
+        public static string CreateControlFile(Dictionary<string, object> options)
         {
-            int majorVersion = 0, minorVersion = 5;
+            int majorVersion = MAX_MAJOR_VERSION, minorVersion = 0;
 
             if (options.ContainsKey("version"))
             {
-                minorVersion = 0;
                 string[] parts = options["version"].ToString().Split('.');
                 if (parts.Length >= 1)
-                    majorVersion = Int32.Parse(parts[0]);
-                if (parts.Length >= 2)
-                    minorVersion = Int32.Parse(parts[1]);
+                {
+                    majorVersion = Int32.Parse(parts[0]);                    
+                                        
+                    if (parts.Length >= 2)
+                        minorVersion = Int32.Parse(parts[1]);
+                }
+            }
+            
+            if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION)
+            {
+                throw new Exception(
+                    string.Format(
+                        "OAR version number for save must be between {0} and {1}", 
+                        MIN_MAJOR_VERSION, MAX_MAJOR_VERSION));
+            }
+            else if (majorVersion == MAX_MAJOR_VERSION)
+            {
+                // Force 1.0
+                minorVersion = 0;
+            }
+            else if (majorVersion == MIN_MAJOR_VERSION)
+            {
+                // Force 0.4
+                minorVersion = 4;                                        
             }
             
             m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
-//            if (majorVersion == 1)
-//            {
-//                m_log.WarnFormat("[ARCHIVER]: Please be aware that version 1.0 OARs are not compatible with OpenSim 0.7.0.2 and earlier.  Please use the --version=0 option if you want to produce a compatible OAR");
-//            }
-            
+            if (majorVersion == 1)
+            {
+                m_log.WarnFormat("[ARCHIVER]: Please be aware that version 1.0 OARs are not compatible with OpenSim 0.7.0.2 and earlier.  Please use the --version=0 option if you want to produce a compatible OAR");
+            }            
             
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 04bdc4febb..04b6e3d3f9 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -122,13 +122,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         }
 
         /// <summary>
-        /// Test saving a V0.2 OpenSim Region Archive.
+        /// Test saving an OpenSim Region Archive.
         /// </summary>
         [Test]
-        public void TestSaveOarV0_2()
+        public void TestSaveOar()
         {
             TestHelper.InMethod();
-            //log4net.Config.XmlConfigurator.Configure();
+//            log4net.Config.XmlConfigurator.Configure();
 
             SceneObjectPart part1 = CreateSceneObjectPart1();
             SceneObjectGroup sog1 = new SceneObjectGroup(part1);
@@ -212,10 +212,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         }
 
         /// <summary>
-        /// Test loading a V0.2 OpenSim Region Archive.
+        /// Test loading an OpenSim Region Archive.
         /// </summary>
         [Test]
-        public void TestLoadOarV0_2()
+        public void TestLoadOar()
         {
             TestHelper.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             // upset load
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             
-            tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.Create0p2ControlFile(new Dictionary<string, Object>()));
+            tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.CreateControlFile(new Dictionary<string, Object>()));
 
             SceneObjectPart part1 = CreateSceneObjectPart1();
             SceneObjectGroup object1 = new SceneObjectGroup(part1);
@@ -317,10 +317,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         }
 
         /// <summary>
-        /// Test loading the region settings of a V0.2 OpenSim Region Archive.
+        /// Test loading the region settings of an OpenSim Region Archive.
         /// </summary>
         [Test]
-        public void TestLoadOarV0_2RegionSettings()
+        public void TestLoadOarRegionSettings()
         {
             TestHelper.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
@@ -329,7 +329,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
             
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
-            tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.Create0p2ControlFile(new Dictionary<string, Object>()));
+            tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.CreateControlFile(new Dictionary<string, Object>()));
 
             RegionSettings rs = new RegionSettings();
             rs.AgentLimit = 17;
@@ -409,10 +409,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         }
         
         /// <summary>
-        /// Test merging a V0.2 OpenSim Region Archive into an existing scene
+        /// Test merging an OpenSim Region Archive into an existing scene
         /// </summary>
         //[Test]
-        public void TestMergeOarV0_2()
+        public void TestMergeOar()
         {
             TestHelper.InMethod();
             //XmlConfigurator.Configure();
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
deleted file mode 100644
index 46ad30fdfd..0000000000
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
-using log4net;
-using System;
-using System.Reflection;
-using System.Text;
-using System.Collections;
- 
-namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
-{
-    public class FreeSwitchDialplan 
-    {
-        private static readonly ILog m_log = 
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-            
-         
-        public Hashtable HandleDialplanRequest(string Context, string Realm, Hashtable request)
-        {
-             m_log.DebugFormat("[FreeSwitchVoice] HandleDialplanRequest called with {0}",request.ToString());
-             
-             Hashtable response = new Hashtable();
-             
-             foreach (DictionaryEntry item in request)
-             {
-                m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
-             }
-
-             string requestcontext = (string) request["Hunt-Context"];
-             response["content_type"] = "text/xml";
-             response["keepalive"] = false;
-            response["int_response_code"] = 200;
-            if (Context != String.Empty && Context != requestcontext)
-            {
-                m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context");
-                response["str_response_string"] = "";
-            } else {
-                response["str_response_string"] = String.Format(@"<?xml version=""1.0"" encoding=""utf-8""?>
-                   <document type=""freeswitch/xml"">
-                     <section name=""dialplan"">
-                     <context name=""{0}"">" + 
-               
-/*                           <!-- dial via SIP uri -->
-                            <extension name=""sip_uri"">
-                                   <condition field=""destination_number"" expression=""^sip:(.*)$"">
-                                   <action application=""bridge"" data=""sofia/${use_profile}/$1""/>
-                                   <!--<action application=""bridge"" data=""$1""/>-->
-                                   </condition>
-                           </extension>*/
-               
-                           @"<extension name=""opensim_conferences"">
-                                   <condition field=""destination_number"" expression=""^confctl-(.*)$"">
-                                           <action application=""answer""/>
-                                           <action application=""conference"" data=""$1-{1}@{0}""/>
-                                   </condition>
-                           </extension>
-                       
-                           <extension name=""opensim_conf"">
-                                   <condition field=""destination_number"" expression=""^conf-(.*)$"">
-                                           <action application=""answer""/>
-                                           <action application=""conference"" data=""$1-{1}@{0}""/>
-                                   </condition>
-                           </extension>
-               
-                           <extension name=""avatar"">
-                                   <condition field=""destination_number"" expression=""^(x.*)$"">
-                                           <action application=""bridge"" data=""user/$1""/>
-                                   </condition>
-                           </extension>
-               
-                     </context>
-                   </section>
-                   </document>", Context, Realm);
-            }
-             
-            return response;
-        }
-    }
-    
-}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
deleted file mode 100644
index 17cdf741b5..0000000000
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
-using log4net;
-using System;
-using System.Reflection;
-using System.Text;
-using System.Collections;
- 
-namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
-{
-    public class FreeSwitchDirectory 
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-            
-        public Hashtable HandleDirectoryRequest(string Context, string Realm, Hashtable request)
-        {
-            Hashtable response = new Hashtable();
-            string domain = (string) request["domain"];
-            if (domain != Realm) {
-                response["content_type"] = "text/xml";
-                response["keepalive"] = false;
-                response["int_response_code"] = 200;
-                response["str_response_string"] = "";
-            } else {
-                 m_log.DebugFormat("[FreeSwitchDirectory] HandleDirectoryRequest called with {0}",request.ToString());
-            
-                 // information in the request we might be interested in
-             
-                 // Request 1 sip_auth for users account
-             
-                 //Event-Calling-Function=sofia_reg_parse_auth
-                 //Event-Calling-Line-Number=1494
-                 //action=sip_auth
-                 //sip_user_agent=Vivox-SDK-2.1.3010.6151-Mac%20(Feb-11-2009/16%3A42%3A41)
-                 //sip_auth_username=xhZuXKmRpECyr2AARJYyGgg%3D%3D  (==)
-                 //sip_auth_realm=9.20.151.43
-                 //sip_contact_user=xhZuXKmRpECyr2AARJYyGgg%3D%3D (==)
-                 //sip_contact_host=192.168.0.3    // this shouldnt really be a local IP, investigate STUN servers
-                 //sip_to_user=xhZuXKmRpECyr2AARJYyGgg%3D%3D
-                 //sip_to_host=9.20.151.43
-                 //sip_auth_method=REGISTER
-                 //user=xhZuXKmRpECyr2AARJYyGgg%3D%3D
-                 //domain=9.20.151.43
-                 //ip=9.167.220.137    // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
-             
-                 foreach (DictionaryEntry item in request)
-                 {
-                    m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}", item.Key, item.Value);
-                 }
-             
-                 string eventCallingFunction = (string) request["Event-Calling-Function"];
-                 if (eventCallingFunction == null)
-                 {
-                     eventCallingFunction = "sofia_reg_parse_auth";
-                 }
-
-                 if (eventCallingFunction.Length == 0)
-                 {
-                     eventCallingFunction = "sofia_reg_parse_auth";
-                 }
-             
-                 if (eventCallingFunction == "sofia_reg_parse_auth")
-                 {
-                     string sipAuthMethod = (string)request["sip_auth_method"];
-                 
-                     if (sipAuthMethod == "REGISTER")
-                     {
-                         response = HandleRegister(Context, Realm, request);
-                     } 
-                     else if (sipAuthMethod == "INVITE")
-                     {
-                          response = HandleInvite(Context, Realm, request);
-                     }
-                     else
-                     {
-                         m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
-                         response["int_response_code"] = 404;
-                         response["content_type"] = "text/xml";
-                         response["str_response_string"] = "";
-                     }
-                 }
-                 else if (eventCallingFunction == "switch_xml_locate_user")
-                 {
-                     response = HandleLocateUser(Realm, request);
-                 }
-                 else if (eventCallingFunction == "user_data_function") // gets called when an avatar to avatar call is made
-                 {
-                      response = HandleLocateUser(Realm, request);
-                 }
-                 else if (eventCallingFunction == "user_outgoing_channel")
-                 {
-                     response = HandleRegister(Context, Realm, request);
-                 }
-                 else if (eventCallingFunction == "config_sofia") // happens once on freeswitch startup
-                 {
-                     response = HandleConfigSofia(Context, Realm, request);
-                 }
-                 else if (eventCallingFunction == "switch_load_network_lists")
-                 {
-                     //response = HandleLoadNetworkLists(request);
-                     response["int_response_code"] = 404;
-                     response["keepalive"] = false;
-                     response["content_type"] = "text/xml";
-                     response["str_response_string"] = "";
-                 }
-                 else
-                 {
-                     m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown Event-Calling-Function {0}",eventCallingFunction);
-                     response["int_response_code"] = 404;
-                     response["keepalive"] = false;
-                     response["content_type"] = "text/xml";
-                     response["str_response_string"] = "";
-                 }
-            }
-            return response;
-        }
-        
-        private Hashtable HandleRegister(string Context, string Realm, Hashtable request)
-        {
-            m_log.Info("[FreeSwitchDirectory] HandleRegister called");
-            
-            // TODO the password we return needs to match that sent in the request, this is hard coded for now
-            string password = "1234";
-            string domain = (string) request["domain"];
-            string user = (string) request["user"];
-            
-            Hashtable response = new Hashtable();
-            response["content_type"] = "text/xml";
-            response["keepalive"] = false;
-            response["int_response_code"] = 200;
-
-            response["str_response_string"] = String.Format(
-                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
-                "<document type=\"freeswitch/xml\">\r\n" +
-                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
-                        "<domain name=\"{0}\">\r\n" +
-                            "<user id=\"{1}\">\r\n" +
-                                "<params>\r\n" +
-                                    "<param name=\"password\" value=\"{2}\" />\r\n" +
-                                    "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
-                                "</params>\r\n" +
-                                "<variables>\r\n" +
-                                    "<variable name=\"user_context\" value=\"{3}\" />\r\n" +
-                                    "<variable name=\"presence_id\" value=\"{1}@{0}\"/>"+
-                                "</variables>\r\n" +
-                            "</user>\r\n" +
-                        "</domain>\r\n" +
-                    "</section>\r\n" +
-                "</document>\r\n",
-                domain , user, password, Context);
-                
-            return response;
-        }
-        
-        private Hashtable HandleInvite(string Context, string Realm, Hashtable request)
-        {
-            m_log.Info("[FreeSwitchDirectory] HandleInvite called");
-            
-            // TODO the password we return needs to match that sent in the request, this is hard coded for now
-            string password = "1234";
-            string domain = (string) request["domain"];
-            string user = (string) request["user"];
-            string sipRequestUser = (string) request["sip_request_user"];
-            
-            Hashtable response = new Hashtable();
-            response["content_type"] = "text/xml";
-            response["keepalive"] = false;
-            response["int_response_code"] = 200;
-            response["str_response_string"] = String.Format(
-                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
-                "<document type=\"freeswitch/xml\">\r\n" +
-                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
-                        "<domain name=\"{0}\">\r\n" +
-                            "<user id=\"{1}\">\r\n" +
-                                "<params>\r\n" +
-                                    "<param name=\"password\" value=\"{2}\" />\r\n" +
-                                    "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${1}@${{dialed_domain}}}}${{sofia_contact(${1}@${{dialed_domain}})}}\"/>\r\n" +
-                                "</params>\r\n" +
-                                "<variables>\r\n" +
-                                    "<variable name=\"user_context\" value=\"{4}\" />\r\n" +
-                                    "<variable name=\"presence_id\" value=\"{1}@$${{domain}}\"/>"+
-                                "</variables>\r\n" +
-                            "</user>\r\n" +
-                            "<user id=\"{3}\">\r\n" +
-                                "<params>\r\n" +
-                                    "<param name=\"password\" value=\"{2}\" />\r\n" +
-                                    "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${3}@${{dialed_domain}}}}${{sofia_contact(${3}@${{dialed_domain}})}}\"/>\r\n" +
-                                "</params>\r\n" +
-                                "<variables>\r\n" +
-                                    "<variable name=\"user_context\" value=\"{4}\" />\r\n" +
-                                    "<variable name=\"presence_id\" value=\"{3}@$${{domain}}\"/>"+
-                                "</variables>\r\n" +
-                            "</user>\r\n" +
-                        "</domain>\r\n" +
-                    "</section>\r\n" +
-                "</document>\r\n",
-                domain , user, password,sipRequestUser, Context);
-                
-            return response;
-        }
-
-        private Hashtable HandleLocateUser(String Realm, Hashtable request)
-        {
-            m_log.Info("[FreeSwitchDirectory] HandleLocateUser called");
-            
-            // TODO the password we return needs to match that sent in the request, this is hard coded for now
-            string domain = (string) request["domain"];
-            string user = (string) request["user"];
-            
-            Hashtable response = new Hashtable();
-            response["content_type"] = "text/xml";
-            response["keepalive"] = false;
-            response["int_response_code"] = 200;
-            response["str_response_string"] = String.Format(
-                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
-                "<document type=\"freeswitch/xml\">\r\n" +
-                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
-                        "<domain name=\"{0}\">\r\n" +
-                            "<params>\r\n" +
-                                "<param name=\"dial-string\" value=\"{{sip_contact_user=${{dialed_user}}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
-                            "</params>\r\n" +
-                            "<user id=\"{1}\">\r\n" +
-                            "<variables>\r\n"+
-                              "<variable name=\"default_gateway\" value=\"$${{default_provider}}\"/>\r\n"+
-                              "<variable name=\"presence_id\" value=\"{1}@$${{domain}}\"/>"+
-                            "</variables>\r\n"+
-                            "</user>\r\n" +
-                        "</domain>\r\n" +
-                    "</section>\r\n" +
-                "</document>\r\n",
-                domain , user);
-            
-            return response;
-        }
-       
-        private Hashtable HandleConfigSofia(string Context, string Realm, Hashtable request)
-        {
-            m_log.Info("[FreeSwitchDirectory] HandleConfigSofia called");
-            
-            // TODO the password we return needs to match that sent in the request, this is hard coded for now
-            string domain = (string) request["domain"];
-            
-            Hashtable response = new Hashtable();
-            response["content_type"] = "text/xml";
-            response["keepalive"] = false;
-            response["int_response_code"] = 200;
-            response["str_response_string"] = String.Format(
-                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
-                "<document type=\"freeswitch/xml\">\r\n" +
-                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
-                        "<domain name=\"{0}\">\r\n" +
-                            "<params>\r\n" +
-                                "<param name=\"dial-string\" value=\"{{sip_contact_user=${{dialed_user}}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
-                            "</params>\r\n" +
-                            "<groups name=\"default\">\r\n"+
-                                "<users>\r\n"+
-                                    "<user id=\"$${{default_provider}}\">\r\n"+
-                                        "<gateways>\r\n"+
-                                          "<gateway name=\"$${{default_provider}}\">\r\n"+
-                                            "<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+
-                                            "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
-                                            "<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+
-                                            "<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+
-                                            "<param name=\"expire-seconds\" value=\"600\"/>\r\n"+
-                                            "<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+
-                                            "<param name=\"retry-seconds\" value=\"30\"/>\r\n"+
-                                            "<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+
-                                            "<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+
-                                            "<param name=\"context\" value=\"{1}\"/>\r\n"+
-                                          "</gateway>\r\n"+
-                                        "</gateways>\r\n"+
-                                        "<params>\r\n"+
-                                          "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
-                                        "</params>\r\n"+
-                                      "</user>\r\n"+
-                                "</users>"+
-                            "</groups>\r\n" +
-                            "<variables>\r\n"+
-                              "<variable name=\"default_gateway\" value=\"$${{default_provider}}\"/>\r\n"+
-                            "</variables>\r\n"+
-                        "</domain>\r\n" +
-                    "</section>\r\n" +
-                "</document>\r\n", 
-                domain, Context); 
-             
-            return response;
-        }
-
-        
-//        private Hashtable HandleLoadNetworkLists(Hashtable request)
-//        {
-//            m_log.Info("[FreeSwitchDirectory] HandleLoadNetworkLists called");
-//
-//            // TODO the password we return needs to match that sent in the request, this is hard coded for now
-//            string domain = (string) request["domain"];
-//
-//            Hashtable response = new Hashtable();
-//            response["content_type"] = "text/xml";
-//            response["keepalive"] = false;
-//            response["int_response_code"] = 200;
-//            response["str_response_string"] = String.Format(
-//                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
-//                "<document type=\"freeswitch/xml\">\r\n" +
-//                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
-//                        "<domain name=\"{0}\">\r\n" +
-//                            "<params>\r\n" +
-//                                "<param name=\"dial-string\" value=\"{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
-//                            "</params>\r\n" +
-//                            "<groups name=\"default\"><users/></groups>\r\n" +
-//                            "<variables>\r\n"+
-//                              "<variable name=\"default_gateway\" value=\"$${{default_provider}}\"/>\r\n"+
-//                            "</variables>\r\n"+
-//                        "</domain>\r\n" +
-//                    "</section>\r\n" +
-//                "</document>\r\n",
-//                domain); 
-//
-//
-//            return response;
-//        }
-    }
-}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 242bc3fdeb..a5e553cbae 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -37,10 +37,12 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
+using Mono.Addins;
 
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
@@ -49,28 +51,27 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 using System.Text.RegularExpressions;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
 namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 {
-    public class FreeSwitchVoiceModule : IRegionModule, IVoiceModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "FreeSwitchVoiceModule")]
+    public class FreeSwitchVoiceModule : INonSharedRegionModule, IVoiceModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private bool UseProxy = false;
-
         // Capability string prefixes
         private static readonly string m_parcelVoiceInfoRequestPath = "0007/";
         private static readonly string m_provisionVoiceAccountRequestPath = "0008/";
         private static readonly string m_chatSessionRequestPath = "0009/";
 
         // Control info
-        private static bool   m_WOF = true;
-        private static bool   m_pluginEnabled  = false;
+        private static bool   m_Enabled  = false;
 
         // FreeSwitch server is going to contact us and ask us all
         // sorts of things.
-        private static string m_freeSwitchServerUser;
-        private static string m_freeSwitchServerPass;
 
         // SLVoice client will do a GET on this prefix
         private static string m_freeSwitchAPIPrefix;
@@ -84,143 +85,146 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         private static string m_freeSwitchRealm;
         private static string m_freeSwitchSIPProxy;
         private static bool m_freeSwitchAttemptUseSTUN;
-        // private static string m_freeSwitchSTUNServer;
         private static string m_freeSwitchEchoServer;
         private static int m_freeSwitchEchoPort;
         private static string m_freeSwitchDefaultWellKnownIP;
         private static int m_freeSwitchDefaultTimeout;
-        // private static int m_freeSwitchSubscribeRetry;
         private static string m_freeSwitchUrlResetPassword;
-        // private static IPEndPoint m_FreeSwitchServiceIP;
-        private int m_freeSwitchServicePort;
+        private uint m_freeSwitchServicePort;
         private string m_openSimWellKnownHTTPAddress;
         private string m_freeSwitchContext;
 
-        private FreeSwitchDirectory m_FreeSwitchDirectory;
-        private FreeSwitchDialplan m_FreeSwitchDialplan;
-
         private readonly Dictionary<string, string> m_UUIDName = new Dictionary<string, string>();
         private Dictionary<string, string> m_ParcelAddress = new Dictionary<string, string>();
 
-        private Scene m_scene;
+        private Scene m_Scene;
 
+        private IConfig m_Config;
 
-        private IConfig m_config;
+        private IFreeswitchService m_FreeswitchService;
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            m_scene = scene;
-            m_config = config.Configs["FreeSwitchVoice"];
+            m_Config = config.Configs["FreeSwitchVoice"];
 
-            if (null == m_config)
+            if (m_Config == null)
             {
                 m_log.Info("[FreeSwitchVoice] no config found, plugin disabled");
                 return;
             }
 
-            if (!m_config.GetBoolean("enabled", false))
+            if (!m_Config.GetBoolean("Enabled", false))
             {
                 m_log.Info("[FreeSwitchVoice] plugin disabled by configuration");
                 return;
             }
 
-            // This is only done the FIRST time this method is invoked.
-            if (m_WOF)
+            try
             {
-                m_pluginEnabled = true;
-                m_WOF = false;
+                string serviceDll = m_Config.GetString("LocalServiceModule",
+                        String.Empty);
 
-                try
+                if (serviceDll == String.Empty)
                 {
-                    m_freeSwitchServerUser = m_config.GetString("freeswitch_server_user", String.Empty);
-                    m_freeSwitchServerPass = m_config.GetString("freeswitch_server_pass", String.Empty);
-                    m_freeSwitchAPIPrefix = m_config.GetString("freeswitch_api_prefix", String.Empty);
-
-                    // XXX: get IP address of HTTP server. (This can be this OpenSim server or another, or could be a dedicated grid service or may live on the freeswitch server)
-
-                    string serviceIP = m_config.GetString("freeswitch_service_server", String.Empty);
-                    int servicePort = m_config.GetInt("freeswitch_service_port", 80);
-                    IPAddress serviceIPAddress = IPAddress.Parse(serviceIP);
-                    // m_FreeSwitchServiceIP = new IPEndPoint(serviceIPAddress, servicePort);
-                    m_freeSwitchServicePort = servicePort;
-                    m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty);
-                    m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm);
-                    m_freeSwitchAttemptUseSTUN = m_config.GetBoolean("freeswitch_attempt_stun", true);
-                    // m_freeSwitchSTUNServer = m_config.GetString("freeswitch_stun_server", m_freeSwitchRealm);
-                    m_freeSwitchEchoServer = m_config.GetString("freeswitch_echo_server", m_freeSwitchRealm);
-                    m_freeSwitchEchoPort = m_config.GetInt("freeswitch_echo_port", 50505);
-                    m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm);
-                    m_openSimWellKnownHTTPAddress = m_config.GetString("opensim_well_known_http_address", serviceIPAddress.ToString());
-                    m_freeSwitchDefaultTimeout = m_config.GetInt("freeswitch_default_timeout", 5000);
-                    // m_freeSwitchSubscribeRetry = m_config.GetInt("freeswitch_subscribe_retry", 120);
-                    m_freeSwitchUrlResetPassword = m_config.GetString("freeswitch_password_reset_url", String.Empty);
-                    m_freeSwitchContext = m_config.GetString("freeswitch_context", "default");
-
-                    if (String.IsNullOrEmpty(m_freeSwitchServerUser) ||
-                        String.IsNullOrEmpty(m_freeSwitchServerPass) ||
-                        String.IsNullOrEmpty(m_freeSwitchRealm) ||
-                        String.IsNullOrEmpty(m_freeSwitchAPIPrefix))
-                    {
-                        m_log.Error("[FreeSwitchVoice] plugin mis-configured");
-                        m_log.Info("[FreeSwitchVoice] plugin disabled: incomplete configuration");
-                        return;
-                    }
-
-                    // set up http request handlers for
-                    // - prelogin: viv_get_prelogin.php
-                    // - signin: viv_signin.php
-                    // - buddies: viv_buddy.php
-                    // - ???: viv_watcher.php
-                    // - signout: viv_signout.php
-                    if (UseProxy)
-                    {
-                        MainServer.Instance.AddHTTPHandler(String.Format("{0}/", m_freeSwitchAPIPrefix),
-                                ForwardProxyRequest);
-                    }
-                    else
-                    {
-                        MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix),
-                                                             FreeSwitchSLVoiceGetPreloginHTTPHandler);
-
-                        // RestStreamHandler h = new
-                        // RestStreamHandler("GET",
-                        // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler);
-                        //  MainServer.Instance.AddStreamHandler(h);
-
-
-
-                        MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix),
-                                         FreeSwitchSLVoiceSigninHTTPHandler);
-
-                        // set up http request handlers to provide
-                        // on-demand FreeSwitch configuration to
-                        // FreeSwitch's mod_curl_xml
-                        MainServer.Instance.AddHTTPHandler(String.Format("{0}/freeswitch-config", m_freeSwitchAPIPrefix),
-                                                             FreeSwitchConfigHTTPHandler);
-
-                        MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix),
-                                         FreeSwitchSLVoiceBuddyHTTPHandler);
-                    }
-
-                    m_log.InfoFormat("[FreeSwitchVoice] using FreeSwitch server {0}", m_freeSwitchRealm);
-
-                    m_FreeSwitchDirectory = new FreeSwitchDirectory();
-                    m_FreeSwitchDialplan = new FreeSwitchDialplan();
-
-                    m_pluginEnabled = true;
-                    m_WOF = false;
-
-                    m_log.Info("[FreeSwitchVoice] plugin enabled");
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[FreeSwitchVoice] plugin initialization failed: {0}", e.Message);
-                    m_log.DebugFormat("[FreeSwitchVoice] plugin initialization failed: {0}", e.ToString());
+                    m_log.Error("[FreeSwitchVoice]: No LocalServiceModule named in section FreeSwitchVoice");
                     return;
                 }
+
+                Object[] args = new Object[] { config };
+                m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args);
+
+                string jsonConfig = m_FreeswitchService.GetJsonConfig();
+                OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig);
+
+                m_freeSwitchAPIPrefix = map["APIPrefix"].AsString();
+                m_freeSwitchRealm = map["Realm"].AsString();
+                m_freeSwitchSIPProxy = map["SIPProxy"].AsString();
+                m_freeSwitchAttemptUseSTUN = map["AttemptUseSTUN"].AsBoolean();
+                m_freeSwitchEchoServer = map["EchoServer"].AsString();
+                m_freeSwitchEchoPort = map["EchoPort"].AsInteger();
+                m_freeSwitchDefaultWellKnownIP = map["DefaultWellKnownIP"].AsString();
+                m_freeSwitchDefaultTimeout = map["DefaultTimeout"].AsInteger();
+                m_freeSwitchUrlResetPassword = String.Empty;
+                m_freeSwitchContext = map["Context"].AsString();
+
+                if (String.IsNullOrEmpty(m_freeSwitchRealm) ||
+                    String.IsNullOrEmpty(m_freeSwitchAPIPrefix))
+                {
+                    m_log.Error("[FreeSwitchVoice] plugin mis-configured");
+                    m_log.Info("[FreeSwitchVoice] plugin disabled: incomplete configuration");
+                    return;
+                }
+
+                // set up http request handlers for
+                // - prelogin: viv_get_prelogin.php
+                // - signin: viv_signin.php
+                // - buddies: viv_buddy.php
+                // - ???: viv_watcher.php
+                // - signout: viv_signout.php
+                MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix),
+                                                     FreeSwitchSLVoiceGetPreloginHTTPHandler);
+
+                // RestStreamHandler h = new
+                // RestStreamHandler("GET",
+                // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler);
+                //  MainServer.Instance.AddStreamHandler(h);
+
+
+
+                MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix),
+                                 FreeSwitchSLVoiceSigninHTTPHandler);
+
+                MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix),
+                                 FreeSwitchSLVoiceBuddyHTTPHandler);
+
+                m_log.InfoFormat("[FreeSwitchVoice] using FreeSwitch server {0}", m_freeSwitchRealm);
+
+                m_Enabled = true;
+
+                m_log.Info("[FreeSwitchVoice] plugin enabled");
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[FreeSwitchVoice] plugin initialization failed: {0}", e.Message);
+                m_log.DebugFormat("[FreeSwitchVoice] plugin initialization failed: {0}", e.ToString());
+                return;
             }
 
-            if (m_pluginEnabled)
+            // This here is a region module trying to make a global setting.
+            // Not really a good idea but it's Windows only, so I can't test.
+            try
+            {
+                ServicePointManager.ServerCertificateValidationCallback += CustomCertificateValidation;
+            }
+            catch (NotImplementedException)
+            {
+                try
+                {
+#pragma warning disable 0612, 0618
+                    // Mono does not implement the ServicePointManager.ServerCertificateValidationCallback yet!  Don't remove this!
+                    ServicePointManager.CertificatePolicy = new MonoCert();
+#pragma warning restore 0612, 0618
+                }
+                catch (Exception)
+                {
+                    // COmmented multiline spam log message
+                    //m_log.Error("[FreeSwitchVoice]: Certificate validation handler change not supported.  You may get ssl certificate validation errors teleporting from your region to some SSL regions.");
+                }
+            }
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_Scene = scene;
+
+            // We generate these like this: The region's external host name
+            // as defined in Regions.ini is a good address to use. It's a
+            // dotted quad (or should be!) and it can reach this host from
+            // a client. The port is grabbed from the region's HTTP server.
+            m_openSimWellKnownHTTPAddress = m_Scene.RegionInfo.ExternalHostName;
+            m_freeSwitchServicePort = MainServer.Instance.Port;
+
+            if (m_Enabled)
             {
                 // we need to capture scene in an anonymous method
                 // here as we need it later in the callbacks
@@ -228,36 +232,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                     {
                         OnRegisterCaps(scene, agentID, caps);
                     };
-
-                try
-                {
-                    ServicePointManager.ServerCertificateValidationCallback += CustomCertificateValidation;
-                }
-                catch (NotImplementedException)
-                {
-                    try
-                    {
-#pragma warning disable 0612, 0618
-                        // Mono does not implement the ServicePointManager.ServerCertificateValidationCallback yet!  Don't remove this!
-                        ServicePointManager.CertificatePolicy = new MonoCert();
-#pragma warning restore 0612, 0618
-                    }
-                    catch (Exception)
-                    {
-                        m_log.Error("[FreeSwitchVoice]: Certificate validation handler change not supported.  You may get ssl certificate validation errors teleporting from your region to some SSL regions.");
-                    }
-                }
             }
         }
 
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
         {
-            if (m_pluginEnabled)
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_Enabled)
             {
                 m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene");
 
                 // register the voice interface for this module, so the script engine can call us
-                m_scene.RegisterModuleInterface<IVoiceModule>(this);
+                scene.RegisterModuleInterface<IVoiceModule>(this);
             }
         }
 
@@ -270,9 +259,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             get { return "FreeSwitchVoiceModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         // <summary>
@@ -725,46 +714,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 
             response["int_response_code"] = 200;
             return response;
-            /*
-            <level0>
-               <status>OK</status><body><status>Ok</status><cookie_name>lib_session</cookie_name>
-             * <cookie>xMj1QJSc7TA-G7XqcW6QXAg==:1290551700:050d35c6fef96f132f780d8039ff7592::</cookie>
-             * <auth_token>xMj1QJSc7TA-G7XqcW6QXAg==:1290551700:050d35c6fef96f132f780d8039ff7592::</auth_token>
-             * <primary>1</primary>
-             * <account_id>7449</account_id>
-             * <displayname>Teravus Ousley</displayname></body></level0>
-            */
-        }
-
-        public Hashtable FreeSwitchConfigHTTPHandler(Hashtable request)
-        {
-            m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchConfigHTTPHandler called with {0}", (string)request["body"]);
-
-            Hashtable response = new Hashtable();
-            response["str_response_string"] = string.Empty;
-            // all the params come as NVPs in the request body
-            Hashtable requestBody = parseRequestBody((string) request["body"]);
-
-            // is this a dialplan or directory request
-            string section = (string) requestBody["section"];
-
-            if (section == "directory")
-                response = m_FreeSwitchDirectory.HandleDirectoryRequest(m_freeSwitchContext, m_freeSwitchRealm, requestBody);
-            else if (section == "dialplan")
-                response = m_FreeSwitchDialplan.HandleDialplanRequest(m_freeSwitchContext, m_freeSwitchRealm, requestBody);
-            else
-                m_log.WarnFormat("[FreeSwitchVoice]: section was {0}", section);
-
-            // XXX: re-generate dialplan:
-            //      - conf == region UUID
-            //      - conf number = region port
-            //      -> TODO Initialise(): keep track of regions via events
-            //      re-generate accounts for all avatars
-            //      -> TODO Initialise(): keep track of avatars via events
-            Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline);
-
-            m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchConfigHTTPHandler return {0}",normalizeEndLines.Replace(((string)response["str_response_string"]), ""));
-            return response;
         }
 
         public Hashtable parseRequestBody(string body)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6d8e558365..dee0d9a8b8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9283,7 +9283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 switch (data)
                 {
-                    case 5: // DATA_SIM_POS
+                    case ScriptBaseClass.DATA_SIM_POS:
                         if (info == null)
                         {
                             ScriptSleep(1000);
@@ -9294,13 +9294,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             info.RegionLocY,
                             0).ToString();
                         break;
-                    case 6: // DATA_SIM_STATUS
+                    case ScriptBaseClass.DATA_SIM_STATUS:
                         if (info != null)
                             reply = "up"; // Duh!
                         else
                             reply = "unknown";
                         break;
-                    case 7: // DATA_SIM_RATING
+                    case ScriptBaseClass.DATA_SIM_RATING:
                         if (info == null)
                         {
                             ScriptSleep(1000);
@@ -9316,7 +9316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         else
                             reply = "UNKNOWN";
                         break;
-                    case 128:
+                    case ScriptBaseClass.DATA_SIM_RELEASE:
                         if (ossl != null)
                             ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData");
                         reply = "OpenSim";
diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
index 150df45cb2..da56b8778d 100644
--- a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
+++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
@@ -35,6 +35,8 @@ using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 using log4net;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Server.Handlers.Freeswitch
 {
@@ -67,12 +69,16 @@ namespace OpenSim.Server.Handlers.Freeswitch
                     ServerUtils.LoadPlugin<IFreeswitchService>(freeswitchService, args);
 
             server.AddHTTPHandler(String.Format("{0}/freeswitch-config", m_freeSwitchAPIPrefix), FreeSwitchConfigHTTPHandler);
+            server.AddHTTPHandler(String.Format("{0}/region-config", m_freeSwitchAPIPrefix), RegionConfigHTTPHandler);
         }
 
         public Hashtable FreeSwitchConfigHTTPHandler(Hashtable request)
         {
             Hashtable response = new Hashtable();
             response["str_response_string"] = string.Empty;
+            response["content_type"] = "text/plain";
+            response["keepalive"] = false;
+            response["int_response_code"] = 500;
 
             Hashtable requestBody = ParseRequestBody((string) request["body"]);
 
@@ -105,5 +111,18 @@ namespace OpenSim.Server.Handlers.Freeswitch
 
             return bodyParams;
         }
+
+        public Hashtable RegionConfigHTTPHandler(Hashtable request)
+        {
+            Hashtable response = new Hashtable();
+            response["content_type"] = "text/json";
+            response["keepalive"] = false;
+            response["int_response_code"] = 200;
+
+            response["str_response_string"] = m_FreeswitchService.GetJsonConfig();
+
+            return response;
+        }
+
     }
 }
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index b62a65aad5..fe6f5cd503 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using System.Collections;
 
 namespace OpenSim.Services.FreeswitchService
@@ -384,5 +385,22 @@ namespace OpenSim.Services.FreeswitchService
              
             return response;
         }
+
+        public string GetJsonConfig()
+        {
+            OSDMap map = new OSDMap(9);
+
+            map.Add("Realm", m_freeSwitchRealm);
+            map.Add("SIPProxy", m_freeSwitchSIPProxy);
+            map.Add("AttemptUseSTUN", m_freeSwitchAttemptUseSTUN);
+            map.Add("EchoServer", m_freeSwitchEchoServer);
+            map.Add("EchoPort", m_freeSwitchEchoPort);
+            map.Add("DefaultWellKnownIP", m_freeSwitchDefaultWellKnownIP);
+            map.Add("DefaultTimeout", m_freeSwitchDefaultTimeout);
+            map.Add("Context", m_freeSwitchContext);
+            map.Add("APIPrefix", m_freeSwitchAPIPrefix);
+
+            return OSDParser.SerializeJsonString(map);
+        }
     }
 }
diff --git a/OpenSim/Services/Interfaces/IFreeswitchService.cs b/OpenSim/Services/Interfaces/IFreeswitchService.cs
index 2b3ffeb8a4..e7941d5406 100644
--- a/OpenSim/Services/Interfaces/IFreeswitchService.cs
+++ b/OpenSim/Services/Interfaces/IFreeswitchService.cs
@@ -35,5 +35,6 @@ namespace OpenSim.Services.Interfaces
     {
         Hashtable HandleDirectoryRequest(Hashtable requestBody);
         Hashtable HandleDialplanRequest(Hashtable requestBody);
+        string GetJsonConfig();
     }
 }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9d348548c0..988831fd4a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -580,44 +580,33 @@
 [FreeSwitchVoice]
     ;; In order for this to work you need a functioning FreeSWITCH PBX set up.
     ;; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
-    ; enabled = false
+    ; Enabled = false
 
-    ;; FreeSWITCH server is going to contact us and ask us all sorts of things
-    ; freeswitch_server_user = freeswitch
-    ; freeswitch_server_pass = password
-    ; freeswitch_api_prefix = /api
+    ;; You need to load a local service for a standalone, and a remote service
+    ;; for a grid region. Use one of the lines below, as appropriate
+    ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService
+    ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector
 
-    ;; external IP address of your OpenSim voice enabled region
-    ;; note: all regions running on same OpenSim.exe will be enabled
-    ; freeswitch_service_server = ip.address.of.your.sim
+    ;; If using a remote module, specify the server URL
+    ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi
 
-    ;; this should be the same port the region listens on
-    ; freeswitch_service_port = 9000
-    ; freeswitch_realm = ip.address.of.freeswitch.server
-    ; freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
+[FreeswitchService]
+    ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
+    ;; !!!!!!STANDALONE ONLY!!!!!!
+    ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
+    ;; IP of your FS server
+    ;ServerAddress = 85.25.142.92
 
-    ;; STUN = Simple Traversal of UDP through NATs
-    ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
-    ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk
-    ; freeswitch_attempt_stun = false
-    ; freeswitch_stun_server = ip.address.of.stun.server
-    ; freeswitch_echo_server = ip.address.of.freeswitch.server
-    ; freeswitch_echo_port = 50505
-    ; freeswitch_well_known_ip = ip.address.of.freeswitch.server
-
-    ;; Type the address of your http server here, hostname is allowed.
-    ;; This is provided so you can specify a hostname
-    ;; This is used by client for account verification. By default, it's the
-    ;; same as the freeswitch service server.
-    ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server
-
-    ;; Timeouts
-    ; freeswitch_default_timeout = 5000
-    ; freeswitch_subscribe_retry = 120
-
-    ;; Misc
-    ; freeswitch_password_reset_url =
+    ;; All other options are - well - optional
+    ; Realm = "127.0.0.1"
+    ; SIPProxy = "127.0.0.1:5060"
+    ; EchoServer = "127.0.0.1"
+    ; EchoPort = 50505
+    ; AttemptSTUN = "false"
+    ; DefaultTimeout = 5000
+    ; Context = "default"
+    ; UserName = "freeswitch"
+    ; Password = "password"
 
 [Groups]
     ;# {Enabled} {} {Enable groups?} {true false} false
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 14998d4d3f..b12e05b398 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -70,11 +70,11 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [FreeswitchService]
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
     ;; IP of your FS server
-    ; FreeswitchService = 127.0.0.1
+    ; ServerAddress = 127.0.0.1
 
     ;; All other options are - well - optional
-    ; Realm = 1"27.0.0.1"
-    ; SIPProxy = 1"27.0.0.1:5060"
+    ; Realm = "127.0.0.1"
+    ; SIPProxy = "127.0.0.1:5060"
     ; EchoServer = "127.0.0.1"
     ; EchoPort = 50505
     ; AttemptSTUN = "false"
diff --git a/prebuild.xml b/prebuild.xml
index db9d50271e..85b31da31a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1053,6 +1053,7 @@
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>