diff --git a/Mage.Client/release/sample-decks/Starter Decks/[M12] Grab for Power.dck b/Mage.Client/release/sample-decks/Starter Decks/[M12] Grab for Power.dck
new file mode 100644
index 00000000000..040386fe604
--- /dev/null
+++ b/Mage.Client/release/sample-decks/Starter Decks/[M12] Grab for Power.dck	
@@ -0,0 +1,36 @@
+//Created with Mage - www.magefree.com
+NAME:Grab for Power
+AUTHOR:WotC
+
+1 [M12:54] Frost Breath
+2 [M12:50] Divination
+2 [M12:45] Azure Mage
+1 [M12:93] Disentomb
+1 [M12:92] Diabolic Tutor
+2 [M12:216] Scepter of Empires
+1 [M12:110] Sorin's Thirst
+1 [M12:99] Gravedigger
+2 [M12:119] Zombie Goliath
+2 [M12:65] Merfolk Looter
+1 [M12:91] Devouring Swarm
+1 [M12:221] Throne of Empires
+2 [M12:46] Belltower Sphinx
+1 [M12:96] Drifting Shade
+3 [M12:95] Doom Blade
+2 [M12:203] Crown of Empires
+1 [M12:73] Ponder
+2 [M12:104] Reassembling Skeleton
+1 [M12:106] Rune-Scarred Demon
+1 [M12:84] Brink of Disaster
+2 [M12:87] Child of Night
+3 [M12:117] Warpath Ghoul
+# Land
+1 [M12:224] Buried Ruin
+3 [M12:234] Island
+3 [M12:235] Island
+2 [M12:236] Island
+2 [M12:237] Island
+4 [M12:238] Swamp
+4 [M12:239] Swamp
+3 [M12:240] Swamp
+3 [M12:241] Swamp
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
new file mode 100644
index 00000000000..a7982af6813
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
@@ -0,0 +1,109 @@
+/*
+ *  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.magic2012;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Outcome;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCreatureOrPlayer;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author North
+ */
+public class WarstormSurge extends CardImpl<WarstormSurge> {
+
+    public WarstormSurge(UUID ownerId) {
+        super(ownerId, 160, "Warstorm Surge", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{R}");
+        this.expansionSetCode = "M12";
+
+        this.color.setRed(true);
+
+        // Whenever a creature enters the battlefield under your control, it deals damage equal to its power to target creature or player.
+        Ability ability = new CreatureEntersBattlefieldTriggeredAbility(new WarstormSurgeEffect());
+        ability.addTarget(new TargetCreaturePermanent());
+        ability.addTarget(new TargetCreatureOrPlayer());
+        this.addAbility(ability);
+    }
+
+    public WarstormSurge(final WarstormSurge card) {
+        super(card);
+    }
+
+    @Override
+    public WarstormSurge copy() {
+        return new WarstormSurge(this);
+    }
+}
+
+class WarstormSurgeEffect extends OneShotEffect<WarstormSurgeEffect> {
+
+    public WarstormSurgeEffect() {
+        super(Outcome.Damage);
+        staticText = "it deals damage equal to its power to target creature or player";
+    }
+
+    public WarstormSurgeEffect(final WarstormSurgeEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public WarstormSurgeEffect copy() {
+        return new WarstormSurgeEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent creature = game.getPermanent(source.getFirstTarget());
+        if (creature != null) {
+            int amount = creature.getPower().getValue();
+            UUID target = source.getTargets().get(1).getFirstTarget();
+            Permanent permanent = game.getPermanent(target);
+            if (permanent != null) {
+                permanent.damage(amount, source.getSourceId(), game, true, false);
+                return true;
+            }
+            Player player = game.getPlayer(target);
+            if (player != null) {
+                player.damage(amount, source.getSourceId(), game, false, true);
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java
index 0044583e01a..4fa8c3ac8a3 100644
--- a/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java
@@ -65,8 +65,7 @@ public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityI
      * @param optional
      */
     public CreatureEntersBattlefieldTriggeredAbility(Effect effect, boolean optional) {
-        super(Zone.BATTLEFIELD, effect, optional);
-        opponentController = false;
+        this(effect, optional, false);
     }
 
     /**
diff --git a/Mage/src/mage/abilities/effects/EffectImpl.java b/Mage/src/mage/abilities/effects/EffectImpl.java
index 7916351123c..b79dd59ac8f 100644
--- a/Mage/src/mage/abilities/effects/EffectImpl.java
+++ b/Mage/src/mage/abilities/effects/EffectImpl.java
@@ -31,7 +31,6 @@ package mage.abilities.effects;
 import java.util.UUID;
 import mage.Constants.EffectType;
 import mage.Constants.Outcome;
-import mage.abilities.Ability;
 import mage.abilities.Mode;
 import mage.target.targetpointer.FirstTargetPointer;
 import mage.target.targetpointer.TargetPointer;