diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/GeneralTazri.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/GeneralTazri.java
new file mode 100644
index 00000000000..53d28738ec2
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/GeneralTazri.java
@@ -0,0 +1,142 @@
+/*
+ *  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.oathofthegatewatch;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreatureCard;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class GeneralTazri extends CardImpl {
+
+    private static final FilterCreatureCard filter = new FilterCreatureCard("an Ally creature card");
+
+    static {
+        filter.add(new SubtypePredicate("Ally"));
+    }
+
+    public GeneralTazri(UUID ownerId) {
+        super(ownerId, 19, "General Tazri", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{W}");
+        this.expansionSetCode = "OGW";
+        this.supertype.add("Legendary");
+        this.subtype.add("Human");
+        this.subtype.add("Ally");
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(4);
+
+        // When General Tazri enters the battlefield, you may search your library for an Ally creature card, reveal it, put it into your hand, then shuffle your library.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(
+                new TargetCardInLibrary(filter), true, true), true));
+        // {W}{U}{B}{R}{G}: Ally creatures you control get +X/+X until end of turn, where X is the number of colors among those creatures.
+        DynamicValue xValue = new GeneralTazriColorCount();
+        this.addAbility(new SimpleActivatedAbility(
+                Zone.BATTLEFIELD,
+                new BoostControlledEffect(xValue, xValue, Duration.EndOfTurn, new FilterCreaturePermanent("Ally", "Ally creatures"), false),
+                new ManaCostsImpl("{3}{W}{W}")));
+
+    }
+
+    public GeneralTazri(final GeneralTazri card) {
+        super(card);
+    }
+
+    @Override
+    public GeneralTazri copy() {
+        return new GeneralTazri(this);
+    }
+}
+
+class GeneralTazriColorCount implements DynamicValue {
+
+    private final static FilterCreaturePermanent filter = new FilterCreaturePermanent();
+
+    static {
+        filter.add(new SubtypePredicate(("Ally")));
+    }
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        int count = 0;
+        boolean black = false;
+        boolean red = false;
+        boolean white = false;
+        boolean green = false;
+        boolean blue = false;
+        for (Permanent creature : game.getBattlefield().getAllActivePermanents(filter, sourceAbility.getControllerId(), game)) {
+            ObjectColor color = creature.getColor(game);
+            black |= color.isBlack();
+            red |= color.isRed();
+            white |= color.isWhite();
+            green |= color.isGreen();
+            blue |= color.isBlue();
+        }
+        count += black ? 1 : 0;
+        count += red ? 1 : 0;
+        count += white ? 1 : 0;
+        count += green ? 1 : 0;
+        count += blue ? 1 : 0;
+        return count;
+    }
+
+    @Override
+    public GeneralTazriColorCount copy() {
+        return new GeneralTazriColorCount();
+    }
+
+    @Override
+    public String getMessage() {
+        return "the number of colors among those creatures";
+    }
+
+    @Override
+    public String toString() {
+        return "X";
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/StoneHavenOutfitter.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/StoneHavenOutfitter.java
new file mode 100644
index 00000000000..31db6ad4a2f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/StoneHavenOutfitter.java
@@ -0,0 +1,80 @@
+/*
+ *  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.oathofthegatewatch;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DiesCreatureTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.EquippedPredicate;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class StoneHavenOutfitter extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("equipped creatures");
+
+    static {
+        filter.add(new EquippedPredicate());
+    }
+
+    public StoneHavenOutfitter(UUID ownerId) {
+        super(ownerId, 37, "Stone Haven Outfitter", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}");
+        this.expansionSetCode = "OGW";
+        this.subtype.add("Kor");
+        this.subtype.add("Artificer");
+        this.subtype.add("Ally");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Equipped creatures you control get +1/+1.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)));
+
+        // Whenever an equipped creature you control dies, draw a card.
+        this.addAbility(new DiesCreatureTriggeredAbility(new DrawCardSourceControllerEffect(1), false, filter));
+    }
+
+    public StoneHavenOutfitter(final StoneHavenOutfitter card) {
+        super(card);
+    }
+
+    @Override
+    public StoneHavenOutfitter copy() {
+        return new StoneHavenOutfitter(this);
+    }
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/StoneHavenOutfitterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/StoneHavenOutfitterTest.java
new file mode 100644
index 00000000000..03043451e8a
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/StoneHavenOutfitterTest.java
@@ -0,0 +1,87 @@
+/*
+ *  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 org.mage.test.cards.triggers.dies;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class StoneHavenOutfitterTest extends CardTestPlayerBase {
+
+    @Test
+    public void testEquipped() {
+        // Equipped creatures you control get +1/+1.
+        // Whenever an equipped creature you control dies, draw a card.
+        addCard(Zone.BATTLEFIELD, playerA, "Stone Haven Outfitter", 1); // Creature 2/2
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+        // Equipped creature has hexproof and haste.
+        // Equip {1}
+        addCard(Zone.BATTLEFIELD, playerA, "Swiftfoot Boots", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Silvercoat Lion");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Silvercoat Lion", 3, 3);
+
+    }
+
+    @Test
+    public void testEquippedDied() {
+        // Equipped creatures you control get +1/+1.
+        // Whenever an equipped creature you control dies, draw a card.
+        addCard(Zone.BATTLEFIELD, playerA, "Stone Haven Outfitter", 1); // Creature 2/2
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
+        // Equipped creature has hexproof and haste.
+        // Equip {1}
+        addCard(Zone.BATTLEFIELD, playerA, "Swiftfoot Boots", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
+
+        addCard(Zone.HAND, playerA, "Lightning Bolt", 1);
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Silvercoat Lion");
+
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Silvercoat Lion");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerA, "Lightning Bolt", 1);
+        assertGraveyardCount(playerA, "Silvercoat Lion", 1);
+
+        assertHandCount(playerA, 1);
+
+    }
+}
diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/EquippedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/EquippedPredicate.java
new file mode 100644
index 00000000000..556e839afac
--- /dev/null
+++ b/Mage/src/main/java/mage/filter/predicate/permanent/EquippedPredicate.java
@@ -0,0 +1,34 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.filter.predicate.permanent;
+
+import java.util.UUID;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class EquippedPredicate implements Predicate<Permanent> {
+
+    @Override
+    public boolean apply(Permanent input, Game game) {
+        for (UUID attachmentId : input.getAttachments()) {
+            Permanent attachment = game.getPermanent(attachmentId);
+            if (attachment != null && attachment.getSubtype().contains("Equipment")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "equipped";
+    }
+}