diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ApothecaryInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/ApothecaryInitiate.java
new file mode 100644
index 00000000000..61a35795aea
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowmoor/ApothecaryInitiate.java
@@ -0,0 +1,79 @@
+/*
+ *  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.shadowmoor;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.common.SpellCastAllTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.mageobject.ColorPredicate;
+
+/**
+ *
+ * @author jeffwadsworth
+
+ */
+public class ApothecaryInitiate extends CardImpl<ApothecaryInitiate> {
+    
+    private static final FilterSpell filter = new FilterSpell("a white spell");
+    
+    static {
+        filter.add(new ColorPredicate(ObjectColor.WHITE));
+    }
+
+    public ApothecaryInitiate(UUID ownerId) {
+        super(ownerId, 1, "Apothecary Initiate", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}");
+        this.expansionSetCode = "SHM";
+        this.subtype.add("Kithkin");
+        this.subtype.add("Cleric");
+
+        this.color.setWhite(true);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Whenever a player casts a white spell, you may pay {1}. If you do, you gain 1 life.
+        this.addAbility(new SpellCastAllTriggeredAbility(new DoIfCostPaid(new GainLifeEffect(1), new ManaCostsImpl("{1}")), filter, true));
+        
+    }
+
+    public ApothecaryInitiate(final ApothecaryInitiate card) {
+        super(card);
+    }
+
+    @Override
+    public ApothecaryInitiate copy() {
+        return new ApothecaryInitiate(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BallynockCohort.java b/Mage.Sets/src/mage/sets/shadowmoor/BallynockCohort.java
new file mode 100644
index 00000000000..d8a7592634e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowmoor/BallynockCohort.java
@@ -0,0 +1,94 @@
+/*
+ *  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.shadowmoor;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.ControlsPermanentCondition;
+import mage.abilities.condition.common.ControlsPermanentCondition.CountType;
+import mage.abilities.decorator.ConditionalContinousEffect;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continious.BoostSourceEffect;
+import mage.abilities.keyword.FirstStrikeAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
+
+/**
+ *
+ * @author jeffwadsworth
+
+ */
+public class BallynockCohort extends CardImpl<BallynockCohort> {
+    
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
+    
+    static {
+        filter.add(new ColorPredicate(ObjectColor.WHITE));
+        filter.add(new AnotherPredicate());
+    }
+    
+    private String rule = "{this} gets +1/+1 as long as you control another white creature";
+
+    public BallynockCohort(UUID ownerId) {
+        super(ownerId, 3, "Ballynock Cohort", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+        this.expansionSetCode = "SHM";
+        this.subtype.add("Kithkin");
+        this.subtype.add("Soldier");
+
+        this.color.setWhite(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // First strike
+        this.addAbility(FirstStrikeAbility.getInstance());
+        
+        // Ballynock Cohort gets +1/+1 as long as you control another white creature.
+        Condition condition = new ControlsPermanentCondition(filter, CountType.MORE_THAN, 0);
+        Effect effect = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule);
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
+        
+    }
+
+    public BallynockCohort(final BallynockCohort card) {
+        super(card);
+    }
+
+    @Override
+    public BallynockCohort copy() {
+        return new BallynockCohort(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OrderOfWhiteclay.java b/Mage.Sets/src/mage/sets/shadowmoor/OrderOfWhiteclay.java
new file mode 100644
index 00000000000..ca9f51a8309
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowmoor/OrderOfWhiteclay.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.sets.shadowmoor;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.UntapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.Filter.ComparisonType;
+import mage.filter.common.FilterCreatureCard;
+import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
+import mage.target.Target;
+import mage.target.common.TargetCardInGraveyard;
+
+/**
+ *
+ * @author jeffwadsworth
+
+ */
+public class OrderOfWhiteclay extends CardImpl<OrderOfWhiteclay> {
+    
+    private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard");
+    
+    static {
+        filter.add(new ConvertedManaCostPredicate(ComparisonType.LessThan, 4));
+    }
+
+    public OrderOfWhiteclay(UUID ownerId) {
+        super(ownerId, 16, "Order of Whiteclay", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}{W}");
+        this.expansionSetCode = "SHM";
+        this.subtype.add("Kithkin");
+        this.subtype.add("Cleric");
+
+        this.color.setWhite(true);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(4);
+
+        // {1}{W}{W}, {untap}: Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{1}{W}{W}"));
+        ability.addCost(new UntapSourceCost());
+        Target target = new TargetCardInGraveyard(filter);
+        target.setRequired(true);
+        ability.addTarget(target);
+        this.addAbility(ability);
+        
+    }
+
+    public OrderOfWhiteclay(final OrderOfWhiteclay card) {
+        super(card);
+    }
+
+    @Override
+    public OrderOfWhiteclay copy() {
+        return new OrderOfWhiteclay(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java b/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java
new file mode 100644
index 00000000000..e06ad420306
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java
@@ -0,0 +1,107 @@
+/*
+ *  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.shadowmoor;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author jeffwadsworth
+ *
+ */
+public class StripBare extends CardImpl<StripBare> {
+
+    public StripBare(UUID ownerId) {
+        super(ownerId, 24, "Strip Bare", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}");
+        this.expansionSetCode = "SHM";
+
+        this.color.setWhite(true);
+
+        // Destroy all Auras and Equipment attached to target creature.
+        this.getSpellAbility().addEffect(new StripBareEffect());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+
+    }
+
+    public StripBare(final StripBare card) {
+        super(card);
+    }
+
+    @Override
+    public StripBare copy() {
+        return new StripBare(this);
+    }
+}
+
+class StripBareEffect extends OneShotEffect<StripBareEffect> {
+
+    public StripBareEffect() {
+        super(Outcome.GainLife);
+        this.staticText = "Destroy all Auras and Equipment attached to target creature";
+    }
+
+    public StripBareEffect(final StripBareEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public StripBareEffect copy() {
+        return new StripBareEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        boolean applied = false;
+        FilterPermanent filter = new FilterPermanent();
+        filter.add(Predicates.or(new SubtypePredicate("Equipment"),
+                new SubtypePredicate("Aura")));
+        Permanent targetCreature = game.getPermanent(source.getFirstTarget());
+        if (targetCreature != null
+                && targetCreature.getAttachments().size() > 0) {
+            for (Permanent attachment : game.getBattlefield().getAllActivePermanents(filter, game)) {
+                if (attachment != null
+                        && targetCreature.getAttachments().contains(attachment.getId())) {
+                    applied = attachment.destroy(source.getId(), game, false);
+                }
+            }
+        }
+        return applied;
+    }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WindbriskRaptor.java b/Mage.Sets/src/mage/sets/shadowmoor/WindbriskRaptor.java
new file mode 100644
index 00000000000..94edd67efb1
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowmoor/WindbriskRaptor.java
@@ -0,0 +1,85 @@
+/*
+ *  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.shadowmoor;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.permanent.AttackingPredicate;
+
+/**
+ *
+ * @author jeffwadsworth
+
+ */
+public class WindbriskRaptor extends CardImpl<WindbriskRaptor> {
+    
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
+    
+    static {
+        filter.add(new AttackingPredicate());
+    }
+
+    public WindbriskRaptor(UUID ownerId) {
+        super(ownerId, 26, "Windbrisk Raptor", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
+        this.expansionSetCode = "SHM";
+        this.subtype.add("Bird");
+
+        this.color.setWhite(true);
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(7);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+        
+        // Attacking creatures you control have lifelink.
+        Effect effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, filter);
+        effect.setText("Attacking creatures you control have lifelink");
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
+        
+    }
+
+    public WindbriskRaptor(final WindbriskRaptor card) {
+        super(card);
+    }
+
+    @Override
+    public WindbriskRaptor copy() {
+        return new WindbriskRaptor(this);
+    }
+}