diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java
new file mode 100644
index 00000000000..9b9e5932c18
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java
@@ -0,0 +1,66 @@
+/*
+ *  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.scarsofmirrodin;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.keyword.HasteAbility;
+import mage.abilities.keyword.InfectAbility;
+import mage.cards.CardImpl;
+
+/**
+ *
+ * @author Loki
+ */
+public class BlackcleaveGoblin extends CardImpl<BlackcleaveGoblin> {
+
+    public BlackcleaveGoblin (UUID ownerId) {
+        super(ownerId, 54, "Blackcleave Goblin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}");
+        this.expansionSetCode = "SOM";
+        this.subtype.add("Goblin");
+        this.subtype.add("Zombie");
+		this.color.setBlack(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(1);
+        this.addAbility(HasteAbility.getInstance());
+        this.addAbility(InfectAbility.getInstance());
+    }
+
+    public BlackcleaveGoblin (final BlackcleaveGoblin card) {
+        super(card);
+    }
+
+    @Override
+    public BlackcleaveGoblin copy() {
+        return new BlackcleaveGoblin(this);
+    }
+
+}
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java
new file mode 100644
index 00000000000..823aa868527
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.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.scarsofmirrodin;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Rarity;
+import mage.Constants.Zone;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.Metalcraft;
+import mage.abilities.decorator.ConditionalContinousEffect;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.common.BoostSourceEffect;
+import mage.cards.CardImpl;
+
+/**
+ *
+ * @author Loki
+ */
+public class GhalmasWarden extends CardImpl<GhalmasWarden> {
+
+    private final String text = "Metalcraft - Ghalma's Warden gets +2/+2 as long as you control three or more artifacts";
+
+    public GhalmasWarden (UUID ownerId) {
+        super(ownerId, 8, "Ghalma's Warden", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}");
+        this.expansionSetCode = "SOM";
+        this.subtype.add("Elephant");
+        this.subtype.add("Soldier");
+		this.color.setWhite(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(4);
+        ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield);
+        ConditionalContinousEffect effect = new ConditionalContinousEffect(boostSource, Metalcraft.getInstance(), text);
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
+    }
+
+    public GhalmasWarden (final GhalmasWarden card) {
+        super(card);
+    }
+
+    @Override
+    public GhalmasWarden copy() {
+        return new GhalmasWarden(this);
+    }
+
+}
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java
index e1bc55c1727..21417f875ee 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java
@@ -42,6 +42,7 @@ import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.BoostControlledEffect;
 import mage.abilities.effects.common.GainAbilityControlledEffect;
+import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.ShroudAbility;
 import mage.cards.CardImpl;
 import mage.filter.FilterPermanent;
@@ -67,6 +68,7 @@ public class IndomitableArchangel extends CardImpl<IndomitableArchangel> {
         this.color.setWhite(true);
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
+        this.addAbility(FlyingAbility.getInstance());
         ContinuousEffect gainAbilityEffect = new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter);
         ConditionalContinousEffect effect = new ConditionalContinousEffect(gainAbilityEffect, Metalcraft.getInstance(), text);
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));