From daa457cc6b0ada08b6b09a1f20ec19036bd58e52 Mon Sep 17 00:00:00 2001
From: Michel Bagnol <m.bagnol@nodewave.com>
Date: Fri, 4 Oct 2019 14:57:25 +0200
Subject: [PATCH 1/6] Properly decode the HTML data from the received json
 response, and decode HTML entities in the org name.

---
 Imbick.StarCitizen.Api/GetOrgsRestRequest.cs         | 1 -
 Imbick.StarCitizen.Api/Imbick.StarCitizen.Api.csproj | 4 ++--
 Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs | 2 +-
 Imbick.StarCitizen.Api/OrganisationsClient.cs        | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs b/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
index 8fc888b..d6f5168 100644
--- a/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
+++ b/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
@@ -2,7 +2,6 @@
     using System.Linq;
     using Models;
     using RestSharp;
-    using SimpleJson;
 
     public class GetOrgsRestRequest
         : RestRequest {
diff --git a/Imbick.StarCitizen.Api/Imbick.StarCitizen.Api.csproj b/Imbick.StarCitizen.Api/Imbick.StarCitizen.Api.csproj
index d3af44f..29f7f8e 100644
--- a/Imbick.StarCitizen.Api/Imbick.StarCitizen.Api.csproj
+++ b/Imbick.StarCitizen.Api/Imbick.StarCitizen.Api.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.8.13" />
-    <PackageReference Include="RestSharp" Version="106.6.7" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.15" />
+    <PackageReference Include="RestSharp" Version="106.6.10" />
   </ItemGroup>
 
 </Project>
diff --git a/Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs b/Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs
index bc82f3c..ae77198 100644
--- a/Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs
+++ b/Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs
@@ -22,7 +22,7 @@ public Organisation Deserialise(string org) {
         private Organisation Deserialise(HtmlNode orgNode) {
             try {
                 return new Organisation {
-                    Name = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[2]/h3[@class=\"trans-03s name\"]").InnerText,
+                    Name = HtmlEntity.DeEntitize(orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[2]/h3[@class=\"trans-03s name\"]").InnerText),
                     Symbol = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[2]/span[@class=\"symbol\"]").InnerText,
                     ThumbnailUrl = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[1]/img").GetAttributeValue("src", string.Empty),
                     Archetype = ToArchetype(orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[1]//span[2]").InnerText),
diff --git a/Imbick.StarCitizen.Api/OrganisationsClient.cs b/Imbick.StarCitizen.Api/OrganisationsClient.cs
index 133d8fd..5c2a364 100644
--- a/Imbick.StarCitizen.Api/OrganisationsClient.cs
+++ b/Imbick.StarCitizen.Api/OrganisationsClient.cs
@@ -31,7 +31,7 @@ public async Task<IEnumerable<Organisation>> GetAsync(SearchRequest searchReques
                 var response = await _client.ExecutePostTaskAsync<Response>(request);
                 if (!response.IsSuccessful)
                     throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
-                var decodedHtml = response.Data.Data.Html.Replace("\\\"", "\""); //todo properly decode this
+                var decodedHtml = SimpleJson.DeserializeObject<string>("\"" + response.Data.Data.Html + "\"", SimpleJson.CurrentJsonSerializerStrategy);
                 return _deserialiser.DeserialiseList(decodedHtml);
             } catch (Exception e) {
                 throw new Exception("Problem retrieving orgs. See inner exception for details.", e);

From 875d5a212f5932b9967acd08d2ab634463f678ef Mon Sep 17 00:00:00 2001
From: Michel Bagnol <m.bagnol@nodewave.com>
Date: Fri, 4 Oct 2019 23:02:31 +0200
Subject: [PATCH 2/6] Support RSI's getOrgMembers API. BREAKING-CHANGE:
 OrganisationClient renamed to to RsiApiClient.

---
 .../GetOrgMembersTests.cs                     |  69 ++++++++++++
 ...isationsClientTests.cs => GetOrgsTests.cs} |  22 ++--
 .../Models/OrgMembersSearchRequestTests.cs    |  45 ++++++++
 .../Models/OrgsSearchRequestTests.cs          | 105 ++++++++++++++++++
 .../Models/SearchRequestTests.cs              | 105 ------------------
 .../GetOrgMembersRestRequest.cs               |  17 +++
 Imbick.StarCitizen.Api/GetOrgsRestRequest.cs  |  12 +-
 .../CamelCaseSerializerStrategy.cs            |  13 +++
 .../OrgHtmlSerializer.cs}                     |  30 ++---
 .../OrgMemberHtmlSerializer.cs                |  40 +++++++
 .../Models/{Organisation.cs => Org.cs}        |  20 ++--
 Imbick.StarCitizen.Api/Models/OrgMember.cs    |  43 +++++++
 .../Models/OrgMembersSearchRequest.cs         |  63 +++++++++++
 ...{SearchRequest.cs => OrgsSearchRequest.cs} |  66 +++++------
 Imbick.StarCitizen.Api/OrganisationsClient.cs |  44 --------
 Imbick.StarCitizen.Api/RsiApiClient.cs        |  73 ++++++++++++
 16 files changed, 540 insertions(+), 227 deletions(-)
 create mode 100644 Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs
 rename Imbick.StarCitizen.Api.Tests/{OrganisationsClientTests.cs => GetOrgsTests.cs} (98%)
 create mode 100644 Imbick.StarCitizen.Api.Tests/Models/OrgMembersSearchRequestTests.cs
 create mode 100644 Imbick.StarCitizen.Api.Tests/Models/OrgsSearchRequestTests.cs
 delete mode 100644 Imbick.StarCitizen.Api.Tests/Models/SearchRequestTests.cs
 create mode 100644 Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs
 create mode 100644 Imbick.StarCitizen.Api/HtmlSerializers/CamelCaseSerializerStrategy.cs
 rename Imbick.StarCitizen.Api/{OrganisationHtmlSerialiser.cs => HtmlSerializers/OrgHtmlSerializer.cs} (70%)
 create mode 100644 Imbick.StarCitizen.Api/HtmlSerializers/OrgMemberHtmlSerializer.cs
 rename Imbick.StarCitizen.Api/Models/{Organisation.cs => Org.cs} (87%)
 create mode 100644 Imbick.StarCitizen.Api/Models/OrgMember.cs
 create mode 100644 Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs
 rename Imbick.StarCitizen.Api/Models/{SearchRequest.cs => OrgsSearchRequest.cs} (66%)
 delete mode 100644 Imbick.StarCitizen.Api/OrganisationsClient.cs
 create mode 100644 Imbick.StarCitizen.Api/RsiApiClient.cs

diff --git a/Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs b/Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs
new file mode 100644
index 0000000..e31a451
--- /dev/null
+++ b/Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs
@@ -0,0 +1,69 @@
+
+namespace Imbick.StarCitizen.Api.Tests {
+    using System.Linq;
+    using System.Net;
+    using System.Threading.Tasks;
+    using Api.Models;
+    using Xunit;
+    using Moq;
+    using RestSharp;
+
+    public class GetOrgMembersTests {
+
+        [Fact]
+        public async Task ListOrgMembersAsync_Always_ReturnsCorrectResultsAsync() {
+            var response = new RestResponse<Response> {
+                Data = _dummyResponse_9Members,
+                StatusCode = HttpStatusCode.OK,
+                ResponseStatus = ResponseStatus.Completed
+            };
+            _mockRest.Setup(r => r.ExecutePostTaskAsync<Response>(It.IsAny<IRestRequest>()))
+                .Returns(Task.FromResult<IRestResponse<Response>>(response));
+            var client = new RsiApiClient(_mockRest.Object);
+
+            var orgMembers = await client.ListOrgMembersAsync("SWISS");
+
+            Assert.Equal(9, orgMembers.Count());
+        }
+
+        [Fact]
+        public async Task GetOrgMembersAsync_WithSearchTerm_ReturnsCorrectResultAsync() {
+            var response = new RestResponse<Response> {
+                Data = _dummyResponse_1Member,
+                StatusCode = HttpStatusCode.OK,
+                ResponseStatus = ResponseStatus.Completed
+            };
+            _mockRest.Setup(c => c.ExecutePostTaskAsync<Response>(It.IsAny<IRestRequest>()))
+                .Returns(Task.FromResult<IRestResponse<Response>>(response));
+            var client = new RsiApiClient(_mockRest.Object);
+            var searchRequest = new OrgMembersSearchRequest { Symbol = "SWISS", Search = "meetsch" };
+            var orgMembers = await client.GetOrgMembersAsync(searchRequest);
+
+            Assert.Equal(1, orgMembers.Count());
+            Assert.Equal(_dummyOrgMember, orgMembers.First());
+        }
+
+        private readonly OrgMember _dummyOrgMember = new OrgMember
+        {
+            Name = "Meetsch",
+            Handle = "meetsch",
+            AvatarUrl = "/media/80d4lybcin5dhr/avatar/Swiss-Starships-Ecusson.png"
+        };
+
+        private readonly Response _dummyResponse_1Member = new Response
+        {
+            Data = new ResponseData
+            {
+                Html = @"\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/meetsch\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/80d4lybcin5dhr\/avatar\/Swiss-Starships-Ecusson.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Meetsch<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">meetsch<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data1\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n"
+            }
+        };
+
+        private readonly Response _dummyResponse_9Members = new Response {
+            Data = new ResponseData {
+                Html = @"\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Maark\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/j9knprddodfokr\/avatar\/110.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Etat-major<\/li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Membre du Conseil<\/li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Pilote en service<\/li>\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Maarkreidi<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Maark<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data1\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 100%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Commandant de corps<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Mr_Pandalf\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/do3enb8nqt5u2r\/avatar\/W_0.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data2\"">Mr_Pandalf<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Mr_Pandalf<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/meetsch\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/80d4lybcin5dhr\/avatar\/Swiss-Starships-Ecusson.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data4\"">Meetsch<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data5\"">meetsch<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Mi_K_L\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/ivofafg2foiz6r\/avatar\/Rambo-Seals.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Mickael<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Mi_K_L<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Rogor_Roxor\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/rsi\/static\/images\/account\/avatar_default_big.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data1\"">Mike_LaMenace<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Rogor_Roxor<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data3\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Major_Duke\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/jcxp1bk3lu52yr\/avatar\/Horror-Reptile.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Major Duke<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Major_Duke<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data2\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Olderan\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/y15plz8yysn3cr\/avatar\/Blackeyegalaxy.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data2\"">Merlin<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Olderan<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data4\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Mike_Roxor\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/zzw94vxbss2w9r\/avatar\/Swissmade.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Mike Swissmade<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data4\"">Mike_Roxor<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data2\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Genju\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/ukk48x1o0xgmyr\/avatar\/1080.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Mute<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data4\"">Genju<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n"
+            }
+        };
+
+        private Mock<IRestClient> _mockRest = new Mock<IRestClient>();
+    }
+}
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api.Tests/OrganisationsClientTests.cs b/Imbick.StarCitizen.Api.Tests/GetOrgsTests.cs
similarity index 98%
rename from Imbick.StarCitizen.Api.Tests/OrganisationsClientTests.cs
rename to Imbick.StarCitizen.Api.Tests/GetOrgsTests.cs
index 93249c7..95c72b7 100644
--- a/Imbick.StarCitizen.Api.Tests/OrganisationsClientTests.cs
+++ b/Imbick.StarCitizen.Api.Tests/GetOrgsTests.cs
@@ -8,10 +8,10 @@ namespace Imbick.StarCitizen.Api.Tests {
     using Moq;
     using RestSharp;
 
-    public class OrganisationsClientTests {
+    public class GetOrgsTests {
 
         [Fact]
-        public async Task ListAsync_Always_ReturnsCorrectResultsAsync() {
+        public async Task ListOrgsAsync_Always_ReturnsCorrectResultsAsync() {
             var response = new RestResponse<Response> {
                 Data = _dummyResponse,
                 StatusCode = HttpStatusCode.OK,
@@ -19,16 +19,16 @@ public async Task ListAsync_Always_ReturnsCorrectResultsAsync() {
             };
             _mockRest.Setup(r => r.ExecutePostTaskAsync<Response>(It.IsAny<IRestRequest>()))
                 .Returns(Task.FromResult<IRestResponse<Response>>(response));
-            var client = new OrganisationsClient(_mockRest.Object);
+            var client = new RsiApiClient(_mockRest.Object);
 
-            var orgs = await client.ListAsync();
+            var orgs = await client.ListOrgsAsync();
 
             Assert.Equal(32, orgs.Count());
             Assert.Equal(_dummyOrg, orgs.First());
         }
 
         [Fact]
-        public async Task GetAsync_WithSearchTerm_ReturnsCorrectResultAsync() {
+        public async Task GetOrgsAsync_WithSearchTerm_ReturnsCorrectResultAsync() {
             var response = new RestResponse<Response> {
                 Data = _dummyResponse,
                 StatusCode = HttpStatusCode.OK,
@@ -36,20 +36,20 @@ public async Task GetAsync_WithSearchTerm_ReturnsCorrectResultAsync() {
             };
             _mockRest.Setup(c => c.ExecutePostTaskAsync<Response>(It.IsAny<IRestRequest>()))
                 .Returns(Task.FromResult<IRestResponse<Response>>(response));
-            var client = new OrganisationsClient(_mockRest.Object);
-            var searchRequest = new SearchRequest {Search = "Empire De La Soumission" };
-            var orgs = await client.GetAsync(searchRequest);
+            var client = new RsiApiClient(_mockRest.Object);
+            var searchRequest = new OrgsSearchRequest {Search = "Empire De La Soumission" };
+            var orgs = await client.GetOrgsAsync(searchRequest);
 
             Assert.Equal(32, orgs.Count());
             Assert.Equal(_dummyOrg, orgs.First());
         }
 
-        private readonly Organisation _dummyOrg = new Organisation {
+        private readonly Org _dummyOrg = new Org {
             Name = "Rogue Pirates",
             Symbol = "ROGPIRATES",
             ThumbnailUrl = "/rsi/static/images/organization/defaults/logo/syndicate.jpg",
-            Archetype = Archetype.Syndicate,
-            Commitment = Commitment.Hardcore,
+            Archetype = OrgArchetype.Syndicate,
+            Commitment = OrgCommitment.Hardcore,
             Language = "Italian",
             IsRecruiting = true,
             IsRolePlay = false,
diff --git a/Imbick.StarCitizen.Api.Tests/Models/OrgMembersSearchRequestTests.cs b/Imbick.StarCitizen.Api.Tests/Models/OrgMembersSearchRequestTests.cs
new file mode 100644
index 0000000..36f00b9
--- /dev/null
+++ b/Imbick.StarCitizen.Api.Tests/Models/OrgMembersSearchRequestTests.cs
@@ -0,0 +1,45 @@
+
+namespace Imbick.StarCitizen.Api.Tests.Models {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Imbick.StarCitizen.Api.Models;
+    using Xunit;
+
+    public class OrgMembersSearchRequestTests
+    {
+        [Fact]
+        public void Ctor_WithMembershipMainOrg_MapsCorrectly()
+        {
+            var request = new OrgMembersSearchRequest
+            {
+                Membership = OrgMembersSearchRequest.MembershipType.MainOrg
+            };
+            var result = new OrgMembersSearchRequestInternal(request);
+            Assert.True(result.Main_Org == 1);
+        }
+
+        [Fact]
+        public void Ctor_WithMembershipAffiliate_MapsCorrectly()
+        {
+            var request = new OrgMembersSearchRequest
+            {
+                Membership = OrgMembersSearchRequest.MembershipType.Affiliate
+            };
+            var result = new OrgMembersSearchRequestInternal(request);
+            Assert.True(result.Main_Org == 0);
+        }
+
+        [Fact]
+        public void Ctor_WithMembershipAny_MapsCorrectly()
+        {
+            var request = new OrgMembersSearchRequest
+            {
+                Membership = OrgMembersSearchRequest.MembershipType.Any
+            };
+            var result = new OrgMembersSearchRequestInternal(request);
+            Assert.True(result.Main_Org == null);
+        }
+
+    }
+}
diff --git a/Imbick.StarCitizen.Api.Tests/Models/OrgsSearchRequestTests.cs b/Imbick.StarCitizen.Api.Tests/Models/OrgsSearchRequestTests.cs
new file mode 100644
index 0000000..3bcfcdc
--- /dev/null
+++ b/Imbick.StarCitizen.Api.Tests/Models/OrgsSearchRequestTests.cs
@@ -0,0 +1,105 @@
+
+namespace Imbick.StarCitizen.Api.Tests.Models {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Imbick.StarCitizen.Api.Models;
+    using Xunit;
+
+    public class OrgsSearchRequestTests
+    {
+        [Fact]
+        public void Ctor_WithBooleanYes_MapsCorrectly() {
+            var request = new OrgsSearchRequest {
+                Recruiting = OrgsSearchRequest.Boolean.Yes,
+                RolePlay = OrgsSearchRequest.Boolean.Yes
+            };
+            var result = new OrgsSearchRequestInternal(request);
+            Assert.True(result.Recruiting.Count() == 1);
+            Assert.True(result.Recruiting.First() == 1);
+            Assert.True(result.RolePlay.Count() == 1);
+            Assert.True(result.RolePlay.First() == 1);
+        }
+
+        [Fact]
+        public void Ctor_WithBooleanNo_MapsCorrectly() {
+            var request = new OrgsSearchRequest {
+                Recruiting = OrgsSearchRequest.Boolean.No,
+                RolePlay = OrgsSearchRequest.Boolean.No
+            };
+            var result = new OrgsSearchRequestInternal(request);
+            Assert.True(result.Recruiting.Count() == 1);
+            Assert.True(result.Recruiting.First() == 0);
+            Assert.True(result.RolePlay.Count() == 1);
+            Assert.True(result.RolePlay.First() == 0);
+        }
+
+        [Fact]
+        public void Ctor_WithBooleanBoth_MapsCorrectly() {
+            var request = new OrgsSearchRequest {
+                Recruiting = OrgsSearchRequest.Boolean.YesAndNo,
+                RolePlay = OrgsSearchRequest.Boolean.YesAndNo
+            };
+            var result = new OrgsSearchRequestInternal(request);
+            AssertContains(result.Recruiting, new List<int>());
+            AssertContains(result.RolePlay, new List<int>());
+        }
+
+        [Fact]
+        public void Ctor_WithSort_MapsCorrectly() {
+            var result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.ActiveAscending});
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.ActiveAsc);
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.ActiveDescending });
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.ActiveDesc);
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.CreatedAscending});
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.CreatedAsc);
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.CreatedDescending});
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.CreatedDesc);
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.NameAscending});
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.NameAsc);
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.NameDescending});
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.NameDesc);
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.SizeAscending});
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.SizeAsc);
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Sort = OrgsSearchRequest.OrganisationSorting.SizeDescending });
+            Assert.Equal(result.Sort, OrgsSearchRequestInternal.SizeDesc);
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+                result = new OrgsSearchRequestInternal(new OrgsSearchRequest {Sort = (OrgsSearchRequest.OrganisationSorting)123}));
+        }
+
+        [Fact]
+        public void Ctor_WithSize_MapsCorrectly() {
+            var result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Size = new[] { OrgSize.Large } });
+            AssertContains(result.Size, new[] { OrgSize.Large.ToString().ToLower() });
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Size = new[] { OrgSize.Medium } });
+            AssertContains(result.Size, new[] { OrgSize.Medium.ToString().ToLower() });
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Size = new[] { OrgSize.Small } });
+            AssertContains(result.Size, new[] { OrgSize.Small.ToString().ToLower() });
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Size = new[] { OrgSize.Small, OrgSize.Medium, OrgSize.Large } });
+            AssertContains(result.Size, new[] { OrgSize.Small.ToString().ToLower(), OrgSize.Medium.ToString().ToLower(), OrgSize.Large.ToString().ToLower() });
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+                result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Size = new [] { (OrgSize)123} }));
+        }
+
+        [Fact]
+        public void Ctor_WithCommitment_MapsCorrectly() {
+            var result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Commitment = new[] { OrgCommitment.Regular } });
+            AssertContains(result.Commitment, new[] { "RE" });
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Commitment = new[] { OrgCommitment.Casual } });
+            AssertContains(result.Commitment, new[] { "CA" });
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Commitment = new[] { OrgCommitment.Hardcore } });
+            AssertContains(result.Commitment, new[] { "HA" });
+            result = new OrgsSearchRequestInternal(new OrgsSearchRequest { Commitment = new[] { OrgCommitment.Casual, OrgCommitment.Hardcore } });
+            AssertContains(result.Commitment, new[] { "CA", "HA" });
+            /*Assert.Throws<ArgumentOutOfRangeException>(() =>
+                result = new SearchRequestInternal(new SearchRequest { Commitment = new[] { (Commitment)123 } }));*/
+        }
+
+        private static void AssertContains<T>(IEnumerable<T> collection, IReadOnlyCollection<T> expectedContent) {
+            Assert.True(collection.Count() == expectedContent.Count);
+            foreach (var i in expectedContent) {
+                Assert.Contains(i, collection);
+            }
+        }
+    }
+}
diff --git a/Imbick.StarCitizen.Api.Tests/Models/SearchRequestTests.cs b/Imbick.StarCitizen.Api.Tests/Models/SearchRequestTests.cs
deleted file mode 100644
index 1ac06a7..0000000
--- a/Imbick.StarCitizen.Api.Tests/Models/SearchRequestTests.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-
-namespace Imbick.StarCitizen.Api.Tests.Models {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Imbick.StarCitizen.Api.Models;
-    using Xunit;
-
-    public class SearchRequestTests
-    {
-        [Fact]
-        public void Ctor_WithBooleanYes_MapsCorrectly() {
-            var request = new SearchRequest {
-                Recruiting = SearchRequest.Boolean.Yes,
-                RolePlay = SearchRequest.Boolean.Yes
-            };
-            var result = new SearchRequestInternal(request);
-            Assert.True(result.Recruiting.Count() == 1);
-            Assert.True(result.Recruiting.First() == 1);
-            Assert.True(result.RolePlay.Count() == 1);
-            Assert.True(result.RolePlay.First() == 1);
-        }
-
-        [Fact]
-        public void Ctor_WithBooleanNo_MapsCorrectly() {
-            var request = new SearchRequest {
-                Recruiting = SearchRequest.Boolean.No,
-                RolePlay = SearchRequest.Boolean.No
-            };
-            var result = new SearchRequestInternal(request);
-            Assert.True(result.Recruiting.Count() == 1);
-            Assert.True(result.Recruiting.First() == 0);
-            Assert.True(result.RolePlay.Count() == 1);
-            Assert.True(result.RolePlay.First() == 0);
-        }
-
-        [Fact]
-        public void Ctor_WithBooleanBoth_MapsCorrectly() {
-            var request = new SearchRequest {
-                Recruiting = SearchRequest.Boolean.YesAndNo,
-                RolePlay = SearchRequest.Boolean.YesAndNo
-            };
-            var result = new SearchRequestInternal(request);
-            AssertContains(result.Recruiting, new List<int>());
-            AssertContains(result.RolePlay, new List<int>());
-        }
-
-        [Fact]
-        public void Ctor_WithSort_MapsCorrectly() {
-            var result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.ActiveAscending});
-            Assert.Equal(result.Sort, SearchRequestInternal.ActiveAsc);
-            result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.ActiveDescending });
-            Assert.Equal(result.Sort, SearchRequestInternal.ActiveDesc);
-            result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.CreatedAscending});
-            Assert.Equal(result.Sort, SearchRequestInternal.CreatedAsc);
-            result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.CreatedDescending});
-            Assert.Equal(result.Sort, SearchRequestInternal.CreatedDesc);
-            result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.NameAscending});
-            Assert.Equal(result.Sort, SearchRequestInternal.NameAsc);
-            result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.NameDescending});
-            Assert.Equal(result.Sort, SearchRequestInternal.NameDesc);
-            result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.SizeAscending});
-            Assert.Equal(result.Sort, SearchRequestInternal.SizeAsc);
-            result = new SearchRequestInternal(new SearchRequest { Sort = SearchRequest.Sorting.SizeDescending });
-            Assert.Equal(result.Sort, SearchRequestInternal.SizeDesc);
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                result = new SearchRequestInternal(new SearchRequest {Sort = (SearchRequest.Sorting)123}));
-        }
-
-        [Fact]
-        public void Ctor_WithSize_MapsCorrectly() {
-            var result = new SearchRequestInternal(new SearchRequest { Size = new[] { Size.Large } });
-            AssertContains(result.Size, new[] { Size.Large.ToString().ToLower() });
-            result = new SearchRequestInternal(new SearchRequest { Size = new[] { Size.Medium } });
-            AssertContains(result.Size, new[] { Size.Medium.ToString().ToLower() });
-            result = new SearchRequestInternal(new SearchRequest { Size = new[] { Size.Small } });
-            AssertContains(result.Size, new[] { Size.Small.ToString().ToLower() });
-            result = new SearchRequestInternal(new SearchRequest { Size = new[] { Size.Small, Size.Medium, Size.Large } });
-            AssertContains(result.Size, new[] { Size.Small.ToString().ToLower(), Size.Medium.ToString().ToLower(), Size.Large.ToString().ToLower() });
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                result = new SearchRequestInternal(new SearchRequest { Size = new [] { (Size)123} }));
-        }
-
-        [Fact]
-        public void Ctor_WithCommitment_MapsCorrectly() {
-            var result = new SearchRequestInternal(new SearchRequest { Commitment = new[] { Commitment.Regular } });
-            AssertContains(result.Commitment, new[] { "RE" });
-            result = new SearchRequestInternal(new SearchRequest { Commitment = new[] { Commitment.Casual } });
-            AssertContains(result.Commitment, new[] { "CA" });
-            result = new SearchRequestInternal(new SearchRequest { Commitment = new[] { Commitment.Hardcore } });
-            AssertContains(result.Commitment, new[] { "HA" });
-            result = new SearchRequestInternal(new SearchRequest { Commitment = new[] { Commitment.Casual, Commitment.Hardcore } });
-            AssertContains(result.Commitment, new[] { "CA", "HA" });
-            /*Assert.Throws<ArgumentOutOfRangeException>(() =>
-                result = new SearchRequestInternal(new SearchRequest { Commitment = new[] { (Commitment)123 } }));*/
-        }
-
-        private static void AssertContains<T>(IEnumerable<T> collection, IReadOnlyCollection<T> expectedContent) {
-            Assert.True(collection.Count() == expectedContent.Count);
-            foreach (var i in expectedContent) {
-                Assert.Contains(i, collection);
-            }
-        }
-    }
-}
diff --git a/Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs b/Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs
new file mode 100644
index 0000000..a7ef67b
--- /dev/null
+++ b/Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs
@@ -0,0 +1,17 @@
+namespace Imbick.StarCitizen.Api {
+    using System.Linq;
+    using Imbick.StarCitizen.Api.HtmlSerializers;
+    using Models;
+    using RestSharp;
+
+    public class GetOrgMembersRestRequest
+        : RestRequest {
+        public static string GetOrgMembersResource = "api/orgs/getOrgMembers";
+
+        public GetOrgMembersRestRequest(OrgMembersSearchRequest searchRequest)
+            : base(GetOrgMembersResource) {
+            SimpleJson.CurrentJsonSerializerStrategy = new CamelCaseSerializerStrategy();
+            AddJsonBody(searchRequest == null ? null : new OrgMembersSearchRequestInternal(searchRequest));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs b/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
index d6f5168..807c6fb 100644
--- a/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
+++ b/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
@@ -1,5 +1,6 @@
 namespace Imbick.StarCitizen.Api {
     using System.Linq;
+    using Imbick.StarCitizen.Api.HtmlSerializers;
     using Models;
     using RestSharp;
 
@@ -7,17 +8,10 @@ public class GetOrgsRestRequest
         : RestRequest {
         public static string GetOrgsResource = "api/orgs/getOrgs";
 
-        public GetOrgsRestRequest(SearchRequest searchRequest)
+        public GetOrgsRestRequest(OrgsSearchRequest searchRequest)
             : base(GetOrgsResource) {
             SimpleJson.CurrentJsonSerializerStrategy = new CamelCaseSerializerStrategy();
-            AddJsonBody(searchRequest == null ? null : new SearchRequestInternal(searchRequest));
-        }
-    }
-
-    internal class CamelCaseSerializerStrategy
-        : PocoJsonSerializerStrategy {
-        protected override string MapClrMemberNameToJsonFieldName(string clrPropertyName) {
-            return char.ToLower(clrPropertyName[0]) + clrPropertyName.Substring(1);
+            AddJsonBody(searchRequest == null ? null : new OrgsSearchRequestInternal(searchRequest));
         }
     }
 }
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api/HtmlSerializers/CamelCaseSerializerStrategy.cs b/Imbick.StarCitizen.Api/HtmlSerializers/CamelCaseSerializerStrategy.cs
new file mode 100644
index 0000000..e62a7b0
--- /dev/null
+++ b/Imbick.StarCitizen.Api/HtmlSerializers/CamelCaseSerializerStrategy.cs
@@ -0,0 +1,13 @@
+namespace Imbick.StarCitizen.Api.HtmlSerializers {
+    using System.Linq;
+    using System.Text.RegularExpressions;
+    using RestSharp;
+
+    internal class CamelCaseSerializerStrategy
+        : PocoJsonSerializerStrategy {
+        protected override string MapClrMemberNameToJsonFieldName(string clrPropertyName) {
+            //lower-case first characher or any character behind an underscore
+            return char.ToLower(clrPropertyName[0]) + Regex.Replace(clrPropertyName.Substring(1), @"_([A-Z]{1})", m => m.ToString().ToLower());
+        }
+    }
+}
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs b/Imbick.StarCitizen.Api/HtmlSerializers/OrgHtmlSerializer.cs
similarity index 70%
rename from Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs
rename to Imbick.StarCitizen.Api/HtmlSerializers/OrgHtmlSerializer.cs
index ae77198..ad3d502 100644
--- a/Imbick.StarCitizen.Api/OrganisationHtmlSerialiser.cs
+++ b/Imbick.StarCitizen.Api/HtmlSerializers/OrgHtmlSerializer.cs
@@ -1,32 +1,32 @@
-namespace Imbick.StarCitizen.Api {
+namespace Imbick.StarCitizen.Api.HtmlSerializers {
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using HtmlAgilityPack;
     using Models;
 
-    public class OrganisationHtmlSerialiser {
+    public class OrgHtmlSerializer {
 
-        public IEnumerable<Organisation> DeserialiseList(string orgs) {
+        public IEnumerable<Org> DeserializeList(string orgs) {
             _doc.LoadHtml(orgs);
             return _doc.DocumentNode.ChildNodes
                 .Where(n => n.Name == "div")
-                .Select(Deserialise);
+                .Select(Deserialize);
         }
 
-        public Organisation Deserialise(string org) {
+        public Org Deserialize(string org) {
             _doc.LoadHtml(org);
-            return Deserialise(_doc.DocumentNode);
+            return Deserialize(_doc.DocumentNode);
         }
 
-        private Organisation Deserialise(HtmlNode orgNode) {
+        private Org Deserialize(HtmlNode orgNode) {
             try {
-                return new Organisation {
+                return new Org {
                     Name = HtmlEntity.DeEntitize(orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[2]/h3[@class=\"trans-03s name\"]").InnerText),
                     Symbol = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[2]/span[@class=\"symbol\"]").InnerText,
                     ThumbnailUrl = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[1]/img").GetAttributeValue("src", string.Empty),
                     Archetype = ToArchetype(orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[1]//span[2]").InnerText),
-                    Commitment = (Commitment)Enum.Parse(typeof(Commitment), orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[3]//span[2]").InnerText),
+                    Commitment = (OrgCommitment)Enum.Parse(typeof(OrgCommitment), orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[3]//span[2]").InnerText),
                     Language = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[2]//span[2]").InnerText,
                     IsRecruiting = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[2]/span[1]//span[2]").InnerText == "Yes",
                     IsRolePlay = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[2]/span[2]//span[2]").InnerText == "Yes",
@@ -38,18 +38,18 @@ private Organisation Deserialise(HtmlNode orgNode) {
             }
         }
 
-        private Archetype ToArchetype(string value) {
+        private OrgArchetype ToArchetype(string value) {
             switch (value.ToLower()) {
                 case "organization":
-                    return Archetype.Organization;
+                    return OrgArchetype.Organization;
                 case "corporation":
-                    return Archetype.Corporation;
+                    return OrgArchetype.Corporation;
                 case "pmc":
-                    return Archetype.Pmc;
+                    return OrgArchetype.Pmc;
                 case "faith":
-                    return Archetype.Faith;
+                    return OrgArchetype.Faith;
                 case "syndicate":
-                    return Archetype.Syndicate;
+                    return OrgArchetype.Syndicate;
             }
 
             throw new ArgumentException(value);
diff --git a/Imbick.StarCitizen.Api/HtmlSerializers/OrgMemberHtmlSerializer.cs b/Imbick.StarCitizen.Api/HtmlSerializers/OrgMemberHtmlSerializer.cs
new file mode 100644
index 0000000..8571c04
--- /dev/null
+++ b/Imbick.StarCitizen.Api/HtmlSerializers/OrgMemberHtmlSerializer.cs
@@ -0,0 +1,40 @@
+namespace Imbick.StarCitizen.Api.HtmlSerializers {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using HtmlAgilityPack;
+    using Models;
+
+    public class OrgMemberHtmlSerializer {
+
+        public IEnumerable<OrgMember> DeserializeList(string orgs) {
+            _doc.LoadHtml(orgs);
+            return _doc.DocumentNode.ChildNodes
+                .Where(n => n.Name == "li")
+                .Select(Deserialize)
+                .Where(m => !String.IsNullOrWhiteSpace(m.Handle));
+        }
+
+        public OrgMember Deserialize(string org) {
+            _doc.LoadHtml(org);
+            return Deserialize(_doc.DocumentNode);
+        }
+
+        private OrgMember Deserialize(HtmlNode orgMemberNode) {
+            try {
+                var imgNode = orgMemberNode.SelectSingleNode("./a//span[contains(concat(' ', normalize-space(@class), ' '), ' thumb ')]/img");
+                return new OrgMember
+                {
+                    Name = HtmlEntity.DeEntitize(orgMemberNode.SelectSingleNode("./a//span[contains(concat(' ', normalize-space(@class), ' '), ' name ')]").InnerText).Trim(),
+                    Handle = HtmlEntity.DeEntitize(orgMemberNode.SelectSingleNode("./a//span[contains(concat(' ', normalize-space(@class), ' '), ' nick ')]").InnerText).Trim(),
+                    AvatarUrl = imgNode != null ? imgNode.GetAttributeValue("src", string.Empty) : null
+                };
+            }
+            catch (Exception e) {
+                throw new Exception("Unable to parse org member. Probably the HTML has changed.", e);
+            }
+        }
+
+        private readonly HtmlDocument _doc = new HtmlDocument();
+    }
+}
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api/Models/Organisation.cs b/Imbick.StarCitizen.Api/Models/Org.cs
similarity index 87%
rename from Imbick.StarCitizen.Api/Models/Organisation.cs
rename to Imbick.StarCitizen.Api/Models/Org.cs
index 1694055..86f775b 100644
--- a/Imbick.StarCitizen.Api/Models/Organisation.cs
+++ b/Imbick.StarCitizen.Api/Models/Org.cs
@@ -3,19 +3,19 @@ namespace Imbick.StarCitizen.Api.Models {
     using System;
     using System.Diagnostics;
 
-    public enum Size {
+    public enum OrgSize {
         Small,
         Medium,
         Large
     }
 
-    public enum Commitment {
+    public enum OrgCommitment {
         Casual,
         Regular,
         Hardcore
     }
 
-    public enum Archetype {
+    public enum OrgArchetype {
         Organization,
         Corporation,
         Pmc,
@@ -23,7 +23,7 @@ public enum Archetype {
         Syndicate
     }
 
-    public enum Activity {
+    public enum OrgActivity {
         BountyHunting = 9,
         Engineering = 7,
         Exploration = 12,
@@ -40,16 +40,16 @@ public enum Activity {
     }
 
     [DebuggerDisplay("{" + nameof(Name) + "}")]
-    public class Organisation
-        : IEquatable<Organisation> {
+    public class Org
+        : IEquatable<Org> {
         public string Name { get; set; }
         public string Symbol { get; set; }
 
         public string ThumbnailUrl { get; set; }
 
-        public Archetype Archetype { get; set; }
+        public OrgArchetype Archetype { get; set; }
 
-        public Commitment Commitment { get; set; }
+        public OrgCommitment Commitment { get; set; }
 
         public string Language { get; set; }
 
@@ -59,7 +59,7 @@ public class Organisation
 
         public long MemberCount { get; set; }
 
-        public bool Equals(Organisation other) {
+        public bool Equals(Org other) {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
             return string.Equals(Name, other.Name) && string.Equals(Symbol, other.Symbol) &&
@@ -73,7 +73,7 @@ public override bool Equals(object obj) {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != this.GetType()) return false;
-            return Equals((Organisation) obj);
+            return Equals((Org) obj);
         }
 
         public override int GetHashCode() {
diff --git a/Imbick.StarCitizen.Api/Models/OrgMember.cs b/Imbick.StarCitizen.Api/Models/OrgMember.cs
new file mode 100644
index 0000000..21a1c55
--- /dev/null
+++ b/Imbick.StarCitizen.Api/Models/OrgMember.cs
@@ -0,0 +1,43 @@
+
+namespace Imbick.StarCitizen.Api.Models
+{
+    using System;
+    using System.Diagnostics;
+
+    [DebuggerDisplay("{" + nameof(Name) + "}")]
+    public class OrgMember
+        : IEquatable<OrgMember>
+    {
+        public string Name { get; set; }
+        public string Handle { get; set; }
+
+        public string AvatarUrl { get; set; }
+
+        public bool Equals(OrgMember other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return string.Equals(Name, other.Name) && string.Equals(Handle, other.Handle) &&
+                   string.Equals(AvatarUrl, other.AvatarUrl);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((OrgMember)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = (Name != null ? Name.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Handle != null ? Handle.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (AvatarUrl != null ? AvatarUrl.GetHashCode() : 0);
+                return hashCode;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs b/Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs
new file mode 100644
index 0000000..62eb4c5
--- /dev/null
+++ b/Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs
@@ -0,0 +1,63 @@
+
+namespace Imbick.StarCitizen.Api.Models {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    public class OrgMembersSearchRequest {
+        public enum MembershipType
+        {
+            Any,
+            MainOrg,
+            Affiliate
+        }
+
+        public string Symbol { get; set; }
+        public string Search { get; set; }
+        public int? Rank { get; set; } = null;
+        public int? Role { get; set; } = null;
+        public MembershipType Membership { get; set; } = MembershipType.Any;
+        public int PageSize { get; set; } = 32;
+        public int Page { get; set; } = 1;
+    }
+
+    internal class OrgMembersSearchRequestInternal {
+        public string Symbol { get; set; }
+        public string Search { get; set; }
+        public int? Rank { get; set; }
+        public int? Role { get; set; }
+
+        [RestSharp.Deserializers.DeserializeAs(Name = "main_org")]
+        [RestSharp.Serializers.SerializeAs(Name = "main_org", Attribute = true, Content = true, NameStyle = RestSharp.Serializers.NameStyle.LowerCase)]
+        public int? Main_Org { get; set; }
+
+        public int PageSize { get; set; }
+        public int Page { get; set; }
+
+        public OrgMembersSearchRequestInternal(OrgMembersSearchRequest copy) {
+            Symbol = copy.Symbol;
+            Search = copy.Search;
+            Rank = copy.Rank;
+            Role = copy.Role;
+            Main_Org = MapMembershipType(copy.Membership);
+            PageSize = copy.PageSize;
+            Page = copy.Page;
+        }
+
+        private int? MapMembershipType(OrgMembersSearchRequest.MembershipType membershipType)
+        {
+            return membershipType == OrgMembersSearchRequest.MembershipType.MainOrg ? 1 :
+                membershipType == OrgMembersSearchRequest.MembershipType.Affiliate ? 0 :
+                (int?)null;
+        }
+    }
+}
+/*
+minimal {symbol:"SWISS",search:"",pagesize:32,page:1}
+search name {symbol:"SWISS",search:"Meetsch"}
+filter rank {symbol:"SWISS",search:"",rank:1}
+filter role {symbol:"SWISS",search:"",role:1}
+filter main_org {symbol:"SWISS",search:"",main_org:1}
+filter affiliate {symbol:"SWISS",search:"",main_org:0}
+full {symbol:"SWISS",search:"Looping",rank:1,role:1,main_org:1,pagesize:32,page:1}
+*/
diff --git a/Imbick.StarCitizen.Api/Models/SearchRequest.cs b/Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs
similarity index 66%
rename from Imbick.StarCitizen.Api/Models/SearchRequest.cs
rename to Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs
index e466f1a..3e15110 100644
--- a/Imbick.StarCitizen.Api/Models/SearchRequest.cs
+++ b/Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs
@@ -4,8 +4,8 @@ namespace Imbick.StarCitizen.Api.Models {
     using System.Collections.Generic;
     using System.Linq;
 
-    public class SearchRequest {
-        public enum Sorting {
+    public class OrgsSearchRequest {
+        public enum OrganisationSorting {
             ActiveAscending,
             ActiveDescending,
             SizeAscending,
@@ -22,20 +22,20 @@ public enum Boolean {
             No
         }
 
-        public Sorting Sort { get; set; }
+        public OrganisationSorting Sort { get; set; }
         public string Search { get; set; }
         public string Language { get; set; } //todo enumerate these
-        public ICollection<Commitment> Commitment { get; set; } = new List<Commitment>();
-        public ICollection<Size> Size { get; set; } = new List<Size>();
-        public ICollection<Archetype> Model => new List<Archetype>();
-        public ICollection<Activity> Activity => new List<Activity>();
+        public ICollection<OrgCommitment> Commitment { get; set; } = new List<OrgCommitment>();
+        public ICollection<OrgSize> Size { get; set; } = new List<OrgSize>();
+        public ICollection<OrgArchetype> Model => new List<OrgArchetype>();
+        public ICollection<OrgActivity> Activity => new List<OrgActivity>();
         public Boolean RolePlay { get; set; }
         public Boolean Recruiting { get; set; }
         public int PageSize { get; set; } = 12;
         public int Page { get; set; } = 1;
     }
 
-    public class SearchRequestInternal {
+    internal class OrgsSearchRequestInternal {
         public static string SizeAsc = "size_asc";
         public static string SizeDesc = "size_desc";
         public static string NameAsc = "name_asc";
@@ -60,7 +60,7 @@ public class SearchRequestInternal {
         public int PageSize { get; set; }
         public int Page { get; set; }
 
-        public SearchRequestInternal(SearchRequest copy) {
+        public OrgsSearchRequestInternal(OrgsSearchRequest copy) {
             Search = copy.Search;
             Language = copy.Language != null ? new List<string> {copy.Language} : new List<string>();
             Sort = MapSort(copy.Sort);
@@ -77,65 +77,65 @@ public SearchRequestInternal(SearchRequest copy) {
             Recruiting = MapBoolean(copy.Recruiting);
         }
 
-        private IEnumerable<string> MapSize(ICollection<Size> sizes) {
-            if (sizes.Any(s => !Enum.IsDefined(typeof(Size), s)))
+        private IEnumerable<string> MapSize(ICollection<OrgSize> sizes) {
+            if (sizes.Any(s => !Enum.IsDefined(typeof(OrgSize), s)))
                 throw new ArgumentOutOfRangeException(nameof(sizes));
             return sizes.Select(s => s.ToString().ToLower());
         }
 
-        private IEnumerable<int> MapBoolean(SearchRequest.Boolean boolean) {
-            return boolean == SearchRequest.Boolean.Yes ? new List<int> {1} :
-                boolean == SearchRequest.Boolean.No ? new List<int> {0} :
+        private IEnumerable<int> MapBoolean(OrgsSearchRequest.Boolean boolean) {
+            return boolean == OrgsSearchRequest.Boolean.Yes ? new List<int> {1} :
+                boolean == OrgsSearchRequest.Boolean.No ? new List<int> {0} :
                 new List<int>( );
         }
 
-        private string MapCommitment(Commitment commitment) {
+        private string MapCommitment(OrgCommitment commitment) {
             switch (commitment) {
-                case Models.Commitment.Regular:
+                case Models.OrgCommitment.Regular:
                     return "RE";
-                case Models.Commitment.Casual:
+                case Models.OrgCommitment.Casual:
                     return "CA";
-                case Models.Commitment.Hardcore:
+                case Models.OrgCommitment.Hardcore:
                     return "HA";
             }
 
             throw new ArgumentOutOfRangeException(nameof(commitment), commitment, null);
         }
 
-        private string MapArchetype(Archetype archetype) {
+        private string MapArchetype(OrgArchetype archetype) {
             switch (archetype) {
-                case Archetype.Organization:
+                case OrgArchetype.Organization:
                     return "generic";
-                case Archetype.Corporation:
+                case OrgArchetype.Corporation:
                     return "corp";
-                case Archetype.Pmc:
+                case OrgArchetype.Pmc:
                     return "pmc";
-                case Archetype.Faith:
+                case OrgArchetype.Faith:
                     return "faith";
-                case Archetype.Syndicate:
+                case OrgArchetype.Syndicate:
                     return "syndicate";
             }
 
             throw new ArgumentOutOfRangeException(nameof(archetype), archetype, null);
         }
 
-        private string MapSort(SearchRequest.Sorting sort) {
+        private string MapSort(OrgsSearchRequest.OrganisationSorting sort) {
             switch (sort) {
-                case SearchRequest.Sorting.SizeAscending:
+                case OrgsSearchRequest.OrganisationSorting.SizeAscending:
                     return SizeAsc;
-                case SearchRequest.Sorting.SizeDescending:
+                case OrgsSearchRequest.OrganisationSorting.SizeDescending:
                     return SizeDesc;
-                case SearchRequest.Sorting.NameAscending:
+                case OrgsSearchRequest.OrganisationSorting.NameAscending:
                     return NameAsc;
-                case SearchRequest.Sorting.NameDescending:
+                case OrgsSearchRequest.OrganisationSorting.NameDescending:
                     return NameDesc;
-                case SearchRequest.Sorting.CreatedAscending:
+                case OrgsSearchRequest.OrganisationSorting.CreatedAscending:
                     return CreatedAsc;
-                case SearchRequest.Sorting.CreatedDescending:
+                case OrgsSearchRequest.OrganisationSorting.CreatedDescending:
                     return CreatedDesc;
-                case SearchRequest.Sorting.ActiveAscending:
+                case OrgsSearchRequest.OrganisationSorting.ActiveAscending:
                     return ActiveAsc;
-                case SearchRequest.Sorting.ActiveDescending:
+                case OrgsSearchRequest.OrganisationSorting.ActiveDescending:
                     return ActiveDesc;
             }
 
diff --git a/Imbick.StarCitizen.Api/OrganisationsClient.cs b/Imbick.StarCitizen.Api/OrganisationsClient.cs
deleted file mode 100644
index 5c2a364..0000000
--- a/Imbick.StarCitizen.Api/OrganisationsClient.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-
-namespace Imbick.StarCitizen.Api {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    using Models;
-    using RestSharp;
-
-    public class OrganisationsClient {
-
-        public OrganisationsClient()
-            : this("https://robertsspaceindustries.com/") { }
-
-        public OrganisationsClient(string baseUrl)
-            : this(new Uri(baseUrl)) { }
-
-        public OrganisationsClient(Uri baseUrl)
-            : this(new RestClient(baseUrl)) { }
-
-        public OrganisationsClient(IRestClient client) {
-            _client = client;
-        }
-
-        public async Task<IEnumerable<Organisation>> ListAsync() {
-            return await GetAsync();
-        }
-
-        public async Task<IEnumerable<Organisation>> GetAsync(SearchRequest searchRequest = null) {
-            var request = new GetOrgsRestRequest(searchRequest);
-            try {
-                var response = await _client.ExecutePostTaskAsync<Response>(request);
-                if (!response.IsSuccessful)
-                    throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
-                var decodedHtml = SimpleJson.DeserializeObject<string>("\"" + response.Data.Data.Html + "\"", SimpleJson.CurrentJsonSerializerStrategy);
-                return _deserialiser.DeserialiseList(decodedHtml);
-            } catch (Exception e) {
-                throw new Exception("Problem retrieving orgs. See inner exception for details.", e);
-            }
-        }
-
-        private readonly IRestClient _client;
-        private readonly OrganisationHtmlSerialiser _deserialiser = new OrganisationHtmlSerialiser();
-    }
-}
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api/RsiApiClient.cs b/Imbick.StarCitizen.Api/RsiApiClient.cs
new file mode 100644
index 0000000..5b073c2
--- /dev/null
+++ b/Imbick.StarCitizen.Api/RsiApiClient.cs
@@ -0,0 +1,73 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Imbick.StarCitizen.Api.Tests")]
+namespace Imbick.StarCitizen.Api {
+    using System;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using Imbick.StarCitizen.Api.HtmlSerializers;
+    using Models;
+    using RestSharp;
+
+    public class RsiApiClient {
+        private readonly IRestClient _client;
+
+        public RsiApiClient()
+            : this("https://robertsspaceindustries.com/") { }
+
+        public RsiApiClient(string baseUrl)
+            : this(new Uri(baseUrl)) { }
+
+        public RsiApiClient(Uri baseUrl)
+            : this(new RestClient(baseUrl)) { }
+
+        public RsiApiClient(IRestClient client) {
+            _client = client;
+        }
+
+        #region getOrgs
+        public async Task<IEnumerable<Org>> ListOrgsAsync() {
+            return await GetOrgsAsync();
+        }
+
+        public async Task<IEnumerable<Org>> GetOrgsAsync(OrgsSearchRequest searchRequest = null) {
+            var request = new GetOrgsRestRequest(searchRequest);
+            try {
+                var response = await _client.ExecutePostTaskAsync<Response>(request);
+                if (!response.IsSuccessful)
+                    throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
+                var decodedHtml = response.Data.Data.Html.Replace("\\\"", "\"");
+                return _orgDeserialiser.DeserializeList(decodedHtml);
+            } catch (Exception e) {
+                throw new Exception("Problem retrieving orgs. See inner exception for details.", e);
+            }
+        }
+
+        private readonly OrgHtmlSerializer _orgDeserialiser = new OrgHtmlSerializer();
+        #endregion
+
+        #region getOrgMembers
+        public async Task<IEnumerable<OrgMember>> ListOrgMembersAsync(string orgSymbol, string memberSearch = null)
+        {
+            return await GetOrgMembersAsync(new OrgMembersSearchRequest() { Symbol = orgSymbol, Search = memberSearch });
+        }
+
+        public async Task<IEnumerable<OrgMember>> GetOrgMembersAsync(OrgMembersSearchRequest searchRequest = null)
+        {
+            var request = new GetOrgMembersRestRequest(searchRequest);
+            try
+            {
+                var response = await _client.ExecutePostTaskAsync<Response>(request);
+                if (!response.IsSuccessful)
+                    throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
+                var decodedHtml = response.Data.Data.Html.Replace("\\\"", "\"");
+                return _orgMemberDeserializer.DeserializeList(decodedHtml);
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Problem retrieving org members. See inner exception for details.", e);
+            }
+        }
+
+        private readonly OrgMemberHtmlSerializer _orgMemberDeserializer = new OrgMemberHtmlSerializer();
+        #endregion
+    }
+}
\ No newline at end of file

From d6851873d2fe4448a9994973e0f71a3682b42c64 Mon Sep 17 00:00:00 2001
From: Michel Bagnol <m.bagnol@nodewave.com>
Date: Fri, 4 Oct 2019 23:12:27 +0200
Subject: [PATCH 3/6] Updated readme.md

---
 README.md | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2811fac..1c397f2 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,34 @@
 
 This repository provides a C# wrapper around the Star Citizen REST API(s).
 
-Currently only the organisation API is supported https://robertsspaceindustries.com/api/orgs/getOrgs
+## Supported APIs from robertsspaceindustries.com
+
+Currently the only supported APIs are:
+
+* the organisation https://robertsspaceindustries.com/api/orgs/getOrgs
+* the organisation's members https://robertsspaceindustries.com/api/orgs/getOrgMembers
+
+### Organisations
 
 It accepts `POST` requests with no body to list all organisations with the default sorting of `size_desc`. Alternatively a json payload can be provided in the body with the following example structure:
 
-`{"sort":"size_desc","search":"","commitment":[],"roleplay":[],"size":[],"model":[],"activity":[],"language":[],"recruiting":[],"pagesize":12,"page":1}`
+`{sort:"size_desc",search:"",commitment:[],roleplay:[],size:[],model:[],activity:[],language:[],recruiting:[],pagesize:12,page:1}`
+
+Supported values for each of the properties can be found in the `Imbick.StarCitizen.Api.Models.OrgsSearchRequest.cs` file.
+
+### Organisation's Members
+
+It accepts `POST` requests with at least the symbol of the organisation to get the members. Alternatively a json payload can be provided in the body with the following example structure:
+
+`{symbol:"SWISS",search:"",pagesize:32,page:1}`
+`{symbol:"SWISS",search:"Meetsch",pagesize:32,page:1}`
+`{symbol:"SWISS",search:"",rank:1,role:1,main_org:1,pagesize:32,page:1}`
+
+Supported values for each of the properties can be found in the `Imbick.StarCitizen.Api.Models.OrgMembersSearchRequest.cs` file.
 
-Supported values for each of the properties can be found in the `Imbick.StarCitizen.Api.Models.SearchRequest.cs` file.
+## Roadmap
 
-Additional APIs I am aware of and may support in the future are:  
+Additional APIs may be supported in the future:  
 `/api/leaderboards/getLeaderboard`  
 `/api/stats/getCrowdfundStats`  
 `/api/starmap`  

From 27f8784611bbc9482a9bd0e16f96079508012dc8 Mon Sep 17 00:00:00 2001
From: Michel Bagnol <m.bagnol@nodewave.com>
Date: Fri, 4 Oct 2019 23:14:06 +0200
Subject: [PATCH 4/6] Simplify Json field name serialization strategy as its
 simply lowercase and not camelCase.

---
 Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs          | 2 +-
 Imbick.StarCitizen.Api/GetOrgsRestRequest.cs                | 2 +-
 ...SerializerStrategy.cs => LowerCaseSerializerStrategy.cs} | 5 ++---
 Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs    | 3 ---
 Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs          | 6 +++---
 5 files changed, 7 insertions(+), 11 deletions(-)
 rename Imbick.StarCitizen.Api/HtmlSerializers/{CamelCaseSerializerStrategy.cs => LowerCaseSerializerStrategy.cs} (51%)

diff --git a/Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs b/Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs
index a7ef67b..4fcef71 100644
--- a/Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs
+++ b/Imbick.StarCitizen.Api/GetOrgMembersRestRequest.cs
@@ -10,7 +10,7 @@ public class GetOrgMembersRestRequest
 
         public GetOrgMembersRestRequest(OrgMembersSearchRequest searchRequest)
             : base(GetOrgMembersResource) {
-            SimpleJson.CurrentJsonSerializerStrategy = new CamelCaseSerializerStrategy();
+            SimpleJson.CurrentJsonSerializerStrategy = new LowerCaseSerializerStrategy();
             AddJsonBody(searchRequest == null ? null : new OrgMembersSearchRequestInternal(searchRequest));
         }
     }
diff --git a/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs b/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
index 807c6fb..3126d8b 100644
--- a/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
+++ b/Imbick.StarCitizen.Api/GetOrgsRestRequest.cs
@@ -10,7 +10,7 @@ public class GetOrgsRestRequest
 
         public GetOrgsRestRequest(OrgsSearchRequest searchRequest)
             : base(GetOrgsResource) {
-            SimpleJson.CurrentJsonSerializerStrategy = new CamelCaseSerializerStrategy();
+            SimpleJson.CurrentJsonSerializerStrategy = new LowerCaseSerializerStrategy();
             AddJsonBody(searchRequest == null ? null : new OrgsSearchRequestInternal(searchRequest));
         }
     }
diff --git a/Imbick.StarCitizen.Api/HtmlSerializers/CamelCaseSerializerStrategy.cs b/Imbick.StarCitizen.Api/HtmlSerializers/LowerCaseSerializerStrategy.cs
similarity index 51%
rename from Imbick.StarCitizen.Api/HtmlSerializers/CamelCaseSerializerStrategy.cs
rename to Imbick.StarCitizen.Api/HtmlSerializers/LowerCaseSerializerStrategy.cs
index e62a7b0..4b08a0a 100644
--- a/Imbick.StarCitizen.Api/HtmlSerializers/CamelCaseSerializerStrategy.cs
+++ b/Imbick.StarCitizen.Api/HtmlSerializers/LowerCaseSerializerStrategy.cs
@@ -3,11 +3,10 @@
     using System.Text.RegularExpressions;
     using RestSharp;
 
-    internal class CamelCaseSerializerStrategy
+    internal class LowerCaseSerializerStrategy
         : PocoJsonSerializerStrategy {
         protected override string MapClrMemberNameToJsonFieldName(string clrPropertyName) {
-            //lower-case first characher or any character behind an underscore
-            return char.ToLower(clrPropertyName[0]) + Regex.Replace(clrPropertyName.Substring(1), @"_([A-Z]{1})", m => m.ToString().ToLower());
+            return clrPropertyName.ToLower();
         }
     }
 }
\ No newline at end of file
diff --git a/Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs b/Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs
index 62eb4c5..3247e34 100644
--- a/Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs
+++ b/Imbick.StarCitizen.Api/Models/OrgMembersSearchRequest.cs
@@ -26,9 +26,6 @@ internal class OrgMembersSearchRequestInternal {
         public string Search { get; set; }
         public int? Rank { get; set; }
         public int? Role { get; set; }
-
-        [RestSharp.Deserializers.DeserializeAs(Name = "main_org")]
-        [RestSharp.Serializers.SerializeAs(Name = "main_org", Attribute = true, Content = true, NameStyle = RestSharp.Serializers.NameStyle.LowerCase)]
         public int? Main_Org { get; set; }
 
         public int PageSize { get; set; }
diff --git a/Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs b/Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs
index 3e15110..6a57a1e 100644
--- a/Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs
+++ b/Imbick.StarCitizen.Api/Models/OrgsSearchRequest.cs
@@ -144,7 +144,7 @@ private string MapSort(OrgsSearchRequest.OrganisationSorting sort) {
     }
 }
 /*
-empty {"sort":"size_desc","search":"","commitment":[],"roleplay":[],"size":[],"model":[],"activity":[],"language":[],"recruiting":[],"pagesize":12,"page":1}
-partial {"sort":"size_desc","search":"","commitment":["CA","RE"],"roleplay":["1","0"],"size":["small","medium"],"model":["generic","corp"],"activity":["9","7"],"language":[],"recruiting":["1","0"],"pagesize":12,"page":1}
-full {"sort":"size_desc","search":"test","commitment":["CA","RE","HA"],"roleplay":["1","0"],"size":["small","medium","large"],"model":["generic","corp","pmc","faith","syndicate"],"activity":["9","7","12","6","5","10","4","3","8","2","13","11","1"],"language":["ce"],"recruiting":["1","0"],"pagesize":12,"page":1}
+empty {sort:"size_desc",search:"",commitment:[],roleplay:[],size:[],model:[],activity:[],language:[],recruiting:[],pagesize:12,page:1}
+partial {sort:"size_desc",search:"",commitment:["CA","RE"],roleplay:["1","0"],size:["small","medium"],model:["generic","corp"],activity:["9","7"],"language":[],recruiting:["1","0"],pagesize:12,page:1}
+full {sort:"size_desc",search:"test",commitment:["CA","RE","HA"],roleplay:["1","0"],size:["small","medium","large"],model:["generic","corp","pmc","faith","syndicate"],activity:["9","7","12","6","5","10","4","3","8","2","13","11","1"],language:["ce"],recruiting:["1","0"],pagesize:12,page:1}
 */
\ No newline at end of file

From 47e3122e37e2a988f4f7e7ab9da00539f3a6ab5c Mon Sep 17 00:00:00 2001
From: Michel Bagnol <m.bagnol@nodewave.com>
Date: Fri, 4 Oct 2019 23:24:43 +0200
Subject: [PATCH 5/6] fix unit-test dummy data

---
 Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs b/Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs
index e31a451..1aa421a 100644
--- a/Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs
+++ b/Imbick.StarCitizen.Api.Tests/GetOrgMembersTests.cs
@@ -54,13 +54,13 @@ public async Task GetOrgMembersAsync_WithSearchTerm_ReturnsCorrectResultAsync()
         {
             Data = new ResponseData
             {
-                Html = @"\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/meetsch\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/80d4lybcin5dhr\/avatar\/Swiss-Starships-Ecusson.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Meetsch<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">meetsch<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data1\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n"
+                Html = @"\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/meetsch\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/80d4lybcin5dhr/avatar/Swiss-Starships-Ecusson.png\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Meetsch</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data1\"">meetsch</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data4\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n"
             }
         };
 
         private readonly Response _dummyResponse_9Members = new Response {
             Data = new ResponseData {
-                Html = @"\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Maark\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/j9knprddodfokr\/avatar\/110.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Etat-major<\/li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Membre du Conseil<\/li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Pilote en service<\/li>\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Maarkreidi<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Maark<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data1\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 100%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Commandant de corps<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Mr_Pandalf\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/do3enb8nqt5u2r\/avatar\/W_0.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data2\"">Mr_Pandalf<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Mr_Pandalf<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/meetsch\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/80d4lybcin5dhr\/avatar\/Swiss-Starships-Ecusson.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data4\"">Meetsch<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data5\"">meetsch<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Mi_K_L\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/ivofafg2foiz6r\/avatar\/Rambo-Seals.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Mickael<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Mi_K_L<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Rogor_Roxor\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/rsi\/static\/images\/account\/avatar_default_big.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data1\"">Mike_LaMenace<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Rogor_Roxor<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data3\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Major_Duke\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/jcxp1bk3lu52yr\/avatar\/Horror-Reptile.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Major Duke<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Major_Duke<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data2\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Olderan\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/y15plz8yysn3cr\/avatar\/Blackeyegalaxy.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data2\"">Merlin<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Olderan<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data4\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Mike_Roxor\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/zzw94vxbss2w9r\/avatar\/Swissmade.jpg\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Mike Swissmade<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data4\"">Mike_Roxor<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data2\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""\/citizens\/Genju\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""\/media\/ukk48x1o0xgmyr\/avatar\/1080.png\"" \/>\n                <div class=\""corner corner-top-left\""><\/div>\n        <div class=\""corner corner-top-right\""><\/div>\n        <div class=\""corner corner-bottom-left\""><\/div>\n        <div class=\""corner corner-bottom-right\""><\/div>\n\t\t\t<\/span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles<\/span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t<\/ul>\n          \t\t\t\t<\/span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Mute<\/span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data4\"">Genju<\/span>\n            <div class=\""wrap-border-line left\""><\/div>\n            <div class=\""wrap-border-line right\""><\/div>\n\t\t\t\t\t<\/span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""><\/span>\n            \t\t\t\t\t<\/span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste<\/span>\n          \t\t\t\t\t\t\t\t\t<\/span>\n\t\t\t<\/span>\n\t\t<\/a>\n    \t\t    <div class=\""corner corner-top-left\""><\/div>\n    <div class=\""corner corner-top-right\""><\/div>\n    <div class=\""corner corner-bottom-left\""><\/div>\n    <div class=\""corner corner-bottom-right\""><\/div>\n\t<\/li>\n"
+                Html = @"\t <li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Maark\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/j9knprddodfokr/avatar/110.jpg\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Etat-major</li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Membre du Conseil</li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li class=\""role\"">Pilote en service</li>\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Maarkreidi</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Maark</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data2\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 100%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">Commandant de corps</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Mr_Pandalf\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/do3enb8nqt5u2r/avatar/W_0.png\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Mr_Pandalf</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Mr_Pandalf</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data5\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/meetsch\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/80d4lybcin5dhr/avatar/Swiss-Starships-Ecusson.png\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data3\"">Meetsch</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data1\"">meetsch</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data1\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Mi_K_L\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/ivofafg2foiz6r/avatar/Rambo-Seals.png\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data4\"">Mickael</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data4\"">Mi_K_L</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data2\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Rogor_Roxor\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/rsi/static/images/account/avatar_default_big.jpg\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data5\"">Mike_LaMenace</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data3\"">Rogor_Roxor</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data3\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Major_Duke\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/jcxp1bk3lu52yr/avatar/Horror-Reptile.jpg\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data2\"">Major Duke</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Major_Duke</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data3\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 40%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">Recrue</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Olderan\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/y15plz8yysn3cr/avatar/Blackeyegalaxy.jpg\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data1\"">Merlin</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data1\"">Olderan</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data3\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Mike_Roxor\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/zzw94vxbss2w9r/avatar/Swissmade.jpg\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data1\"">Mike Swissmade</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data2\"">Mike_Roxor</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data3\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n\t<li class=\""member-item js-member-item org-main org-visibility-V\"" data-org-sid=\""SWISS\"" data-org-name=\""Swiss Starships\"">\n\t\t<a class=\""membercard js-edit-member\""  href=\""/citizens/Genju\"">\n      <span class=\""thumb\"">\n        \t\t\t\t<img src=\""/media/ukk48x1o0xgmyr/avatar/1080.png\"" />\n                <div class=\""corner corner-top-left\""></div>\n        <div class=\""corner corner-top-right\""></div>\n        <div class=\""corner corner-bottom-left\""></div>\n        <div class=\""corner corner-bottom-right\""></div>\n\t\t\t</span>\n\t\t\t<span class=\""right\"">\n        \t\t\t\t<span class=\""abs-overlay trans-03s roles\"">\n          \t\t\t\t\t<span class=\""title\"">Roles</span>\n\t\t\t\t\t<ul class=\""rolelist\"">\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n          \t\t\t\t</span>\n                \n                                                \n\t\t\t\t<span class=\""trans-03s frontinfo\"">\n\t\t\t\t\t<span class=\""name-wrap\"">\n\t\t\t\t\t\t<span class=\""trans-03s name data1\"">Mute</span>\n\t\t\t\t\t\t<span class=\""trans-03s nick data5\"">Genju</span>\n            <div class=\""wrap-border-line left\""></div>\n            <div class=\""wrap-border-line right\""></div>\n\t\t\t\t\t</span>\n\t\t\t\t\t<span class=\""ranking-stars data3\"">\n            \t\t\t\t\t\t<span class=\""stars\"" style=\""width: 20%;\""></span>\n            \t\t\t\t\t</span>\n\t\t\t\t\t          <span class=\""rank\"">R&eacute;serviste</span>\n          \t\t\t\t\t\t\t\t\t</span>\n\t\t\t</span>\n\t\t</a>\n    \t\t    <div class=\""corner corner-top-left\""></div>\n    <div class=\""corner corner-top-right\""></div>\n    <div class=\""corner corner-bottom-left\""></div>\n    <div class=\""corner corner-bottom-right\""></div>\n\t</li>\n"
             }
         };
 

From b493c416b0b33e62224b6d8944c4590c32b2efc5 Mon Sep 17 00:00:00 2001
From: Michel Bagnol <m.bagnol@nodewave.com>
Date: Sat, 5 Oct 2019 23:17:42 +0200
Subject: [PATCH 6/6] retry in case of api throttling, tolerant to api
 returning empty data, and some minor fix to deserialize "club" orgs.

---
 .../HtmlSerializers/OrgHtmlSerializer.cs      | 14 ++-
 Imbick.StarCitizen.Api/Models/Org.cs          | 10 +-
 Imbick.StarCitizen.Api/RsiApiClient.cs        | 99 +++++++++++++++----
 3 files changed, 97 insertions(+), 26 deletions(-)

diff --git a/Imbick.StarCitizen.Api/HtmlSerializers/OrgHtmlSerializer.cs b/Imbick.StarCitizen.Api/HtmlSerializers/OrgHtmlSerializer.cs
index ad3d502..26983f7 100644
--- a/Imbick.StarCitizen.Api/HtmlSerializers/OrgHtmlSerializer.cs
+++ b/Imbick.StarCitizen.Api/HtmlSerializers/OrgHtmlSerializer.cs
@@ -11,7 +11,8 @@ public IEnumerable<Org> DeserializeList(string orgs) {
             _doc.LoadHtml(orgs);
             return _doc.DocumentNode.ChildNodes
                 .Where(n => n.Name == "div")
-                .Select(Deserialize);
+                .Select(Deserialize)
+                .Where(m => !String.IsNullOrWhiteSpace(m.Symbol)); ;
         }
 
         public Org Deserialize(string org) {
@@ -21,16 +22,19 @@ public Org Deserialize(string org) {
 
         private Org Deserialize(HtmlNode orgNode) {
             try {
+                var memberCount = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[2]/span[3]//span[2]").InnerText;
+                var archetype = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[1]//span[2]").InnerText;
+                var commitment = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[3]//span[2]").InnerText;
                 return new Org {
                     Name = HtmlEntity.DeEntitize(orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[2]/h3[@class=\"trans-03s name\"]").InnerText),
                     Symbol = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[2]/span[@class=\"symbol\"]").InnerText,
                     ThumbnailUrl = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[2]/span[1]/img").GetAttributeValue("src", string.Empty),
-                    Archetype = ToArchetype(orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[1]//span[2]").InnerText),
-                    Commitment = (OrgCommitment)Enum.Parse(typeof(OrgCommitment), orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[3]//span[2]").InnerText),
+                    Archetype = String.IsNullOrWhiteSpace(archetype) ? OrgArchetype._UNDEFINED_ : ToArchetype(archetype),
+                    Commitment = String.IsNullOrWhiteSpace(commitment) ? OrgCommitment._UNDEFINED_ : (OrgCommitment)Enum.Parse(typeof(OrgCommitment), commitment),
                     Language = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[1]/span[2]//span[2]").InnerText,
                     IsRecruiting = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[2]/span[1]//span[2]").InnerText == "Yes",
                     IsRolePlay = orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[2]/span[2]//span[2]").InnerText == "Yes",
-                    MemberCount = long.Parse(orgNode.SelectSingleNode("./a[@class=\"trans-03s clearfix\"]/span[3]/span[2]/span[3]//span[2]").InnerText)
+                    MemberCount = String.IsNullOrWhiteSpace(memberCount) ? 0 : long.Parse(memberCount)
                 };
             }
             catch (Exception e) {
@@ -50,6 +54,8 @@ private OrgArchetype ToArchetype(string value) {
                     return OrgArchetype.Faith;
                 case "syndicate":
                     return OrgArchetype.Syndicate;
+                case "club":
+                    return OrgArchetype.Club;
             }
 
             throw new ArgumentException(value);
diff --git a/Imbick.StarCitizen.Api/Models/Org.cs b/Imbick.StarCitizen.Api/Models/Org.cs
index 86f775b..5b4a56f 100644
--- a/Imbick.StarCitizen.Api/Models/Org.cs
+++ b/Imbick.StarCitizen.Api/Models/Org.cs
@@ -9,21 +9,27 @@ public enum OrgSize {
         Large
     }
 
-    public enum OrgCommitment {
+    public enum OrgCommitment
+    {
+        _UNDEFINED_,
         Casual,
         Regular,
         Hardcore
     }
 
     public enum OrgArchetype {
+        _UNDEFINED_,
         Organization,
         Corporation,
+        Club,
         Pmc,
         Faith,
         Syndicate
     }
 
-    public enum OrgActivity {
+    public enum OrgActivity
+    {
+        _UNDEFINED_ = 0,
         BountyHunting = 9,
         Engineering = 7,
         Exploration = 12,
diff --git a/Imbick.StarCitizen.Api/RsiApiClient.cs b/Imbick.StarCitizen.Api/RsiApiClient.cs
index 5b073c2..e175372 100644
--- a/Imbick.StarCitizen.Api/RsiApiClient.cs
+++ b/Imbick.StarCitizen.Api/RsiApiClient.cs
@@ -2,6 +2,7 @@
 namespace Imbick.StarCitizen.Api {
     using System;
     using System.Collections.Generic;
+    using System.Threading;
     using System.Threading.Tasks;
     using Imbick.StarCitizen.Api.HtmlSerializers;
     using Models;
@@ -9,6 +10,7 @@ namespace Imbick.StarCitizen.Api {
 
     public class RsiApiClient {
         private readonly IRestClient _client;
+        private const int RETRY_DELAY = 30000;
 
         public RsiApiClient()
             : this("https://robertsspaceindustries.com/") { }
@@ -30,15 +32,45 @@ public async Task<IEnumerable<Org>> ListOrgsAsync() {
 
         public async Task<IEnumerable<Org>> GetOrgsAsync(OrgsSearchRequest searchRequest = null) {
             var request = new GetOrgsRestRequest(searchRequest);
-            try {
-                var response = await _client.ExecutePostTaskAsync<Response>(request);
-                if (!response.IsSuccessful)
-                    throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
-                var decodedHtml = response.Data.Data.Html.Replace("\\\"", "\"");
-                return _orgDeserialiser.DeserializeList(decodedHtml);
-            } catch (Exception e) {
-                throw new Exception("Problem retrieving orgs. See inner exception for details.", e);
-            }
+            int retryCount = 3;
+            bool retry = false;
+            string lastCode;
+            do
+            {
+                try
+                {
+                    var response = await _client.ExecutePostTaskAsync<Response>(request);
+                    if (!response.IsSuccessful)
+                        throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
+
+                    if (response.Data.Code != "OK")
+                    {
+                        if (response.Data.Code == "ErrApiThrottled" && retryCount > 0)
+                        {
+                            retry = true;
+                            retryCount--;
+                            lastCode = response.Data.Code;
+                            Thread.Sleep(RETRY_DELAY);
+                        }
+                        else
+                        {
+                            throw new Exception(response.Data.Code);
+                        }
+                    }
+                    else
+                    {
+                        retry = false;
+                        var decodedHtml = response.Data.Data.Html.Replace("\\\"", "\"");
+                        return _orgDeserialiser.DeserializeList(decodedHtml);
+                    }
+                }
+                catch (Exception e)
+                {
+                    throw new Exception("Problem retrieving orgs. See inner exception for details.", e);
+                }
+            } while (retry);
+
+            throw new Exception(lastCode);
         }
 
         private readonly OrgHtmlSerializer _orgDeserialiser = new OrgHtmlSerializer();
@@ -53,18 +85,45 @@ public async Task<IEnumerable<OrgMember>> ListOrgMembersAsync(string orgSymbol,
         public async Task<IEnumerable<OrgMember>> GetOrgMembersAsync(OrgMembersSearchRequest searchRequest = null)
         {
             var request = new GetOrgMembersRestRequest(searchRequest);
-            try
+            int retryCount = 3;
+            bool retry = false;
+            string lastCode;
+            do
             {
-                var response = await _client.ExecutePostTaskAsync<Response>(request);
-                if (!response.IsSuccessful)
-                    throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
-                var decodedHtml = response.Data.Data.Html.Replace("\\\"", "\"");
-                return _orgMemberDeserializer.DeserializeList(decodedHtml);
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Problem retrieving org members. See inner exception for details.", e);
-            }
+                try
+                {
+                    var response = await _client.ExecutePostTaskAsync<Response>(request);
+                    if (!response.IsSuccessful)
+                        throw new Exception($"Request to endpoint was unsuccessful. {response.ErrorMessage}");
+
+                    if (response.Data.Code != "OK")
+                    {
+                        if (response.Data.Code == "ErrApiThrottled" && retryCount > 0)
+                        {
+                            retry = true;
+                            retryCount--;
+                            lastCode = response.Data.Code;
+                            Thread.Sleep(RETRY_DELAY);
+                        }
+                        else
+                        {
+                            throw new Exception(response.Data.Code);
+                        }
+                    }
+                    else
+                    {
+                        retry = false;
+                        var decodedHtml = response.Data.Data.Html.Replace("\\\"", "\"");
+                        return _orgMemberDeserializer.DeserializeList(decodedHtml);
+                    }
+                }
+                catch (Exception e)
+                {
+                    throw new Exception("Problem retrieving org members. See inner exception for details.", e);
+                }
+            } while (retry);
+
+            throw new Exception(lastCode);
         }
 
         private readonly OrgMemberHtmlSerializer _orgMemberDeserializer = new OrgMemberHtmlSerializer();