diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
index 5a5218a9b..678ed27a3 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
@@ -36,6 +36,7 @@
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set21.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set21.json
new file mode 100644
index 000000000..4757bb708
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set21.json
@@ -0,0 +1,391 @@
+{
+  "21_1": {
+    "title": "Blue Mountain Dwarf",
+    "culture": "dwarven",
+    "type": "companion",
+    "race": "dwarf",
+    "cost": 2,
+    "strength": 6,
+    "vitality": 2
+  },
+  "21_2": {
+    "title": "Stand Together",
+    "culture": "gandalf",
+    "type": "event",
+    "keyword": "maneuver",
+    "cost": 3
+  },
+  "21_3": {
+    "title": "Thrice Worthy and Beloved Barliman",
+    "culture": "gandalf",
+    "type": "condition",
+    "cost": 0,
+    "strength": 1
+  },
+  "21_4": {
+    "title": "Gondorian Broadsword",
+    "culture": "gondor",
+    "type": "possession",
+    "possession": "hand weapon",
+    "cost": 2,
+    "strength": 2
+  },
+  "21_5": {
+    "title": "Relics of the Second Age",
+    "culture": "gondor",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 1
+  },
+  "21_6": {
+    "title": "Thrown Sword",
+    "culture": "gondor",
+    "type": "event",
+    "keyword": "skirmish",
+    "cost": 1
+  },
+  "21_7": {
+    "title": "Lurtz",
+    "subtitle": "Weapon of Saruman",
+    "culture": "isengard",
+    "type": "minion",
+    "race": "uruk-hai",
+    "cost": 7,
+    "strength": 12,
+    "vitality": 3,
+    "site": 5
+  },
+  "21_8": {
+    "title": "Strength of Servitude",
+    "culture": "isengard",
+    "type": "event",
+    "keyword": "response",
+    "cost": 1
+  },
+  "21_9": {
+    "title": "Uruk Swarmer",
+    "culture": "isengard",
+    "type": "minion",
+    "race": "uruk-hai",
+    "cost": 3,
+    "strength": 6,
+    "vitality": 2,
+    "site": 5
+  },
+  "21_10": {
+    "title": "Goblin Bow",
+    "culture": "moria",
+    "type": "possession",
+    "possession": "ranged weapon",
+    "cost": 1,
+    "strength": 1,
+    "vitality": 1
+  },
+  "21_11": {
+    "title": "Goblin Warchief",
+    "subtitle": "Captain of the Underhall",
+    "culture": "moria",
+    "type": "minion",
+    "race": "orc",
+    "cost": 4,
+    "strength": 9,
+    "vitality": 2,
+    "site": 4
+  },
+  "21_12": {
+    "title": "No Hope of Escape That Way",
+    "culture": "moria",
+    "type": "event",
+    "keyword": "maneuver",
+    "cost": 1
+  },
+  "21_13": {
+    "title": "The Old Forest",
+    "culture": "wraith",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 0
+  },
+  "21_14": {
+    "title": "Old Man Willow",
+    "subtitle": "Heart of the Withywindle",
+    "culture": "wraith",
+    "type": "minion",
+    "race": "tree",
+    "cost": 3,
+    "strength": 2,
+    "vitality": 6,
+    "site": 2
+  },
+  "21_15": {
+    "title": "And in the Darkness Bind Them",
+    "culture": "sauron",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 0
+  },
+  "21_16": {
+    "title": "Gladden Ambush",
+    "culture": "sauron",
+    "type": "event",
+    "keyword": "maneuver",
+    "cost": 0
+  },
+  "21_17": {
+    "title": "Bilbo",
+    "subtitle": "One Hundred and Eleventy",
+    "culture": "shire",
+    "type": "ally",
+    "race": "hobbit",
+    "cost": 2,
+    "strength": 2,
+    "vitality": 3,
+    "allyHome": "fellowship,1"
+  },
+  "21_18": {
+    "title": "Hobbit Concealment",
+    "culture": "shire",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 1
+  },
+  "21_19": {
+    "title": "Sam",
+    "subtitle": "Hobbit of Hobbiton",
+    "culture": "shire",
+    "type": "companion",
+    "race": "hobbit",
+    "cost": 2,
+    "strength": 3,
+    "vitality": 4,
+    "signet": "frodo"
+  },
+  "21_20": {
+    "title": "Walking Stick",
+    "culture": "shire",
+    "type": "possession",
+    "possession": "staff",
+    "strength": 0
+  },
+  "21_21": {
+    "title": "Barred the Gates",
+    "culture": "dwarven",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 0
+  },
+  "21_22": {
+    "title": "Light-shaft",
+    "culture": "dwarven",
+    "type": "event",
+    "keyword": "regroup",
+    "cost": 0
+  },
+  "21_23": {
+    "title": "Longbeard's Axe",
+    "culture": "dwarven",
+    "type": "possession",
+    "possession": "hand weapon",
+    "cost": 1,
+    "strength": 2
+  },
+  "21_24": {
+    "title": "Venturing Dwarf",
+    "culture": "dwarven",
+    "type": "companion",
+    "race": "dwarf",
+    "cost": 2,
+    "strength": 5,
+    "vitality": 3
+  },
+  "21_25": {
+    "title": "Dazzling Flash",
+    "culture": "gandalf",
+    "type": "event",
+    "keyword": "skirmish",
+    "cost": 1
+  },
+  "21_26": {
+    "title": "No Time for Wonder",
+    "culture": "gandalf",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 1
+  },
+  "21_27": {
+    "title": "Dagger of Westernesse",
+    "culture": "gondor",
+    "type": "artifact",
+    "possession": "hand weapon",
+    "cost": 0,
+    "strength": 2
+  },
+  "21_28": {
+    "title": "Goblin Avengers",
+    "culture": "moria",
+    "type": "minion",
+    "race": "orc",
+    "cost": 7,
+    "strength": 13,
+    "vitality": 3,
+    "site": 4
+  },
+  "21_29": {
+    "title": "Goblin Warren",
+    "culture": "moria",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 1
+  },
+  "21_30": {
+    "title": "Thither We Are Going Against My Wish",
+    "culture": "moria",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 1
+  },
+  "21_31": {
+    "title": "Hollin Snarler",
+    "culture": "sauron",
+    "type": "minion",
+    "race": "warg",
+    "cost": 3,
+    "strength": 8,
+    "vitality": 2,
+    "site": 3
+  },
+  "21_32": {
+    "title": "The Hunt is Up!",
+    "culture": "sauron",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 1
+  },
+  "21_33": {
+    "title": "Hunting Pack",
+    "culture": "sauron",
+    "type": "minion",
+    "race": "warg",
+    "cost": 5,
+    "strength": 11,
+    "vitality": 3,
+    "site": 5
+  },
+  "21_34": {
+    "title": "Pippin",
+    "subtitle": "Fool of a Took",
+    "culture": "shire",
+    "type": "companion",
+    "race": "hobbit",
+    "cost": 1,
+    "strength": 3,
+    "vitality": 4,
+    "signet": "gandalf"
+  },
+  "21_35": {
+    "title": "Deft Aid",
+    "culture": "elven",
+    "type": "condition",
+    "site": 1
+  },
+  "21_36": {
+    "title": "Elven Flet",
+    "culture": "elven",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 1
+  },
+  "21_37": {
+    "title": "In Imladris it Dwells",
+    "culture": "elven",
+    "type": "event",
+    "keyword": "fellowship",
+    "cost": 0
+  },
+  "21_38": {
+    "title": "Rivendell Sentry",
+    "culture": "elven",
+    "type": "ally",
+    "race": "elf",
+    "cost": 2,
+    "strength": 5,
+    "vitality": 2,
+    "allyHome": "fellowship,4"
+  },
+  "21_39": {
+    "title": "Arroch",
+    "culture": "gondor",
+    "type": "possession",
+    "possession": "mount",
+    "cost": 2,
+    "vitality": 1
+  },
+  "21_40": {
+    "title": "The Deeds of the Steward's House",
+    "culture": "gondor",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 2
+  },
+  "21_41": {
+    "title": "They Have a Cave Troll",
+    "culture": "gondor",
+    "type": "event",
+    "keyword": "maneuver",
+    "cost": 1
+  },
+  "21_42": {
+    "title": "Isengard Attendant",
+    "culture": "isengard",
+    "type": "minion",
+    "race": "orc",
+    "cost": 3,
+    "strength": 7,
+    "vitality": 2,
+    "site": 4
+  },
+  "21_43": {
+    "title": "Stirruk",
+    "culture": "isengard",
+    "type": "possession",
+    "possession": "hand weapon",
+    "cost": 1,
+    "strength": 3,
+    "vitality": 1
+  },
+  "21_44": {
+    "title": "Uruk Batch",
+    "culture": "isengard",
+    "type": "minion",
+    "race": "uruk-hai",
+    "cost": 3,
+    "strength": 7,
+    "vitality": 2,
+    "site": 5
+  },
+  "21_45": {
+    "title": "Influence of Shadow",
+    "culture": "sauron",
+    "type": "condition",
+    "keyword": "support area",
+    "cost": 0
+  },
+  "21_46": {
+    "title": "Tower Shaman",
+    "culture": "sauron",
+    "type": "minion",
+    "race": "orc",
+    "cost": 4,
+    "strength": 6,
+    "vitality": 3,
+    "site": 6
+  },
+  "21_47": {
+    "title": "Udun Scimitar",
+    "culture": "sauron",
+    "type": "possession",
+    "possession": "hand weapon",
+    "cost": 2,
+    "strength": 2
+  },
+}
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
index 5bb640b4e..27c54a446 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
@@ -30,6 +30,7 @@
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/game.html b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
index 7b4981d5a..ed5410d77 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/game.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
@@ -30,6 +30,7 @@
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
index 381faa6eb..d76529500 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
@@ -29,6 +29,7 @@
     <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/index.html b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
index 0af95ee9f..5e86924b8 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/index.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
@@ -39,6 +39,7 @@
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js.inc b/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
index caca3b4a3..ea0607081 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
@@ -22,6 +22,7 @@
 <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
 <script type="text/javascript" src="js/gemp-022/set40.js"></script>
 <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
 <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
 <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
index 9ac4955d9..a8bdc1ae3 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
@@ -110,6 +110,7 @@ var CardFilter = Class.extend({
             + "<option value='0-32'>All Sets</option>"
             + "<option value='0-19'>Official Sets</option>"
             + "<option value='30-32'>The Hobbit Sets</option>"
+            + "<option value='21'>Player's Council Sets</option>"
             + "<option disabled>----------</option>"
             + "<option value='fotr_block'>Fellowship Block</option>"
             + "<option value='ttt_block'>Towers Block</option>"
@@ -144,6 +145,7 @@ var CardFilter = Class.extend({
             + "<option value='17'>17 - Rise of Saruman</option>"
             + "<option value='18'>18 - Treachery & Deceit</option>"
             + "<option value='19'>19 - Ages End</option>"
+            + "<option value='21'>1+ - Fellowship Supplement</option>"
             + "<option value='30'>30 - The Hobbit: Main Deck</option>"
             + "<option value='31'>31 - The Hobbit: Expansion 1</option>"
             + "<option value='32'>32 - The Hobbit: Expansion 2</option>"
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
index ddaba1044..12c9bd154 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
@@ -215,6 +215,9 @@ var Card = Class.extend({
             return img;
         //Additional Hobbit Draft blueprints
         img = hobbit[blueprintId];
+        if (img != null)
+            return img;
+        img = set21[blueprintId];
         if (img != null)
             return img;
         return null;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js
new file mode 100644
index 000000000..48913b329
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js
@@ -0,0 +1,49 @@
+var set21 = {
+	'21_1': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_1.jpg',
+	'21_2': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_2.jpg',
+	'21_3': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_3.jpg',
+	'21_4': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_4.jpg',
+	'21_5': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_5.jpg',
+	'21_6': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_6.jpg',
+	'21_7': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_7.jpg',
+	'21_8': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_8.jpg',
+	'21_9': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_9.jpg',
+	'21_10': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_10.jpg',
+	'21_11': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_11.jpg',
+	'21_12': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_12.jpg',
+	'21_13': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_13.jpg',
+	'21_14': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_14.jpg',
+	'21_15': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_15.jpg',
+	'21_16': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_16.jpg',
+	'21_17': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_17.jpg',
+	'21_18': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_18.jpg',
+	'21_19': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_19.jpg',
+	'21_20': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_20.jpg',
+	'21_21': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_21.jpg',
+	'21_22': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_22.jpg',
+	'21_23': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_23.jpg',
+	'21_24': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_24.jpg',
+	'21_25': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_25.jpg',
+	'21_26': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_26.jpg',
+	'21_27': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_27.jpg',
+	'21_28': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_28.jpg',
+	'21_29': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_29.jpg',
+	'21_30': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_30.jpg',
+	'21_31': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_31.jpg',
+	'21_32': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_32.jpg',
+	'21_33': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_33.jpg',
+	'21_34': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_34.jpg',
+	'21_35': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_35.jpg',
+	'21_36': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_36.jpg',
+	'21_37': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_37.jpg',
+	'21_38': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_38.jpg',
+	'21_39': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_39.jpg',
+	'21_40': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_40.jpg',
+	'21_41': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_41.jpg',
+	'21_42': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_42.jpg',
+	'21_43': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_43.jpg',
+	'21_44': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_44.jpg',
+	'21_45': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_45.jpg',
+	'21_46': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_46.jpg',
+	'21_47': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_47.jpg'
+}
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
index 8d063c3c1..0fd83d3f2 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
@@ -44,6 +44,7 @@
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
index 6d7efd7cd..3d510efa5 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
@@ -30,6 +30,7 @@
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
index 6fb0573cc..c5199004f 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
@@ -30,6 +30,7 @@
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
     <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set21.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt
new file mode 100644
index 000000000..e72c611a9
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt
@@ -0,0 +1,47 @@
+21S1
+21S2
+21S3
+21S4
+21S5
+21S6
+21S7
+21S8
+21S9
+21S10
+21S11
+21S12
+21S13
+21S14
+21S15
+21S16
+21S17
+21S18
+21S19
+21S20
+21S21
+21S22
+21S23
+21S24
+21S25
+21S26
+21S27
+21S28
+21S29
+21S30
+21S31
+21S32
+21S33
+21S34
+21S35
+21S36
+21S37
+21S38
+21S39
+21S40
+21S41
+21S42
+21S43
+21S44
+21S45
+21S46
+21S47
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
index 03ba11955..fbdd65f9b 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
@@ -146,5 +146,14 @@
     "merchantable": false,
     "needsLoading": false,
     "playable": false
+  },
+  {
+    "setId": "21",
+    "setName": "PC FOTR Supplements",
+    "rarityFile": "/set21-rarity.txt",
+    "originalSet": false,
+    "merchantable": false,
+    "needsLoading": false,
+    "playable": true
   }
 ]
diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Race.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Race.java
index 185c438a3..9e96a814d 100644
--- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Race.java
+++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Race.java
@@ -7,7 +7,10 @@ public enum Race implements Filterable {
     GOBLIN("Goblin"),
 	
 	//Additional Hobbit Draft races
-    DRAGON("Dragon"), EAGLE("Eagle"), BIRD("Bird");
+    DRAGON("Dragon"), EAGLE("Eagle"), BIRD("Bird"),
+
+    //PC Races
+    WARG("Warg");
 
     private String _humanReadable;
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
index 5394e088c..c65e7fd28 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -402,5 +402,13 @@
         "maximumSameName":100,
         "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
         "hall":false
+    },
+    {
+        "name":"PC-Fellowship Block",
+        "code":"pc_fotr_block",
+        "sites":"FELLOWSHIP",
+        "cancelRingBearerSkirmish":true,
+        "set":[1, 2, 3, 21],
+        "banned":["1_1"]
     }
 ]