diff --git a/Mage.Sets/src/mage/cards/c/CryptcallerChariot.java b/Mage.Sets/src/mage/cards/c/CryptcallerChariot.java
new file mode 100644
index 00000000000..0b1cb3afe56
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/c/CryptcallerChariot.java
@@ -0,0 +1,49 @@
+package mage.cards.c;
+
+import mage.MageInt;
+import mage.abilities.dynamicvalue.common.SavedDiscardValue;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.DiscardOneOrMoreCardsTriggeredAbility;
+import mage.abilities.keyword.CrewAbility;
+import mage.abilities.keyword.MenaceAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.game.permanent.token.ZombieToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class CryptcallerChariot extends CardImpl {
+
+    public CryptcallerChariot(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}{B}");
+
+        this.subtype.add(SubType.VEHICLE);
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(5);
+
+        // Menace
+        this.addAbility(new MenaceAbility());
+
+        // Whenever you discard one or more cards, create that many tapped 2/2 black Zombie creature tokens.
+        this.addAbility(new DiscardOneOrMoreCardsTriggeredAbility(new CreateTokenEffect(
+                new ZombieToken(), SavedDiscardValue.MANY, true, false
+        )));
+
+        // Crew 2
+        this.addAbility(new CrewAbility(2));
+    }
+
+    private CryptcallerChariot(final CryptcallerChariot card) {
+        super(card);
+    }
+
+    @Override
+    public CryptcallerChariot copy() {
+        return new CryptcallerChariot(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/cards/i/IntiSeneschalOfTheSun.java b/Mage.Sets/src/mage/cards/i/IntiSeneschalOfTheSun.java
index 3ebf9c7aa5a..76c2a0d35f4 100644
--- a/Mage.Sets/src/mage/cards/i/IntiSeneschalOfTheSun.java
+++ b/Mage.Sets/src/mage/cards/i/IntiSeneschalOfTheSun.java
@@ -1,10 +1,10 @@
 package mage.cards.i;
 
 import mage.MageInt;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.AttacksWithCreaturesTriggeredAbility;
 import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
 import mage.abilities.costs.common.DiscardCardCost;
+import mage.abilities.effects.common.DiscardOneOrMoreCardsTriggeredAbility;
 import mage.abilities.effects.common.DoWhenCostPaid;
 import mage.abilities.effects.common.ExileTopXMayPlayUntilEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
@@ -12,10 +12,11 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.*;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
 import mage.counters.CounterType;
-import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.target.common.TargetAttackingCreature;
 
 import java.util.UUID;
@@ -46,7 +47,10 @@ public final class IntiSeneschalOfTheSun extends CardImpl {
         ), 1));
 
         // Whenever you discard one or more cards, exile the top card of your library. You may play that card until your next end step.
-        this.addAbility(new IntiSeneschalOfTheSunTriggeredAbility());
+        this.addAbility(new DiscardOneOrMoreCardsTriggeredAbility(
+                new ExileTopXMayPlayUntilEffect(1, Duration.UntilYourNextEndStep)
+                        .withTextOptions("that card", true)
+        ));
     }
 
     private IntiSeneschalOfTheSun(final IntiSeneschalOfTheSun card) {
@@ -58,31 +62,3 @@ public final class IntiSeneschalOfTheSun extends CardImpl {
         return new IntiSeneschalOfTheSun(this);
     }
 }
-
-class IntiSeneschalOfTheSunTriggeredAbility extends TriggeredAbilityImpl {
-
-    IntiSeneschalOfTheSunTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new ExileTopXMayPlayUntilEffect(1, Duration.UntilYourNextEndStep)
-                .withTextOptions("that card", true));
-        this.setTriggerPhrase("Whenever you discard one or more cards, ");
-    }
-
-    private IntiSeneschalOfTheSunTriggeredAbility(final IntiSeneschalOfTheSunTriggeredAbility ability) {
-        super(ability);
-    }
-
-    @Override
-    public IntiSeneschalOfTheSunTriggeredAbility copy() {
-        return new IntiSeneschalOfTheSunTriggeredAbility(this);
-    }
-
-    @Override
-    public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.DISCARDED_CARDS;
-    }
-
-    @Override
-    public boolean checkTrigger(GameEvent event, Game game) {
-        return isControlledBy(event.getPlayerId());
-    }
-}
diff --git a/Mage.Sets/src/mage/sets/Aetherdrift.java b/Mage.Sets/src/mage/sets/Aetherdrift.java
index 092d42ca0dc..77a34de50e2 100644
--- a/Mage.Sets/src/mage/sets/Aetherdrift.java
+++ b/Mage.Sets/src/mage/sets/Aetherdrift.java
@@ -62,6 +62,7 @@ public final class Aetherdrift extends ExpansionSet {
         cards.add(new SetCardInfo("Count on Luck", 118, Rarity.RARE, mage.cards.c.CountOnLuck.class));
         cards.add(new SetCardInfo("Country Roads", 253, Rarity.UNCOMMON, mage.cards.c.CountryRoads.class));
         cards.add(new SetCardInfo("Crash and Burn", 119, Rarity.COMMON, mage.cards.c.CrashAndBurn.class));
+        cards.add(new SetCardInfo("Cryptcaller Chariot", 80, Rarity.RARE, mage.cards.c.CryptcallerChariot.class));
         cards.add(new SetCardInfo("Daretti, Rocketeer Engineer", 120, Rarity.RARE, mage.cards.d.DarettiRocketeerEngineer.class));
         cards.add(new SetCardInfo("Daring Mechanic", 11, Rarity.COMMON, mage.cards.d.DaringMechanic.class));
         cards.add(new SetCardInfo("Deathless Pilot", 82, Rarity.COMMON, mage.cards.d.DeathlessPilot.class));
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SavedDiscardValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SavedDiscardValue.java
new file mode 100644
index 00000000000..c41ccdc5d13
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SavedDiscardValue.java
@@ -0,0 +1,40 @@
+package mage.abilities.dynamicvalue.common;
+
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+
+/**
+ * @author TheElk801
+ */
+public enum SavedDiscardValue implements DynamicValue {
+    MANY("many"),
+    MUCH("much");
+
+    private final String message;
+
+    SavedDiscardValue(String message) {
+        this.message = "that " + message;
+    }
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        return (Integer) effect.getValue("discarded");
+    }
+
+    @Override
+    public SavedDiscardValue copy() {
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return message;
+    }
+
+    @Override
+    public String getMessage() {
+        return "";
+    }
+}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DiscardOneOrMoreCardsTriggeredAbility.java b/Mage/src/main/java/mage/abilities/effects/common/DiscardOneOrMoreCardsTriggeredAbility.java
new file mode 100644
index 00000000000..2f9d60137e9
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/effects/common/DiscardOneOrMoreCardsTriggeredAbility.java
@@ -0,0 +1,49 @@
+package mage.abilities.effects.common;
+
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+
+/**
+ * @author TheElk801
+ */
+public class DiscardOneOrMoreCardsTriggeredAbility extends TriggeredAbilityImpl {
+
+    public DiscardOneOrMoreCardsTriggeredAbility(Effect effect) {
+        this(effect, false);
+    }
+
+    public DiscardOneOrMoreCardsTriggeredAbility(Effect effect, boolean optional) {
+        this(Zone.BATTLEFIELD, effect, optional);
+    }
+
+    public DiscardOneOrMoreCardsTriggeredAbility(Zone zone, Effect effect, boolean optional) {
+        super(zone, effect, optional);
+        setTriggerPhrase("Whenever you discard one or more cards, ");
+    }
+
+    private DiscardOneOrMoreCardsTriggeredAbility(final DiscardOneOrMoreCardsTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public DiscardOneOrMoreCardsTriggeredAbility copy() {
+        return new DiscardOneOrMoreCardsTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.DISCARDED_CARDS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (!isControlledBy(event.getPlayerId())) {
+            return false;
+        }
+        this.getEffects().setValue("discarded", event.getAmount());
+        return true;
+    }
+}