diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MoonlightGeist.java b/Mage.Sets/src/mage/sets/avacynrestored/MoonlightGeist.java
new file mode 100644
index 0000000000..f552f322ce
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/avacynrestored/MoonlightGeist.java
@@ -0,0 +1,76 @@
+/*
+ *  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.avacynrestored;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.Constants.Zone;
+import mage.Constants.Duration;
+import mage.MageInt;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.PreventCombatDamageFromSourceEffect;
+import mage.abilities.effects.common.PreventCombatDamageSourceEffect;
+import mage.abilities.Ability;
+
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class MoonlightGeist extends CardImpl<MoonlightGeist> {
+
+    public MoonlightGeist(UUID ownerId) {
+        super(ownerId, 29, "Moonlight Geist", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+        this.expansionSetCode = "AVR";
+        this.subtype.add("Spirit");
+
+        this.color.setWhite(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(1);
+
+        this.addAbility(FlyingAbility.getInstance());
+        
+        // {3}{W}: Prevent all combat damage that would be dealt to and dealt by Moonlight Geist this turn.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventCombatDamageSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{3}{W}"));
+        ability.addEffect(new PreventCombatDamageFromSourceEffect(Duration.EndOfTurn));
+        this.addAbility(ability);
+    }
+
+    public MoonlightGeist(final MoonlightGeist card) {
+        super(card);
+    }
+
+    @Override
+    public MoonlightGeist copy() {
+        return new MoonlightGeist(this);
+    }
+}
\ No newline at end of file
diff --git a/Mage/src/mage/abilities/effects/common/PreventCombatDamageFromSourceEffect.java b/Mage/src/mage/abilities/effects/common/PreventCombatDamageFromSourceEffect.java
new file mode 100644
index 0000000000..62135d641c
--- /dev/null
+++ b/Mage/src/mage/abilities/effects/common/PreventCombatDamageFromSourceEffect.java
@@ -0,0 +1,86 @@
+/*
+ *  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.abilities.effects.common;
+
+import mage.Constants.Duration;
+import mage.abilities.Ability;
+import mage.abilities.effects.PreventionEffectImpl;
+import mage.game.Game;
+import mage.game.events.DamageEvent;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class PreventCombatDamageFromSourceEffect extends PreventionEffectImpl<PreventCombatDamageFromSourceEffect> {
+
+	public PreventCombatDamageFromSourceEffect(Duration duration) {
+            super(duration);
+            staticText = "Prevent all combat damage that would be dealt by {this} " + duration.toString();
+	}
+
+	public PreventCombatDamageFromSourceEffect(final PreventCombatDamageFromSourceEffect effect) {
+            super(effect);
+	}
+
+	@Override
+	public PreventCombatDamageFromSourceEffect copy() {
+            return new PreventCombatDamageFromSourceEffect(this);
+	}
+
+	@Override
+	public boolean apply(Game game, Ability source) {
+            return true;
+	}
+
+	@Override
+	public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+            GameEvent preventEvent = new GameEvent(GameEvent.EventType.PREVENT_DAMAGE, source.getSourceId(), source.getFirstTarget(), source.getControllerId(), event.getAmount(), false);
+            if (!game.replaceEvent(preventEvent)) {
+                int damage = event.getAmount();
+                event.setAmount(0);
+                game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, source.getSourceId(), source.getFirstTarget(), source.getControllerId(), damage));
+                return true;
+            }
+            return false;
+        }
+
+	@Override
+	public boolean applies(GameEvent event, Ability source, Game game) {
+            if (super.applies(event, source, game)) {
+                DamageEvent damageEvent = (DamageEvent) event;
+                if (event.getSourceId().equals(source.getSourceId()) && damageEvent.isCombatDamage()) {
+                    return true;
+                }
+            }
+            return false;
+	}
+
+}
\ No newline at end of file