diff --git a/src/PioneerTypes.hs b/src/PioneerTypes.hs
index 1bd75a3..dc84fa5 100644
--- a/src/PioneerTypes.hs
+++ b/src/PioneerTypes.hs
@@ -1,10 +1,39 @@
 module PioneerTypes 
 where
 
-data Structure = Flag    -- Flag
-               | Barrack -- Small
-               | Sawmill -- Medium
-               | Castle  -- Large
+data Structure = Flag           -- Flag
+               | Woodcutter     -- Huts
+               | Forester
+               | Stonemason
+               | Fisher
+               | Hunter
+               | Barracks
+               | Guardhouse
+               | LookoutTower
+               | Well
+               | Sawmill        -- Houses
+               | Slaughterhouse
+               | Mill
+               | Bakery
+               | IronSmelter
+               | Metalworks
+               | Armory
+               | Mint
+               | Shipyard
+               | Brewery
+               | Storehouse
+               | Watchtower
+               | Catapult
+               | GoldMine       -- Mines
+               | IronMine
+               | GraniteMine
+               | CoalMine
+               | Farm           -- Castles
+               | PigFarm
+               | DonkeyBreeder
+               | Harbor
+               | Fortress
+               deriving Eq
 
 data Amount    = Infinite   -- Neverending supply
                | Finite Int -- Finite supply 
@@ -13,6 +42,7 @@ data Amount    = Infinite   -- Neverending supply
 data Commodity = WoodPlank
                | Sword
                | Fish
+               deriving Eq
 
 data Resource  = Coal
                | Iron