diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java
new file mode 100644
index 000000000..b917bd3a3
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java
@@ -0,0 +1,75 @@
+package com.gempukku.lotro.cards.set17.gandalf;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.TriggerConditions;
+import com.gempukku.lotro.cards.effects.ExertCharactersEffect;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
+import com.gempukku.lotro.logic.effects.AddThreatsEffect;
+import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
+import com.gempukku.lotro.logic.effects.WoundCharactersEffect;
+import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.timing.EffectResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Rise of Saruman
+ * Side: Free
+ * Culture: Gandalf
+ * Twilight Cost: 1
+ * Type: Follower
+ * Strength: +1
+ * Resistance: +1
+ * Game Text: Aid - Add a threat. (At the start of the maneuver phase, you may add a threat to transfer this to
+ * a companion.) If bearer is a [GANDALF] Wizard, each time bearer wins a skirmish, you may exert a minion (if that
+ * minion is a Wizard, wound it instead).
+ */
+public class Card17_020 extends AbstractFollower {
+    public Card17_020() {
+        super(Side.FREE_PEOPLE, 1, 1, 0, 1, Culture.GANDALF, "Gwaihir", true);
+    }
+
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+        return PlayConditions.canAddThreat(game, self, 1);
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, PhysicalCard self) {
+        return new AddThreatsEffect(self.getOwner(), self, 1);
+    }
+
+    @Override
+    protected List<OptionalTriggerAction> getExtraOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
+        if (TriggerConditions.winsSkirmish(game, effectResult, Filters.hasAttached(self), Culture.GANDALF, Race.WIZARD)) {
+            final OptionalTriggerAction action = new OptionalTriggerAction(self);
+            action.appendEffect(
+                    new ChooseActiveCardEffect(self, playerId, "Choose a minion", CardType.MINION,
+                            Filters.or(
+                                    Filters.and(Race.WIZARD, Filters.canTakeWound),
+                                    Filters.and(Filters.not(Race.WIZARD), Filters.canExert(self))
+                            )) {
+                        @Override
+                        protected void cardSelected(LotroGame game, PhysicalCard card) {
+                            if (card.getBlueprint().getRace() == Race.WIZARD)
+                                action.appendEffect(
+                                        new WoundCharactersEffect(self, card));
+                            else
+                                action.appendEffect(
+                                        new ExertCharactersEffect(self, card));
+                        }
+                    });
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}