diff --git a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java
new file mode 100644
index 0000000000..ddb4330ca9
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java
@@ -0,0 +1,167 @@
+/*
+ *  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.zendikar;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Outcome;
+import mage.Constants.Rarity;
+import mage.Constants.Zone;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.DefenderAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.watchers.WatcherImpl;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class Gomazoa extends CardImpl<Gomazoa> {
+
+    public Gomazoa(UUID ownerId) {
+        super(ownerId, 46, "Gomazoa", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}");
+        this.expansionSetCode = "ZEN";
+        this.subtype.add("Jellyfish");
+
+        this.color.setBlue(true);
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(3);
+
+        // Defender
+        this.addAbility(DefenderAbility.getInstance());
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // {tap}: Put Gomazoa and each creature it's blocking on top of their owners' libraries, then those players shuffle their libraries.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GomazoaEffect(), new TapSourceCost()));
+        this.addWatcher(new BlockedByWatcher());
+
+    }
+
+    public Gomazoa(final Gomazoa card) {
+        super(card);
+    }
+
+    @Override
+    public Gomazoa copy() {
+        return new Gomazoa(this);
+    }
+}
+
+class GomazoaEffect extends OneShotEffect<GomazoaEffect> {
+
+    public GomazoaEffect() {
+        super(Outcome.Neutral);
+        this.staticText = "Put Gomazoa and each creature it's blocking on top of their owners' libraries, then those players shuffle their libraries";
+    }
+
+    public GomazoaEffect(final GomazoaEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public GomazoaEffect copy() {
+        return new GomazoaEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        List<UUID> creaturesBlocked = new ArrayList<UUID>();
+        List<UUID> players = new ArrayList<UUID>();
+        Permanent gomazoa = game.getPermanent(source.getSourceId());
+        if (gomazoa != null) {
+            gomazoa.moveToZone(Zone.LIBRARY, id, game, true);
+        }
+        
+        BlockedByWatcher watcher = (BlockedByWatcher) game.getState().getWatchers().get("BlockedByWatcher", source.getSourceId());
+        
+        creaturesBlocked = watcher.blockedByWatcher;
+        
+        for (UUID blockedById : creaturesBlocked) {
+            Permanent blockedByGomazoa = game.getPermanent(blockedById);
+            if (blockedByGomazoa != null && blockedByGomazoa.isAttacking()) {
+                players.add(blockedByGomazoa.getOwnerId());
+                blockedByGomazoa.moveToZone(Zone.LIBRARY, id, game, true);
+            }
+        }
+        for (UUID player : players) {
+            Player owner = game.getPlayer(player);
+            if (owner != null) {
+                owner.shuffleLibrary(game);
+            }
+        }
+        return true;
+    }
+}
+
+class BlockedByWatcher extends WatcherImpl<BlockedByWatcher> {
+
+    public List<UUID> blockedByWatcher = new ArrayList<UUID>();
+
+    public BlockedByWatcher() {
+        super("BlockedByWatcher", Constants.WatcherScope.CARD);
+    }
+
+    public BlockedByWatcher(final BlockedByWatcher watcher) {
+        super(watcher);
+        this.blockedByWatcher = watcher.blockedByWatcher;
+    }
+
+    @Override
+    public BlockedByWatcher copy() {
+        return new BlockedByWatcher(this);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.BLOCKER_DECLARED) {
+            if (sourceId.equals(event.getSourceId()) && !blockedByWatcher.contains(event.getTargetId())) {
+                blockedByWatcher.add(event.getTargetId());
+            }
+        }
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        blockedByWatcher.clear();
+    }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java b/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java
new file mode 100644
index 0000000000..7214d6d2db
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java
@@ -0,0 +1,191 @@
+/*
+ *  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.zendikar;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.UUID;
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.Constants.TargetController;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.choices.Choice;
+import mage.choices.ChoiceImpl;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetControlledPermanent;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class WorldQueller extends CardImpl<WorldQueller> {
+
+    public WorldQueller(UUID ownerId) {
+        super(ownerId, 39, "World Queller", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+        this.expansionSetCode = "ZEN";
+        this.subtype.add("Avatar");
+
+        this.color.setWhite(true);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // At the beginning of your upkeep, you may choose a card type. If you do, each player sacrifices a permanent of that type.
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new WorldQuellerEffect(), TargetController.YOU, true));
+
+    }
+
+    public WorldQueller(final WorldQueller card) {
+        super(card);
+    }
+
+    @Override
+    public WorldQueller copy() {
+        return new WorldQueller(this);
+    }
+}
+
+class WorldQuellerEffect extends OneShotEffect<WorldQuellerEffect> {
+
+    private static final HashSet<String> choice = new HashSet<String>();
+
+    static {
+        choice.add(CardType.ARTIFACT.toString());
+        choice.add(CardType.CREATURE.toString());
+        choice.add(CardType.LAND.toString());
+        choice.add(CardType.ENCHANTMENT.toString());
+        choice.add(CardType.INSTANT.toString());
+        choice.add(CardType.SORCERY.toString());
+        choice.add(CardType.PLANESWALKER.toString());
+        choice.add(CardType.TRIBAL.toString());
+    }
+
+    public WorldQuellerEffect() {
+        super(Constants.Outcome.Benefit);
+        staticText = "you may choose a card type. If you do, each player sacrifices a permanent of that type";
+    }
+
+    public WorldQuellerEffect(final WorldQuellerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public WorldQuellerEffect copy() {
+        return new WorldQuellerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        List<Card> chosen = new ArrayList<Card>();
+        Player you = game.getPlayer(source.getControllerId());
+        if (you != null) {
+            Choice choiceImpl = new ChoiceImpl();
+            choiceImpl.setChoices(choice);
+            while (!you.choose(outcome.Neutral, choiceImpl, game));
+            CardType type = null;
+            String choosenType = choiceImpl.getChoice();
+
+            if (choosenType.equals(CardType.ARTIFACT.toString())) {
+                type = CardType.ARTIFACT;
+            } else if (choosenType.equals(CardType.LAND.toString())) {
+                type = CardType.LAND;
+            } else if (choosenType.equals(CardType.CREATURE.toString())) {
+                type = CardType.CREATURE;
+            } else if (choosenType.equals(CardType.ENCHANTMENT.toString())) {
+                type = CardType.ENCHANTMENT;
+            } else if (choosenType.equals(CardType.INSTANT.toString())) {
+                type = CardType.INSTANT;
+            } else if (choosenType.equals(CardType.SORCERY.toString())) {
+                type = CardType.SORCERY;
+            } else if (choosenType.equals(CardType.PLANESWALKER.toString())) {
+                type = CardType.PLANESWALKER;
+            } else if (choosenType.equals(CardType.TRIBAL.toString())) {
+                type = CardType.TRIBAL;
+            }
+
+            FilterPermanent filter = new FilterPermanent();
+            filter.add(new CardTypePredicate(type));
+
+            System.out.println("The type chosen is " + type.toString());
+
+            TargetPermanent target = new TargetControlledPermanent(1, 1, filter, false);
+            target.setRequired(true);
+            target.setNotTarget(true);
+
+            // you always go first
+            if (target.canChoose(you.getId(), game)) {
+                while (!target.isChosen() && target.canChoose(you.getId(), game)) {
+                    you.choose(Constants.Outcome.Sacrifice, target, source.getId(), game);
+                }
+                Permanent permanent = game.getPermanent(target.getFirstTarget());
+                if (permanent != null) {
+                    chosen.add(permanent);
+                }
+            }
+
+            target.clearChosen();
+
+            // opponents follow
+            for (UUID playerId : game.getPlayerList()) {
+                if (playerId != you.getId()) {
+                    Player player = game.getPlayer(playerId);
+                    if (target.canChoose(playerId, game)) {
+                        while (!target.isChosen() && target.canChoose(playerId, game)) {
+                            player.choose(Constants.Outcome.Sacrifice, target, source.getId(), game);
+                        }
+                        Permanent permanent = game.getPermanent(target.getFirstTarget());
+                        if (permanent != null) {
+                            chosen.add(permanent);
+                        }
+                        target.clearChosen();
+                    }
+                }
+            }
+
+            // all chosen permanents are sacrificed together
+            for (Permanent permanent : game.getBattlefield().getAllActivePermanents()) {
+                if (chosen.contains(permanent)) {
+                    permanent.sacrifice(source.getId(), game);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}