corrade-vassal – Diff between revs 13 and 16

Subversion Repositories:

?pathlinks?

Rev 13 – Rev 17 – Go to most recent revision – Details – Blame – Last modification – View Log

 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http.Headers;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
         public static volatile int regionsStateCheckIndex;
         public static VassalConfiguration vassalConfiguration = new VassalConfiguration();
         public static Vassal vassalForm;
         public static readonly object ClientInstanceTeleportLock = new object();
         public static readonly object RegionsStateCheckLock = new object();
+        public static Web.wasHTTPClient HTTPClient;
+        /// <summary>
+        ///     Corrade version.
+        /// </summary>
+        public static readonly string VASSAL_VERSION = Assembly.GetEntryAssembly().GetName().Version.ToString();
         /// <summary>
         ///     Corrade's input filter function.
         /// </summary>
         private static readonly Func<string, string> wasInput = o =>
+        {
             if (string.IsNullOrEmpty(o)) return string.Empty;
-            foreach (Filter filter in vassalConfiguration.InputFilters)
+            foreach (var filter in vassalConfiguration.InputFilters)
+            {
                 switch (filter)
+                {
         /// </summary>
         private static readonly Func<string, string> wasOutput = o =>
+        {
             if (string.IsNullOrEmpty(o)) return string.Empty;
-            foreach (Filter filter in vassalConfiguration.OutputFilters)
+            foreach (var filter in vassalConfiguration.OutputFilters)
+            {
                 switch (filter)
+                {
                     case Filter.RFC1738:
         private static readonly Action updateCurrentRegionName = () =>
+        {
             try
             {
-                string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                     KeyValue.Escape(new Dictionary<string, string>
+                    {
                         {"command", "getregiondata"},
                         {"group", vassalConfiguration.Group},
                         {"password", vassalConfiguration.Password},
                         {"data", "Name"}
-                    }, wasOutput), 60000);
+                    }, wasOutput)).Result);
                 bool success;
                 if (string.IsNullOrEmpty(result) ||
                     !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
+                {
+        {
             InitializeComponent();
             vassalForm = this;
+        }
-        ///////////////////////////////////////////////////////////////////////////
-        //    Copyright (C) 2014 Wizardry and Steamworks - License: GNU GPLv3    //
-        ///////////////////////////////////////////////////////////////////////////
-        /// <summary>
-        ///     Sends a post request to an URL with set key-value pairs.
-        /// </summary>
-        /// <param name="URL">the url to send the message to</param>
-        /// <param name="message">key-value pairs to send</param>
-        /// <param name="millisecondsTimeout">the time in milliseconds for the request to timeout</param>
-        private static string wasPOST(string URL, Dictionary<string, string> message, uint millisecondsTimeout)
+        private void ShowToolTip(object sender, EventArgs e)
-        {
-            try
-            {
-                HttpWebRequest request = (HttpWebRequest) WebRequest.Create(URL);
-                request.UserAgent = VASSAL_CONSTANTS.USER_AGENT;
-                request.Proxy = WebRequest.DefaultWebProxy;
+        {
-                request.Pipelined = true;
-                request.KeepAlive = true;
-                request.Timeout = (int) millisecondsTimeout;
-                request.ReadWriteTimeout = (int) millisecondsTimeout;
-                request.AllowAutoRedirect = true;
-                request.AllowWriteStreamBuffering = true;
-                request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-                request.Method = WebRequestMethods.Http.Post;
-                // set the content type based on chosen output filers
-                switch (vassalConfiguration.OutputFilters.Last())
-                {
-                    case Filter.RFC1738:
-                        request.ContentType = VASSAL_CONSTANTS.CONTENT_TYPE.WWW_FORM_URLENCODED;
-                        break;
-                    default:
-                        request.ContentType = VASSAL_CONSTANTS.CONTENT_TYPE.TEXT_PLAIN;
+            vassalForm.BeginInvoke(
-                        break;
-                }
-                // send request
-                using (Stream requestStream = request.GetRequestStream())
-                {
-                    using (StreamWriter dataStream = new StreamWriter(requestStream))
-                    {
-                        dataStream.Write(KeyValue.Encode(message));
-                    }
-                }
-                // read response
-                using (HttpWebResponse response = (HttpWebResponse) request.GetResponse())
+                (Action)(() =>
                 {
+                    PictureBox pictureBox = sender as PictureBox;
-                    using (Stream responseStream = response.GetResponseStream())
+                    if (pictureBox != null)
-                    {
-                        if (responseStream != null)
-                        {
-                            using (
+                    {
-                                StreamReader streamReader = new StreamReader(responseStream))
-                            {
-                                return streamReader.ReadToEnd();
-                            }
                         toolTip1.Show(toolTip1.GetToolTip(pictureBox), pictureBox);
                     }
-                }
-            }
-            catch (Exception)
-            {
-            }
-            return null;
+                }));
+        }
         private void RegionSelected(object sender, EventArgs e)
                     estateTopTabTimer.Stop();
                     estateTexturesTabTimer.Stop();
                     Monitor.Enter(ClientInstanceTeleportLock);
-                    string selectedRegionName = string.Empty;
+                    var selectedRegionName = string.Empty;
-                    Vector3 selectedRegionPosition = Vector3.Zero;
+                    var selectedRegionPosition = Vector3.Zero;
-                    bool startTeleport = false;
+                    var startTeleport = false;
                     vassalForm.Invoke((MethodInvoker) (() =>
+                    {
-                        ListViewItem listViewItem = LoadedRegionsBox.SelectedItem as ListViewItem;
+                        var listViewItem = LoadedRegionsBox.SelectedItem as ListViewItem;
                         switch (listViewItem != null && LoadedRegionsBox.SelectedIndex != -1)
+                        {
                             case true:
                     }));
                     // Pause for teleport (10 teleports / 15s allowed).
                     Thread.Sleep(700);
-                    int elapsedSeconds = 0;
+                    var elapsedSeconds = 0;
-                    Timer teleportTimer = new Timer(TimeSpan.FromSeconds(1).TotalMilliseconds);
+                    var teleportTimer = new Timer(TimeSpan.FromSeconds(1).TotalMilliseconds);
                     teleportTimer.Elapsed += (o, p) =>
+                    {
                         vassalForm.Invoke((MethodInvoker) (() =>
                                           vassalConfiguration.TeleportTimeout)), 100);
                         }));
                     };
                     teleportTimer.Start();
                     string result = null;
-                    ManualResetEvent receivedPOST = new ManualResetEvent(false);
+                    var receivedPOST = new ManualResetEvent(false);
                     new Thread(() =>
+                    {
-                        result = wasInput(wasPOST(vassalConfiguration.HTTPServerURL,
+                        result = wasInput(Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "teleport"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"region", selectedRegionName},
                                 {"position", selectedRegionPosition.ToString()},
                                 {"fly", "True"}
-                            }, wasOutput), vassalConfiguration.TeleportTimeout));
+                            }, wasOutput)).Result));
                         receivedPOST.Set();
                     }) {IsBackground = true}.Start();
                     receivedPOST.WaitOne((int) vassalConfiguration.TeleportTimeout, false);
                     teleportTimer.Stop();
                     switch (!string.IsNullOrEmpty(result) && KeyValue.Get("success", result) == "True")
                     vassalForm.BeginInvoke((MethodInvoker) (() =>
+                    {
                         vassalForm.StatusProgress.Value = 100;
                         vassalForm.RegionTeleportGroup.Enabled = true;
                         // Set the map image to the loading spinner.
-                        Assembly thisAssembly = Assembly.GetExecutingAssembly();
+                        var thisAssembly = Assembly.GetExecutingAssembly();
-                        Stream file =
+                        var file =
                             thisAssembly.GetManifestResourceStream("Vassal.img.loading.gif");
                         switch (file != null)
+                        {
                             case true:
                                 vassalForm.Invoke((MethodInvoker) (() =>
+        }
         private void SettingsRequested(object sender, EventArgs e)
+        {
             vassalForm.BeginInvoke((MethodInvoker) (() => { VassalStatusGroup.Enabled = false; }));
-            SettingsForm settingsForm = new SettingsForm {TopMost = true};
+            var settingsForm = new SettingsForm {TopMost = true};
             settingsForm.Show();
+        }
+            {
                 // Load the configuration.
                 VassalConfiguration.Load(VASSAL_CONSTANTS.VASSAL_CONFIGURATION_FILE, ref vassalConfiguration);
                 // Apply settings
                 RegionRestartDelayBox.Text = vassalConfiguration.RegionRestartDelay.ToString(Utils.EnUsCulture);
+                // HTTP
+                string mediaType;
+                switch (vassalConfiguration.InputFilters.LastOrDefault())
+                {
+                    case Filter.RFC1738:
+                        mediaType = @"application/x-www-form-urlencoded";
+                        break;
+                    default:
+                        mediaType = @"text/plain";
+                        break;
+                }
+                // Create HTTP Client
+                Vassal.HTTPClient = new Web.wasHTTPClient(new ProductInfoHeaderValue(@"Vassal",
+                    Vassal.VASSAL_VERSION), new CookieContainer(), mediaType, vassalConfiguration.ServicesTimeout);
+            }
             // Get all the regions if they exist.
             if (File.Exists(VASSAL_CONSTANTS.VASSAL_REGIONS))
+            {
                 Vector3 localPosition;
-                List<KeyValuePair<string, Vector3>> ConfiguredRegions = new List<KeyValuePair<string, Vector3>>(
+                var ConfiguredRegions = new List<KeyValuePair<string, Vector3>>(
                     File.ReadAllLines(VASSAL_CONSTANTS.VASSAL_REGIONS)
                         .Select(o => new List<string>(CSV.ToEnumerable(o)))
                         .Where(o => o.Count == 2)
                         .ToDictionary(o => o.First(),
                 LoadedRegionsBox.Items.AddRange(
                     ConfiguredRegions.Select(o => (object) new ListViewItem {Text = o.Key, Tag = o.Value})
                         .ToArray());
                 // Populate the batch restart grid view.
                 BatchRestartGridView.Rows.Clear();
-                foreach (KeyValuePair<string, Vector3> data in ConfiguredRegions)
+                foreach (var data in ConfiguredRegions)
+                {
                     BatchRestartGridView.Rows.Add(data.Key, data.Value.ToString());
+                }
+                // Populate the batch covenant grid view.
+                BatchSetCovenantGridView.Rows.Clear();
+                foreach (var data in ConfiguredRegions)
+                {
+                    BatchSetCovenantGridView.Rows.Add(data.Key, data.Value.ToString());
+                }
                 // Populate the regions state grid view.
-                foreach (KeyValuePair<string, Vector3> data in ConfiguredRegions)
+                foreach (var data in ConfiguredRegions)
+                {
                     RegionsStateGridView.Rows.Add(data.Key, "Check pening...");
+                }
+            }
                 if (!Monitor.TryEnter(ClientInstanceTeleportLock))
                     return;
                 try
+                {
                     // Check Corrade connection status.
-                    TcpClient tcpClient = new TcpClient();
+                    var tcpClient = new TcpClient();
-                    Uri uri = new Uri(vassalConfiguration.HTTPServerURL);
+                    var uri = new Uri(vassalConfiguration.HTTPServerURL);
                     tcpClient.Connect(uri.Host, uri.Port);
                     // port open
                     vassalForm.BeginInvoke((MethodInvoker) (() =>
+                    {
                         vassalForm.CurrentRegionAt.Visible = true;
                         vassalForm.CurrentRegionName.Visible = true;
-                        Assembly thisAssembly = Assembly.GetExecutingAssembly();
+                        var thisAssembly = Assembly.GetExecutingAssembly();
-                        Stream file =
+                        var file =
                             thisAssembly.GetManifestResourceStream("Vassal.img.online.png");
                         switch (file != null)
+                        {
                             case true:
                                 vassalForm.BeginInvoke((MethodInvoker) (() =>
                     // port closed
                     vassalForm.BeginInvoke((MethodInvoker) (() =>
+                    {
                         vassalForm.CurrentRegionAt.Visible = false;
                         vassalForm.CurrentRegionName.Visible = false;
-                        Assembly thisAssembly = Assembly.GetExecutingAssembly();
+                        var thisAssembly = Assembly.GetExecutingAssembly();
-                        Stream file =
+                        var file =
                             thisAssembly.GetManifestResourceStream("Vassal.img.offline.png");
                         switch (file != null)
+                        {
                             case true:
                                 vassalForm.BeginInvoke((MethodInvoker) (() =>
+                }
                 try
+                {
                     // Get the simulator name and if we are an estate manager.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getregiondata"},
                             {"group", vassalConfiguration.Group},
+                                {
                                     "Name",
                                     "IsEstateManager"
                                 })
+                            }
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     bool success;
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
-                    List<string> data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
+                    var data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
                     if (data.Count.Equals(0))
                         throw new Exception();
             // Start the overview timer.
             overviewTabTimer.Elapsed += (o, p) =>
+            {
                 // Do not do anything in case the tab is not selected.
-                bool run = false;
+                var run = false;
                 vassalForm.Invoke((MethodInvoker) (() => { run = Tabs.SelectedTab.Equals(OverviewTab); }));
                 if (!run)
                 overviewTabTimer.Stop();
                 try
+                {
                     // Start measuring the lag to Corrade.
-                    Stopwatch stopWatch = new Stopwatch();
+                    var stopWatch = new Stopwatch();
                     stopWatch.Start();
                     // Get the statistics.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getregiondata"},
                             {"group", vassalConfiguration.Group},
                                     "PhysicsTime",
                                     "NetTime",
                                     "AvatarPositions"
                                 })
+                            }
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     stopWatch.Stop();
                     bool success;
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
-                    List<string> data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
+                    var data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
                     if (data.Count.Equals(0))
                         throw new Exception();
                     }));
                     // Get avatar positions.
                     // Pattern: [...], X, 10, Y, 63, Z, 200, [...], X, 52, Y, 73, Z, 55, [...[...]]
                     float X = 0, Y = 0, Z = 0;
-                    List<Vector3> positions = data.Select((x, i) => new {Item = x, Index = i})
+                    var positions = data.Select((x, i) => new {Item = x, Index = i})
                         .Where(x => x.Item.Equals("X") || x.Item.Equals("Y") || x.Item.Equals("Z"))
                         .Select(z => data[z.Index + 1]).Select((x, i) => new {Value = x, Index = i})
                         .GroupBy(x => x.Index/3)
                         .Select(x => x.Select(v => v.Value).ToList())
                                 float.TryParse(x[2], out Z))
                         .Select(x => new Vector3(X, Y, Z))
                         .ToList();
                     // Get the map image.
-                    result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getgridregiondata"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"data", "MapImageID"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
                     data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
                     if (!data.Count.Equals(2))
                         throw new Exception();
-                    result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "download"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"item", data.Last()},
                             {"type", "Texture"},
                             {"format", "Jpeg"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
-                    byte[] mapImageBytes = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
+                    var mapImageBytes = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
                     Image mapImage;
-                    using (MemoryStream memoryStream = new MemoryStream(mapImageBytes, 0, mapImageBytes.Length))
+                    using (var memoryStream = new MemoryStream(mapImageBytes, 0, mapImageBytes.Length))
+                    {
                         mapImage = Image.FromStream(memoryStream);
                     }
                     // Draw the avatars onto the map.
-                    Graphics mapGraphics = Graphics.FromImage(mapImage);
+                    var mapGraphics = Graphics.FromImage(mapImage);
-                    foreach (Vector3 position in positions)
+                    foreach (var position in positions)
+                    {
             overviewTabTimer.Start();
             regionsStateTabTimer.Elapsed += (o, p) =>
+            {
                 // Do not do anything in case the tab is not selected.
-                bool run = false;
+                var run = false;
                 vassalForm.Invoke((MethodInvoker) (() => { run = Tabs.SelectedTab.Equals(RegionsStateTab); }));
                 if (!run)
                 regionsStateTabTimer.Stop();
                 try
+                {
-                    string regionName = string.Empty;
+                    var regionName = string.Empty;
                     vassalForm.Invoke((MethodInvoker) (() =>
+                    {
                         regionName =
                     if (string.IsNullOrEmpty(regionName))
                         throw new Exception();
                     // Get the region status.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getgridregiondata"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"region", regionName},
                             {"data", "Access"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     bool success;
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
-                    List<string> data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
+                    var data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
                     if (!data.Count.Equals(2))
                         throw new Exception();
-                    string status = data.Last();
+                    var status = data.Last();
             // Start the top scores timer.
             estateTopTabTimer.Elapsed += (o, p) =>
+            {
                 // Do not do anything in case the tab is not selected.
-                bool run = false;
+                var run = false;
                 vassalForm.Invoke((MethodInvoker) (() => { run = Tabs.SelectedTab.Equals(EstateTopTab); }));
                 if (!run)
                 estateTopTabTimer.Stop();
                 try
+                {
                     // Get the top scripts.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getregiontop"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"type", "scripts"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     bool success;
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
-                    HashSet<List<string>> data =
+                    var data =
                         new HashSet<List<string>>(CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
                             .Select((x, i) => new {Index = i, Value = x})
                     vassalForm.Invoke((MethodInvoker) (() =>
+                    {
                         // Remove rows that are not in the data update.
                         foreach (
-                            int index in
+                            var index in
                                 TopScriptsGridView.Rows.AsParallel().Cast<DataGridViewRow>()
                                     .Where(
                                         topScriptsRow =>
                                             !data.Any(q => q[2].Equals(topScriptsRow.Cells["TopScriptsUUID"].Value)))
                                     .Select(q => q.Index))
+                        {
                             TopScriptsGridView.Rows.RemoveAt(index);
+                        }
                         // Now update or add new data.
-                        foreach (List<string> dataComponents in data.Where(q => q.Count.Equals(5)))
+                        foreach (var dataComponents in data.Where(q => q.Count.Equals(5)))
                         {
-                            DataGridViewRow row =
+                            var row =
                                 TopScriptsGridView.Rows.AsParallel()
                                     .Cast<DataGridViewRow>()
                                     .FirstOrDefault(q => q.Cells["TopScriptsUUID"].Value.Equals(dataComponents[2]));
                             switch (row != null)
+                            }
+                        }
                     }));
                     // Get the top colliders.
-                    result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getregiontop"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"type", "colliders"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result) ||
                     vassalForm.Invoke((MethodInvoker) (() =>
+                    {
                         // Remove rows that are not in the data update.
                         foreach (
-                            int index in
+                            var index in
                                 TopCollidersGridView.Rows.AsParallel().Cast<DataGridViewRow>()
                                     .Where(
                                         topCollidersRow =>
                                             !data.Any(q => q[2].Equals(topCollidersRow.Cells["TopCollidersUUID"].Value)))
                                     .Select(q => q.Index))
+                        {
                             TopCollidersGridView.Rows.RemoveAt(index);
+                        }
                         // Now update or add new data.
-                        foreach (List<string> dataComponents in data.Where(q => q.Count.Equals(5)))
+                        foreach (var dataComponents in data.Where(q => q.Count.Equals(5)))
                         {
-                            DataGridViewRow row =
+                            var row =
                                 TopCollidersGridView.Rows.AsParallel()
                                     .Cast<DataGridViewRow>()
                                     .FirstOrDefault(q => q.Cells["TopCollidersUUID"].Value.Equals(dataComponents[2]));
                             switch (row != null)
             // Start the resident list timer.
             residentListTabTimer.Elapsed += (o, p) =>
+            {
                 // Do not do anything in case the tab is not selected.
-                bool run = false;
+                var run = false;
                 vassalForm.Invoke((MethodInvoker) (() => { run = Tabs.SelectedTab.Equals(ResidentListTab); }));
                 if (!run)
                 residentListTabTimer.Stop();
                 try
+                {
                     // Get the avatar positions.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getavatarpositions"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"entity", "region"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     bool success;
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
-                    HashSet<List<string>> data =
+                    var data =
                         new HashSet<List<string>>(CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
                             .Select((x, i) => new {Index = i, Value = x})
                     vassalForm.Invoke((MethodInvoker) (() =>
+                    {
                         // Remove rows that are not in the data update.
                         foreach (
-                            int index in
+                            var index in
                                 ResidentListGridView.Rows.AsParallel().Cast<DataGridViewRow>()
                                     .Where(
                                         residentListRow =>
                                             !data.Any(q => q[1].Equals(residentListRow.Cells["ResidentListUUID"].Value)))
                                     .Select(q => q.Index))
+                        {
                             ResidentListGridView.Rows.RemoveAt(index);
+                        }
                         // Now update or add new data.
-                        foreach (List<string> dataComponents in data.Where(q => q.Count.Equals(3)))
+                        foreach (var dataComponents in data.Where(q => q.Count.Equals(3)))
                         {
-                            DataGridViewRow row =
+                            var row =
                                 ResidentListGridView.Rows.AsParallel()
                                     .Cast<DataGridViewRow>()
                                     .FirstOrDefault(q => q.Cells["ResidentListUUID"].Value.Equals(dataComponents[1]));
                             switch (row != null)
             residentListTabTimer.Start();
             estateTexturesTabTimer.Elapsed += (o, p) =>
+            {
                 // Do not do anything in case the tab is not selected.
-                bool run = false;
+                var run = false;
                 vassalForm.Invoke((MethodInvoker) (() => { run = Tabs.SelectedTab.Equals(EstateTexturesTab); }));
                 if (!run)
                 estateTexturesTabTimer.Stop();
                 try
+                {
                     // Get the region terrain texture UUIDs.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getregionterraintextures"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     bool success;
                     if (string.IsNullOrEmpty(result) ||
                         !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception();
-                    List<string> data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
+                    var data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
                     if (!data.Count.Equals(4))
+                        }
                     }));
                     Parallel.ForEach(Enumerable.Range(0, 4), i =>
                     {
-                        result = wasPOST(vassalConfiguration.HTTPServerURL,
+                        result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "download"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"item", data[i]},
                                 {"type", "Texture"},
                                 {"format", "Jpeg"}
-                            }, wasOutput), vassalConfiguration.DataTimeout);
+                            }, wasOutput)).Result);
                         if (string.IsNullOrEmpty(result) ||
                             !bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                             return;
-                        byte[] mapImageBytes = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
+                        var mapImageBytes = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
-                        using (MemoryStream memoryStream = new MemoryStream(mapImageBytes, 0, mapImageBytes.Length))
+                        using (var memoryStream = new MemoryStream(mapImageBytes, 0, mapImageBytes.Length))
+                        {
         private void RequestedEditRegions(object sender, EventArgs e)
+        {
             // Clear any selection.
             LoadedRegionsBox.SelectedIndex = -1;
-            RegionEditForm regionEditForm = new RegionEditForm {TopMost = true};
+            var regionEditForm = new RegionEditForm {TopMost = true};
             regionEditForm.Show();
+        }
             vassalForm.BeginInvoke((MethodInvoker) (() =>
+            {
                 switch (vassalForm.ExportCSVDialog.ShowDialog())
+                {
                     case DialogResult.OK:
-                        string file = vassalForm.ExportCSVDialog.FileName;
+                        var file = vassalForm.ExportCSVDialog.FileName;
                         new Thread(() =>
+                        {
                             vassalForm.BeginInvoke((MethodInvoker) (() =>
+                            {
                                 try
+                                {
                                     vassalForm.StatusText.Text = @"exporting...";
                                     vassalForm.StatusProgress.Value = 0;
-                                    using (StreamWriter streamWriter = new StreamWriter(file, false, Encoding.UTF8))
+                                    using (var streamWriter = new StreamWriter(file, false, Encoding.UTF8))
+                                    {
                                         foreach (DataGridViewRow topScriptsRow in TopScriptsGridView.Rows)
+                                        {
                                             streamWriter.WriteLine(CSV.FromEnumerable(new[]
             vassalForm.BeginInvoke((MethodInvoker) (() =>
+            {
                 switch (vassalForm.ExportCSVDialog.ShowDialog())
+                {
                     case DialogResult.OK:
-                        string file = vassalForm.ExportCSVDialog.FileName;
+                        var file = vassalForm.ExportCSVDialog.FileName;
                         new Thread(() =>
+                        {
                             vassalForm.BeginInvoke((MethodInvoker) (() =>
+                            {
                                 try
+                                {
                                     vassalForm.StatusText.Text = @"exporting...";
                                     vassalForm.StatusProgress.Value = 0;
-                                    using (StreamWriter streamWriter = new StreamWriter(file, false, Encoding.UTF8))
+                                    using (var streamWriter = new StreamWriter(file, false, Encoding.UTF8))
+                                    {
                                         foreach (DataGridViewRow topCollidersRow in TopCollidersGridView.Rows)
+                                        {
                                             streamWriter.WriteLine(CSV.FromEnumerable(new[]
                         break;
                     default:
                         topScriptsRowRegex = new Regex(@".+?", RegexOptions.Compiled);
                         break;
+                }
-                foreach (DataGridViewRow topScriptsRow in TopScriptsGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                foreach (var topScriptsRow in TopScriptsGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                {
                     topScriptsRow.Visible =
                         topScriptsRowRegex.IsMatch(topScriptsRow.Cells["TopScriptsScore"].Value.ToString()) ||
                         topScriptsRowRegex.IsMatch(
                             topScriptsRow.Cells["TopScriptsTaskName"].Value.ToString()) ||
                     default:
                         topCollidersRowRegex = new Regex(@".+?", RegexOptions.Compiled);
                         break;
+                }
                 foreach (
-                    DataGridViewRow topCollidersRow in TopCollidersGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                    var topCollidersRow in TopCollidersGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                {
                     topCollidersRow.Visible =
                         topCollidersRowRegex.IsMatch(topCollidersRow.Cells["TopCollidersScore"].Value.ToString()) ||
                         topCollidersRowRegex.IsMatch(
                             topCollidersRow.Cells["TopCollidersTaskName"].Value.ToString()) ||
                 vassalForm.ReturnTopScriptsButton.Enabled = false;
                 RegionTeleportGroup.Enabled = false;
             }));
             // Enqueue all the UUIDs to return.
-            Queue<KeyValuePair<UUID, Vector3>> returnUUIDs = new Queue<KeyValuePair<UUID, Vector3>>();
+            var returnUUIDs = new Queue<KeyValuePair<UUID, Vector3>>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 foreach (
-                    DataGridViewRow topScriptsRow in
+                    var topScriptsRow in
                         TopScriptsGridView.Rows.AsParallel()
                             .Cast<DataGridViewRow>()
                             .Where(o => o.Selected || o.Cells.Cast<DataGridViewCell>().Any(p => p.Selected)))
+                {
                 Monitor.Enter(ClientInstanceTeleportLock);
                 try
+                {
                     vassalForm.Invoke((MethodInvoker) (() => { vassalForm.StatusProgress.Value = 0; }));
-                    int totalObjects = returnUUIDs.Count;
+                    var totalObjects = returnUUIDs.Count;
                     do
+                    {
                         // Dequeue the first object.
-                        KeyValuePair<UUID, Vector3> objectData = returnUUIDs.Dequeue();
+                        var objectData = returnUUIDs.Dequeue();
                         vassalForm.Invoke(
                             (MethodInvoker)
                                 (() => { vassalForm.StatusText.Text = @"Returning object UUID: " + objectData.Key; }));
-                        string currentRegionName = string.Empty;
+                        var currentRegionName = string.Empty;
                         vassalForm.Invoke((MethodInvoker) (() => { currentRegionName = CurrentRegionName.Text; }));
                         // Teleport to the object.
-                        string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                        var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "teleport"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"position", objectData.Value.ToString()},
                                 {"region", currentRegionName},
                                 {"fly", "True"}
-                            }, wasOutput), vassalConfiguration.TeleportTimeout);
+                            }, wasOutput)).Result);
                         if (string.IsNullOrEmpty(result))
+                        {
                             vassalForm.Invoke(
                                 (MethodInvoker)
                                     (() => { vassalForm.StatusText.Text = @"Error communicating with Corrade."; }));
                             continue;
+                        }
                         // Return the object.
-                        result = wasPOST(vassalConfiguration.HTTPServerURL,
+                        result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "derez"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"item", objectData.Key.ToString()},
                                 {"range", "32"}, // maximal prim size = 64 - middle bounding box at half
                             case true:
                                 vassalForm.Invoke((MethodInvoker) (() =>
+                                {
                                     vassalForm.StatusText.Text = @"Returned object: " + objectData.Key;
                                     // Remove the row from the grid view.
-                                    DataGridViewRow row =
+                                    var row =
                                         TopScriptsGridView.Rows.AsParallel()
                                             .Cast<DataGridViewRow>()
                                             .FirstOrDefault(
                                                 o => o.Cells["TopScriptsUUID"].Value.Equals(objectData.Key.ToString()));
                                     if (row == null) return;
-                                    int i = row.Index;
+                                    var i = row.Index;
                                     TopScriptsGridView.Rows.RemoveAt(i);
                                 }));
                                 break;
                             case false:
                                 vassalForm.Invoke((MethodInvoker) (() =>
                 vassalForm.ReturnTopCollidersButton.Enabled = false;
                 RegionTeleportGroup.Enabled = false;
             }));
             // Enqueue all the UUIDs to return.
-            Queue<KeyValuePair<UUID, Vector3>> returnObjectUUIDQueue = new Queue<KeyValuePair<UUID, Vector3>>();
+            var returnObjectUUIDQueue = new Queue<KeyValuePair<UUID, Vector3>>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 foreach (
-                    DataGridViewRow topCollidersRow in
+                    var topCollidersRow in
                         TopCollidersGridView.Rows.AsParallel()
                             .Cast<DataGridViewRow>()
                             .Where(o => o.Selected || o.Cells.Cast<DataGridViewCell>().Any(p => p.Selected)))
+                {
                 Monitor.Enter(ClientInstanceTeleportLock);
                 try
+                {
                     vassalForm.Invoke((MethodInvoker) (() => { vassalForm.StatusProgress.Value = 0; }));
-                    int totalObjects = returnObjectUUIDQueue.Count;
+                    var totalObjects = returnObjectUUIDQueue.Count;
                     do
+                    {
                         // Dequeue the first object.
-                        KeyValuePair<UUID, Vector3> objectData = returnObjectUUIDQueue.Dequeue();
+                        var objectData = returnObjectUUIDQueue.Dequeue();
                         vassalForm.Invoke(
                             (MethodInvoker)
                                 (() => { vassalForm.StatusText.Text = @"Returning UUID: " + objectData.Key; }));
-                        string currentRegionName = string.Empty;
+                        var currentRegionName = string.Empty;
                         vassalForm.Invoke((MethodInvoker) (() => { currentRegionName = CurrentRegionName.Text; }));
                         // Teleport to the object.
-                        string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                        var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "teleport"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"position", objectData.Value.ToString()},
                                 {"region", currentRegionName},
                                 {"fly", "True"}
-                            }, wasOutput), vassalConfiguration.DataTimeout);
+                            }, wasOutput)).Result);
                         if (string.IsNullOrEmpty(result))
+                        {
                             vassalForm.Invoke(
                                 (MethodInvoker)
                                     (() => { vassalForm.StatusText.Text = @"Error communicating with Corrade."; }));
                             continue;
+                        }
                         // Return the object.
-                        result = wasPOST(vassalConfiguration.HTTPServerURL,
+                        result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "derez"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"item", objectData.Key.ToString()},
                                 {"range", "32"}, // maximal prim size = 64 - middle bounding box at half
                             case true:
                                 vassalForm.Invoke((MethodInvoker) (() =>
+                                {
                                     vassalForm.StatusText.Text = @"Returned object: " + objectData.Key;
                                     // Remove the row from the grid view.
-                                    DataGridViewRow row =
+                                    var row =
                                         TopCollidersGridView.Rows.AsParallel()
                                             .Cast<DataGridViewRow>()
                                             .FirstOrDefault(
                                                 o => o.Cells["TopCollidersUUID"].Value.Equals(objectData.Key.ToString()));
                                     if (row == null) return;
-                                    int i = row.Index;
+                                    var i = row.Index;
                                     TopCollidersGridView.Rows.RemoveAt(i);
                                 }));
                                 break;
                             case false:
                                 vassalForm.Invoke((MethodInvoker) (() =>
+        {
             // Block teleports and disable button.
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 vassalForm.BatchRestartButton.Enabled = false;
+                vassalForm.RegionRestartDelayBox.Enabled = false;
                 RegionTeleportGroup.Enabled = false;
             }));
             // Enqueue all the regions to restart.
-            Queue<KeyValuePair<string, Vector3>> restartRegionQueue = new Queue<KeyValuePair<string, Vector3>>();
+            var restartRegionQueue = new Queue<KeyValuePair<string, Vector3>>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 foreach (
-                    DataGridViewRow topCollidersRow in
+                    var topCollidersRow in
                         BatchRestartGridView.Rows.AsParallel()
                             .Cast<DataGridViewRow>()
                             .Where(o => o.Selected || o.Cells.Cast<DataGridViewCell>().Any(p => p.Selected)))
+                {
                     Vector3 objectPosition;
-                    string regionName = topCollidersRow.Cells["BatchRestartRegionName"].Value.ToString();
+                    var regionName = topCollidersRow.Cells["BatchRestartRegionName"].Value.ToString();
                     if (string.IsNullOrEmpty(regionName) ||
                         !Vector3.TryParse(topCollidersRow.Cells["BatchRestartPosition"].Value.ToString(),
                             out objectPosition))
                         continue;
             if (restartRegionQueue.Count.Equals(0))
+            {
                 vassalForm.Invoke((MethodInvoker) (() =>
+                {
                     vassalForm.BatchRestartButton.Enabled = true;
+                    vassalForm.RegionRestartDelayBox.Enabled = true;
                     RegionTeleportGroup.Enabled = true;
                 }));
                 return;
+            }
                 try
+                {
                     do
+                    {
                         // Dequeue the first object.
-                        KeyValuePair<string, Vector3> restartRegionData = restartRegionQueue.Dequeue();
+                        var restartRegionData = restartRegionQueue.Dequeue();
                         DataGridViewRow currentDataGridViewRow = null;
                         vassalForm.Invoke((MethodInvoker) (() =>
+                        {
                             currentDataGridViewRow = vassalForm.BatchRestartGridView.Rows.AsParallel()
                                 .Cast<DataGridViewRow>()
                         if (currentDataGridViewRow == null) continue;
                         try
+                        {
-                            bool success = false;
+                            var success = false;
                             string result;
                             // Retry to teleport to each region a few times.
-                            int teleportRetries = 3;
+                            var teleportRetries = 3;
                             do
+                            {
                                                                  teleportRetries.ToString(Utils.EnUsCulture) +
                                                                  @")";
                                 }));
                                 // Teleport to the region.
-                                result = wasPOST(vassalConfiguration.HTTPServerURL,
+                                result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                     KeyValue.Escape(new Dictionary<string, string>
+                                    {
                                         {"command", "teleport"},
                                         {"group", vassalConfiguration.Group},
                                         {"password", vassalConfiguration.Password},
                                         {"position", restartRegionData.Value.ToString()},
                                         {"region", restartRegionData.Key},
                                         {"fly", "True"}
-                                    }, wasOutput), vassalConfiguration.DataTimeout);
+                                    }, wasOutput)).Result);
                                 if (string.IsNullOrEmpty(result))
+                                {
                             } while (!success && !(--teleportRetries).Equals(0));
                             if (!success)
                                 throw new Exception("Failed to teleport to region.");
-                            result = wasPOST(vassalConfiguration.HTTPServerURL,
+                            result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                 KeyValue.Escape(new Dictionary<string, string>
+                                {
                                     {"command", "getregiondata"},
                                     {"group", vassalConfiguration.Group},
                                     {"password", vassalConfiguration.Password},
                                     {"data", "IsEstateManager"}
-                                }, wasOutput), vassalConfiguration.DataTimeout);
+                                }, wasOutput)).Result);
                             if (string.IsNullOrEmpty(result))
                                 throw new Exception("Error communicating with Corrade.");
                             if (!bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                                 throw new Exception("No success status could be retrieved.");
                             if (!success)
                                 throw new Exception("Could not retrieve estate rights.");
-                            List<string> data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
+                            var data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
                             if (!data.Count.Equals(2))
                                 throw new Exception("Could not retrieve estate rights.");
                             bool isEstateManager;
                             switch (
                                 bool.TryParse(data[data.IndexOf("IsEstateManager") + 1], out isEstateManager) &&
                                 isEstateManager)
+                            {
                                 case true: // we are an estate manager
-                                    result = wasPOST(vassalConfiguration.HTTPServerURL,
+                                    result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                         KeyValue.Escape(new Dictionary<string, string>
                                         {
                                             {"command", "restartregion"},
                                             {"group", vassalConfiguration.Group},
                                             {"password", vassalConfiguration.Password},
                                             {"action", "restart"},
+                                            {
+                                    {
                                         vassalForm.StatusText.Text = @"Region scheduled for restart.";
                                         currentDataGridViewRow.Selected = false;
                                         currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightGreen;
                                         foreach (
-                                            DataGridViewCell cell in
+                                            var cell in
                                                 currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                        {
                                             cell.ToolTipText = @"Region scheduled for restart.";
+                                        }
                                     }));
+                            {
                                 vassalForm.StatusText.Text = ex.Message;
                                 currentDataGridViewRow.Selected = false;
                                 currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightPink;
                                 foreach (
-                                    DataGridViewCell cell in
+                                    var cell in
                                         currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                {
                                     cell.ToolTipText = ex.Message;
+                                }
                             }));
                     Monitor.Exit(ClientInstanceTeleportLock);
                     // Allow teleports and enable button.
                     vassalForm.BeginInvoke((MethodInvoker) (() =>
+                    {
                         vassalForm.BatchRestartButton.Enabled = true;
+                        vassalForm.RegionRestartDelayBox.Enabled = true;
                         RegionTeleportGroup.Enabled = true;
                     }));
+                }
             })
             {IsBackground = true}.Start();
                     default:
                         residentListRowRegex = new Regex(@".+?", RegexOptions.Compiled);
                         break;
+                }
                 foreach (
-                    DataGridViewRow residentListRow in ResidentListGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                    var residentListRow in ResidentListGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                {
                     residentListRow.Visible =
                         residentListRowRegex.IsMatch(residentListRow.Cells["ResidentListName"].Value.ToString()) ||
                         residentListRowRegex.IsMatch(
                             residentListRow.Cells["ResidentListUUID"].Value.ToString()) ||
                 ResidentListBanGroup.Enabled = false;
                 RegionTeleportGroup.Enabled = false;
             }));
             // Enqueue all the agents to ban.
-            Queue<UUID> agentsQueue = new Queue<UUID>();
+            var agentsQueue = new Queue<UUID>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 foreach (
-                    DataGridViewRow residentListRow in
+                    var residentListRow in
                         ResidentListGridView.Rows.AsParallel()
                             .Cast<DataGridViewRow>()
                             .Where(o => o.Selected || o.Cells.Cast<DataGridViewCell>().Any(p => p.Selected)))
+                {
                 try
+                {
                     do
+                    {
                         // Dequeue the first object.
-                        UUID agentUUID = agentsQueue.Dequeue();
+                        var agentUUID = agentsQueue.Dequeue();
                         DataGridViewRow currentDataGridViewRow = null;
                         vassalForm.Invoke((MethodInvoker) (() =>
+                        {
                             currentDataGridViewRow = vassalForm.ResidentListGridView.Rows.AsParallel()
                                 .Cast<DataGridViewRow>()
                         if (currentDataGridViewRow == null) continue;
                         try
+                        {
-                            bool alsoBan = false;
+                            var alsoBan = false;
                             vassalForm.Invoke(
                                 (MethodInvoker) (() => { alsoBan = vassalForm.ResidentBanAllEstatesBox.Checked; }));
                             // Ban the resident.
-                            string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                            var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                 KeyValue.Escape(new Dictionary<string, string>
+                                {
                                     {"command", "setestatelist"},
                                     {"group", vassalConfiguration.Group},
                                     {"password", vassalConfiguration.Password},
                                     {"type", "ban"},
                                     {"action", "add"},
                                     {"agent", agentUUID.ToString()},
                                     {"all", alsoBan.ToString()}
-                                }, wasOutput), vassalConfiguration.DataTimeout);
+                                }, wasOutput)).Result);
+                                    {
                                         vassalForm.StatusText.Text = @"Resident banned.";
                                         currentDataGridViewRow.Selected = false;
                                         currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightGreen;
                                         foreach (
-                                            DataGridViewCell cell in
+                                            var cell in
                                                 currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                        {
                                             cell.ToolTipText = @"Resident banned.";
+                                        }
                                     }));
+                            {
                                 vassalForm.StatusText.Text = ex.Message;
                                 currentDataGridViewRow.Selected = false;
                                 currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightPink;
                                 foreach (
-                                    DataGridViewCell cell in
+                                    var cell in
                                         currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                {
                                     cell.ToolTipText = ex.Message;
+                                }
                             }));
                 Monitor.Enter(ClientInstanceTeleportLock);
                 try
+                {
                     // Get the map heights.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getterrainheight"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"entity", "region"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                         throw new Exception("No success status could be retrieved.");
                     if (!success)
                         throw new Exception("Could not get terrain heights.");
-                    List<double> heights = new List<double>();
+                    var heights = new List<double>();
-                    foreach (string map in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))))
+                    foreach (var map in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))))
+                    {
                         double height;
                         if (!double.TryParse(map, out height))
                             continue;
                         heights.Add(height);
+                    }
                     if (heights.Count.Equals(0))
                         throw new Exception("Could not get terrain heights.");
-                    double maxHeight = heights.Max();
+                    var maxHeight = heights.Max();
-                    using (Bitmap bitmap = new Bitmap(256, 256))
+                    using (var bitmap = new Bitmap(256, 256))
                     {
-                        foreach (int x in Enumerable.Range(1, 255))
+                        foreach (var x in Enumerable.Range(1, 255))
+                        {
-                            foreach (int y in Enumerable.Range(1, 255))
+                            foreach (var y in Enumerable.Range(1, 255))
+                            {
                                 bitmap.SetPixel(x, 256 - y,
                                     Color.FromArgb(
                                         Math.Max(
                                             (int) Numerics.MapValueToRange(heights[256*x + y], 0, maxHeight, 0, 255), 0),
 , 0));
+                            }
+                        }
-                        Bitmap closureBitmap = (Bitmap) bitmap.Clone();
+                        var closureBitmap = (Bitmap) bitmap.Clone();
                         vassalForm.BeginInvoke((MethodInvoker) (() =>
+                        {
                             switch (vassalForm.SavePNGFileDialog.ShowDialog())
+                            {
                                 case DialogResult.OK:
-                                    string file = vassalForm.SavePNGFileDialog.FileName;
+                                    var file = vassalForm.SavePNGFileDialog.FileName;
                                     new Thread(() =>
+                                    {
                 Monitor.Enter(ClientInstanceTeleportLock);
                 try
+                {
                     // Download the terrain.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "terrain"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"action", "get"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                         throw new Exception("No success status could be retrieved.");
                     if (!success)
                         throw new Exception("Could not download terrain.");
-                    byte[] data = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
+                    var data = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
                     vassalForm.BeginInvoke((MethodInvoker) (() =>
+                    {
                         switch (vassalForm.SaveRawFileDialog.ShowDialog())
+                        {
                             case DialogResult.OK:
-                                string file = vassalForm.SaveRawFileDialog.FileName;
+                                var file = vassalForm.SaveRawFileDialog.FileName;
                                 new Thread(() =>
+                                {
                     vassalForm.Invoke((MethodInvoker) (() =>
+                    {
                         switch (vassalForm.LoadRawFileDialog.ShowDialog())
+                        {
                             case DialogResult.OK:
-                                string file = vassalForm.LoadRawFileDialog.FileName;
+                                var file = vassalForm.LoadRawFileDialog.FileName;
                                 vassalForm.StatusText.Text = @"loading terrain...";
                                 vassalForm.StatusProgress.Value = 0;
                                 break;
+                        }
                     }));
                     // Upload the terrain.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "terrain"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"action", "set"},
                             {"data", Convert.ToBase64String(data)}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                         break;
                     default:
                         estateListRowRegex = new Regex(@".+?", RegexOptions.Compiled);
                         break;
+                }
-                foreach (DataGridViewRow estateListRow in EstateListGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                foreach (var estateListRow in EstateListGridView.Rows.AsParallel().Cast<DataGridViewRow>())
+                {
                     estateListRow.Visible =
                         estateListRowRegex.IsMatch(estateListRow.Cells["EstateListName"].Value.ToString());
+                }
             }));
+        }
         private void EstateListSelected(object sender, EventArgs e)
         {
-            string selectedEstateListType = string.Empty;
+            var selectedEstateListType = string.Empty;
-            bool queryEstateList = false;
+            var queryEstateList = false;
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 if (vassalForm.EstateListSelectBox.SelectedItem == null) return;
                 selectedEstateListType = vassalForm.EstateListSelectBox.SelectedItem.ToString();
                         EstateListsResidentsGroup.Enabled = false;
                         EstateListsGroupsGroup.Enabled = false;
                     }));
                     // Get the selected estate list.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getestatelist"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"type", selectedEstateListType}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                     if (!success)
                         throw new Exception("Could not retrieve estate list.");
                     vassalForm.Invoke((MethodInvoker) (() => { EstateListGridView.Rows.Clear(); }));
-                    foreach (List<string> data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
+                    foreach (var data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
                         .Where(x => !string.IsNullOrEmpty(x))
                         .Select((x, i) => new {Index = i, Value = x})
                         .GroupBy(x => x.Index/2)
+        }
         private void RequestRemoveEstateListMember(object sender, EventArgs e)
+        {
             // Get the estate list type.
-            string selectedEstateListType = string.Empty;
+            var selectedEstateListType = string.Empty;
-            bool queryEstateList = false;
+            var queryEstateList = false;
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 if (vassalForm.EstateListSelectBox.SelectedItem == null)
+                {
             // If not estate list type is selected then return.
             if (!queryEstateList) return;
             // Enqueue all the regions to restart.
-            Queue<UUID> estateListMembersQueue = new Queue<UUID>();
+            var estateListMembersQueue = new Queue<UUID>();
             vassalForm.Invoke((MethodInvoker) (() =>
             {
                 foreach (
-                    DataGridViewRow estateListRow in
+                    var estateListRow in
                         EstateListGridView.Rows.AsParallel()
                             .Cast<DataGridViewRow>()
                             .Where(o => o.Selected || o.Cells.Cast<DataGridViewCell>().Any(p => p.Selected)))
             new Thread(() =>
+            {
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
-                    UUID memberUUID = UUID.Zero;
+                    var memberUUID = UUID.Zero;
                     do
+                    {
                         try
+                        {
                             memberUUID = estateListMembersQueue.Dequeue();
                             // Remove the agent or group from the list.
-                            string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                            var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                 KeyValue.Escape(new Dictionary<string, string>
+                                {
                                     {"command", "setestatelist"},
                                     {"group", vassalConfiguration.Group},
                                     {"password", vassalConfiguration.Password},
                                     {"type", selectedEstateListType},
                                     {"action", "remove"},
                                     {selectedEstateListType.Equals("group") ? "target" : "agent", memberUUID.ToString()}
-                                }, wasOutput), vassalConfiguration.DataTimeout);
+                                }, wasOutput)).Result);
                             if (string.IsNullOrEmpty(result))
                                 throw new Exception("Unable to remove member");
                             vassalForm.Invoke((MethodInvoker) (() =>
+                            {
                                 foreach (
-                                    int i in
+                                    var i in
                                         EstateListGridView.Rows.AsParallel()
                                             .Cast<DataGridViewRow>()
                                             .Where(
                                                 o =>
+        }
         private void RequestEstateListsAddResident(object sender, EventArgs e)
+        {
             // Get the estate list type.
-            string selectedEstateListType = string.Empty;
+            var selectedEstateListType = string.Empty;
-            bool queryEstateList = false;
+            var queryEstateList = false;
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 selectedEstateListType = vassalForm.EstateListSelectBox.SelectedItem.ToString();
                 switch (
             }));
             // If not estate list type is selected then return.
             if (!queryEstateList) return;
-            string firstName = string.Empty;
+            var firstName = string.Empty;
-            string lastName = string.Empty;
+            var lastName = string.Empty;
             vassalForm.Invoke((MethodInvoker) (() =>
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
                     // Add the resident to the list.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "setestatelist"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"type", selectedEstateListType},
                             {"action", "add"},
                             {"firstname", firstName},
                             {"lastname", lastName}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                     if (!success)
                         throw new Exception("Unable to add resident");
                     // Retrieve the estate list for updates.
-                    result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getestatelist"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"type", selectedEstateListType}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (!success)
                         throw new Exception("Could not retrieve estate list.");
                     vassalForm.Invoke((MethodInvoker) (() => { EstateListGridView.Rows.Clear(); }));
-                    foreach (List<string> data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
+                    foreach (var data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
                         .Where(x => !string.IsNullOrEmpty(x))
                         .Select((x, i) => new {Index = i, Value = x})
                         .GroupBy(x => x.Index/2)
+        }
         private void RequestEstateListsAddGroup(object sender, EventArgs e)
+        {
             // Get the estate list type.
-            string selectedEstateListType = string.Empty;
+            var selectedEstateListType = string.Empty;
-            bool queryEstateList = false;
+            var queryEstateList = false;
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 selectedEstateListType = vassalForm.EstateListSelectBox.SelectedItem.ToString();
                 switch (
             }));
             // If not estate list type is selected then return.
             if (!queryEstateList) return;
-            string target = string.Empty;
+            var target = string.Empty;
             vassalForm.Invoke((MethodInvoker) (() =>
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
                     // Add the group to the list.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "setestatelist"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"type", selectedEstateListType},
                             {"action", "add"},
                             {"target", target}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                     if (!success)
                         throw new Exception("Unable to add group");
                     // Retrieve the estate list for updates.
-                    result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "getestatelist"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"type", selectedEstateListType}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (!success)
                         throw new Exception("Could not retrieve estate list.");
                     vassalForm.Invoke((MethodInvoker) (() => { EstateListGridView.Rows.Clear(); }));
-                    foreach (List<string> data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
+                    foreach (var data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
                         .Where(x => !string.IsNullOrEmpty(x))
                         .Select((x, i) => new {Index = i, Value = x})
                         .GroupBy(x => x.Index/2)
+            {
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
-                    bool scripts = false;
+                    var scripts = false;
-                    bool collisons = false;
+                    var collisons = false;
-                    bool physics = false;
+                    var physics = false;
                     vassalForm.Invoke((MethodInvoker) (() =>
+                    {
                         scripts = RegionDebugScriptsBox.Checked;
                         collisons = RegionDebugCollisionsBox.Checked;
                         physics = RegionDebugPhysicsBox.Checked;
                     }));
                     // Set the debug settings.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "setregiondebug"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"scripts", scripts.ToString()},
                             {"collisions", collisons.ToString()},
                             {"physics", physics.ToString()}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
+            {
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
-                    bool terraform = false;
+                    var terraform = false;
-                    bool fly = false;
+                    var fly = false;
-                    bool damage = false;
+                    var damage = false;
-                    bool resell = false;
+                    var resell = false;
-                    bool push = false;
+                    var push = false;
-                    bool parcel = false;
+                    var parcel = false;
-                    bool mature = false;
+                    var mature = false;
                     uint agentLimit = 20;
-                    double objectBonus = 2.0;
+                    var objectBonus = 2.0;
-                    bool run = false;
+                    var run = false;
                     vassalForm.Invoke((MethodInvoker) (() =>
                     }));
                     if (!run) return;
                     // Set the debug settings.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "setregioninfo"},
                             {"push", push.ToString()},
                             {"parcel", parcel.ToString()},
                             {"mature", mature.ToString()},
                             {"limit", agentLimit.ToString(Utils.EnUsCulture)},
                             {"bonus", objectBonus.ToString(Utils.EnUsCulture)}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                         throw new Exception("Error communicating with Corrade");
             {IsBackground = true}.Start();
+        }
         private void RequestEstateTexturesApply(object sender, EventArgs e)
         {
-            List<UUID> groundTextureUUIDs = new List<UUID>();
+            var groundTextureUUIDs = new List<UUID>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 UUID textureUUID;
                 switch (!UUID.TryParse(RegionTexturesLowUUIDApplyBox.Text, out textureUUID))
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
                     // Set the debug settings.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "setregionterraintextures"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"data", CSV.FromEnumerable(groundTextureUUIDs.Select(o => o.ToString()))}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
             {IsBackground = true};
+        }
         private void RequestDownloadRegionTexture(object sender, EventArgs e)
         {
-            string textureName = string.Empty;
+            var textureName = string.Empty;
-            UUID textureUUID = UUID.Zero;
+            var textureUUID = UUID.Zero;
-            bool run = false;
+            var run = false;
             vassalForm.Invoke((MethodInvoker) (() =>
             {
-                Button button = sender as Button;
+                var button = sender as Button;
                 if (button == null)
+                {
                     run = false;
                     return;
+            {
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "download"},
                             {"group", vassalConfiguration.Group},
                             {"password", vassalConfiguration.Password},
                             {"item", textureUUID.ToString()},
                             {"type", "Texture"},
                             {"format", "Png"}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                         throw new Exception("Error communicating with Corrade");
                     bool success;
                     if (!bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
                         throw new Exception("No success status could be retrieved");
-                    byte[] mapImageBytes = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
+                    var mapImageBytes = Convert.FromBase64String(wasInput(KeyValue.Get("data", result)));
                     Image mapImage;
-                    using (MemoryStream memoryStream = new MemoryStream(mapImageBytes, 0, mapImageBytes.Length))
+                    using (var memoryStream = new MemoryStream(mapImageBytes, 0, mapImageBytes.Length))
+                    {
                         mapImage = Image.FromStream(memoryStream);
+                    }
                     vassalForm.BeginInvoke((MethodInvoker) (() =>
+                    {
                         switch (vassalForm.SavePNGFileDialog.ShowDialog())
+                        {
                             case DialogResult.OK:
-                                string file = vassalForm.SavePNGFileDialog.FileName;
+                                var file = vassalForm.SavePNGFileDialog.FileName;
+        }
         private void RequestEstateListsAddGroupsFromCSV(object sender, EventArgs e)
+        {
             // Get the estate list type.
-            string selectedEstateListType = string.Empty;
+            var selectedEstateListType = string.Empty;
-            bool queryEstateList = false;
+            var queryEstateList = false;
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 if (vassalForm.EstateListSelectBox.SelectedItem == null) return;
                 selectedEstateListType = vassalForm.EstateListSelectBox.SelectedItem.ToString();
             }));
             // If not estate list type is selected then return.
             if (!queryEstateList) return;
-            Queue<KeyValuePair<string, UUID>> targets = new Queue<KeyValuePair<string, UUID>>();
+            var targets = new Queue<KeyValuePair<string, UUID>>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 switch (vassalForm.LoadCSVFile.ShowDialog())
+                {
                     case DialogResult.OK:
-                        string file = vassalForm.LoadCSVFile.FileName;
+                        var file = vassalForm.LoadCSVFile.FileName;
                         try
+                        {
                             vassalForm.StatusText.Text = @"loading group list...";
                             vassalForm.StatusProgress.Value = 0;
                             // import groups
                             UUID targetUUID;
-                            foreach (KeyValuePair<string, UUID> target in
+                            foreach (var target in
                                 File.ReadAllLines(file)
                         break;
+                }
             }));
             if (targets.Count.Equals(0)) return;
-            int initialQueueSize = targets.Count;
+            var initialQueueSize = targets.Count;
             // Block teleports and disable button.
             vassalForm.Invoke((MethodInvoker) (() =>
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
                     do
                     {
-                        KeyValuePair<string, UUID> target = targets.Dequeue();
+                        var target = targets.Dequeue();
                         vassalForm.Invoke((MethodInvoker) (() =>
+                        {
                             StatusText.Text = @"Adding to estate list: " + target.Key;
                             vassalForm.StatusProgress.Value =
                                 Math.Min((int) (100d*Math.Abs(targets.Count - initialQueueSize)/initialQueueSize), 100);
                         }));
                         // Skip any items that already exist.
-                        bool run = false;
+                        var run = false;
                         vassalForm.Invoke((MethodInvoker) (() =>
+                        {
                         if (target.Value.Equals(UUID.Zero)) continue;
                         try
+                        {
                             // Add the group to the list.
-                            string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                            var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                 KeyValue.Escape(new Dictionary<string, string>
+                                {
                                     {"command", "setestatelist"},
                                     {"group", vassalConfiguration.Group},
                                     {"password", vassalConfiguration.Password},
                                     {"type", selectedEstateListType},
                                     {"action", "add"},
                                     {"target", target.Value.ToString()}
-                                }, wasOutput), vassalConfiguration.DataTimeout);
+                                }, wasOutput)).Result);
                             if (string.IsNullOrEmpty(result))
                     // Retrieve the estate list.
                     try
+                    {
                         // Retrieve the estate list for updates.
-                        string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                        var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "getestatelist"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"type", selectedEstateListType}
-                            }, wasOutput), vassalConfiguration.DataTimeout);
+                            }, wasOutput)).Result);
                         if (string.IsNullOrEmpty(result))
                         if (!success)
                             throw new Exception("Could not retrieve estate list.");
                         vassalForm.Invoke((MethodInvoker) (() => { EstateListGridView.Rows.Clear(); }));
-                        foreach (List<string> data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
+                        foreach (var data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
                             .Where(x => !string.IsNullOrEmpty(x))
                             .Select((x, i) => new {Index = i, Value = x})
                             .GroupBy(x => x.Index/2)
+        }
         private void RequestEstateListsAddResidentsFromCSV(object sender, EventArgs e)
+        {
             // Get the estate list type.
-            string selectedEstateListType = string.Empty;
+            var selectedEstateListType = string.Empty;
-            bool queryEstateList = false;
+            var queryEstateList = false;
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 if (vassalForm.EstateListSelectBox.SelectedItem == null) return;
                 selectedEstateListType = vassalForm.EstateListSelectBox.SelectedItem.ToString();
             }));
             // If not estate list type is selected then return.
             if (!queryEstateList) return;
-            Queue<KeyValuePair<string, UUID>> targets = new Queue<KeyValuePair<string, UUID>>();
+            var targets = new Queue<KeyValuePair<string, UUID>>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 switch (vassalForm.LoadCSVFile.ShowDialog())
+                {
                     case DialogResult.OK:
-                        string file = vassalForm.LoadCSVFile.FileName;
+                        var file = vassalForm.LoadCSVFile.FileName;
                         try
+                        {
                             vassalForm.StatusText.Text = @"loading residents list...";
                             vassalForm.StatusProgress.Value = 0;
                             // import groups
                             UUID targetUUID;
-                            foreach (KeyValuePair<string, UUID> target in
+                            foreach (var target in
                                 File.ReadAllLines(file)
                         break;
+                }
             }));
             if (targets.Count.Equals(0)) return;
-            int initialQueueSize = targets.Count;
+            var initialQueueSize = targets.Count;
             // Block teleports and disable button.
             vassalForm.Invoke((MethodInvoker) (() =>
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
                     do
                     {
-                        KeyValuePair<string, UUID> target = targets.Dequeue();
+                        var target = targets.Dequeue();
                         vassalForm.Invoke((MethodInvoker) (() =>
+                        {
                             StatusText.Text = @"Adding to estate list: " + target.Key;
                             vassalForm.StatusProgress.Value =
                                 Math.Min((int) (100d*Math.Abs(targets.Count - initialQueueSize)/initialQueueSize), 100);
                         }));
                         // Skip any items that already exist.
-                        bool run = false;
+                        var run = false;
                         vassalForm.Invoke((MethodInvoker) (() =>
+                        {
                         if (target.Value.Equals(UUID.Zero)) continue;
                         try
+                        {
                             // Add the group to the list.
-                            string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                            var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                 KeyValue.Escape(new Dictionary<string, string>
+                                {
                                     {"command", "setestatelist"},
                                     {"group", vassalConfiguration.Group},
                                     {"password", vassalConfiguration.Password},
                                     {"type", selectedEstateListType},
                                     {"action", "add"},
                                     {"agent", target.Value.ToString()}
-                                }, wasOutput), vassalConfiguration.DataTimeout);
+                                }, wasOutput)).Result);
                             if (string.IsNullOrEmpty(result))
                     // Retrieve the estate list.
                     try
+                    {
                         // Retrieve the estate list for updates.
-                        string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                        var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                             KeyValue.Escape(new Dictionary<string, string>
+                            {
                                 {"command", "getestatelist"},
                                 {"group", vassalConfiguration.Group},
                                 {"password", vassalConfiguration.Password},
                                 {"type", selectedEstateListType}
-                            }, wasOutput), vassalConfiguration.DataTimeout);
+                            }, wasOutput)).Result);
                         if (string.IsNullOrEmpty(result))
                         if (!success)
                             throw new Exception("Could not retrieve estate list.");
                         vassalForm.Invoke((MethodInvoker) (() => { EstateListGridView.Rows.Clear(); }));
-                        foreach (List<string> data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
+                        foreach (var data in CSV.ToEnumerable(wasInput(KeyValue.Get("data", result)))
                             .Where(x => !string.IsNullOrEmpty(x))
                             .Select((x, i) => new {Index = i, Value = x})
                             .GroupBy(x => x.Index/2)
             vassalForm.BeginInvoke((MethodInvoker) (() =>
+            {
                 switch (vassalForm.ExportCSVDialog.ShowDialog())
+                {
                     case DialogResult.OK:
-                        string file = vassalForm.ExportCSVDialog.FileName;
+                        var file = vassalForm.ExportCSVDialog.FileName;
                         new Thread(() =>
+                        {
                             vassalForm.BeginInvoke((MethodInvoker) (() =>
+                            {
                                 try
+                                {
                                     vassalForm.StatusText.Text = @"exporting...";
                                     vassalForm.StatusProgress.Value = 0;
-                                    using (StreamWriter streamWriter = new StreamWriter(file, false, Encoding.UTF8))
+                                    using (var streamWriter = new StreamWriter(file, false, Encoding.UTF8))
+                                    {
                                         foreach (DataGridViewRow estateListRow in EstateListGridView.Rows)
+                                        {
                                             streamWriter.WriteLine(CSV.FromEnumerable(new[]
                 ResidentListBanGroup.Enabled = false;
                 RegionTeleportGroup.Enabled = false;
             }));
             // Enqueue all the agents to teleport home.
-            Queue<UUID> agentsQueue = new Queue<UUID>();
+            var agentsQueue = new Queue<UUID>();
             vassalForm.Invoke((MethodInvoker) (() =>
+            {
                 foreach (
-                    DataGridViewRow residentListRow in
+                    var residentListRow in
                         ResidentListGridView.Rows.AsParallel()
                             .Cast<DataGridViewRow>()
                             .Where(o => o.Selected || o.Cells.Cast<DataGridViewCell>().Any(p => p.Selected)))
+                {
                 try
+                {
                     do
+                    {
                         // Dequeue the first object.
-                        UUID agentUUID = agentsQueue.Dequeue();
+                        var agentUUID = agentsQueue.Dequeue();
                         DataGridViewRow currentDataGridViewRow = null;
                         vassalForm.Invoke((MethodInvoker) (() =>
+                        {
                             currentDataGridViewRow = vassalForm.ResidentListGridView.Rows.AsParallel()
                                 .Cast<DataGridViewRow>()
                         if (currentDataGridViewRow == null) continue;
                         try
+                        {
                             // Teleport the user home.
-                            string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                            var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                                 KeyValue.Escape(new Dictionary<string, string>
+                                {
                                     {"command", "estateteleportusershome"},
                                     {"group", vassalConfiguration.Group},
                                     {"password", vassalConfiguration.Password},
                                     {"avatars", agentUUID.ToString()}
-                                }, wasOutput), vassalConfiguration.DataTimeout);
+                                }, wasOutput)).Result);
                             if (string.IsNullOrEmpty(result))
+                                    {
                                         vassalForm.StatusText.Text = @"Resident teleported home.";
                                         currentDataGridViewRow.Selected = false;
                                         currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightGreen;
                                         foreach (
-                                            DataGridViewCell cell in
+                                            var cell in
                                                 currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                        {
                                             cell.ToolTipText = @"Resident teleported home.";
+                                        }
                                     }));
+                            {
                                 vassalForm.StatusText.Text = ex.Message;
                                 currentDataGridViewRow.Selected = false;
                                 currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightPink;
                                 foreach (
-                                    DataGridViewCell cell in
+                                    var cell in
                                         currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                {
                                     cell.ToolTipText = ex.Message;
+                                }
                             }));
+            {
                 try
+                {
                     Monitor.Enter(ClientInstanceTeleportLock);
-                    int waterHeight = 10;
+                    var waterHeight = 10;
-                    int terrainRaiseLimit = 100;
+                    var terrainRaiseLimit = 100;
-                    int terrainLowerLimit = -100;
+                    var terrainLowerLimit = -100;
-                    bool useEstateSun = true;
+                    var useEstateSun = true;
-                    bool fixedSun = false;
+                    var fixedSun = false;
-                    int sunPosition = 18;
+                    var sunPosition = 18;
-                    bool run = false;
+                    var run = false;
                     vassalForm.Invoke((MethodInvoker) (() =>
                     }));
                     if (!run) return;
                     // Set the terrain variables.
-                    string result = wasPOST(vassalConfiguration.HTTPServerURL,
+                    var result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
                         KeyValue.Escape(new Dictionary<string, string>
+                        {
                             {"command", "setregionterrainvariables"},
                             {"terrainraiselimit", terrainRaiseLimit.ToString()},
                             {"terrainlowerlimit", terrainLowerLimit.ToString()},
                             {"useestatesun", useEstateSun.ToString()},
                             {"fixedsun", fixedSun.ToString()},
                             {"sunposition", sunPosition.ToString()}
-                        }, wasOutput), vassalConfiguration.DataTimeout);
+                        }, wasOutput)).Result);
                     if (string.IsNullOrEmpty(result))
                         throw new Exception("Error communicating with Corrade");
         private void ReconnectRequested(object sender, EventArgs e)
+        {
             // Spawn a thread to check Corrade's connection status.
             new Thread(() =>
+            {
-                TcpClient tcpClient = new TcpClient();
+                var tcpClient = new TcpClient();
                 try
+                {
-                    Uri uri = new Uri(vassalConfiguration.HTTPServerURL);
+                    var uri = new Uri(vassalConfiguration.HTTPServerURL);
                     tcpClient.Connect(uri.Host, uri.Port);
                     // port open
                     vassalForm.BeginInvoke((MethodInvoker) (() => { vassalForm.Tabs.Enabled = true; }));
                     // set the loading spinner
                     if (vassalForm.RegionAvatarsMap.Image == null)
+                    {
-                        Assembly thisAssembly = Assembly.GetExecutingAssembly();
+                        var thisAssembly = Assembly.GetExecutingAssembly();
-                        Stream file =
+                        var file =
                             thisAssembly.GetManifestResourceStream("Vassal.img.loading.gif");
                         switch (file != null)
+                        {
                             case true:
                                 vassalForm.BeginInvoke((MethodInvoker) (() =>
                 public const string TEXT_PLAIN = @"text/plain";
                 public const string WWW_FORM_URLENCODED = @"application/x-www-form-urlencoded";
+            }
+        }
+        private void RequestBatchSetCovenant(object sender, EventArgs e)
+        {
+            // Block teleports and disable button.
+            vassalForm.Invoke((MethodInvoker)(() =>
+            {
+                vassalForm.BatchSetCovenantButton.Enabled = false;
+                vassalForm.SetCovenantNotecardUUIDBox.Enabled = false;
+                RegionTeleportGroup.Enabled = false;
+            }));
+            // Enqueue all the regions to set covenant.
+            var batchSetCovenantQueue = new Queue<KeyValuePair<string, Vector3>>();
+            vassalForm.Invoke((MethodInvoker)(() =>
+            {
+                foreach (
+                    var topCollidersRow in
+                        BatchSetCovenantGridView.Rows.AsParallel()
+                            .Cast<DataGridViewRow>()
+                            .Where(o => o.Selected || o.Cells.Cast<DataGridViewCell>().Any(p => p.Selected)))
+                {
+                    Vector3 objectPosition;
+                    var regionName = topCollidersRow.Cells["BatchSetCovenantRegionName"].Value.ToString();
+                    if (string.IsNullOrEmpty(regionName) ||
+                        !Vector3.TryParse(topCollidersRow.Cells["BatchSetCovenantPosition"].Value.ToString(),
+                            out objectPosition))
+                        continue;
+                    batchSetCovenantQueue.Enqueue(new KeyValuePair<string, Vector3>(regionName, objectPosition));
+                }
+            }));
+            // If no rows were selected, enable teleports, the return button and return.
+            if (batchSetCovenantQueue.Count.Equals(0))
+            {
+                vassalForm.Invoke((MethodInvoker)(() =>
+                {
+                    vassalForm.BatchSetCovenantButton.Enabled = true;
+                    vassalForm.SetCovenantNotecardUUIDBox.Enabled = true;
+                    RegionTeleportGroup.Enabled = true;
+                }));
+                return;
+            }
+            new Thread(() =>
+            {
+                Monitor.Enter(ClientInstanceTeleportLock);
+                try
+                {
+                    do
+                    {
+                        // Dequeue the first object.
+                        var batchSetCovenantRegionData = batchSetCovenantQueue.Dequeue();
+                        DataGridViewRow currentDataGridViewRow = null;
+                        vassalForm.Invoke((MethodInvoker)(() =>
+                        {
+                            currentDataGridViewRow = vassalForm.BatchSetCovenantGridView.Rows.AsParallel()
+                                .Cast<DataGridViewRow>()
+                                .FirstOrDefault(
+                                    o =>
+                                        o.Cells["BatchSetCovenantRegionName"].Value.ToString()
+                                            .Equals(batchSetCovenantRegionData.Key, StringComparison.OrdinalIgnoreCase) &&
+                                        o.Cells["BatchSetCovenantPosition"].Value.ToString()
+                                            .Equals(batchSetCovenantRegionData.Value.ToString(),
+                                                StringComparison.OrdinalIgnoreCase));
+                        }));
+                        if (currentDataGridViewRow == null) continue;
+                        try
+                        {
+                            var success = false;
+                            string result;
+                            // Retry to teleport to each region a few times.
+                            var teleportRetries = 3;
+                            do
+                            {
+                                vassalForm.Invoke((MethodInvoker)(() =>
+                                {
+                                    vassalForm.StatusText.Text = @"Attempting to teleport to " + batchSetCovenantRegionData.Key +
+                                                                 @" " + @"(" +
+                                                                 teleportRetries.ToString(Utils.EnUsCulture) +
+                                                                 @")";
+                                }));
+                                // Teleport to the region.
+                                result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
+                                    KeyValue.Escape(new Dictionary<string, string>
+                                    {
+                                        {"command", "teleport"},
+                                        {"group", vassalConfiguration.Group},
+                                        {"password", vassalConfiguration.Password},
+                                        {"position", batchSetCovenantRegionData.Value.ToString()},
+                                        {"region", batchSetCovenantRegionData.Key},
+                                        {"fly", "True"}
+                                    }, wasOutput)).Result);
+                                if (string.IsNullOrEmpty(result))
+                                {
+                                    vassalForm.Invoke(
+                                        (MethodInvoker)
+                                            (() =>
+                                            {
+                                                vassalForm.StatusText.Text = @"Error communicating with Corrade.";
+                                            }));
+                                    continue;
+                                }
+                                if (!bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
+                                {
+                                    vassalForm.Invoke(
+                                        (MethodInvoker)
+                                            (() =>
+                                            {
+                                                vassalForm.StatusText.Text = @"No success status could be retrieved. ";
+                                            }));
+                                    continue;
+                                }
+                                switch (success)
+                                {
+                                    case true:
+                                        vassalForm.Invoke(
+                                            (MethodInvoker)
+                                                (() => { vassalForm.StatusText.Text = @"Teleport succeeded."; }));
+                                        break;
+                                    default:
+                                        // In case the destination is to close (Corrade status code 37559),
+                                        // then we are on the same region so no need to retry.
+                                        uint status; //37559
+                                        switch (
+                                            uint.TryParse(wasInput(KeyValue.Get("status", result)), out status) &&
+                                            status.Equals(37559))
+                                        {
+                                            case true: // We are on the region already!
+                                                success = true;
+                                                break;
+                                            default:
+                                                vassalForm.Invoke(
+                                                    (MethodInvoker)
+                                                        (() => { vassalForm.StatusText.Text = @"Teleport failed."; }));
+                                                break;
+                                        }
+                                        break;
+                                }
+                                // Pause for teleport (10 teleports / 15s allowed).
+                                Thread.Sleep(700);
+                            } while (!success && !(--teleportRetries).Equals(0));
+                            if (!success)
+                                throw new Exception("Failed to teleport to region.");
+                            result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
+                                KeyValue.Escape(new Dictionary<string, string>
+                                {
+                                    {"command", "getregiondata"},
+                                    {"group", vassalConfiguration.Group},
+                                    {"password", vassalConfiguration.Password},
+                                    {"data", "IsEstateManager"}
+                                }, wasOutput)).Result);
+                            if (string.IsNullOrEmpty(result))
+                                throw new Exception("Error communicating with Corrade.");
+                            if (!bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
+                                throw new Exception("No success status could be retrieved.");
+                            if (!success)
+                                throw new Exception("Could not retrieve estate rights.");
+                            var data = CSV.ToEnumerable(wasInput(KeyValue.Get("data", result))).ToList();
+                            if (!data.Count.Equals(2))
+                                throw new Exception("Could not retrieve estate rights.");
+                            bool isEstateManager;
+                            switch (
+                                bool.TryParse(data[data.IndexOf("IsEstateManager") + 1], out isEstateManager) &&
+                                isEstateManager)
+                            {
+                                case true: // we are an estate manager
+                                    result = Encoding.UTF8.GetString(HTTPClient.POST(vassalConfiguration.HTTPServerURL,
+                                        KeyValue.Escape(new Dictionary<string, string>
+                                        {
+                                            {"command", "setestatecovenant"},
+                                            {"group", vassalConfiguration.Group},
+                                            {"password", vassalConfiguration.Password},
+                                            {"item", vassalForm.SetCovenantNotecardUUIDBox.Text}
+                                        }, wasOutput)).Result);
+                                    if (string.IsNullOrEmpty(result))
+                                        throw new Exception("Error communicating with Corrade.");
+                                    if (!bool.TryParse(wasInput(KeyValue.Get("success", result)), out success))
+                                        throw new Exception("No success status could be retrieved.");
+                                    if (!success)
+                                        throw new Exception("Could not set region covenant.");
+                                    vassalForm.Invoke((MethodInvoker)(() =>
+                                    {
+                                        vassalForm.StatusText.Text = @"Region covenant set.";
+                                        currentDataGridViewRow.Selected = false;
+                                        currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightGreen;
+                                        foreach (
+                                            var cell in
+                                                currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                        {
+                                            cell.ToolTipText = @"Region covenant set.";
+                                        }
+                                    }));
+                                    break;
+                                default:
+                                    throw new Exception("No estate manager rights for setting covenant.");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            vassalForm.Invoke((MethodInvoker)(() =>
+                            {
+                                vassalForm.StatusText.Text = ex.Message;
+                                currentDataGridViewRow.Selected = false;
+                                currentDataGridViewRow.DefaultCellStyle.BackColor = Color.LightPink;
+                                foreach (
+                                    var cell in
+                                        currentDataGridViewRow.Cells.AsParallel().Cast<DataGridViewCell>())
+                                {
+                                    cell.ToolTipText = ex.Message;
+                                }
+                            }));
+                        }
+                        finally
+                        {
+                            // Pause for teleport (10 teleports / 15s allowed).
+                            Thread.Sleep(700);
+                        }
+                    } while (!batchSetCovenantQueue.Count.Equals(0));
+                }
+                catch (Exception)
+                {
+                }
+                finally
+                {
+                    Monitor.Exit(ClientInstanceTeleportLock);
+                    // Allow teleports and enable button.
+                    vassalForm.BeginInvoke((MethodInvoker)(() =>
+                    {
+                        vassalForm.BatchSetCovenantButton.Enabled = true;
+                        vassalForm.SetCovenantNotecardUUIDBox.Enabled = true;
-        #region CRYPTOGRAPHY
+                        RegionTeleportGroup.Enabled = true;
+                    }));
+                }
+            })
             { IsBackground = true }.Start();
         #endregion
+    }