diff --git a/dat/faction.xml b/dat/faction.xml
index f766fbd..d6fd40e 100644
--- a/dat/faction.xml
+++ b/dat/faction.xml
@@ -9,8 +9,8 @@
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>Collective</enemy>
-<enemy>Unknown1</enemy>
-<enemy>Unknown2</enemy>
+<enemy>Draktharr</enemy>
+<enemy>Detours</enemy>
 <enemy>Collective</enemy>
 </enemies>
 </faction>
@@ -20,12 +20,12 @@
 <ally>Militia</ally>
 <ally>Independent</ally>
 <ally>Empire</ally>
-<ally>Unknown6</ally>
+<ally>Soromid</ally>
 </allies>
 <enemies>
 <enemy>Pirate</enemy>
-<enemy>Unknown2</enemy>
-<enemy>Unknown1</enemy>
+<enemy>Detours</enemy>
+<enemy>Draktharr</enemy>
 <enemy>Collective</enemy>
 </enemies>
 </faction>
@@ -33,12 +33,12 @@
 <player>-20</player>
 <enemies>
 <enemy>Empire</enemy>
-<enemy>Unknown3</enemy>
-<enemy>Unknown4</enemy>
-<enemy>Unknown1</enemy>
-<enemy>Unknown5</enemy>
+<enemy>Aerius</enemy>
+<enemy>Ascendancy</enemy>
+<enemy>Draktharr</enemy>
+<enemy>Tex'nus</enemy>
 <enemy>Collective</enemy>
-<enemy>Unknown6</enemy>
+<enemy>Soromid</enemy>
 </enemies>
 </faction>
 <faction name="Militia">
@@ -50,19 +50,19 @@
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>Collective</enemy>
-<enemy>Unknown2</enemy>
+<enemy>Detours</enemy>
 </enemies>
 </faction>
 <faction name="Empire">
 <player>0</player>
 <allies>
-<ally>Unknown6</ally>
+<ally>Soromid</ally>
 <ally>Merchant</ally>
 </allies>
 <enemies>
 <enemy>Pirate</enemy>
-<enemy>Unknown2</enemy>
-<enemy>Unknown1</enemy>
+<enemy>Detours</enemy>
+<enemy>Draktharr</enemy>
 <enemy>Collective</enemy>
 </enemies>
 </faction>
@@ -70,73 +70,86 @@
 <player>-100</player>
 <enemies>
 <enemy>Empire</enemy>
-<enemy>Unknown3</enemy>
-<enemy>Unknown4</enemy>
-<enemy>Unknown1</enemy>
-<enemy>Unknown5</enemy>
-<enemy>Unknown6</enemy>
+<enemy>Aerius</enemy>
+<enemy>Ascendancy</enemy>
+<enemy>Draktharr</enemy>
+<enemy>Tex'nus</enemy>
+<enemy>Soromid</enemy>
 <enemy>Pirate</enemy>
-<enemy>Unknown2</enemy>
+<enemy>Detours</enemy>
 </enemies>
 </faction>
-<faction name="Unknown3">
+<faction name="Aerius">
 <player>0</player>
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>Collective</enemy>
-<enemy>Unknown1</enemy>
+<enemy>Draktharr</enemy>
 </enemies>
 </faction>
-<faction name="Unknown2">
+<faction name="Detours">
 <player>-10</player>
 <enemies>
 <enemy>Empire</enemy>
-<enemy>Unknown4</enemy>
-<enemy>Unknown1</enemy>
-<enemy>Unknown5</enemy>
+<enemy>Ascendancy</enemy>
+<enemy>Draktharr</enemy>
+<enemy>Tex'nus</enemy>
 <enemy>Collective</enemy>
-<enemy>Unknown6</enemy>
+<enemy>Soromid</enemy>
 </enemies>
 </faction>
-<faction name="Unknown4">
+<faction name="Ascendancy">
 <player>0</player>
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>Collective</enemy>
-<enemy>Unknown1</enemy>
+<enemy>Draktharr</enemy>
 </enemies>
 </faction>
-<faction name="Unknown1">
+<faction name="Draktharr">
 <player>-80</player>
 <enemies>
 <enemy>Empire</enemy>
-<enemy>Unknown3</enemy>
-<enemy>Unknown4</enemy>
-<enemy>Unknown5</enemy>
-<enemy>Unknown6</enemy>
+<enemy>Aerius</enemy>
+<enemy>Ascendancy</enemy>
+<enemy>Tex'nus</enemy>
+<enemy>Soromid</enemy>
 <enemy>Pirate</enemy>
-<enemy>Unknown2</enemy>
+<enemy>Detours</enemy>
 <enemy>Collective</enemy>
 </enemies>
 </faction>
-<faction name="Unknown5">
+<faction name="Tex'nus">
 <player>0</player>
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>Collective</enemy>
-<enemy>Unknown1</enemy>
+<enemy>Draktharr</enemy>
 </enemies>
 </faction>
-<faction name="Unknown6">
+<faction name="Soromid">
 <player>0</player>
 <allies>
 <ally>Empire</ally>
 <ally>Merchant</ally>
 </allies>
 <enemies>
-<enemy>Unknown1</enemy>
+<enemy>Draktharr</enemy>
 <enemy>Pirate</enemy>
-<enemy>Unknown2</enemy>
+<enemy>Detours</enemy>
+<enemy>Collective</enemy>
+</enemies>
+</faction>
+<faction name="Goddard">
+<longname>House Goddard</longname>
+<player>0</player>
+<allies>
+<ally>Empire</ally>
+<ally>Merchant</ally>
+</allies>
+<enemies>
+<enemy>Pirate</enemy>
+<enemy>Detours</enemy>
 <enemy>Collective</enemy>
 </enemies>
 </faction>
diff --git a/dat/fleet.xml b/dat/fleet.xml
index 9957408..b4b8285 100644
--- a/dat/fleet.xml
+++ b/dat/fleet.xml
@@ -7,9 +7,9 @@
 <pilot chance='100'>Lancelot</pilot>
 </pilots>
 </fleet>
-<fleet name="Militia Goddard">
+<fleet name="Goddard Goddard">
 <ai>militia</ai>
-<faction>Independent</faction>
+<faction>Goddard</faction>
 <pilots>
 <pilot chance='100'>Goddard</pilot>
 </pilots>
diff --git a/dat/planet.xml b/dat/planet.xml
index 5425c52..e9c0fd7 100644
--- a/dat/planet.xml
+++ b/dat/planet.xml
@@ -302,9 +302,9 @@
    <x>0</x>
   </pos>
   <general>
-   <bar>The Goddard Bar is unsurprisingly an old obsolete model remade as a bar.  It's surprisingly comfortable and  cozy as a bar, although every so often you can hear creaking in the ancient metal frame.</bar>
-   <description>Zhiru es well known for being the birthplace of the Goddard.  Everything seems themed around the massive space vessel.  It was a quiet planet until the Goddard Inc. was created.  Now most of the population is employed by them.</description>
-   <faction>Independent</faction>
+  <bar>The Goddard Bar is unsurprisingly an old obsolete model remade as a bar.  It's surprisingly comfortable and  cozy as a bar, although every so often you can hear creaking in the ancient metal frame.</bar>
+  <description>Zhiru was a quiet planet, home of House Goddard, one of the minor Houses. One day House Goddard began to plan to create a massive spacecraft, based on their air-born planes. The result was the massive Goddard, named after the house that created it. The ship was a huge success and went about to give House Goddard fame thoughout the galaxy. Now Zhiru is a booming ship factory, specialized in the creation and maintenance of the Goddard ships. This is all possible due to the weak gravity atmosphere that envelopes Zhiru that allows the massive spacecraft to land and take off without much difficulty.</description>
+   <faction>Goddard</faction>
    <commodities>
     <commodity>Food</commodity>
     <commodity>Ore</commodity>
diff --git a/dat/ship.xml b/dat/ship.xml
index 2f1dba4..b7e92d6 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -278,10 +278,10 @@ Used by security agencies all over the universe for it's reliability and availab
 <sound>engine</sound>
 <class>3</class>
 <price>11500000</price>
-<fabricator>Goddard Inc.</fabricator>
+<fabricator>House Goddard</fabricator>
 <tech>1001</tech>
 <description>The archaic design of the Goddard is decieving.  Although it takes the shape of traditional flying intra-planet vessels, it's very suited for space travel.
-Production is entirely done on Zhiru en the Goddard system by Goddard Inc, the sole providor and dealer in Goddards.  Over time, specialization and improvements on the original time have kept it very competitive in the market.  It's a classic of space.</description>
+Production is entirely done on Zhiru en the Goddard system by House Goddard, the sole providor and dealer in Goddards.  Over time, specialization and improvements on the original time have kept it very competitive in the market.  It's a classic of space.</description>
 <movement>
 <thrust>100</thrust>
 <turn>80</turn>
diff --git a/dat/ssys.xml b/dat/ssys.xml
index ff28df0..3b1f981 100644
--- a/dat/ssys.xml
+++ b/dat/ssys.xml
@@ -819,15 +819,14 @@
  </ssys>
  <ssys name="Goddard">
   <fleets>
-   <fleet chance="70">Militia Goddard</fleet>
-   <fleet chance="50">Militia Goddard</fleet>
+   <fleet chance="70">Goddard Goddard</fleet>
+   <fleet chance="50">Goddard Goddard</fleet>
    <fleet chance="30">Merchant Llama</fleet>
    <fleet chance="30">Merchant Llama</fleet>
    <fleet chance="30">Merchant Mule</fleet>
    <fleet chance="30">Merchant Mule</fleet>
    <fleet chance="30">Sml Merchant Convoy</fleet>
    <fleet chance="50">Empire Lancelot</fleet>
-   <fleet chance="50">Militia Lancelot</fleet>
   </fleets>
   <jumps>
    <jump>Borla</jump>
@@ -847,4 +846,4 @@
    <stars>500</stars>
   </general>
  </ssys>
-</Systems>
\ No newline at end of file
+</Systems>