diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java
new file mode 100644
index 000000000..0c1846eb7
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java
@@ -0,0 +1,66 @@
+package com.gempukku.lotro.cards.set31.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.CancelSkirmishEffect;
+import com.gempukku.lotro.cards.effects.TransferToSupportEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filter;
+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.ActivateCardAction;
+import com.gempukku.lotro.logic.effects.ChooseAndDiscardCardsFromHandEffect;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.timing.EffectResult;
+
+import java.util.Collections;
+import java.util.List;
+
+ /**
+ * Set: The Short Rest
+ * Side: Free
+ * Culture: Gandalf
+ * Twilight Cost: 1
+ * Type: Follower
+ * Strength: +1
+ * Game Text: Aid - Discard a [GANDALF] card from hand. Skirmish: Transfer Gwaihir to your support area to
+ * cancel a skirmish involving bearer and a mounted Orc.
+ */
+public class Card31_015 extends AbstractFollower {
+    public Card31_015() {
+        super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.GANDALF, "Gwaihir", "Lord of the Eagles", true);
+    }
+	
+    @Override
+	  public Race getRace() {
+		    return Race.EAGLE;
+	  }
+	
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+		    return (PlayConditions.canDiscardFromHand(game, self.getOwner(), 1, Culture.GANDALF));
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+        return new ChooseAndDiscardCardsFromHandEffect(action, self.getOwner(), false, 1, 1, Culture.GANDALF);
+    }
+
+    @Override
+    protected List<? extends Action> getExtraPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)) {
+			      final ActivateCardAction action = new ActivateCardAction(self);
+			      PhysicalCard bearer = self.getAttachedTo();
+			      action.appendCost(new TransferToSupportEffect(self));
+			      if (Filters.and(bearer, Filters.inSkirmishAgainst(Race.ORC, Filters.mounted))) {
+				        action.appendEffect(new CancelSkirmishEffect(bearer));
+				        return Collections.singletonList(action);
+			      }
+		    }
+		    return null;
+    }
+}
+