diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/CatharsShield.java b/Mage.Sets/src/mage/sets/eldritchmoon/CatharsShield.java
new file mode 100644
index 00000000000..086a6d6218a
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/CatharsShield.java
@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.eldritchmoon;
+
+import java.util.UUID;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.continuous.BoostEquippedEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
+import mage.abilities.keyword.EquipAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.constants.AttachmentType;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class CatharsShield extends CardImpl {
+
+    public CatharsShield(UUID ownerId) {
+        super(ownerId, 192, "Cathar's Shield", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{0}");
+        this.expansionSetCode = "EMN";
+        this.subtype.add("Equipment");
+
+        // Equipped creature gets +0/+3 and has vigilance.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT)));
+        
+        // Equip {3}
+        this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3), new TargetControlledCreaturePermanent()));
+    }
+
+    public CatharsShield(final CatharsShield card) {
+        super(card);
+    }
+
+    @Override
+    public CatharsShield copy() {
+        return new CatharsShield(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/CultistsStaff.java b/Mage.Sets/src/mage/sets/eldritchmoon/CultistsStaff.java
new file mode 100644
index 00000000000..c689a5d9771
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/CultistsStaff.java
@@ -0,0 +1,67 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.eldritchmoon;
+
+import java.util.UUID;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.continuous.BoostEquippedEffect;
+import mage.abilities.keyword.EquipAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class CultistsStaff extends CardImpl {
+
+    public CultistsStaff(UUID ownerId) {
+        super(ownerId, 194, "Cultist's Staff", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}");
+        this.expansionSetCode = "EMN";
+        this.subtype.add("Equipment");
+
+        // Equipped creature gets +2/+2.        
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2)));
+        // Equip {3}
+        this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3), new TargetControlledCreaturePermanent()));
+    }
+
+    public CultistsStaff(final CultistsStaff card) {
+        super(card);
+    }
+
+    @Override
+    public CultistsStaff copy() {
+        return new CultistsStaff(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/GeistFueledScarecrow.java b/Mage.Sets/src/mage/sets/eldritchmoon/GeistFueledScarecrow.java
new file mode 100644
index 00000000000..253d0ffa349
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/GeistFueledScarecrow.java
@@ -0,0 +1,74 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.eldritchmoon;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.cost.SpellsCostIncreasementControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class GeistFueledScarecrow extends CardImpl {
+    
+    private static final FilterCard filter = new FilterCard("Creature spells");
+
+    static {
+        filter.add(new CardTypePredicate(CardType.CREATURE));
+    }
+
+    public GeistFueledScarecrow(UUID ownerId) {
+        super(ownerId, 196, "Geist-Fueled Scarecrow", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}");
+        this.expansionSetCode = "EMN";
+        this.subtype.add("Scarecrow");
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Creature spells you cast cost {1} more to cast.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
+            new SpellsCostIncreasementControllerEffect(filter, new ManaCostsImpl("{1}"))));
+    }
+
+    public GeistFueledScarecrow(final GeistFueledScarecrow card) {
+        super(card);
+    }
+
+    @Override
+    public GeistFueledScarecrow copy() {
+        return new GeistFueledScarecrow(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/NephaliaAcademy.java b/Mage.Sets/src/mage/sets/eldritchmoon/NephaliaAcademy.java
new file mode 100644
index 00000000000..2e5b922462f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/NephaliaAcademy.java
@@ -0,0 +1,148 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.eldritchmoon;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.abilities.mana.ColorlessManaAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.ZoneChangeEvent;
+import mage.players.Player;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class NephaliaAcademy extends CardImpl {
+
+    public NephaliaAcademy(UUID ownerId) {
+        super(ownerId, 205, "Nephalia Academy", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
+        this.expansionSetCode = "EMN";
+
+        // If a spell or ability an opponent controls causes you to discard a card, you may reveal that card and put it on top of your library instead of putting it anywhere else.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NephaliaAcademyEffect()));
+
+        // {T}: Add {C} to your mana pool.
+        this.addAbility(new ColorlessManaAbility());
+    }
+
+    public NephaliaAcademy(final NephaliaAcademy card) {
+        super(card);
+    }
+
+    @Override
+    public NephaliaAcademy copy() {
+        return new NephaliaAcademy(this);
+    }
+}
+
+class NephaliaAcademyEffect extends ReplacementEffectImpl {
+
+    private UUID cardId;
+    private int zoneChangeCounter;
+
+    public NephaliaAcademyEffect() {
+        super(Duration.WhileOnBattlefield, Outcome.Benefit);
+        staticText = "If a spell or ability an opponent controls causes you to discard a card, you may reveal that card and put it on top of your library instead of putting it anywhere else.";
+    }
+
+    public NephaliaAcademyEffect(final NephaliaAcademyEffect effect) {
+        super(effect);
+        this.cardId = effect.cardId;
+        this.zoneChangeCounter = effect.zoneChangeCounter;
+    }
+
+    @Override
+    public NephaliaAcademyEffect copy() {
+        return new NephaliaAcademyEffect(this);
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType().equals(GameEvent.EventType.DISCARD_CARD)
+                || event.getType().equals(GameEvent.EventType.ZONE_CHANGE);
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        if (event.getType().equals(GameEvent.EventType.DISCARD_CARD)) {
+            return event.getPlayerId().equals(source.getControllerId());
+        }
+        if (event.getType().equals(GameEvent.EventType.ZONE_CHANGE)) {
+            if (event.getTargetId().equals(cardId) && game.getState().getZoneChangeCounter(event.getTargetId()) == zoneChangeCounter) {
+                if (((ZoneChangeEvent) event).getFromZone().equals(Zone.HAND) && ((ZoneChangeEvent) event).getToZone().equals(Zone.GRAVEYARD)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        if (event.getType().equals(GameEvent.EventType.DISCARD_CARD)) {
+            // only save card info
+            Card card = game.getCard(event.getTargetId());
+            if (card != null) {
+                cardId = card.getId();
+                zoneChangeCounter = game.getState().getZoneChangeCounter(cardId);
+            }
+            return false;
+        }
+        if (event.getType().equals(GameEvent.EventType.ZONE_CHANGE)) {
+            Player controller = game.getPlayer(source.getControllerId());
+            Card card = game.getCard(event.getTargetId());
+            if (controller != null && card != null) {
+                cardId = null;
+                zoneChangeCounter = 0;
+                if (controller.chooseUse(outcome, "Put " + card.getIdName() + " on top of your library instead?", source, game)) {
+                    
+                    Cards cardsToLibrary = new CardsImpl(card);                 
+                    // reveal the card then put it on top of your library
+                    controller.revealCards(card.getName(), cardsToLibrary, game);
+                    controller.putCardsOnTopOfLibrary(cardsToLibrary, game, source, false);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java
new file mode 100644
index 00000000000..5063c289d72
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java
@@ -0,0 +1,65 @@
+package org.mage.test.cards.single.emn;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class NephaliaAcademyTest extends CardTestPlayerBase {
+
+    @Test
+    public void testReplacementEffectBySpell() {
+        // Sorcery {B}
+        // Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
+        addCard(Zone.HAND, playerA, "Duress", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
+        
+        // Nephalia Academy - Land <>
+        // If a spell or ability an opponent controls causes you to discard a card, 
+        // you may reveal that card and put it on top of your library instead of putting it anywhere else.
+        addCard(Zone.HAND, playerB, "Giant Growth", 1); // discard fodder
+        addCard(Zone.BATTLEFIELD, playerB, "Nephalia Academy", 1);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Duress");
+        addTarget(playerA, playerB);
+        setChoice(playerA, "Giant Growth"); // choose to discard Giant Growth
+        setChoice(playerB, "Yes"); // replacement effect, choose to reveal the card and place on top of library
+        execute();
+                
+        assertGraveyardCount(playerA, "Duress", 1);
+        assertHandCount(playerB, "Giant Growth", 0);
+        assertGraveyardCount(playerB, "Giant Growth", 0);
+        assertLibraryCount(playerB, "Giant Growth", 1);
+    }
+    
+    @Test
+    public void testDeclineReplacementEffectBySpell() {
+        // Sorcery {B}
+        // Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
+        addCard(Zone.HAND, playerA, "Duress", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
+        
+        // Nephalia Academy - Land <>
+        // If a spell or ability an opponent controls causes you to discard a card, 
+        // you may reveal that card and put it on top of your library instead of putting it anywhere else.
+        addCard(Zone.HAND, playerB, "Giant Growth", 1); // discard fodder
+        addCard(Zone.BATTLEFIELD, playerB, "Nephalia Academy", 1);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Duress");
+        addTarget(playerA, playerB);
+        setChoice(playerA, "Giant Growth"); // choose to discard Giant Growth
+        setChoice(playerB, "No"); // decline the replacement effect, allow the discard to happen
+        execute();
+                
+        assertGraveyardCount(playerA, "Duress", 1);
+        assertHandCount(playerB, "Giant Growth", 0);
+        assertGraveyardCount(playerB, "Giant Growth", 1); // discarded to grave
+    }
+    
+    //TODO: Add tests for replacement effect by ability
+    
+}