diff --git a/Mage.Sets/src/mage/cards/h/HammerheadTyrant.java b/Mage.Sets/src/mage/cards/h/HammerheadTyrant.java
new file mode 100644
index 00000000000..2ddd62db7c0
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/h/HammerheadTyrant.java
@@ -0,0 +1,87 @@
+package mage.cards.h;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
+import mage.abilities.effects.common.ReturnToHandTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterNonlandPermanent;
+import mage.filter.predicate.ObjectSourcePlayer;
+import mage.filter.predicate.ObjectSourcePlayerPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.stack.Spell;
+import mage.target.TargetPermanent;
+import mage.util.CardUtil;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class HammerheadTyrant extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterNonlandPermanent(
+            "nonland permanent an opponent controls with mana value less than or equal to that spell's mana value"
+    );
+
+    static {
+        filter.add(TargetController.OPPONENT.getControllerPredicate());
+    }
+
+    public HammerheadTyrant(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}");
+
+        this.subtype.add(SubType.DRAGON);
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Whenever you cast a spell, return up to one target nonland permanent an opponent controls with mana value less than or equal to that spell's mana value to its owner's hand.
+        Ability ability = new SpellCastControllerTriggeredAbility(
+                new ReturnToHandTargetEffect(), StaticFilters.FILTER_SPELL_A, false
+        );
+        ability.addTarget(new TargetPermanent(0, 1, filter));
+        this.addAbility(ability);
+    }
+
+    private HammerheadTyrant(final HammerheadTyrant card) {
+        super(card);
+    }
+
+    @Override
+    public HammerheadTyrant copy() {
+        return new HammerheadTyrant(this);
+    }
+}
+
+enum HammerheadTyrantPredicate implements ObjectSourcePlayerPredicate<Permanent> {
+    instance;
+
+    @Override
+    public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
+        return input
+                .getObject()
+                .getManaValue()
+                <= CardUtil
+                .castStream(
+                        input.getSource()
+                                .getEffects()
+                                .stream()
+                                .map(effect -> effect.getValue("spellCast")),
+                        Spell.class
+                )
+                .findFirst()
+                .map(Spell::getManaValue)
+                .orElse(-1);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/TarkirDragonstormCommander.java b/Mage.Sets/src/mage/sets/TarkirDragonstormCommander.java
index 8808a412c92..cc2897e8b18 100644
--- a/Mage.Sets/src/mage/sets/TarkirDragonstormCommander.java
+++ b/Mage.Sets/src/mage/sets/TarkirDragonstormCommander.java
@@ -149,6 +149,7 @@ public final class TarkirDragonstormCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Grenzo, Havoc Raiser", 216, Rarity.RARE, mage.cards.g.GrenzoHavocRaiser.class));
         cards.add(new SetCardInfo("Grisly Salvage", 290, Rarity.COMMON, mage.cards.g.GrislySalvage.class));
         cards.add(new SetCardInfo("Guttersnipe", 217, Rarity.UNCOMMON, mage.cards.g.Guttersnipe.class));
+        cards.add(new SetCardInfo("Hammerhead Tyrant", 21, Rarity.RARE, mage.cards.h.HammerheadTyrant.class));
         cards.add(new SetCardInfo("Harbinger of the Hunt", 291, Rarity.RARE, mage.cards.h.HarbingerOfTheHunt.class));
         cards.add(new SetCardInfo("Harrow", 258, Rarity.COMMON, mage.cards.h.Harrow.class));
         cards.add(new SetCardInfo("Haughty Djinn", 154, Rarity.RARE, mage.cards.h.HaughtyDjinn.class));