diff --git a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java
new file mode 100644
index 0000000000..5bf40b9c85
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java
@@ -0,0 +1,88 @@
+/*
+ *  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.cards.g;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapTargetCost;
+import mage.abilities.effects.common.ReturnToHandTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.common.FilterNonlandPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.target.common.TargetControlledPermanent;
+import mage.target.common.TargetNonlandPermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class GalecasterColossus extends CardImpl {
+
+    private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent you don't control");
+    private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("untapped Wizard you control");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.NOT_YOU));
+        filter2.add(new SubtypePredicate(SubType.WIZARD));
+        filter2.add(Predicates.not(new TappedPredicate()));
+    }
+
+    public GalecasterColossus(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}{U}");
+
+        this.subtype.add("Giant");
+        this.subtype.add("Wizard");
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(6);
+
+        // Tap an untapped Wizard you control: Return target nonland permanent you don't control to its owner's hand.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapTargetCost(new TargetControlledPermanent(1, 1, filter2, true)));
+        ability.addTarget(new TargetNonlandPermanent(filter));
+        this.addAbility(ability);
+    }
+
+    public GalecasterColossus(final GalecasterColossus card) {
+        super(card);
+    }
+
+    @Override
+    public GalecasterColossus copy() {
+        return new GalecasterColossus(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java b/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java
index 90d94d622d..c9b9bf8bb8 100644
--- a/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java
+++ b/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java
@@ -71,7 +71,7 @@ public class MirriWeatherlightDuelist extends CardImpl {
 
         // Whenever Mirri, Weatherlight Duelist attacks, each opponent can't block with more than one creature this combat.
         this.addAbility(new AttacksTriggeredAbility(new AddContinuousEffectToGame(new MirriWeatherlightDuelistBlockRestrictionEffect()), false));
-        
+
         // As long as Mirri, Weatherlight Duelist is tapped, no more than one creature can attack you each combat.
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
                 new MirriWeatherlightDuelistAttackRestrictionEffect(1), SourceTappedCondition.instance,
@@ -121,38 +121,6 @@ class MirriWeatherlightDuelistBlockRestrictionEffect extends RestrictionEffect {
     }
 }
 
-/*class MirriWeatherlightDuelistAttackRestrictionEffect extends RestrictionEffect {
-
-    MirriWeatherlightDuelistAttackRestrictionEffect() {
-        super(Duration.WhileOnBattlefield);
-        staticText = "no more than one creature can attack you each combat";
-    }
-
-    MirriWeatherlightDuelistAttackRestrictionEffect(final MirriWeatherlightDuelistAttackRestrictionEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public MirriWeatherlightDuelistAttackRestrictionEffect copy() {
-        return new MirriWeatherlightDuelistAttackRestrictionEffect(this);
-    }
-
-    @Override
-    public boolean applies(Permanent permanent, Ability source, Game game) {
-        return true;
-    }
-
-    @Override
-    public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
-        for (UUID creature : game.getCombat().getAttackers()) {
-            if (game.getPermanent(creature).getControllerId().equals(attacker.getControllerId())
-                    && game.getCombat().getDefendingPlayerId(creature, game).equals(source.getControllerId())) {
-                return false;
-            }
-        }
-        return true;
-    }
-}*/
 class MirriWeatherlightDuelistAttackRestrictionEffect extends ContinuousEffectImpl {
 
     private final int maxAttackedBy;
diff --git a/Mage.Sets/src/mage/sets/Commander2017.java b/Mage.Sets/src/mage/sets/Commander2017.java
index 47663bbc7a..b2e4e92a2b 100644
--- a/Mage.Sets/src/mage/sets/Commander2017.java
+++ b/Mage.Sets/src/mage/sets/Commander2017.java
@@ -61,6 +61,7 @@ public class Commander2017 extends ExpansionSet {
         cards.add(new SetCardInfo("Edgar Markov", 36, Rarity.MYTHIC, mage.cards.e.EdgarMarkov.class));
         cards.add(new SetCardInfo("Fortunate Few", 4, Rarity.RARE, mage.cards.f.FortunateFew.class));
         cards.add(new SetCardInfo("Fractured Identity", 37, Rarity.RARE, mage.cards.f.FracturedIdentity.class));
+        cards.add(new SetCardInfo("Galecaster Colossus", 10, Rarity.RARE, mage.cards.g.GalecasterColossus.class));
         cards.add(new SetCardInfo("Herald's Horn", 53, Rarity.UNCOMMON, mage.cards.h.HeraldsHorn.class));
         cards.add(new SetCardInfo("Hungry Lynx", 31, Rarity.RARE, mage.cards.h.HungryLynx.class));
         cards.add(new SetCardInfo("Inalla, Archmage Ritualist", 38, Rarity.MYTHIC, mage.cards.i.InallaArchmageRitualist.class));