diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
index f4af5ec56dc..40141ae80a4 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
@@ -156,7 +156,7 @@ public class DamageDealAi extends DamageAiBase {
                     }
                 }
             }
-            if (ai.getAttackedWithCreatureThisTurn()) {
+            if (!ai.getCreaturesAttackedThisTurn().isEmpty()) {
                 dmg = Integer.parseInt(logic.substring(logic.indexOf(".") + 1));
             }
         } else if ("WildHunt".equals(logic)) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java b/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java
index 69c5bf22fc0..fd7632bc44d 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java
@@ -63,7 +63,7 @@ public class DestroyAi extends SpellAbilityAi {
             }
         } else if ("AtEOTIfNotAttacking".equals(sa.getParam("AILogic"))) {
             PhaseHandler ph = ai.getGame().getPhaseHandler();
-            if (!ph.is(PhaseType.END_OF_TURN) || ai.getAttackedWithCreatureThisTurn()) {
+            if (!ph.is(PhaseType.END_OF_TURN) || !ai.getCreaturesAttackedThisTurn().isEmpty()) {
                 return false;
             }
         }
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index cebd914147e..908f2bc678e 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -54,6 +54,8 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import java.util.*;
 
+import static forge.util.EnumMapUtil.toStringMap;
+
 /**
  * Methods for common actions performed during a game.
  * 
@@ -297,7 +299,7 @@ public class GameAction {
                 repParams.putAll(params);
             }
 
-            ReplacementResult repres = game.getReplacementHandler().run(EnumMapUtil.toStringMap(repParams));
+            ReplacementResult repres = game.getReplacementHandler().run(toStringMap(repParams));
             if (repres != ReplacementResult.NotReplaced) {
                 // reset failed manifested Cards back to original
                 if (c.isManifested()) {
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityKey.java b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
index 5b4e47df779..fe5b8bb1162 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityKey.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
@@ -10,8 +10,9 @@ public enum AbilityKey {
     AbilityMana("AbilityMana"),
     Activator("Activator"),
     Affected("Affected"),
-    Attach("Attach"),
     AllVotes("AllVotes"),
+    Amount("Amount"),
+    Attach("Attach"),
     AttachSource("AttachSource"),
     AttachTarget("AttachTarget"),
     Attacked("Attacked"),
@@ -51,14 +52,12 @@ public enum AbilityKey {
     Devoured("Devoured"),
     EchoPaid("EchoPaid"),
     Exploited("Exploited"),
+    Explorer("Explorer"),
     Event("Event"),
     Fighter("Fighter"),
     FirstTime("FirstTime"),
     Fizzle("Fizzle"),
     IsCombatDamage("IsCombatDamage"),
-    PayingMana("PayingMana"),
-    Phase("Phase"),
-    Player("Player"),
     IndividualCostPaymentInstance("IndividualCostPaymentInstance"),
     IsMadness("IsMadness"),
     LifeAmount("LifeAmount"),
@@ -71,14 +70,23 @@ public enum AbilityKey {
     Object("Object"),
     Objects("Objects"),
     OtherAttackers("OtherAttackers"),
+    OtherVoters("OtherVoters"),
     Origin("Origin"),
     OriginalController("OriginalController"),
+    OriginalDefender("OriginalDefender"),
+    PayingMana("PayingMana"),
+    Phase("Phase"),
+    Player("Player"),
     Produced("Produced"),
     Result("Result"),
     Scheme("Scheme"),
     Source("Source"),
+    Sources("Sources"),
     SourceSA("SourceSA"),
+    SpellAbility("SpellAbility"),
     SpellAbilityStackInstance("SpellAbilityStackInstance"),
+    SpellAbilityTargetingCards("SpellAbilityTargetingCards"),
+    StackInstance("StackInstance"),
     StackSa("StackSa"),
     StackSi("StackSi"),
     Target("Target"),
@@ -99,10 +107,204 @@ public enum AbilityKey {
         return key;
     }
 
+    /**
+     * @param s A string that would be output from toString
+     * @return the corresponding key if there is one or null otherwise
+     */
+    public static AbilityKey fromString(String s) {
+        switch (s) {
+            case "AbilityMana":
+                return AbilityMana;
+            case "Activator":
+                return Activator;
+            case "Affected":
+                return Affected;
+            case "AllVotes":
+                return AllVotes;
+            case "Amount":
+                return Amount;
+            case "Attach":
+                return Attach;
+            case "AttachSource":
+                return AttachSource;
+            case "AttachTarget":
+                return AttachTarget;
+            case "Attacked":
+                return Attacked;
+            case "Attacker":
+                return Attacker;
+            case "Attackers":
+                return Attackers;
+            case "AttackingPlayer":
+                return AttackingPlayer;
+            case "AttackedTarget":
+                return AttackedTarget;
+            case "Blocker":
+                return Blocker;
+            case "Blockers":
+                return Blockers;
+            case "CastSA":
+                return CastSA;
+            case "CastSACMC":
+                return CastSACMC;
+            case "Card":
+                return Card;
+            case "Cards":
+                return Cards;
+            case "CardLKI":
+                return CardLKI;
+            case "Cause":
+                return Cause;
+            case "Causer":
+                return Causer;
+            case "Championed":
+                return Championed;
+            case "CopySA":
+                return CopySA;
+            case "Cost":
+                return Cost;
+            case "CostStack":
+                return CostStack;
+            case "CounterAmount":
+                return CounterAmount;
+            case "CounteredSA":
+                return CounteredSA;
+            case "CounterType":
+                return CounterType;
+            case "Crew":
+                return Crew;
+            case "CumulativeUpkeepPaid":
+                return CumulativeUpkeepPaid;
+            case "CurrentCastSpells":
+                return CurrentCastSpells;
+            case "CurrentStormCount":
+                return CurrentStormCount;
+            case "DamageAmount":
+                return DamageAmount;
+            case "DamageSource":
+                return DamageSource;
+            case "DamageSources":
+                return DamageSources;
+            case "DamageTarget":
+                return DamageTarget;
+            case "DamageTargets":
+                return DamageTargets;
+            case "Defender":
+                return Defender;
+            case "Defenders":
+                return Defenders;
+            case "DefendingPlayer":
+                return DefendingPlayer;
+            case "Destination":
+                return Destination;
+            case "Devoured":
+                return Devoured;
+            case "EchoPaid":
+                return EchoPaid;
+            case "Exploited":
+                return Exploited;
+            case "Explorer":
+                return Explorer;
+            case "Event":
+                return Event;
+            case "Fighter":
+                return Fighter;
+            case "FirstTime":
+                return FirstTime;
+            case "Fizzle":
+                return Fizzle;
+            case "IsCombatDamage":
+                return IsCombatDamage;
+            case "IndividualCostPaymentInstance":
+                return IndividualCostPaymentInstance;
+            case "IsMadness":
+                return IsMadness;
+            case "LifeAmount":
+                return LifeAmount;
+            case "MonstrosityAmount":
+                return MonstrosityAmount;
+            case "NewCounterAmount":
+                return NewCounterAmount;
+            case "Num":
+                return Num;
+            case "NumBlockers":
+                return NumBlockers;
+            case "NumThisTurn":
+                return NumThisTurn;
+            case "Number":
+                return Number;
+            case "Object":
+                return Object;
+            case "Objects":
+                return Objects;
+            case "OtherAttackers":
+                return OtherAttackers;
+            case "OtherVoters":
+                return OtherVoters;
+            case "Origin":
+                return Origin;
+            case "OriginalController":
+                return OriginalController;
+            case "OriginalDefender":
+                return OriginalDefender;
+            case "PayingMana":
+                return PayingMana;
+            case "Phase":
+                return Phase;
+            case "Player":
+                return Player;
+            case "Produced":
+                return Produced;
+            case "Result":
+                return Result;
+            case "Scheme":
+                return Scheme;
+            case "Source":
+                return Source;
+            case "Sources":
+                return Sources;
+            case "SourceSA":
+                return SourceSA;
+            case "SpellAbility":
+                return SpellAbility;
+            case "SpellAbilityStackInstance":
+                return SpellAbilityStackInstance;
+            case "SpellAbilityTargetingCards":
+                return SpellAbilityTargetingCards;
+            case "StackInstance":
+                return StackInstance;
+            case "StackSa":
+                return StackSa;
+            case "StackSi":
+                return StackSi;
+            case "Target":
+                return Target;
+            case "Targets":
+                return Targets;
+            case "Transformer":
+                return Transformer;
+            case "Vehicle":
+                return Vehicle;
+            case "Won":
+                return Won;
+            default:
+                return null;
+        }
+
+    }
+
     public static <V> EnumMap<AbilityKey, V> newMap() {
         return new EnumMap<>(AbilityKey.class);
     }
 
+    public static <V> EnumMap<AbilityKey, V> newMap(Map<AbilityKey, V> map) {
+        // The EnumMap constructor throws IllegalArgumentException if the map is empty.
+        if (map.isEmpty()) {
+            return newMap();
+        }
+        return new EnumMap<>(map);
+    }
+
     public static Map<AbilityKey, Object> mapFromCard(forge.game.card.Card card) {
         final Map<AbilityKey, Object> runParams = newMap();
 
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index f8abf7b00b0..25728de2544 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -139,13 +139,15 @@ public class AbilityUtils {
             final SpellAbility root = sa.getRootAbility();
             if (defined.contains("LKICopy")) { //Triggered*LKICopy
                 int lkiPosition = defined.indexOf("LKICopy");
-                final Object crd = root.getTriggeringObject(defined.substring(9, lkiPosition));
+                AbilityKey type = AbilityKey.fromString(defined.substring(9, lkiPosition));
+                final Object crd = root.getTriggeringObject(type);
                 if (crd instanceof Card) {
                     c = (Card) crd;
                 }
             }
             else {
-                final Object crd = root.getTriggeringObject(defined.substring(9));
+                AbilityKey type = AbilityKey.fromString(defined.substring(9));
+                final Object crd = root.getTriggeringObject(type);
                 if (crd instanceof Card) {
                     c = game.getCardState((Card) crd);
                 } else if (crd instanceof Iterable) {
@@ -462,12 +464,9 @@ public class AbilityUtils {
                 players.remove(game.getPhaseHandler().getPlayerTurn());
                 val = CardFactoryUtil.playerXCount(players, calcX[1], card);
             }
-            else if (hType.startsWith("PropertyYou") && !(ability instanceof SpellAbility)) {
-                // Related to the controller of the card with ability when the ability is static (or otherwise not a SpellAbility)
-                // TODO: This doesn't work in situations when the controller of the card is different from the spell caster
-                // (e.g. opponent's Hollow One exiled by Hostage Taker - cost reduction will not work in this scenario, requires
-                // a more significant rework).
-                players.add(card.getController());
+            else if (hType.startsWith("PropertyYou") && ability instanceof SpellAbility) {
+                // Hollow One
+                players.add(((SpellAbility) ability).getActivatingPlayer());
                 val = CardFactoryUtil.playerXCount(players, calcX[1], card);
             }
             else if (hType.startsWith("Property") && ability instanceof SpellAbility) {
@@ -641,12 +640,12 @@ public class AbilityUtils {
         }
         if (calcX[0].startsWith("TriggeredPlayer") || calcX[0].startsWith("TriggeredTarget")) {
             final SpellAbility root = sa.getRootAbility();
-            Object o = root.getTriggeringObject(calcX[0].substring(9));
+            Object o = root.getTriggeringObject(AbilityKey.fromString(calcX[0].substring(9)));
             return o instanceof Player ? CardFactoryUtil.playerXProperty((Player) o, calcX[1], card) * multiplier : 0;
         }
         if (calcX[0].equals("TriggeredSpellAbility")) {
             final SpellAbility root = sa.getRootAbility();
-            SpellAbility sat = (SpellAbility) root.getTriggeringObject("SpellAbility");
+            SpellAbility sat = (SpellAbility) root.getTriggeringObject(AbilityKey.SpellAbility);
             return calculateAmount(sat.getHostCard(), calcX[1], sat);
         }
         // Added on 9/30/12 (ArsenalNut) - Ended up not using but might be useful in future
@@ -695,11 +694,11 @@ public class AbilityUtils {
         }
         else if (calcX[0].startsWith("TriggerObjects")) {
             final SpellAbility root = sa.getRootAbility();
-            list = (CardCollection) root.getTriggeringObject(calcX[0].substring(14));
+            list = (CardCollection) root.getTriggeringObject(AbilityKey.fromString(calcX[0].substring(14)));
         }
         else if (calcX[0].startsWith("Triggered")) {
             final SpellAbility root = sa.getRootAbility();
-            list = new CardCollection((Card) root.getTriggeringObject(calcX[0].substring(9)));
+            list = new CardCollection((Card) root.getTriggeringObject(AbilityKey.fromString(calcX[0].substring(9))));
         }
         else if (calcX[0].startsWith("TriggerCount")) {
             // TriggerCount is similar to a regular Count, but just
@@ -707,7 +706,7 @@ public class AbilityUtils {
             final SpellAbility root = sa.getRootAbility();
             final String[] l = calcX[1].split("/");
             final String m = CardFactoryUtil.extractOperators(calcX[1]);
-            final int count = (Integer) root.getTriggeringObject(l[0]);
+            final int count = (Integer) root.getTriggeringObject(AbilityKey.fromString(l[0]));
 
             return CardFactoryUtil.doXMath(count, m, card) * multiplier;
         }
@@ -777,19 +776,19 @@ public class AbilityUtils {
         final Object o;
         if (type.startsWith("Triggered")) {
             if (type.contains("Card")) {
-                o = sa.getTriggeringObject("Card");
+                o = sa.getTriggeringObject(AbilityKey.Card);
             }
             else if (type.contains("Object")) {
-                o = sa.getTriggeringObject("Object");
+                o = sa.getTriggeringObject(AbilityKey.Object);
             }
             else if (type.contains("Attacker")) {
-                o = sa.getTriggeringObject("Attacker");
+                o = sa.getTriggeringObject(AbilityKey.Attacker);
             }
             else if (type.contains("Blocker")) {
-                o = sa.getTriggeringObject("Blocker");
+                o = sa.getTriggeringObject(AbilityKey.Blocker);
             }
             else {
-                o = sa.getTriggeringObject("Card");
+                o = sa.getTriggeringObject(AbilityKey.Card);
             }
 
             if (!(o instanceof Card)) {
@@ -1004,7 +1003,7 @@ public class AbilityUtils {
             if (defParsed.endsWith("Controller")) {
                 String triggeringType = defParsed.substring(9);
                 triggeringType = triggeringType.substring(0, triggeringType.length() - 10);
-                final Object c = root.getTriggeringObject(triggeringType);
+                final Object c = root.getTriggeringObject(AbilityKey.fromString(triggeringType));
                 if (c instanceof Card) {
                     o = ((Card) c).getController();
                 }
@@ -1015,7 +1014,7 @@ public class AbilityUtils {
             else if (defParsed.endsWith("Opponent")) {
                 String triggeringType = defParsed.substring(9);
                 triggeringType = triggeringType.substring(0, triggeringType.length() - 8);
-                final Object c = root.getTriggeringObject(triggeringType);
+                final Object c = root.getTriggeringObject(AbilityKey.fromString(triggeringType));
                 if (c instanceof Card) {
                     o = ((Card) c).getController().getOpponents();
                 }
@@ -1026,14 +1025,14 @@ public class AbilityUtils {
             else if (defParsed.endsWith("Owner")) {
                 String triggeringType = defParsed.substring(9);
                 triggeringType = triggeringType.substring(0, triggeringType.length() - 5);
-                final Object c = root.getTriggeringObject(triggeringType);
+                final Object c = root.getTriggeringObject(AbilityKey.fromString(triggeringType));
                 if (c instanceof Card) {
                     o = ((Card) c).getOwner();
                 }
             }
             else {
                 final String triggeringType = defParsed.substring(9);
-                o = root.getTriggeringObject(triggeringType);
+                o = root.getTriggeringObject(AbilityKey.fromString(triggeringType));
             }
             if (o != null) {
                 if (o instanceof Player) {
@@ -1252,13 +1251,13 @@ public class AbilityUtils {
             final SpellAbility root = sa.getRootAbility();
 
             final String triggeringType = defined.substring(9);
-            final Object o = root.getTriggeringObject(triggeringType);
+            final Object o = root.getTriggeringObject(AbilityKey.fromString(triggeringType));
             if (o instanceof SpellAbility) {
                 s = (SpellAbility) o;
                 // if there is no target information in SA but targets are listed in SpellAbilityTargeting cards, copy that
                 // information so it's not lost if the calling code is interested in targets of the triggered SA.
                 if (triggeringType.equals("SpellAbility")) {
-                    final CardCollectionView tgtList = (CardCollectionView)root.getTriggeringObject("SpellAbilityTargetingCards");
+                    final CardCollectionView tgtList = (CardCollectionView)root.getTriggeringObject(AbilityKey.SpellAbilityTargetingCards);
                     if (s.getTargets() != null && s.getTargets().getNumTargeted() == 0) {
                         if (tgtList != null && tgtList.size() > 0) {
                             TargetChoices tc = new TargetChoices();
@@ -1390,7 +1389,7 @@ public class AbilityUtils {
             cost = new Cost(source.getManaCost(), true);
         }
         else if (unlessCost.equals("TriggeredSpellManaCost")) {
-            SpellAbility triggered = (SpellAbility) sa.getRootAbility().getTriggeringObject("SpellAbility");
+            SpellAbility triggered = (SpellAbility) sa.getRootAbility().getTriggeringObject(AbilityKey.SpellAbility);
             Card triggeredCard = triggered.getHostCard();
             if (triggeredCard.getManaCost() == null) {
                 cost = new Cost(ManaCost.ZERO, true);
@@ -1608,7 +1607,7 @@ public class AbilityUtils {
                 // Count$TriggeredPayingMana.<Color1>.<Color2>
                 if (sq[0].startsWith("TriggeredPayingMana")) {
                     final SpellAbility root = sa.getRootAbility();
-                    String mana = (String) root.getTriggeringObject("PayingMana");
+                    String mana = (String) root.getTriggeringObject(AbilityKey.PayingMana);
                     int count = 0;
                     Matcher mat = Pattern.compile(StringUtils.join(sq, "|", 1, sq.length)).matcher(mana);
                     while (mat.find()) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeCombatantsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeCombatantsEffect.java
index bc74c3b9533..6135aa48c18 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeCombatantsEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeCombatantsEffect.java
@@ -2,6 +2,7 @@ package forge.game.ability.effects;
 
 import forge.game.Game;
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
 import forge.game.combat.AttackingBand;
@@ -54,12 +55,12 @@ public class ChangeCombatantsEffect extends SpellAbilityEffect {
                     // retarget triggers to the new defender (e.g. Ulamog, Ceaseless Hunger + Portal Mage)
                     for (SpellAbilityStackInstance si : game.getStack()) {
                         if (si.isTrigger() && c.equals(si.getSourceCard())
-                                && si.getTriggeringObject("Attacker") != null) {
-                            si.addTriggeringObject("OriginalDefender", originalDefender);
+                                && si.getTriggeringObject(AbilityKey.Attacker) != null) {
+                            si.addTriggeringObject(AbilityKey.OriginalDefender, originalDefender);
                             if (defender instanceof Player) {
-                                si.updateTriggeringObject("DefendingPlayer", defender);
+                                si.updateTriggeringObject(AbilityKey.DefendingPlayer, defender);
                             } else if (defender instanceof Card) {
-                                si.updateTriggeringObject("DefendingPlayer", ((Card)defender).getController());
+                                si.updateTriggeringObject(AbilityKey.DefendingPlayer, ((Card)defender).getController());
                             }
                         }
                     }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 7debeb1d96a..128c49d24a8 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -980,7 +980,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     } 
                     c.setController(newController, game.getNextTimestamp());
                 }
-
+                if (sa.hasParam("WithCounters")) {
+                    String[] parse = sa.getParam("WithCounters").split("_");
+                    c.addEtbCounter(CounterType.getType(parse[0]), Integer.parseInt(parse[1]), player);
+                }
                 if (sa.hasParam("Transformed")) {
                     if (c.isDoubleFaced()) {
                         c.changeCardState("Transform", null);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
index 4641d05d75f..61848eba1f3 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
@@ -70,6 +70,7 @@ public class RestartGameEffect extends SpellAbilityEffect {
 
             player.setStartingLife(psc.getStartingLife());
             player.setPoisonCounters(0, sa.getHostCard());
+            player.resetSpellCastThisGame();
             player.setLandsPlayedLastTurn(0);
             player.resetLandsPlayedThisTurn();
             player.resetInvestigatedThisTurn();
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index cef51f069ee..99ecc3df0ea 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1048,7 +1048,7 @@ public class Card extends GameEntity implements Comparable<Card> {
         }
     }
 
-    public final Object getTriggeringObject(final String typeIn) {
+    public final Object getTriggeringObject(final AbilityKey typeIn) {
         Object triggered = null;
         if (!currentState.getTriggers().isEmpty()) {
             for (final Trigger t : currentState.getTriggers()) {
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index a1566899fd1..829f0979785 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -35,6 +35,7 @@ import forge.game.GameEntity;
 import forge.game.GameEntityCounterTable;
 import forge.game.GameLogEntryType;
 import forge.game.ability.AbilityFactory;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.card.CardPredicates.Presets;
@@ -917,6 +918,10 @@ public class CardFactoryUtil {
             return doXMath(cc.getSurveilThisTurn(), m, c);
         }
 
+        if (sq[0].equals("YouCastThisGame")) {
+            return doXMath(cc.getSpellsCastThisGame(), m, c);
+        }
+
         if (sq[0].equals("FirstSpellTotalManaSpent")) {
             try{
                 return doXMath(c.getFirstSpellAbility().getTotalManaSpent(), m, c);
@@ -948,7 +953,7 @@ public class CardFactoryUtil {
         
         // TriggeringObjects
         if (sq[0].startsWith("Triggered")) {
-            return doXMath(xCount((Card) c.getTriggeringObject("Card"), sq[0].substring(9)), m, c);
+            return doXMath(xCount((Card) c.getTriggeringObject(AbilityKey.Card), sq[0].substring(9)), m, c);
         }
 
         if (sq[0].contains("YourStartingLife")) {
@@ -1329,6 +1334,13 @@ public class CardFactoryUtil {
             return doXMath(cc.getAttackersDeclaredThisTurn(), m, c);
         }
 
+        // Count$CardAttackedThisTurn_<Valid>
+        if (sq[0].contains("CreaturesAttackedThisTurn")) {
+            final String[] workingCopy = l[0].split("_");
+            final String validFilter = workingCopy[1];
+            return doXMath(CardLists.getType(cc.getCreaturesAttackedThisTurn(), validFilter).size(), m, c);
+        }
+
         // Count$ThisTurnCast <Valid>
         // Count$LastTurnCast <Valid>
         if (sq[0].contains("ThisTurnCast") || sq[0].contains("LastTurnCast")) {
diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 1411664dd18..3a2969c98eb 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -6,6 +6,7 @@ import forge.card.MagicColor;
 import forge.game.Direction;
 import forge.game.Game;
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.AttackingBand;
@@ -874,7 +875,7 @@ public class CardProperty {
                         }
                         return false;
                     case "TriggeredCard":
-                        final Object triggeringObject = source.getTriggeringObject(restriction.substring("Triggered".length()));
+                        final Object triggeringObject = source.getTriggeringObject(AbilityKey.fromString(restriction.substring("Triggered".length())));
                         if (!(triggeringObject instanceof Card)) {
                             return false;
                         }
@@ -957,7 +958,7 @@ public class CardProperty {
                     if (spellAbility == null) {
                         System.out.println("Looking at TriggeredCard but no SA?");
                     } else {
-                        Card triggeredCard = ((Card)spellAbility.getTriggeringObject("Card"));
+                        Card triggeredCard = ((Card) spellAbility.getTriggeringObject(AbilityKey.Card));
                         if (triggeredCard != null && card.sharesNameWith(triggeredCard)) {
                             return true;
                         }
diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java
index 1bb94cdcdb4..4dcd5e489bf 100644
--- a/forge-game/src/main/java/forge/game/card/CardUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardUtil.java
@@ -25,6 +25,7 @@ import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.game.Game;
 import forge.game.GameObject;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.player.Player;
@@ -412,7 +413,7 @@ public final class CardUtil {
             }
         } else if (reflectProperty.equals("Produced")) {
             // Why is this name so similar to the one below?
-            final String producedColors = abMana instanceof AbilitySub ? (String) abMana.getRootAbility().getTriggeringObject("Produced") : (String) abMana.getTriggeringObject("Produced");
+            final String producedColors = abMana instanceof AbilitySub ? (String) abMana.getRootAbility().getTriggeringObject(AbilityKey.Produced) : (String) abMana.getTriggeringObject(AbilityKey.Produced);
             for (final String col : MagicColor.Constant.ONLY_COLORS) {
                 final String s = MagicColor.toShortString(col);
                 if (producedColors.contains(s)) {
diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java
index 19b1bfa52f8..53911856989 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -557,7 +557,7 @@ public class CardView extends GameEntityView {
         }
 
         tname = tname.isEmpty() ? state.getName() : tname;
-        toracle = toracle.isEmpty() ? state.getOracleText() : toracle;
+
         if (isSplitCard()) {
             taltname = getAlternateState().getName();
             taltoracle = getAlternateState().getOracleText();
@@ -572,7 +572,7 @@ public class CardView extends GameEntityView {
                 sb.append(taltoracle);
                 return sb.toString().trim();
             } else {
-                return toracle;
+                return toracle.isEmpty() ? state.getOracleText() : toracle;
             }
         }
 
diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
index 7cf10bb47a3..0b7b6dfb8f7 100644
--- a/forge-game/src/main/java/forge/game/combat/Combat.java
+++ b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -546,13 +546,13 @@ public class Combat {
         Game game = c.getGame();
         for (SpellAbilityStackInstance si : game.getStack()) {
             if (si.isTrigger() && c.equals(si.getSourceCard())) {
-                GameEntity origDefender = (GameEntity)si.getTriggeringObject("OriginalDefender");
+                GameEntity origDefender = (GameEntity)si.getTriggeringObject(AbilityKey.OriginalDefender);
                 if (origDefender != null) {
-                    si.updateTriggeringObject("Defender", origDefender);
+                    si.updateTriggeringObject(AbilityKey.Defender, origDefender);
                     if (origDefender instanceof Player) {
-                        si.updateTriggeringObject("DefendingPlayer", origDefender);
+                        si.updateTriggeringObject(AbilityKey.DefendingPlayer, origDefender);
                     } else if (origDefender instanceof Card) {
-                        si.updateTriggeringObject("DefendingPlayer", ((Card)origDefender).getController());
+                        si.updateTriggeringObject(AbilityKey.DefendingPlayer, ((Card)origDefender).getController());
                     }
                 }
             }
diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index 2b17d5b3003..1578b1d1d81 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -317,7 +317,7 @@ public class CombatUtil {
 
         c.getDamageHistory().setCreatureAttackedThisCombat(true);
         c.getDamageHistory().clearNotAttackedSinceLastUpkeepOf();
-        c.getController().setAttackedWithCreatureThisTurn(true);
+        c.getController().addCreaturesAttackedThisTurn(c);
         c.getController().incrementAttackersDeclaredThisTurn();
 
         if (combat.getDefenderByAttacker(c) != null && combat.getDefenderByAttacker(c) instanceof Player) {
diff --git a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
index dc8eabe113f..da168fe0cab 100644
--- a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
+++ b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
@@ -150,7 +150,7 @@ public class GlobalAttackRestrictions {
         final Game game = attackingPlayer.getGame();
 
         /* if (game.getStaticEffects().getGlobalRuleChange(GlobalRuleChange.onlyOneAttackerATurn)) {
-            if (attackingPlayer.getAttackedWithCreatureThisTurn()) {
+            if (!attackingPlayer.getAttackedWithCreatureThisTurn().isEmpty()) {
                 max = 0;
             } else {
                 max = 1;
diff --git a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java
index 554a7697404..25c4ca28ca7 100644
--- a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java
+++ b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java
@@ -381,6 +381,9 @@ public class CostAdjustment {
         } else if ("Undaunted".equals(amount)) {
             value = card.getController().getOpponents().size();
         } else if (staticAbility.hasParam("Relative")) {
+            // TODO: update cards with "This spell costs X less to cast...if you..."
+            // The caster is sa.getActivatingPlayer()
+            // cards like Hostage Taker can cast spells from other players.
             value = AbilityUtils.calculateAmount(hostCard, amount, sa);
         } else {
             value = AbilityUtils.calculateAmount(hostCard, amount, staticAbility);
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 887af26d406..b7aec94aa23 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -84,6 +84,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     private final Map<Card, Integer> assignedDamage = Maps.newHashMap();
     private final Map<Card, Integer> assignedCombatDamage = Maps.newHashMap();
     private int spellsCastThisTurn = 0;
+    private int spellsCastThisGame = 0;
     private int spellsCastLastTurn = 0;
     private int landsPlayedThisTurn = 0;
     private int landsPlayedLastTurn = 0;
@@ -124,7 +125,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     private ManaPool manaPool = new ManaPool(this);
     private GameEntity mustAttackEntity = null;
     private GameEntity mustAttackEntityThisTurn = null;
-    private boolean attackedWithCreatureThisTurn = false;
+    private CardCollection creatureAttackedThisTurn = new CardCollection();
     private boolean activateLoyaltyAbilityThisTurn = false;
     private boolean tappedLandForManaThisTurn = false;
     private int attackersDeclaredThisTurn = 0;
@@ -1824,11 +1825,14 @@ public class Player extends GameEntity implements Comparable<Player> {
         activateLoyaltyAbilityThisTurn = b;
     }
 
-    public final boolean getAttackedWithCreatureThisTurn() {
-        return attackedWithCreatureThisTurn;
+    public final CardCollection getCreaturesAttackedThisTurn() {
+        return creatureAttackedThisTurn;
     }
-    public final void setAttackedWithCreatureThisTurn(final boolean b) {
-        attackedWithCreatureThisTurn = b;
+    public final void addCreaturesAttackedThisTurn(final Card c) {
+        creatureAttackedThisTurn.add(c);
+    }
+    public final void clearCreaturesAttackedThisTurn() {
+        creatureAttackedThisTurn.clear();
     }
 
     public final int getAttackersDeclaredThisTurn() {
@@ -2206,6 +2210,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
     public final void addSpellCastThisTurn() {
         spellsCastThisTurn++;
+        spellsCastThisGame++;
         achievementTracker.spellsCast++;
         if (spellsCastThisTurn > achievementTracker.maxStormCount) {
             achievementTracker.maxStormCount = spellsCastThisTurn;
@@ -2217,7 +2222,12 @@ public class Player extends GameEntity implements Comparable<Player> {
     public final void setSpellsCastLastTurn(int num) {
         spellsCastLastTurn = num;
     }
-
+    public final int getSpellsCastThisGame() {
+        return spellsCastThisGame;
+    }
+    public final void resetSpellCastThisGame() {
+        spellsCastThisGame = 0;
+    }
     public final int getLifeGainedByTeamThisTurn() {
         return lifeGainedByTeamThisTurn;
     }
@@ -2389,7 +2399,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         resetNumDrawnThisTurn();
         resetNumDiscardedThisTurn();
         setNumCardsInHandStartedThisTurnWith(getCardsIn(ZoneType.Hand).size());
-        setAttackedWithCreatureThisTurn(false);
+        clearCreaturesAttackedThisTurn();
         setActivateLoyaltyAbilityThisTurn(false);
         setTappedLandForManaThisTurn(false);
         setLandsPlayedLastTurn(getLandsPlayedThisTurn());
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
index 88fe88e9833..fb7c64c7d80 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -24,6 +24,7 @@ import com.google.common.collect.Maps;
 import forge.card.mana.ManaCost;
 import forge.game.*;
 import forge.game.ability.AbilityFactory;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
@@ -138,7 +139,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
 
     private HashMap<String, CardCollection> paidLists = Maps.newHashMap();
 
-    private Map<String, Object> triggeringObjects = Maps.newHashMap();
+    private EnumMap<AbilityKey, Object> triggeringObjects = AbilityKey.newMap();
 
     private HashMap<String, Object> replacingObjects = Maps.newHashMap();
 
@@ -552,23 +553,23 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
         return sa;
     }
 
-    public Map<String, Object> getTriggeringObjects() {
+    public Map<AbilityKey, Object> getTriggeringObjects() {
         return triggeringObjects;
     }
-    public void setTriggeringObjects(final Map<String, Object> triggeredObjects) {
-        triggeringObjects = Maps.newHashMap(triggeredObjects);
+    public void setTriggeringObjects(final Map<AbilityKey, Object> triggeredObjects) {
+        triggeringObjects = AbilityKey.newMap(triggeredObjects);
     }
-    public Object getTriggeringObject(final String type) {
+    public Object getTriggeringObject(final AbilityKey type) {
         return triggeringObjects.get(type);
     }
-    public void setTriggeringObject(final String type, final Object o) {
+    public void setTriggeringObject(final AbilityKey type, final Object o) {
         triggeringObjects.put(type, o);
     }
-    public boolean hasTriggeringObject(final String type) {
+    public boolean hasTriggeringObject(final AbilityKey type) {
         return triggeringObjects.containsKey(type);
     }
     public void resetTriggeringObjects() {
-        triggeringObjects = Maps.newHashMap();
+        triggeringObjects = AbilityKey.newMap();
     }
 
     public List<Object> getTriggerRemembered() {
@@ -877,7 +878,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
             clone.originalMapParams = Maps.newHashMap(this.originalMapParams);
             clone.mapParams = Maps.newHashMap(this.mapParams);
 
-            clone.triggeringObjects = Maps.newHashMap(this.triggeringObjects);
+            clone.triggeringObjects = AbilityKey.newMap(this.triggeringObjects);
 
             if (getPayCosts() != null) {
                 clone.setPayCosts(getPayCosts().copy());
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
index 4b781bd5942..7153cd12baa 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
@@ -92,7 +92,7 @@ public class SpellAbilityStackInstance implements IIdentifiable, IHasCardView {
     // is Kicked, is Buyback
 
     // Triggers
-    private final Map<String, Object> triggeringObjects;
+    private final Map<AbilityKey, Object> triggeringObjects;
     private final List<Object> triggerRemembered;
 
     private final Map<String, String> storedSVars = Maps.newHashMap();
@@ -364,7 +364,7 @@ public class SpellAbilityStackInstance implements IIdentifiable, IHasCardView {
         }
     }
 
-    public boolean addTriggeringObject(String trigObj, Object value) {
+    public boolean addTriggeringObject(AbilityKey trigObj, Object value) {
         if (!triggeringObjects.containsKey(trigObj)) {
             triggeringObjects.put(trigObj, value);
             return true;
@@ -372,7 +372,7 @@ public class SpellAbilityStackInstance implements IIdentifiable, IHasCardView {
         return false;
     }
 
-    public boolean updateTriggeringObject(String trigObj, Object value) {
+    public boolean updateTriggeringObject(AbilityKey trigObj, Object value) {
         if (triggeringObjects.containsKey(trigObj)) {
             triggeringObjects.replace(trigObj, value);
             return true;
@@ -380,7 +380,7 @@ public class SpellAbilityStackInstance implements IIdentifiable, IHasCardView {
         return false;
     }
 
-    public Object getTriggeringObject(String trigObj) {
+    public Object getTriggeringObject(AbilityKey trigObj) {
         if (triggeringObjects.containsKey(trigObj)) {
             return triggeringObjects.get(trigObj);
         }
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
index 3906fe03688..ca2446d0e8d 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
@@ -527,7 +527,7 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
         }
 
         if (hasParam("PlayerAttackedWithCreatureThisTurn")
-                && !player.getAttackedWithCreatureThisTurn()) {
+                && player.getCreaturesAttackedThisTurn().isEmpty()) {
             return false;
         }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
index 05886532f3b..18b0e3c6f50 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -21,6 +21,7 @@ import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.TriggerReplacementBase;
 import forge.game.ability.AbilityFactory;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.ApiType;
 import forge.game.ability.effects.CharmEffect;
 import forge.game.card.Card;
@@ -36,7 +37,6 @@ import forge.game.zone.ZoneType;
 import java.util.*;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import forge.util.TextUtil;
 
@@ -70,7 +70,7 @@ public abstract class Trigger extends TriggerReplacementBase {
 
     private TriggerType mode;
 
-    private Map<String, Object> storedTriggeredObjects = null;
+    private Map<AbilityKey, Object> storedTriggeredObjects = null;
     
     private List<Object> triggerRemembered = Lists.newArrayList();
 
@@ -87,8 +87,8 @@ public abstract class Trigger extends TriggerReplacementBase {
      *            a {@link java.util.HashMap} object.
      * @since 1.0.15
      */
-    public final void setStoredTriggeredObjects(final Map<String, Object> storedTriggeredObjects) {
-        this.storedTriggeredObjects = Maps.newHashMap(storedTriggeredObjects);
+    public final void setStoredTriggeredObjects(final Map<AbilityKey, Object> storedTriggeredObjects) {
+        this.storedTriggeredObjects = AbilityKey.newMap(storedTriggeredObjects);
     }
 
     /**
@@ -99,7 +99,7 @@ public abstract class Trigger extends TriggerReplacementBase {
      * @return a {@link java.util.HashMap} object.
      * @since 1.0.15
      */
-    public final Map<String, Object> getStoredTriggeredObjects() {
+    public final Map<AbilityKey, Object> getStoredTriggeredObjects() {
         return this.storedTriggeredObjects;
     }
 
@@ -363,9 +363,9 @@ public abstract class Trigger extends TriggerReplacementBase {
     }
 
 
-    public boolean meetsRequirementsOnTriggeredObjects(Game game,  Map<String, Object> runParams) {
+    public boolean meetsRequirementsOnTriggeredObjects(Game game,  final Map<AbilityKey, Object> runParams) {
         if ("True".equals(this.mapParams.get("EvolveCondition"))) {
-            final Card moved = (Card) runParams.get("Card");
+            final Card moved = (Card) runParams.get(AbilityKey.Card);
             if (moved == null) {
                 return false;
                 // final StringBuilder sb = new StringBuilder();
@@ -381,26 +381,26 @@ public abstract class Trigger extends TriggerReplacementBase {
 
         String condition = this.mapParams.get("Condition");
         if ("AltCost".equals(condition)) {
-            final Card moved = (Card) runParams.get("Card");
+            final Card moved = (Card) runParams.get(AbilityKey.Card);
             if( null != moved && !moved.isOptionalCostPaid(OptionalCost.AltCost))
                 return false;
         } else if ("AttackedPlayerWithMostLife".equals(condition)) {
-            GameEntity attacked = (GameEntity) runParams.get("Attacked");
+            GameEntity attacked = (GameEntity) runParams.get(AbilityKey.Attacked);
             if (attacked == null) {
                 // Check "Defender" too because once triggering objects are set on TriggerAttacks, the value of Attacked
                 // ends up being in Defender at that point.
-                attacked = (GameEntity) runParams.get("Defender");
+                attacked = (GameEntity) runParams.get(AbilityKey.Defender);
             }
             if (attacked == null || !attacked.isValid("Player.withMostLife",
                     this.getHostCard().getController(), this.getHostCard(), null)) {
                 return false;
             }
         } else if ("AttackedPlayerWhoAttackedYouLastTurn".equals(condition)) {
-            GameEntity attacked = (GameEntity) runParams.get("Attacked");
+            GameEntity attacked = (GameEntity) runParams.get(AbilityKey.Attacked);
             if (attacked == null) {
                 // Check "Defender" too because once triggering objects are set on TriggerAttacks, the value of Attacked
                 // ends up being in Defender at that point.
-                attacked = (GameEntity) runParams.get("DefendingPlayer");
+                attacked = (GameEntity) runParams.get(AbilityKey.DefendingPlayer);
             }
             Player attacker = this.getHostCard().getController();
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java b/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java
index a07aff661d8..dcb65899236 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -62,7 +63,7 @@ public class TriggerAbandoned extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Scheme", this.getRunParams().get("Scheme"));
+        sa.setTriggeringObject(AbilityKey.Scheme, this.getRunParams().get("Scheme"));
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java b/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java
index 5a603b715c8..ab2f92ccba2 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -63,13 +64,13 @@ public class TriggerAdapt extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Adapt: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Adapt: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java
index f185d57a441..96fdfd28ae6 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -72,14 +73,14 @@ public class TriggerAttached extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Source", this.getRunParams().get("AttachSource"));
-        sa.setTriggeringObject("Target", this.getRunParams().get("AttachTarget"));
+        sa.setTriggeringObject(AbilityKey.Source, this.getRunParams().get("AttachSource"));
+        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("AttachTarget"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Attachee: ").append(sa.getTriggeringObject("Target"));
+        sb.append("Attachee: ").append(sa.getTriggeringObject(AbilityKey.Target));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
index 89136658f35..20fef05e093 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.spellability.SpellAbility;
@@ -84,18 +85,18 @@ public class TriggerAttackerBlocked extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Attacker", getRunParams().get("Attacker"));
-        sa.setTriggeringObject("Blockers", getRunParams().get("Blockers"));
-        sa.setTriggeringObject("Defender", getRunParams().get("Defender"));
-        sa.setTriggeringObject("DefendingPlayer", getRunParams().get("DefendingPlayer"));
-        sa.setTriggeringObject("NumBlockers", getRunParams().get("NumBlockers"));
+        sa.setTriggeringObject(AbilityKey.Attacker, getRunParams().get("Attacker"));
+        sa.setTriggeringObject(AbilityKey.Blockers, getRunParams().get("Blockers"));
+        sa.setTriggeringObject(AbilityKey.Defender, getRunParams().get("Defender"));
+        sa.setTriggeringObject(AbilityKey.DefendingPlayer, getRunParams().get("DefendingPlayer"));
+        sa.setTriggeringObject(AbilityKey.NumBlockers, getRunParams().get("NumBlockers"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")).append(", ");
-        sb.append("Number Blockers: ").append(sa.getTriggeringObject("NumBlockers"));
+        sb.append("Attacker: ").append(sa.getTriggeringObject(AbilityKey.Attacker)).append(", ");
+        sb.append("Number Blockers: ").append(sa.getTriggeringObject(AbilityKey.NumBlockers));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java
index be66cc09438..7ddb60acdef 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -87,15 +88,15 @@ public class TriggerAttackerBlockedByCreature extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker"));
-        sa.setTriggeringObject("Blocker", this.getRunParams().get("Blocker"));
+        sa.setTriggeringObject(AbilityKey.Attacker, this.getRunParams().get("Attacker"));
+        sa.setTriggeringObject(AbilityKey.Blocker, this.getRunParams().get("Blocker"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")).append(", ");
-        sb.append("Blocker: ").append(sa.getTriggeringObject("Blocker"));
+        sb.append("Attacker: ").append(sa.getTriggeringObject(AbilityKey.Attacker)).append(", ");
+        sb.append("Blocker: ").append(sa.getTriggeringObject(AbilityKey.Blocker));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java
index c9ac21fc4bd..a8e9d41209a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -69,15 +70,15 @@ public class TriggerAttackerUnblocked extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker"));
-        sa.setTriggeringObject("Defender", this.getRunParams().get("Defender"));
-        sa.setTriggeringObject("DefendingPlayer", this.getRunParams().get("DefendingPlayer"));
+        sa.setTriggeringObject(AbilityKey.Attacker, this.getRunParams().get("Attacker"));
+        sa.setTriggeringObject(AbilityKey.Defender, this.getRunParams().get("Defender"));
+        sa.setTriggeringObject(AbilityKey.DefendingPlayer, this.getRunParams().get("DefendingPlayer"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker"));
+        sb.append("Attacker: ").append(sa.getTriggeringObject(AbilityKey.Attacker));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java
index 66ed8f5c01b..23567718e5c 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -84,15 +85,15 @@ public class TriggerAttackerUnblockedOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("AttackingPlayer", this.getRunParams().get("AttackingPlayer"));
-        sa.setTriggeringObject("Defenders", this.getRunParams().get("Defenders"));
+        sa.setTriggeringObject(AbilityKey.AttackingPlayer, this.getRunParams().get("AttackingPlayer"));
+        sa.setTriggeringObject(AbilityKey.Defenders, this.getRunParams().get("Defenders"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("AttackingPlayer: ").append(sa.getTriggeringObject("AttackingPlayer"));
-        sb.append("Defenders: ").append(sa.getTriggeringObject("Defenders"));
+        sb.append("AttackingPlayer: ").append(sa.getTriggeringObject(AbilityKey.AttackingPlayer));
+        sb.append("Defenders: ").append(sa.getTriggeringObject(AbilityKey.Defenders));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java
index 72f9649bba1..f9be4cacdd6 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -86,14 +87,14 @@ public class TriggerAttackersDeclared extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Attackers", this.getRunParams().get("Attackers"));
-        sa.setTriggeringObject("AttackingPlayer", this.getRunParams().get("AttackingPlayer"));
+        sa.setTriggeringObject(AbilityKey.Attackers, this.getRunParams().get("Attackers"));
+        sa.setTriggeringObject(AbilityKey.AttackingPlayer, this.getRunParams().get("AttackingPlayer"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Number Attackers: ").append(sa.getTriggeringObject("Attackers"));
+        sb.append("Number Attackers: ").append(sa.getTriggeringObject(AbilityKey.Attackers));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
index 0f28b513ce6..cc35af51e0c 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
@@ -124,17 +125,17 @@ public class TriggerAttacks extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker"));
-        sa.setTriggeringObject("Defender", this.getRunParams().get("Attacked"));
-        sa.setTriggeringObject("Defenders", this.getRunParams().get("Defenders"));
-        sa.setTriggeringObject("DefendingPlayer", this.getRunParams().get("DefendingPlayer"));
+        sa.setTriggeringObject(AbilityKey.Attacker, this.getRunParams().get("Attacker"));
+        sa.setTriggeringObject(AbilityKey.Defender, this.getRunParams().get("Attacked"));
+        sa.setTriggeringObject(AbilityKey.Defenders, this.getRunParams().get("Defenders"));
+        sa.setTriggeringObject(AbilityKey.DefendingPlayer, this.getRunParams().get("DefendingPlayer"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker"));
+        sb.append("Attacker: ").append(sa.getTriggeringObject(AbilityKey.Attacker));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java
index 17d9840f804..d52c072f825 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java
@@ -3,6 +3,7 @@ package forge.game.trigger;
 import java.util.Map;
 
 import forge.game.Game;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -35,13 +36,13 @@ public class TriggerBecomeMonarch extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", ");
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", ");
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java
index 5a70ce99648..1e6643e767f 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -64,14 +65,14 @@ public class TriggerBecomeMonstrous extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", getRunParams().get("Card"));
-        sa.setTriggeringObject("MonstrosityAmount", getRunParams().get("MonstrosityAmount"));
+        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.MonstrosityAmount, getRunParams().get("MonstrosityAmount"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Monstrous: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Monstrous: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java
index ab84910d4cf..d6086fc7133 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -62,13 +63,13 @@ public class TriggerBecomeRenowned extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Renowned: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Renowned: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
index 097262f0c51..4e87946af5f 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -88,16 +89,16 @@ public class TriggerBecomesTarget extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("SourceSA", this.getRunParams().get("SourceSA"));
-        sa.setTriggeringObject("Source", ((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard());
-        sa.setTriggeringObject("Target", this.getRunParams().get("Target"));
+        sa.setTriggeringObject(AbilityKey.SourceSA, this.getRunParams().get("SourceSA"));
+        sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard());
+        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("Target"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Source: ").append(((SpellAbility) sa.getTriggeringObject("SourceSA")).getHostCard()).append(", ");
-        sb.append("Target: ").append(sa.getTriggeringObject("Target"));
+        sb.append("Source: ").append(((SpellAbility) sa.getTriggeringObject(AbilityKey.SourceSA)).getHostCard()).append(", ");
+        sb.append("Target: ").append(sa.getTriggeringObject(AbilityKey.Target));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java
index bd8a2868c51..368a1bc2281 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.game.GameObject;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -80,16 +81,16 @@ public class TriggerBecomesTargetOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("SourceSA", this.getRunParams().get("SourceSA"));
-        sa.setTriggeringObject("Source", ((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard());
-        sa.setTriggeringObject("Targets", this.getRunParams().get("Targets"));
+        sa.setTriggeringObject(AbilityKey.SourceSA, this.getRunParams().get("SourceSA"));
+        sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard());
+        sa.setTriggeringObject(AbilityKey.Targets, this.getRunParams().get("Targets"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Source: ").append(((SpellAbility) sa.getTriggeringObject("SourceSA")).getHostCard()).append(", ");
-        sb.append("Targets: ").append(sa.getTriggeringObject("Targets"));
+        sb.append("Source: ").append(((SpellAbility) sa.getTriggeringObject(AbilityKey.SourceSA)).getHostCard()).append(", ");
+        sb.append("Targets: ").append(sa.getTriggeringObject(AbilityKey.Targets));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java
index 15e1cc02550..c7ec35ae012 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -51,14 +52,14 @@ public class TriggerBlockersDeclared extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Blockers", this.getRunParams().get("Blockers"));
-        sa.setTriggeringObject("Attackers", this.getRunParams().get("Attackers"));
+        sa.setTriggeringObject(AbilityKey.Blockers, this.getRunParams().get("Blockers"));
+        sa.setTriggeringObject(AbilityKey.Attackers, this.getRunParams().get("Attackers"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Blockers: ").append(sa.getTriggeringObject("Blockers"));
+        sb.append("Blockers: ").append(sa.getTriggeringObject(AbilityKey.Blockers));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java
index 441348ace95..6388a1ed6a2 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -88,14 +89,14 @@ public class TriggerBlocks extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Blocker", this.getRunParams().get("Blocker"));
-        sa.setTriggeringObject("Attackers", this.getRunParams().get("Attackers"));
+        sa.setTriggeringObject(AbilityKey.Blocker, this.getRunParams().get("Blocker"));
+        sa.setTriggeringObject(AbilityKey.Attackers, this.getRunParams().get("Attackers"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Blocker: ").append(sa.getTriggeringObject("Blocker"));
+        sb.append("Blocker: ").append(sa.getTriggeringObject(AbilityKey.Blocker));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java b/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java
index 2604e2d55c7..d95e92662ad 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -71,14 +72,14 @@ public class TriggerChampioned extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Championed", this.getRunParams().get("Championed"));
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Championed, this.getRunParams().get("Championed"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Championed: ").append(sa.getTriggeringObject("Championed"));
+        sb.append("Championed: ").append(sa.getTriggeringObject(AbilityKey.Championed));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java
index 31a073b8508..0648a26418d 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -70,13 +71,13 @@ public class TriggerChangesController extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Changed Controller: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Changed Controller: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
index 87c150ee7b7..1cd778b509b 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.game.Game;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
 import forge.game.card.CardFactoryUtil;
@@ -217,13 +218,13 @@ public class TriggerChangesZone extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Zone Changer: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Zone Changer: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java
index f49005ac74a..f2a36fa0f45 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java
@@ -3,6 +3,7 @@ package forge.game.trigger;
 import java.util.List;
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.*;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
@@ -26,14 +27,14 @@ public class TriggerChangesZoneAll extends Trigger {
 
         CardCollection allCards = this.filterCards(table);
 
-        sa.setTriggeringObject("Cards", allCards);
-        sa.setTriggeringObject("Amount", allCards.size());
+        sa.setTriggeringObject(AbilityKey.Cards, allCards);
+        sa.setTriggeringObject(AbilityKey.Amount, allCards.size());
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Amount: ").append(sa.getTriggeringObject("Amount"));
+        sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.Amount));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java
index 26f64523bdc..7b87470996a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 import forge.game.player.Player;
@@ -121,19 +122,19 @@ public class TriggerCounterAdded extends Trigger {
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
         if (this.getRunParams().containsKey("Card"))
-            sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+            sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
         if (this.getRunParams().containsKey("Player"))
-            sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+            sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
         sb.append("Added once: ");
-        if (sa.hasTriggeringObject("Card"))
-            sb.append(sa.getTriggeringObject("Card"));
-        if (sa.hasTriggeringObject("Player"))
-            sb.append(sa.getTriggeringObject("Player"));
+        if (sa.hasTriggeringObject(AbilityKey.Card))
+            sb.append(sa.getTriggeringObject(AbilityKey.Card));
+        if (sa.hasTriggeringObject(AbilityKey.Player))
+            sb.append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java
index 94b49909f02..859fd6b8787 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java
@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 
 import forge.game.GameEntity;
 import forge.game.GameEntityCounterTable;
+import forge.game.ability.AbilityKey;
 import forge.game.card.*;
 import forge.game.spellability.SpellAbility;
 
@@ -33,14 +34,14 @@ public class TriggerCounterAddedAll extends Trigger {
             amount += v;
         }
 
-        sa.setTriggeringObject("Objects", Lists.newArrayList(all.keySet()));
-        sa.setTriggeringObject("Amount", amount);
+        sa.setTriggeringObject(AbilityKey.Objects, Lists.newArrayList(all.keySet()));
+        sa.setTriggeringObject(AbilityKey.Amount, amount);
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Amount: ").append(sa.getTriggeringObject("Amount"));
+        sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.Amount));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
index 549a3d81670..4baeaff29c5 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 import forge.game.player.Player;
@@ -106,22 +107,22 @@ public class TriggerCounterAddedOnce extends Trigger {
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
         if (this.getRunParams().containsKey("Card"))
-            sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+            sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
         if (this.getRunParams().containsKey("Player"))
-            sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
-        sa.setTriggeringObject("Amount", this.getRunParams().get("CounterAmount"));
+            sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Amount, this.getRunParams().get("CounterAmount"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
         sb.append("Added once: ");
-        if (sa.hasTriggeringObject("Card"))
-            sb.append(sa.getTriggeringObject("Card"));
-        if (sa.hasTriggeringObject("Player"))
-            sb.append(sa.getTriggeringObject("Player"));
+        if (sa.hasTriggeringObject(AbilityKey.Card))
+            sb.append(sa.getTriggeringObject(AbilityKey.Card));
+        if (sa.hasTriggeringObject(AbilityKey.Player))
+            sb.append(sa.getTriggeringObject(AbilityKey.Player));
 
-        sb.append(" Amount: ").append(sa.getTriggeringObject("Amount"));
+        sb.append(" Amount: ").append(sa.getTriggeringObject(AbilityKey.Amount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
index 46e0bc5fa41..1f344bfad12 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 import forge.game.spellability.SpellAbility;
@@ -82,13 +83,13 @@ public class TriggerCounterRemoved extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Removed from: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Removed from: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
index 4e02b6d8df4..a96eb1df4c9 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 import forge.game.spellability.SpellAbility;
@@ -73,15 +74,15 @@ public class TriggerCounterRemovedOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Amount", this.getRunParams().get("CounterAmount"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Amount, this.getRunParams().get("CounterAmount"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Removed from: ").append(sa.getTriggeringObject("Card"));
-        sb.append(" Amount: ").append(sa.getTriggeringObject("Amount"));
+        sb.append("Removed from: ").append(sa.getTriggeringObject(AbilityKey.Card));
+        sb.append(" Amount: ").append(sa.getTriggeringObject(AbilityKey.Amount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java b/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java
index 0b11585be24..ae5087b29e2 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -92,17 +93,17 @@ public class TriggerCountered extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Cause", this.getRunParams().get("Cause"));
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
-        sa.setTriggeringObject("CounteredSA", this.getRunParams().get("CounteredSA"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Cause, this.getRunParams().get("Cause"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.CounteredSA, this.getRunParams().get("CounteredSA"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Countered: ").append(sa.getTriggeringObject("Card")).append(", ");
-        sb.append("Cause: ").append(sa.getTriggeringObject("Cause"));
+        sb.append("Countered: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", ");
+        sb.append("Cause: ").append(sa.getTriggeringObject(AbilityKey.Cause));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
index e784432b422..655fa1d591a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.spellability.SpellAbility;
@@ -38,16 +39,16 @@ public class TriggerCrewed extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject("Vehicle", this.getRunParams().get("Vehicle"));
-        sa.setTriggeringObject("Crew", this.getRunParams().get("Crew"));
+        sa.setTriggeringObject(AbilityKey.Vehicle, this.getRunParams().get("Vehicle"));
+        sa.setTriggeringObject(AbilityKey.Crew, this.getRunParams().get("Crew"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Vehicle: ").append(sa.getTriggeringObject("Vehicle"));
+        sb.append("Vehicle: ").append(sa.getTriggeringObject(AbilityKey.Vehicle));
         sb.append("  ");
-        sb.append("Crew: ").append(sa.getTriggeringObject("Crew"));
+        sb.append("Crew: ").append(sa.getTriggeringObject(AbilityKey.Crew));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java
index d62f0f8f58c..82359ed0c66 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -49,13 +50,13 @@ public class TriggerCycled extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Cycled: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Cycled: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java
index 7b4331ddb06..7a8dee7acec 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 import forge.util.Expressions;
@@ -105,17 +106,17 @@ public class TriggerDamageDealtOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Source", this.getRunParams().get("DamageSource"));
-        sa.setTriggeringObject("Targets", this.getRunParams().get("DamageTargets"));
-        sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObject(AbilityKey.Source, this.getRunParams().get("DamageSource"));
+        sa.setTriggeringObject(AbilityKey.Targets, this.getRunParams().get("DamageTargets"));
+        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
-        sb.append("Damaged: ").append(sa.getTriggeringObject("Targets")).append(", ");
-        sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
+        sb.append("Damage Source: ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", ");
+        sb.append("Damaged: ").append(sa.getTriggeringObject(AbilityKey.Targets)).append(", ");
+        sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
index dc9df9b8fcc..1c9751d0321 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardUtil;
 import forge.game.spellability.SpellAbility;
@@ -118,19 +119,19 @@ public class TriggerDamageDone extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Source", CardUtil.getLKICopy((Card)this.getRunParams().get("DamageSource")));
-        sa.setTriggeringObject("Target", this.getRunParams().get("DamageTarget"));
-        sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)this.getRunParams().get("DamageSource")));
+        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
+        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
         // This parameter is here because LKI information related to combat doesn't work properly
-        sa.setTriggeringObject("DefendingPlayer", this.getRunParams().get("DefendingPlayer"));
+        sa.setTriggeringObject(AbilityKey.DefendingPlayer, this.getRunParams().get("DefendingPlayer"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
-        sb.append("Damaged: ").append(sa.getTriggeringObject("Target")).append(", ");
-        sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
+        sb.append("Damage Source: ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", ");
+        sb.append("Damaged: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", ");
+        sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java
index d5a9634cc39..f80a9c9e3c6 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java
@@ -4,6 +4,7 @@ import java.util.Map;
 import java.util.Set;
 
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -58,12 +59,12 @@ public class TriggerDamageDoneOnce extends Trigger {
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
         if (this.getRunParams().containsKey("DamageTarget")) {
-            sa.setTriggeringObject("Target", this.getRunParams().get("DamageTarget"));
+            sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
         }
         if (this.getRunParams().containsKey("DamageSources")) {
-            sa.setTriggeringObject("Sources", this.getRunParams().get("DamageSources"));
+            sa.setTriggeringObject(AbilityKey.Sources, this.getRunParams().get("DamageSources"));
         }
-        sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
         
 
     }
@@ -71,10 +72,10 @@ public class TriggerDamageDoneOnce extends Trigger {
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        if (sa.getTriggeringObject("Target") != null) {
-            sb.append("Damaged: ").append(sa.getTriggeringObject("Target")).append(", ");
+        if (sa.getTriggeringObject(AbilityKey.Target) != null) {
+            sb.append("Damaged: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", ");
         }
-        sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
+        sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java
index bb8adf982c6..5807e02e70a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardUtil;
 import forge.game.spellability.SpellAbility;
@@ -102,17 +103,17 @@ public class TriggerDamagePrevented extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Source", CardUtil.getLKICopy((Card)this.getRunParams().get("DamageSource")));
-        sa.setTriggeringObject("Target", this.getRunParams().get("DamageTarget"));
-        sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)this.getRunParams().get("DamageSource")));
+        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
+        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
-        sb.append("Damage Target: ").append(sa.getTriggeringObject("Target")).append(", ");
-        sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
+        sb.append("Damage Source: ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", ");
+        sb.append("Damage Target: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", ");
+        sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java
index c1fb8ce35c2..b2cbf8ce369 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 import forge.util.Expressions;
@@ -93,15 +94,15 @@ public class TriggerDamagePreventedOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Target", this.getRunParams().get("DamageTarget"));
-        sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
+        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Damage Target: ").append(sa.getTriggeringObject("Target")).append(", ");
-        sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
+        sb.append("Damage Target: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", ");
+        sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java
index cd533694d4f..22a39539d54 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -67,15 +68,15 @@ public class TriggerDestroyed extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Causer", this.getRunParams().get("Causer"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Causer, this.getRunParams().get("Causer"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Destroyed: ").append(sa.getTriggeringObject("Card")).append(", ");
-        sb.append("Destroyer: ").append(sa.getTriggeringObject("Causer"));
+        sb.append("Destroyed: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", ");
+        sb.append("Destroyer: ").append(sa.getTriggeringObject(AbilityKey.Causer));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java
index ac8002f5682..9d2ab4a1d8e 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -60,13 +61,13 @@ public class TriggerDevoured extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Devoured", this.getRunParams().get("Devoured"));
+        sa.setTriggeringObject(AbilityKey.Devoured, this.getRunParams().get("Devoured"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Devoured: ").append(sa.getTriggeringObject("Devoured"));
+        sb.append("Devoured: ").append(sa.getTriggeringObject(AbilityKey.Devoured));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java
index 0c60b064149..5b046239a43 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -85,15 +86,15 @@ public class TriggerDiscarded extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Cause", this.getRunParams().get("Cause"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Cause, this.getRunParams().get("Cause"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Discarded: ").append(sa.getTriggeringObject("Card")).append(", ");
-        sb.append("Cause: ").append(sa.getTriggeringObject("Cause"));
+        sb.append("Discarded: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", ");
+        sb.append("Cause: ").append(sa.getTriggeringObject(AbilityKey.Cause));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
index 7e236166d20..30fae66a797 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import forge.game.Game;
 import forge.game.GameStage;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -80,14 +81,14 @@ public class TriggerDrawn extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", getRunParams().get("Card"));
-        sa.setTriggeringObject("Player", getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java
index 71c0af1aac8..615c5e94f10 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -61,13 +62,13 @@ public class TriggerEvolved extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Evolved: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Evolved: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java b/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java
index d4006d908e5..b70e1fd4894 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -32,14 +33,14 @@ public class TriggerExerted extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Exerted: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Exerted: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java
index 3592a8d0adf..0842e0732ae 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 
 import forge.game.spellability.SpellAbility;
@@ -96,13 +97,13 @@ public class TriggerExiled extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Exiled: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Exiled: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java b/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java
index dd566071c3c..49437a4b948 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -71,15 +72,15 @@ public class TriggerExploited extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Exploited", this.getRunParams().get("Exploited"));
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Exploited, this.getRunParams().get("Exploited"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Exploited: ").append(sa.getTriggeringObject("Exploited")).append(", ");
-        sb.append("Exploiter: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Exploited: ").append(sa.getTriggeringObject(AbilityKey.Exploited)).append(", ");
+        sb.append("Exploiter: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java b/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java
index 69e458136a9..54f1ff15f54 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -61,14 +62,14 @@ public class TriggerExplores extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Explorer", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Explorer, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("Explorer: ").append(sa.getTriggeringObject("Explorer"));
+        sb.append("Explorer: ").append(sa.getTriggeringObject(AbilityKey.Explorer));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerFight.java b/forge-game/src/main/java/forge/game/trigger/TriggerFight.java
index e45b2eeda7e..aecf04ca0db 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerFight.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerFight.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -62,13 +63,13 @@ public class TriggerFight extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Fighter", this.getRunParams().get("Fighter"));
+        sa.setTriggeringObject(AbilityKey.Fighter, this.getRunParams().get("Fighter"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Fighter: ").append(sa.getTriggeringObject("Fighter"));
+        sb.append("Fighter: ").append(sa.getTriggeringObject(AbilityKey.Fighter));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java
index 3d4795f9be7..45dbc6a8346 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -69,13 +70,13 @@ public class TriggerFlippedCoin extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 2d896b4a7cd..cf2f159ae65 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -322,13 +322,6 @@ public class TriggerHandler {
     }
 
     public final void runTrigger(final TriggerType mode, final Map<AbilityKey, Object> runParams, boolean holdTrigger) {
-        runTriggerOld(mode, toStringMap(runParams), holdTrigger);
-    }
-    // The plan is to slowly refactor any usages of `runTriggerOld` to use `runTrigger`. Then we can just inline
-    // `runTriggerOld` into `runTrigger` and change the code inside to just always use a `Map<TriggerKey, Object>`.
-    // The reason we can't just call them both `runTrigger` is because we get a `same erasure` compile error if we do.
-    @Deprecated
-    private void runTriggerOld(final TriggerType mode, final Map<String, Object> runParams, boolean holdTrigger) {
         if (suppressedModes.contains(mode)) {
             return;
         }
@@ -342,10 +335,10 @@ public class TriggerHandler {
         }
     }
 
-    private void runStateTrigger(Map<String, Object> runParams) {
+    private void runStateTrigger(final Map<AbilityKey, Object> runParams) {
         for (final Trigger t: activeTriggers) {
             if (canRunTrigger(t, TriggerType.Always, runParams)) {
-                runSingleTrigger(t, runParams);
+                runSingleTrigger(t, toStringMap(runParams));
             }
         }
     }
@@ -367,7 +360,7 @@ public class TriggerHandler {
 
     private boolean runWaitingTrigger(final TriggerWaiting wt) {
         final TriggerType mode = wt.getMode();
-        final Map<String, Object> runParams = wt.getParams();
+        final Map<AbilityKey, Object> runParams = wt.getParams();
 
         final Player playerAP = game.getPhaseHandler().getPlayerTurn();
         if (playerAP == null) {
@@ -383,19 +376,19 @@ public class TriggerHandler {
         // Static triggers
         for (final Trigger t : Lists.newArrayList(activeTriggers)) {
             if (t.isStatic() && canRunTrigger(t, mode, runParams)) {
-                runSingleTrigger(t, runParams);
+                runSingleTrigger(t, toStringMap(runParams));
 
                 checkStatics = true;
             }
         }
 
-        if (runParams.containsKey("Destination")) {
+        if (runParams.containsKey(AbilityKey.Destination)) {
             // Check static abilities when a card enters the battlefield
-            if (runParams.get("Destination") instanceof String) {
-                final String type = (String) runParams.get("Destination");
+            if (runParams.get(AbilityKey.Destination) instanceof String) {
+                final String type = (String) runParams.get(AbilityKey.Destination);
                 checkStatics |= type.equals("Battlefield");
             } else {
-                final ZoneType zone = (ZoneType) runParams.get("Destination");
+                final ZoneType zone = (ZoneType) runParams.get(AbilityKey.Destination);
                 checkStatics |= zone.equals(ZoneType.Battlefield);
             }
         }
@@ -425,8 +418,9 @@ public class TriggerHandler {
 
     private boolean runNonStaticTriggersForPlayer(final Player player, final TriggerWaiting wt, final List<Trigger> delayedTriggersWorkingCopy ) {
 
-        final TriggerType mode = wt.getMode(); 
-        final Map<String, Object> runParams = wt.getParams();
+        final TriggerType mode = wt.getMode();
+        final Map<AbilityKey, Object> runParams = wt.getParams();
+        final Map<String, Object> stringRunParams = toStringMap(runParams);
         final List<Trigger> triggers = wt.getTriggers() != null ? wt.getTriggers() : activeTriggers;
 
         Card card = null;
@@ -434,18 +428,20 @@ public class TriggerHandler {
 
         for (final Trigger t : triggers) {
             if (!t.isStatic() && t.getHostCard().getController().equals(player) && canRunTrigger(t, mode, runParams)) {
-                if (runParams.containsKey("Card") && runParams.get("Card") instanceof Card) {
-                    card = (Card) runParams.get("Card");
-                    if (runParams.containsKey("Destination") && !ZoneType.Battlefield.name().equals(runParams.get("Destination"))) {
+                if (runParams.containsKey(AbilityKey.Card) && runParams.get(AbilityKey.Card) instanceof Card) {
+                    card = (Card) runParams.get(AbilityKey.Card);
+                    if (runParams.containsKey(AbilityKey.Destination)
+                            && !ZoneType.Battlefield.name().equals(runParams.get(AbilityKey.Destination))) {
                         card = CardUtil.getLKICopy(card);
                         if (card.isCloned() || !t.isIntrinsic()) {
-                            runParams.put("Card", card);
+                            runParams.put(AbilityKey.Card, card);
                         }
                     }
                 }
 
                 if (t.getMapParams().containsKey("OncePerEffect")) {
-                    SpellAbilityStackInstance si = (SpellAbilityStackInstance) runParams.get("SpellAbilityStackInstance");
+                    SpellAbilityStackInstance si =
+                            (SpellAbilityStackInstance) runParams.get(AbilityKey.SpellAbilityStackInstance);
                     if (si != null) {
                         si.addOncePerEffectTrigger(t);
                     }
@@ -454,7 +450,7 @@ public class TriggerHandler {
                 int x = 1 + handlePanharmonicon(t, runParams, player);
 
                 for (int i = 0; i < x; ++i) {
-                    runSingleTrigger(t, runParams);
+                    runSingleTrigger(t, stringRunParams);
                 }
                 checkStatics = true;
             }
@@ -463,7 +459,7 @@ public class TriggerHandler {
         for (final Trigger deltrig : delayedTriggersWorkingCopy) {
             if (deltrig.getHostCard().getController().equals(player)) {
                 if (isTriggerActive(deltrig) && canRunTrigger(deltrig, mode, runParams)) {
-                    runSingleTrigger(deltrig, runParams);
+                    runSingleTrigger(deltrig, stringRunParams);
                     delayedTriggers.remove(deltrig);
                 }
             }
@@ -505,7 +501,7 @@ public class TriggerHandler {
         return true;
     }
 
-    private boolean canRunTrigger(final Trigger regtrig, final TriggerType mode, final Map<String, Object> runParams) {
+    private boolean canRunTrigger(final Trigger regtrig, final TriggerType mode, final Map<AbilityKey, Object> runParams) {
         if (regtrig.getMode() != mode) {
             return false; // Not the right mode.
         }
@@ -518,7 +514,7 @@ public class TriggerHandler {
             return false; // Conditions aren't right.
         }
 
-        if (!regtrig.performTest(runParams)) {
+        if (!regtrig.performTest(toStringMap(runParams))) {
             return false; // Test failed.
         }
         if (regtrig.isSuppressed()) {
@@ -535,10 +531,10 @@ public class TriggerHandler {
         // Torpor Orb check
         if (game.getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noCreatureETBTriggers)
                 && !regtrig.isStatic() && mode.equals(TriggerType.ChangesZone)) {
-            if (runParams.get("Destination") instanceof String) {
-                final String dest = (String) runParams.get("Destination");
-                if (dest.equals("Battlefield") && runParams.get("Card") instanceof Card) {
-                    final Card card = (Card) runParams.get("Card");
+            if (runParams.get(AbilityKey.Destination) instanceof String) {
+                final String dest = (String) runParams.get(AbilityKey.Destination);
+                if (dest.equals("Battlefield") && runParams.get(AbilityKey.Card) instanceof Card) {
+                    final Card card = (Card) runParams.get(AbilityKey.Card);
                     if (card.isCreature()) {
                         return false;
                     }
@@ -698,7 +694,7 @@ public class TriggerHandler {
         }
     }
 
-    private int handlePanharmonicon(final Trigger t, final Map<String, Object> runParams, final Player p) {
+    private int handlePanharmonicon(final Trigger t, final Map<AbilityKey, Object> runParams, final Player p) {
         Card host = t.getHostCard();
 
         // not a changesZone trigger or changesZoneAll
@@ -727,10 +723,10 @@ public class TriggerHandler {
                     final String kw = ki.getOriginal();
                     if (kw.startsWith("Panharmonicon")) {
                         // Enter the Battlefield Trigger
-                        if (runParams.get("Destination") instanceof String) {
-                            final String dest = (String) runParams.get("Destination");
-                            if ("Battlefield".equals(dest) && runParams.get("Card") instanceof Card) {
-                                final Card card = (Card) runParams.get("Card");
+                        if (runParams.get(AbilityKey.Destination) instanceof String) {
+                            final String dest = (String) runParams.get(AbilityKey.Destination);
+                            if ("Battlefield".equals(dest) && runParams.get(AbilityKey.Card) instanceof Card) {
+                                final Card card = (Card) runParams.get(AbilityKey.Card);
                                 final String valid = kw.split(":")[1];
                                 if (card.isValid(valid.split(","), p, ck, null)) {
                                     n++;
@@ -739,12 +735,12 @@ public class TriggerHandler {
                         }
                     } else if (kw.startsWith("Dieharmonicon")) {
                         // 700.4. The term dies means "is put into a graveyard from the battlefield."
-                        if (runParams.get("Origin") instanceof String) {
-                            final String origin = (String) runParams.get("Origin");
-                            if ("Battlefield".equals(origin) && runParams.get("Destination") instanceof String) {
-                                final String dest = (String) runParams.get("Destination");
-                                if ("Graveyard".equals(dest) && runParams.get("Card") instanceof Card) {
-                                    final Card card = (Card) runParams.get("Card");
+                        if (runParams.get(AbilityKey.Origin) instanceof String) {
+                            final String origin = (String) runParams.get(AbilityKey.Origin);
+                            if ("Battlefield".equals(origin) && runParams.get(AbilityKey.Destination) instanceof String) {
+                                final String dest = (String) runParams.get(AbilityKey.Destination);
+                                if ("Graveyard".equals(dest) && runParams.get(AbilityKey.Card) instanceof Card) {
+                                    final Card card = (Card) runParams.get(AbilityKey.Card);
                                     final String valid = kw.split(":")[1];
                                     if (card.isValid(valid.split(","), p, ck, null)) {
                                         n++;
@@ -756,7 +752,7 @@ public class TriggerHandler {
                 }
             }
         } else if (t.getMode() == TriggerType.ChangesZoneAll) {
-            final CardZoneTable table = (CardZoneTable) runParams.get("Cards");
+            final CardZoneTable table = (CardZoneTable) runParams.get(AbilityKey.Cards);
             // iterate over all cards
             for (final Card ck : p.getCardsIn(ZoneType.Battlefield)) {
                 for (final KeywordInterface ki : ck.getKeywords()) {
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java b/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java
index 89f3a10341d..4673c43daaf 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
@@ -52,14 +53,14 @@ public class TriggerInvestigated extends Trigger {
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     /** {@inheritDoc} */
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java
index 0622263bdce..42facf2e807 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -51,13 +52,13 @@ public class TriggerLandPlayed extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Land played: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Land played: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java
index 599594075a5..9b13cc0d680 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -73,15 +74,15 @@ public class TriggerLifeGained extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("LifeAmount", getRunParams().get("LifeAmount"));
-        sa.setTriggeringObject("Player", getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.LifeAmount, getRunParams().get("LifeAmount"));
+        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", ");
-        sb.append("Gained Amount: ").append(sa.getTriggeringObject("LifeAmount"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", ");
+        sb.append("Gained Amount: ").append(sa.getTriggeringObject(AbilityKey.LifeAmount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java
index d905e1c8b07..a592a376217 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -70,15 +71,15 @@ public class TriggerLifeLost extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("LifeAmount", this.getRunParams().get("LifeAmount"));
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.LifeAmount, this.getRunParams().get("LifeAmount"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", ");
-        sb.append("Lost Amount: ").append(sa.getTriggeringObject("LifeAmount"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", ");
+        sb.append("Lost Amount: ").append(sa.getTriggeringObject(AbilityKey.LifeAmount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java
index 931ef32c740..e55850fa631 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -38,13 +39,13 @@ public class TriggerLosesGame extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java
index bf13399f36e..51a74fa139e 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -69,14 +70,14 @@ public class TriggerPayCumulativeUpkeep extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("PayingMana", this.getRunParams().get("PayingMana"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.PayingMana, this.getRunParams().get("PayingMana"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Mana: ").append(sa.getTriggeringObject("PayingMana"));
+        sb.append("Mana: ").append(sa.getTriggeringObject(AbilityKey.PayingMana));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java
index f9e7ecabf45..d6f94a2ea0f 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -69,7 +70,7 @@ public class TriggerPayEcho extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java
index 4616f0db3a9..9ff7bd8f4a8 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -60,15 +61,15 @@ public class TriggerPayLife extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("LifeAmount", getRunParams().get("LifeAmount"));
-        sa.setTriggeringObject("Player", getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.LifeAmount, getRunParams().get("LifeAmount"));
+        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", ");
-        sb.append("paid Amount: ").append(sa.getTriggeringObject("LifeAmount"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", ");
+        sb.append("paid Amount: ").append(sa.getTriggeringObject(AbilityKey.LifeAmount));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java
index 3fbe945effc..974d40259e7 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -59,13 +60,13 @@ public class TriggerPhase extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Phase: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Phase: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java
index c3b4aa6e789..d519d56959e 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -27,13 +28,13 @@ public class TriggerPhaseIn extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Phased In: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Phased In: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java
index d0abe3e4747..7adcb00cc8b 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -35,13 +36,13 @@ public class TriggerPhaseOut extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Phased Out: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Phased Out: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java
index 55bbcbd4b5c..4e1ccdf0a7e 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java
@@ -1,6 +1,7 @@
 package forge.game.trigger;
 
 import forge.game.PlanarDice;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -55,13 +56,13 @@ public class TriggerPlanarDice extends Trigger {
      */
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Roller: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Roller: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java
index f6ab67086ea..9cee000a7fe 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.spellability.SpellAbility;
@@ -52,13 +53,13 @@ public class TriggerPlaneswalkedFrom extends Trigger {
      */
     @Override
     public void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Cards", this.getRunParams().get("Cards"));
+        sa.setTriggeringObject(AbilityKey.Cards, this.getRunParams().get("Cards"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Planeswalked From: ").append(sa.getTriggeringObject("Cards"));
+        sb.append("Planeswalked From: ").append(sa.getTriggeringObject(AbilityKey.Cards));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java
index 169a9b070a3..5644c090053 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -52,13 +53,13 @@ public class TriggerPlaneswalkedTo extends Trigger {
      */
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject("Cards", this.getRunParams().get("Cards"));
+        sa.setTriggeringObject(AbilityKey.Cards, this.getRunParams().get("Cards"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Planeswalked To: ").append(sa.getTriggeringObject("Cards"));
+        sb.append("Planeswalked To: ").append(sa.getTriggeringObject(AbilityKey.Cards));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java b/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java
index cd9f836c466..8eea96379ef 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -67,14 +68,14 @@ public class TriggerRegenerated extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Cause", this.getRunParams().get("Cause"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Cause, this.getRunParams().get("Cause"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Regenerated: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Regenerated: ").append(sa.getTriggeringObject(AbilityKey.Card));
         //sb.append("Destroyer: ").append(sa.getTriggeringObject("Causer"));
         return sb.toString();
     }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java b/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java
index c7614ca9d95..b86e7b10439 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java
@@ -2,6 +2,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -31,13 +32,13 @@ public class TriggerRevealed extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Revealed: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Revealed: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
index 64e545483fb..aac417535ef 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.cost.IndividualCostPaymentInstance;
 import forge.game.player.Player;
@@ -125,13 +126,13 @@ public class TriggerSacrificed extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Sacrificed: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Sacrificed: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
index 70be461dde3..bd0f3cadac5 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -61,13 +62,13 @@ public class TriggerScry extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Scryer: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Scryer: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java
index 538b82670ff..05fd3e062dc 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.List;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
@@ -73,13 +74,13 @@ public class TriggerSearchedLibrary extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Searcher: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Searcher: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java b/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java
index 0cebd807951..1811c949573 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.card.CardType;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -76,7 +77,7 @@ public class TriggerSetInMotion extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Scheme", this.getRunParams().get("Scheme"));
+        sa.setTriggeringObject(AbilityKey.Scheme, this.getRunParams().get("Scheme"));
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java
index e8abae4f522..ed801458055 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -73,13 +74,13 @@ public class TriggerShuffled extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Shuffler: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Shuffler: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java
index 43fde3f60c0..db43216f341 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java
@@ -26,6 +26,7 @@ import com.google.common.collect.Sets;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.GameObject;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardLists;
@@ -265,23 +266,23 @@ public class TriggerSpellAbilityCast extends Trigger {
     public final void setTriggeringObjects(final SpellAbility sa) {
         final SpellAbility castSA = (SpellAbility) getRunParams().get("CastSA");
         final SpellAbilityStackInstance si = sa.getHostCard().getGame().getStack().getInstanceFromSpellAbility(castSA);
-        sa.setTriggeringObject("Card", castSA.getHostCard());
-        sa.setTriggeringObject("SpellAbility", castSA);
-        sa.setTriggeringObject("StackInstance", si);
-        sa.setTriggeringObject("SpellAbilityTargetingCards", (si != null ? si.getSpellAbility(true) : castSA).getTargets().getTargetCards());
-        sa.setTriggeringObject("Player", getRunParams().get("Player"));
-        sa.setTriggeringObject("Activator", getRunParams().get("Activator"));
-        sa.setTriggeringObject("CurrentStormCount", getRunParams().get("CurrentStormCount"));
-        sa.setTriggeringObject("CurrentCastSpells", getRunParams().get("CurrentCastSpells"));
-        sa.setTriggeringObject("CastSACMC", getRunParams().get("CastSACMC"));
+        sa.setTriggeringObject(AbilityKey.Card, castSA.getHostCard());
+        sa.setTriggeringObject(AbilityKey.SpellAbility, castSA);
+        sa.setTriggeringObject(AbilityKey.StackInstance, si);
+        sa.setTriggeringObject(AbilityKey.SpellAbilityTargetingCards, (si != null ? si.getSpellAbility(true) : castSA).getTargets().getTargetCards());
+        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Activator, getRunParams().get("Activator"));
+        sa.setTriggeringObject(AbilityKey.CurrentStormCount, getRunParams().get("CurrentStormCount"));
+        sa.setTriggeringObject(AbilityKey.CurrentCastSpells, getRunParams().get("CurrentCastSpells"));
+        sa.setTriggeringObject(AbilityKey.CastSACMC, getRunParams().get("CastSACMC"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Card: ").append(sa.getTriggeringObject("Card")).append(", ");
-        sb.append("Activator: ").append(sa.getTriggeringObject("Activator")).append(", ");
-        sb.append("SpellAbility: ").append(sa.getTriggeringObject("SpellAbility"));
+        sb.append("Card: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", ");
+        sb.append("Activator: ").append(sa.getTriggeringObject(AbilityKey.Activator)).append(", ");
+        sb.append("SpellAbility: ").append(sa.getTriggeringObject(AbilityKey.SpellAbility));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java
index 26bb022c137..4dc044312ac 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java
@@ -19,6 +19,7 @@ package forge.game.trigger;
 
 import java.util.Map;
 import forge.game.Game;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
@@ -92,17 +93,17 @@ public class TriggerSpellAbilityCopy extends Trigger {
     public final void setTriggeringObjects(final SpellAbility sa) {
         final SpellAbility copySA = (SpellAbility) getRunParams().get("CopySA");
         final SpellAbilityStackInstance si = sa.getHostCard().getGame().getStack().getInstanceFromSpellAbility(copySA);
-        sa.setTriggeringObject("Card", copySA.getHostCard());
-        sa.setTriggeringObject("SpellAbility", copySA);
-        sa.setTriggeringObject("StackInstance", si);
+        sa.setTriggeringObject(AbilityKey.Card, copySA.getHostCard());
+        sa.setTriggeringObject(AbilityKey.SpellAbility, copySA);
+        sa.setTriggeringObject(AbilityKey.StackInstance, si);
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Card: ").append(sa.getTriggeringObject("Card")).append(", ");
-        sb.append("Activator: ").append(sa.getTriggeringObject("Activator")).append(", ");
-        sb.append("SpellAbility: ").append(sa.getTriggeringObject("SpellAbility"));
+        sb.append("Card: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", ");
+        sb.append("Activator: ").append(sa.getTriggeringObject(AbilityKey.Activator)).append(", ");
+        sb.append("SpellAbility: ").append(sa.getTriggeringObject(AbilityKey.SpellAbility));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java b/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java
index 2d3ee1dbb19..374e97aa73a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
@@ -48,14 +49,14 @@ public class TriggerSurveil extends Trigger {
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     /** {@inheritDoc} */
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java
index 44185a79ef7..421a34d71ac 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -77,13 +78,13 @@ public class TriggerTaps extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Tapped: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Tapped: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
index 348492cb775..5474f5fc6b8 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.card.MagicColor;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
@@ -104,16 +105,16 @@ public class TriggerTapsForMana extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
-        sa.setTriggeringObject("Produced", this.getRunParams().get("Produced"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Produced, this.getRunParams().get("Produced"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Tapped for Mana: ").append(sa.getTriggeringObject("Card"));
-        sb.append("Produced: ").append(sa.getTriggeringObject("Produced"));
+        sb.append("Tapped for Mana: ").append(sa.getTriggeringObject(AbilityKey.Card));
+        sb.append("Produced: ").append(sa.getTriggeringObject(AbilityKey.Produced));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java
index b1237117a44..ab5944ab9b0 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -58,13 +59,13 @@ public class TriggerTransformed extends Trigger {
      */
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject("Transformer", this.getRunParams().get("Transformer"));
+        sa.setTriggeringObject(AbilityKey.Transformer, this.getRunParams().get("Transformer"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Transformed: ").append(sa.getTriggeringObject("Transformer"));
+        sb.append("Transformed: ").append(sa.getTriggeringObject(AbilityKey.Transformer));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java b/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java
index aa0ac8a718d..0c6c879c4b9 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -20,13 +21,13 @@ public class TriggerTurnBegin extends Trigger {
 
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Player: ").append(sa.getTriggeringObject("Player"));
+        sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java
index 41d27376928..8aa74bb14d3 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -60,13 +61,13 @@ public class TriggerTurnFaceUp extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Turn Face up: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Turn Face up: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java
index 8b96b06fd3f..f68eb51c482 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import forge.game.GameEntity;
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -72,15 +73,15 @@ public class TriggerUnattach extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Object", getRunParams().get("Object"));
-        sa.setTriggeringObject("Attach", getRunParams().get("Attach"));
+        sa.setTriggeringObject(AbilityKey.Object, getRunParams().get("Object"));
+        sa.setTriggeringObject(AbilityKey.Attach, getRunParams().get("Attach"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Object: ").append(sa.getTriggeringObject("Object")).append(", ");
-        sb.append("Attachment: ").append(sa.getTriggeringObject("Attach"));
+        sb.append("Object: ").append(sa.getTriggeringObject(AbilityKey.Object)).append(", ");
+        sb.append("Attachment: ").append(sa.getTriggeringObject(AbilityKey.Attach));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java
index 7c583f1467d..f06243482c8 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java
@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
@@ -66,13 +67,13 @@ public class TriggerUntaps extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Untapped: ").append(sa.getTriggeringObject("Card"));
+        sb.append("Untapped: ").append(sa.getTriggeringObject(AbilityKey.Card));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java
index 4ed2b85ad2d..07481b9571a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 
+import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
@@ -65,13 +66,13 @@ public class TriggerVote extends Trigger {
     public final void setTriggeringObjects(final SpellAbility sa) {
         @SuppressWarnings("unchecked")
         final ListMultimap<Object, Player> votes = (ArrayListMultimap<Object, Player>) this.getRunParams().get("AllVotes");
-        sa.setTriggeringObject("OtherVoters", getVoters(this.getHostCard().getController(), votes, true, true));
+        sa.setTriggeringObject(AbilityKey.OtherVoters, getVoters(this.getHostCard().getController(), votes, true, true));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Voters: ").append(sa.getTriggeringObject("OtherVoters"));
+        sb.append("Voters: ").append(sa.getTriggeringObject(AbilityKey.OtherVoters));
         return sb.toString();
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerWaiting.java b/forge-game/src/main/java/forge/game/trigger/TriggerWaiting.java
index 0bf489d05fd..d5fa10ae934 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerWaiting.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerWaiting.java
@@ -1,5 +1,6 @@
 package forge.game.trigger;
 
+import forge.game.ability.AbilityKey;
 import forge.util.TextUtil;
 
 import java.util.List;
@@ -10,10 +11,10 @@ import java.util.Map;
  */
 public class TriggerWaiting {
     private TriggerType mode;
-    private Map<String, Object> params;
+    private Map<AbilityKey, Object> params;
     private List<Trigger> triggers = null;
 
-    public TriggerWaiting(TriggerType m, Map<String, Object> p) {
+    public TriggerWaiting(TriggerType m, Map<AbilityKey, Object> p) {
         mode = m;
         params = p;
     }
@@ -22,7 +23,7 @@ public class TriggerWaiting {
         return mode;
     }
 
-    public Map<String, Object> getParams() {
+    public Map<AbilityKey, Object> getParams() {
         return params;
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
index e48396c53a6..23354269263 100644
--- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
+++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
@@ -3,6 +3,7 @@ package forge.game.trigger;
 import forge.card.mana.ManaCost;
 import forge.game.Game;
 import forge.game.GameObject;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
@@ -101,27 +102,27 @@ public class WrappedAbility extends Ability {
     }
 
     @Override
-    public Map<String, Object> getTriggeringObjects() {
+    public Map<AbilityKey, Object> getTriggeringObjects() {
         return sa.getTriggeringObjects();
     }
 
     @Override
-    public void setTriggeringObjects(final Map<String, Object> triggeredObjects) {
+    public void setTriggeringObjects(final Map<AbilityKey, Object> triggeredObjects) {
         sa.setTriggeringObjects(triggeredObjects);
     }
 
     @Override
-    public void setTriggeringObject(final String type, final Object o) {
+    public void setTriggeringObject(final AbilityKey type, final Object o) {
         sa.setTriggeringObject(type, o);
     }
 
     @Override
-    public Object getTriggeringObject(final String type) {
+    public Object getTriggeringObject(final AbilityKey type) {
         return sa.getTriggeringObject(type);
     }
 
     @Override
-    public boolean hasTriggeringObject(final String type) {
+    public boolean hasTriggeringObject(final AbilityKey type) {
         return sa.hasTriggeringObject(type);
     }
 
@@ -532,8 +533,8 @@ public class WrappedAbility extends Ability {
                 }
             }
         }
-        final Map<String, Object> triggerMap = new HashMap<>(sa.getTriggeringObjects());
-        for (Entry<String, Object> ev : triggerMap.entrySet()) {
+        final Map<AbilityKey, Object> triggerMap = AbilityKey.newMap(sa.getTriggeringObjects());
+        for (Entry<AbilityKey, Object> ev : triggerMap.entrySet()) {
             if (ev.getValue() instanceof Card) {
                 Card card = (Card) ev.getValue();
                 Card current = game.getCardState(card);
diff --git a/forge-game/src/test/java/forge/game/ability/AbilityKeyTest.java b/forge-game/src/test/java/forge/game/ability/AbilityKeyTest.java
new file mode 100644
index 00000000000..699151a4033
--- /dev/null
+++ b/forge-game/src/test/java/forge/game/ability/AbilityKeyTest.java
@@ -0,0 +1,23 @@
+package forge.game.ability;
+
+import com.google.common.collect.Maps;
+import junit.framework.TestCase;
+
+import java.util.Map;
+
+public class AbilityKeyTest extends TestCase {
+    public void testFromStringWorksForAllKeys() {
+        for (AbilityKey key : AbilityKey.values()) {
+            assertEquals(key, AbilityKey.fromString(key.toString()));
+        }
+    }
+
+    public void testCopyingEmptyMapWorks() {
+        Map<AbilityKey, Object> map = Maps.newHashMap();
+
+        Map<AbilityKey, Object> newMap = AbilityKey.newMap(map);
+
+        // An actual copy should be made.
+        assertNotSame(map, newMap);
+    }
+}
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 372d19a39c1..3523df7e579 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -28,6 +28,7 @@ import forge.sound.SoundSystem;
 import forge.toolbox.*;
 import forge.util.Callback;
 import forge.util.FileUtil;
+import forge.util.Localizer;
 import forge.util.Utils;
 
 import java.util.ArrayList;
@@ -96,6 +97,8 @@ public class Forge implements ApplicationListener {
 
         textureFiltering = prefs.getPrefBoolean(FPref.UI_LIBGDX_TEXTURE_FILTERING);
 
+        final Localizer localizer = Localizer.getInstance();
+
         //load model on background thread (using progress bar to report progress)
         FThreads.invokeInBackgroundThread(new Runnable() {
             @Override
@@ -106,13 +109,13 @@ public class Forge implements ApplicationListener {
 
                 FModel.initialize(splashScreen.getProgressBar(), null);
 
-                splashScreen.getProgressBar().setDescription("Loading fonts...");
+                splashScreen.getProgressBar().setDescription(localizer.getMessage("lblLoadingFonts"));
                 FSkinFont.preloadAll();
 
-                splashScreen.getProgressBar().setDescription("Loading card translations...");
+                splashScreen.getProgressBar().setDescription(localizer.getMessage("lblLoadingCardTranslations"));
                 CardTranslation.preloadTranslation(prefs.getPref(FPref.UI_LANGUAGE));
 
-                splashScreen.getProgressBar().setDescription("Finishing startup...");
+                splashScreen.getProgressBar().setDescription(localizer.getMessage("lblFinishingStartup"));
 
                 Gdx.app.postRunnable(new Runnable() {
                     @Override
@@ -248,11 +251,16 @@ public class Forge implements ApplicationListener {
                 }
             }
         };
+
+        final Localizer localizer = Localizer.getInstance();
+
         if (silent) {
             callback.run(true);
         }
         else {
-            FOptionPane.showConfirmDialog("Are you sure you wish to restart Forge?", "Restart Forge", "Restart", "Cancel", callback);
+            FOptionPane.showConfirmDialog(
+                    localizer.getMessage("lblAreYouSureYouWishRestartForge"), localizer.getMessage("lblRestartForge"),
+                    localizer.getMessage("lblRestart"), localizer.getMessage("lblCancel"), callback);
         }
     }
 
@@ -268,11 +276,16 @@ public class Forge implements ApplicationListener {
                 }
             }
         };
+        
+        final Localizer localizer = Localizer.getInstance();
+
         if (silent) {
             callback.run(true);
         }
         else {
-            FOptionPane.showConfirmDialog("Are you sure you wish to exit Forge?", "Exit Forge", "Exit", "Cancel", callback);
+            FOptionPane.showConfirmDialog(
+                localizer.getMessage("lblAreYouSureYouWishExitForge"), localizer.getMessage("lblExitForge"),
+                localizer.getMessage("lblExit"), localizer.getMessage("lblCancel"), callback);
         }
     }
 
diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java
index 5f42bcd27fb..208010bdeef 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinFont.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java
@@ -355,111 +355,107 @@ public class FSkinFont {
         //generate from zh-CN.properties,and cardnames-zh-CN.txt
         //forge generate 3000+ characters cache need Take some time(MIN_FONT_SIZE - MAX_FONT_SIZE all size)
         //maybe using libgdx-hiero generate font cache is better
-        chars +=  "·âéöû—“”•−●、。「」『』一丁七万三！（），／：；？～鼹鼻齐齑"
-              +   "上下不与丑专且世丘业丛东丝两严丧个中丰临丸丹为丽举乃久么义"
-              +   "之乌乍乐乔乖乘乙九也乡书乱乳乾了予争事二于云互五井亘亚些亡"
-              +   "交亥亦产享京亮亲亵人亿什仁仅仆仇今介仍从仑仓仕他仗付仙代令"
-              +   "以仪们仰仲件价任份仿伊伍伏伐休众优伙会伟传伤伦伪伯伴伶伺似"
-              +   "伽但位低住佐佑体何余佚佛作你佣佩佳使例侍侏供依侠侣侦侧侬侮"
-              +   "侯侵便促俄俊俐俑俘保信修俯俸個倍倒候借倡倦倨倪债值倾假偏做"
-              +   "停偶偷偿傀傍储催傲像僧僭僵僻儒儡儿兀允元充兆先光克免兔兕党"
-              +   "入全八公六兰共关兴兵其具典兹养兼兽内册再冒冕写军农冠冢冥冬"
-              +   "冰冲决况冶冷冻净准凋凌减凑凛凝几凡凤凭凯凰凶出击凿刀刃分切"
-              +   "刈刍刑划列则刚创初删判利别刮到制刷刹刺刻刽剂剃削剌前剎剑剖"
-              +   "剜剥剧剩剪副割剽劈力劝办功加务劣动助努劫励劲劳势勃勇勉勋勒"
-              +   "勘募勤勾包匍匐匕化北匙匠匪匹区医匿十千升午半华协卑卒卓单卖"
-              +   "南博卜占卡卢卦卫印危即却卵卷卸厂厄厅历厉压厚原厢厥厦厨去参"
-              +   "叉及友双反发叔取受变叙叛叠口古句另叨只叫召叮可台史右叶号司"
-              +   "叹吁吃各合吉吊同名后吏吐向吓吕吗君吞吟否含听吮启吱吸吹吻吼"
-              +   "呆告呕员周味呼命咆和咏咒咕咬咯咳咽哀品哈响哑哗哥哨哩哪哭哮"
-              +   "哲哺唐唤售唯唱啃啄商啜啪啮啸喀喂善喉喊喋喘喙喜喝喧喷嗅嗔嗜"
-              +   "嗡嗣嗫嘉嘎嘘嘲嘴嘶噜噤器噬嚎嚼囊囚四回因团囤园困围固国图圆"
-              +   "圈團土圣在地场圾均坊坍坎坏坐坑块坚坛坝坞坟坠坤坦坪坷垂垃型"
-              +   "垒垛垠垢垣垦埃埋城域培基堂堆堕堡堤堪堰塌塑塔塘塞填境墓墙增"
-              +   "墟墨壁壅壕壤士壬壮声壳壶处备复夏外多夜够大天太夫央失头夷夸"
-              +   "夹夺奇奈奉奋奎契奔奖套奢奥女奴她好如妃妄妆妇妈妖妙妥妪妮妲"
-              +   "妹姆姊始姓姜姥姬姿威娃娅娜婆婉婪婶媒嫁嫩嬉子孑孔孕字存孚孢"
-              +   "季孤学孪孳孵孽宁它宅宇守安完宏宗官宙定宜宝实宠审客宣室宪宫"
-              +   "宰害宴家容宾宿寂寄密寇富寒寓寝察寡寨寰寸对寺寻导封射将尉尊"
-              +   "小少尔尖尘尚尝尤尬就尸尹尺尼尽尾局层居屈屋屏屑展属屠履屯山"
-              +   "屹岁岑岔岖岗岚岛岩岱岳岸峡峭峰峻崇崎崔崖崩崽嵌巅巍川巡巢工"
-              +   "左巧巨巫差己已巳巴巷币市布帅帆师希帕帖帘帜帝带席帮帷常帽幅"
-              +   "幔幕干平年并幸幻幼幽广庄庆庇床序库应底店庙府庞废度座庭庶廉"
-              +   "廊延建开异弃弄弊式弑弓引弗弘弟张弥弦弧弩弯弱張弹强归当录彗"
-              +   "形彩彰影役彻彼往征径待很徊律後徒徕得徘徙從御復循微徵德徽心"
-              +   "必忆忌忍忒志忘忠忧快忱念忽忾忿怀态怒怖思急性怨怪怯总恍恐恒"
-              +   "恕恢恣恨恩恫息恰恳恶恸恼悉悍悔悖悟患悦您悬悯悲悼情惊惑惘惚"
-              +   "惠惧惨惩惫惰想惹愁愈愎意愚感愣愤愧愿慈慌慎慑慕慢慧慨慰慷憎"
-              +   "憩懦戈戏成我戒戕或战戟截戮戳戴户戾房所扁扇扈手才扎扑扒打托"
-              +   "扣执扩扫扬扭扮扯扰找承技抄抉把抑抓投抖抗折抚抛抢护报披抱抵"
-              +   "抹押抽拂拆拉拍拒拓拔拖拘招拜拟拣拥拦拧拨择括拯拱拳拷拼拽拾"
-              +   "拿持挂指按挑挖挚挟挠挡挣挥挪挫振挺挽捆捉捍捕捞损换捣捧据捷"
-              +   "捻掀授掉掌掐排掘掠探接控推掩措掮掳掷揍描提插握揭援揽搁搅搏"
-              +   "搐搜搞搬搭携摄摆摇摘摧摩摸摹撒撕撞撤撬播撵撼擅操擎擒擞擦攀"
-              +   "攫支收改攻放政故效敌敏救敕教敞敢散敦敬数敲整文斐斑斓斗斤斥"
-              +   "斧斩断斯新方施旁旅旋族旗无既日旧旨早旭时旷旸旺昂昆昌明昏易"
-              +   "昔昙星映春昨昭是昵昼显晃晋晓晕晖晚晨普景晰晴晶晷智暂暗暮暴"
-              +   "曙曜曝曦曲曳更曼曾替最月有服朗望朝期木未末本札术朵机朽杀杂"
-              +   "权杉李村杖杜束条来杨杯杰松板极构析林枚果枝枢枪枭枯架枷柄柏"
-              +   "某染柜查柩柯柱柳栅标栈栋栏树栓栖栗株样核根格栽桂框案桌桎桑"
-              +   "桓桠档桥桨桩桶梁梅梓梢梣梦梧梨梭梯械检棄棍棒棕棘棚森棱棺椁"
-              +   "植椎椒椽楂楔楚楣楼概榄榆榔榨榴槌槛模横樱樵橇橡橫檀檐次欢欣"
-              +   "欧欲欺歇歌止正此步武歪死歼殁殆殇殉殊残殍殒殓殖殡殴段殷殿毁"
-              +   "毅母每毒比毕毛毡氅氏民氓气氤氦氧氲水永汀汁求汇汉汐汗汛池污"
-              +   "汤汨汪汰汲汹汽沃沈沉沌沐沙沟没沥沦沮河沸油治沼沾沿泄泉泊法"
-              +   "泛泞泡波泣泥注泪泯泰泽洁洋洒洗洛洞津洪洲活洼派流浅浆浇浊测"
-              +   "济浑浓浚浩浪浮浴海浸涅消涉涌涎涛涟涡涤润涨涩液涵淋淘淤淬深"
-              +   "混淹添清渊渎渐渔渗渝渠渡渣渥温港渲渴游湍湖湛湮湾湿溃溅源溜"
-              +   "溢溪溯溶溺滋滑滓滔滚滞满滤滥滨滴漂漏演漠漩漫潘潜潭潮澄澈澹"
-              +   "激濑濒瀑瀚灌火灭灯灰灵灼灾灿炉炎炙炫炬炭炮炸点炼炽烁烂烈烙"
-              +   "烛烟烤烦烧烫烬热烽焉焊焚焦焰然煌煎煞煤照煮煽熄熊熏熔熟熠熵"
-              +   "燃燎燕燧爆爪爬爱爵父片版牌牒牙牛牝牡牢牦牧物牲牵特牺犀犁犄"
-              +   "犧犬犯状狂狄狈狐狗狙狞狡狩独狭狮狰狱狷狸狼猁猎猛猜猪猫献猴"
-              +   "猿獒獠獾玄率玉王玖玛玩玫环现玷玻珀珂珊珍珠班球理琉琐琥琳琴"
-              +   "琵琼瑕瑙瑚瑞瑟瑰璃璞璧瓜瓣瓦瓮瓯瓶瓷甘生用甩甫田由甲电画畅"
-              +   "界畏留略畸畿疆疏疑疗疚疡疣疤疫疮疯疲疵疹疽疾病症痕痛痞痢痨"
-              +   "痪痴痹瘟瘠瘤瘫瘴癣癫癸登白百的皆皇皈皮皱皿盆盈盐监盒盔盖盗"
-              +   "盘盛盟目盲直相盾省看真眠眨眩眷眺眼着睁睡督睥睨睿瞄瞒瞥瞪瞬"
-              +   "瞭瞰瞳矛矢知矫短矮石矾矿码砂砍研砖砦砧破砸砾础硕硫硬确碍碎"
-              +   "碑碟碧碰碳碻碾磁磊磨磷磺礁示礼社祀祈祖祝神祟祠祥票祭祷祸禁"
-              +   "禄福离禽私秃秉秋种科秘秣秤秩积称移秽稀程税稚稳稻穆穗穴究穷"
-              +   "穹空穿突窃窍窒窖窗窘窜窝窟窥立竖站竞章童竭端竹笏笑笔笛笞符"
-              +   "第笼等筑筒答策筛筝筹签简箔算箝管箭箱篓篮篱篷簇簧簪米类粉粒"
-              +   "粗粮粹精糊糙糟系素索紧紫累繁纂纠红约级纪纬纯纱纳纵纷纸纹纺"
-              +   "纽线练组绅细织终绊绍经绒结绕绘给绚络绝绞统绥继绩绪续绮绯绳"
-              +   "维绵综绽绿缀缄缅缆缇缉缎缓缕编缘缚缝缠缩缪缰缸缺罅网罔罗罚"
-              +   "罡罩罪置羁羊美羚羞群羽翁翅翎翔翠翡翰翱翻翼耀老考者而耍耐耕"
-              +   "耗耘耙耳耶职联聚聪肃肆肇肉肌肖肝肠肢肤肥肩肯育肴肺肿胀胁胃"
-              +   "胆背胎胖胜胞胡胧胫胶胸能脂脆脉脊脏脑脓脚脱脸腐腔腕腥腱腹腾"
-              +   "腿膂膏膛膜膝臂臃臣自臭至致舌舍舒舞舟航般舰舱船艇良艰色艺艾"
-              +   "节芒芙芜芥芬芭芮花芳芽苇苍苏苔苗苛苜苟若苦英茁茂范茉茎茜茧"
-              +   "茨茫茸荆草荒荚荡荣荨荫药荷莉莎莓莫莱莲莳获莽菁菇菊菌菜菲萃"
-              +   "萌萍萎萝营萦萧萨萼落著葛葬葵蒂蒙蒸蓄蓑蓝蓟蓿蔑蔓蔚蔷蔻蔽蕈"
-              +   "蕊蕨蕴蕾薄薇薙薪藏藐藓藤藻虎虏虐虑虔虚虫虱虹蚀蚁蚊蚋蚣蚺蛆"
-              +   "蛇蛊蛋蛎蛙蛛蛞蛭蛮蛰蛸蛾蜂蜈蜉蜒蜕蜗蜘蜜蜡蜥蜴蜷蜿蝇蝎蝓蝗"
-              +   "蝙蝠蝣蝾螂螅融螫螳螺蟀蟋蟑蟒蟹蠕蠢血行衍街衡衣补表衫衰袂袋"
-              +   "袍袖被袭裁裂装裔裘褐褛褪褫褴褶襄西要覆见观规觅视览觉觊角解"
-              +   "触言詹誉誓警计认讧讨让训议讯记讲许论讽设访诀证评诅识诈诉词"
-              +   "试诗诘诚诛话诞诡该详诫语误诱诲说诵请诸诺读调谆谈谊谋谍谐谕"
-              +   "谗谜谟谢谣谦谧谨谬谭谱谴谵谷豁象豪豹豺貂貌贝贞负贡财责贤败"
-              +   "货质贩贪贫贬购贮贯贱贴贵贷贸费贺贼贾贿赂赃资赋赌赎赏赐赖赘"
-              +   "赛赞赠赢赤赦赫走赶起超越趋足跃跑跖跚跛距跟跨路跳践跺踏踝踢"
-              +   "踩踪踵踽蹂蹄蹊蹋蹒蹦蹬躁躏身躯躲車车轨轩转轭轮软轰轴轻载较"
-              +   "辉辑输辖辗辙辛辜辞辟辨辩辫辰辱边达迁迂迅过迈迎运近返还这进"
-              +   "远违连迟迦迩迪迫迭述迳迷迸迹追退送适逃逆选逊透逐递途通逝逞"
-              +   "速造逢逮逸逻逼遁遇遍遏道遗遣遥遨遭遮避邀還那邦邪邬邸郊郎部"
-              +   "都鄙酋配酒酬酷酸酿醉醒采釉释里重野量金鉴针钉钓钗钙钜钝钟钢"
-              +   "钥钦钨钩钮钯钱钳钵钻钽铁铃铅铎铜铠铬铭铲银铸铺链销锁锄锅锈"
-              +   "锋锐错锡锢锤锥锦锭键锯锻镇镖镜镬镰镶长間闇门闩闪闭问闯闲间"
-              +   "闷闸闹闻阀阁阅队阱防阳阴阵阶阻阿陀附际陆陋降限院除陨险陪陲"
-              +   "陵陶陷隆随隐隔隘障隧隶隼难雀雄雅集雇雏雕雨雪雯雳零雷雹雾需"
-              +   "霆震霉霍霓霖霜霞霰露霸霹青靖静非靠靡面革靴靶鞍鞑鞭韧音韵韶"
-              +   "页顶项顺须顽顾顿颂预颅领颈颊题颚颜额颠颤风飒飓飘飙飞食餍餐"
-              +   "餮饕饥饭饮饰饱饵饶饿馆馈馐馑首香馨马驭驮驯驰驱驳驹驻驼驽驾"
-              +   "驿骁骂骄骆骇验骏骐骑骗骚骤骨骰骷骸骼髅髓高鬃鬓鬣鬼魁魂魄魅"
-              +   "魇魈魏魔鰴鱼鲁鲜鲤鲨鲮鲸鲽鳃鳄鳍鳐鳗鳝鳞鸟鸠鸡鸢鸣鸦鸽鹅鹉"
-              +   "鹊鹏鹗鹞鹤鹦鹫鹭鹰鹿麋麒麟麦麻黄黎黏黑默黛黜點黠黯鼎鼓鼠鼬"
-              +   "齿龇龙龟";
+        chars += "●、。「」『』一丁七万三上下不与丑专且世丘业丛东丝两严丧个中"
+              +  "丰临丸丹为主丽举乃久么义之乌乍乐乔乖乘乙九也乡书乱乳乾了予争"
+              +  "事二于云互五井亘亚些亡交亥亦产享京亮亲亵人亿什仁仅仆仇今介仍"
+              +  "从仑仓仕他仗付仙代令以仪们仰仲件价任份仿伊伍伏伐休众优伙会伟"
+              +  "传伤伦伪伯伴伶伺似伽但位低住佐佑体何余佚佛作你佣佩佳使例侍侏"
+              +  "供依侠侣侦侧侬侮侯侵便促俄俊俐俑俘保信修俯俸個倍倒候借倡倦倨"
+              +  "倪债值倾假偏做停偶偷偿傀傍储催傲像僧僭僵僻儒儡儿兀允元充兆先"
+              +  "光克免兔兕党入全八公六兰共关兴兵其具典兹养兼兽内册再冒冕写军"
+              +  "农冠冢冥冬冰冲决况冶冷冻净准凋凌减凑凛凝几凡凤凭凯凰凶出击凿"
+              +  "刀刃分切刈刍刑划列则刚创初删判利别刮到制刷刹刺刻刽剂剃削剌前"
+              +  "剎剑剖剜剥剧剩剪副割剽劈力劝办功加务劣动助努劫励劲劳势勃勇勉"
+              +  "勋勒勘募勤勾包匍匐匕化北匙匠匪匹区医匿十千升午半华协卑卒卓单"
+              +  "卖南博卜占卡卢卦卫印危即却卵卷卸厂厄厅历厉压厚原厢厥厦厨去参"
+              +  "叉及友双反发叔取受变叙叛叠口古句另叨只叫召叮可台史右叶号司叹"
+              +  "吁吃各合吉吊同名后吏吐向吓吕吗君吞吟否含听吮启吱吸吹吻吼呆告"
+              +  "呕员周味呼命咆和咏咒咕咬咯咳咽哀品哈响哑哗哥哨哩哪哭哮哲哺唐"
+              +  "唤售唯唱啃啄商啜啪啮啸喀喂善喉喊喋喘喙喜喝喧喷嗅嗔嗜嗡嗣嗫嘉"
+              +  "嘎嘘嘲嘴嘶噜噤器噬嚎嚼囊囚四回因团囤园困围固国图圆圈團土圣在"
+              +  "地场圾均坊坍坎坏坐坑块坚坛坝坞坟坠坤坦坪坷垂垃型垒垛垠垢垣垦"
+              +  "埃埋城域培基堂堆堕堡堤堪堰塌塑塔塘塞填境墓墙增墟墨壁壅壕壤士"
+              +  "壬壮声壳壶处备复夏外多夜够大天太夫央失头夷夸夹夺奇奈奉奋奎契"
+              +  "奔奖套奢奥女奴她好如妃妄妆妇妈妖妙妥妪妮妲妹姆姊始姓姜姥姬姿"
+              +  "威娃娅娜婆婉婪婶媒嫁嫩嬉子孑孔孕字存孚孢季孤学孪孳孵孽宁它宅"
+              +  "宇守安完宏宗官宙定宜宝实宠审客宣室宪宫宰害宴家容宾宿寂寄密寇"
+              +  "富寒寓寝察寡寨寰寸对寺寻导封射将尉尊小少尔尖尘尚尝尤尬就尸尹"
+              +  "尺尼尽尾局层居屈屋屏屑展属屠履屯山屹岁岑岔岖岗岚岛岩岱岳岸峡"
+              +  "峭峰峻崇崎崔崖崩崽嵌巅巍川巡巢工左巧巨巫差己已巳巴巷币市布帅"
+              +  "帆师希帕帖帘帜帝带席帮帷常帽幅幔幕干平年并幸幻幼幽广庄庆庇床"
+              +  "序库应底店庙府庞废度座庭庶廉廊延建开异弃弄弊式弑弓引弗弘弟张"
+              +  "弥弦弧弩弯弱張弹强归当录彗形彩彰影役彻彼往征径待很徊律後徒徕"
+              +  "得徘徙從御復循微徵德徽心必忆忌忍忒志忘忠忧快忱念忽忾忿怀态怒"
+              +  "怖思急性怨怪怯总恍恐恒恕恢恣恨恩恫息恰恳恶恸恼悉悍悔悖悟患悦"
+              +  "您悬悯悲悼情惊惑惘惚惠惧惨惩惫惰想惹愁愈愎意愚感愣愤愧愿慈慌"
+              +  "慎慑慕慢慧慨慰慷憎憩懦戈戏成我戒戕或战戟截戮戳戴户戾房所扁扇"
+              +  "扈手才扎扑扒打托扣执扩扫扬扭扮扯扰找承技抄抉把抑抓投抖抗折抚"
+              +  "抛抢护报披抱抵抹押抽拂拆拉拍拒拓拔拖拘招拜拟拣拥拦拧拨择括拯"
+              +  "拱拳拷拼拽拾拿持挂指按挑挖挚挟挠挡挣挥挪挫振挺挽捆捉捍捕捞损"
+              +  "换捣捧据捷捻掀授掉掌掐排掘掠探接控推掩措掮掳掷揍描提插握揭援"
+              +  "揽搁搅搏搐搜搞搬搭携摄摆摇摘摧摩摸摹撒撕撞撤撬播撵撼擅操擎擒"
+              +  "擞擦攀攫支收改攻放政故效敌敏救敕教敞敢散敦敬数敲整文斐斑斓斗"
+              +  "斤斥斧斩断斯新方施旁旅旋族旗无既日旧旨早旭时旷旸旺昂昆昌明昏"
+              +  "易昔昙星映春昨昭是昵昼显晃晋晓晕晖晚晨普景晰晴晶晷智暂暗暮暴"
+              +  "曙曜曝曦曲曳更曼曾替最月有服朗望朝期木未末本札术朵机朽杀杂权"
+              +  "杉李村杖杜束条来杨杯杰松板极构析林枚果枝枢枪枭枯架枷柄柏某染"
+              +  "柜查柩柯柱柳栅标栈栋栏树栓栖栗株样核根格栽桂框案桌桎桑桓桠档"
+              +  "桥桨桩桶梁梅梓梢梣梦梧梨梭梯械检棄棍棒棕棘棚森棱棺椁植椎椒椽"
+              +  "楂楔楚楣楼概榄榆榔榨榴槌槛模横樱樵橇橡橫檀檐次欢欣欧欲欺歇歌"
+              +  "止正此步武歪死歼殁殆殇殉殊残殍殒殓殖殡殴段殷殿毁毅母每毒比毕"
+              +  "毛毡氅氏民氓气氤氦氧氲水永汀汁求汇汉汐汗汛池污汤汨汪汰汲汹汽"
+              +  "沃沈沉沌沐沙沟没沥沦沮河沸油治沼沾沿泄泉泊法泛泞泡波泣泥注泪"
+              +  "泯泰泽洁洋洒洗洛洞津洪洲活洼派流浅浆浇浊测济浑浓浚浩浪浮浴海"
+              +  "浸涅消涉涌涎涛涟涡涤润涨涩液涵淋淘淤淬深混淹添清渊渎渐渔渗渝"
+              +  "渠渡渣渥温港渲渴游湍湖湛湮湾湿溃溅源溜溢溪溯溶溺滋滑滓滔滚滞"
+              +  "满滤滥滨滴漂漏演漠漩漫潘潜潭潮澄澈澹激濑濒瀑瀚灌火灭灯灰灵灼"
+              +  "灾灿炉炎炙炫炬炭炮炸点炼炽烁烂烈烙烛烟烤烦烧烫烬热烽焉焊焚焦"
+              +  "焰然煌煎煞煤照煮煽熄熊熏熔熟熠熵燃燎燕燧爆爪爬爱爵父片版牌牒"
+              +  "牙牛牝牡牢牦牧物牲牵特牺犀犁犄犧犬犯状狂狄狈狐狗狙狞狡狩独狭"
+              +  "狮狰狱狷狸狼猁猎猛猜猪猫献猴猿獒獠獾玄率玉王玖玛玩玫环现玷玻"
+              +  "珀珂珊珍珠班球理琉琐琥琳琴琵琼瑕瑙瑚瑞瑟瑰璃璞璧瓜瓣瓦瓮瓯瓶"
+              +  "瓷甘生用甩甫田由甲电画畅界畏留略畸畿疆疏疑疗疚疡疣疤疫疮疯疲"
+              +  "疵疹疽疾病症痕痛痞痢痨痪痴痹瘟瘠瘤瘫瘴癣癫癸登白百的皆皇皈皮"
+              +  "皱皿盆盈盐监盒盔盖盗盘盛盟目盲直相盾省看真眠眨眩眷眺眼着睁睡"
+              +  "督睥睨睿瞄瞒瞥瞪瞬瞭瞰瞳矛矢知矫短矮石矾矿码砂砍研砖砦砧破砸"
+              +  "砾础硕硫硬确碍碎碑碟碧碰碳碻碾磁磊磨磷磺礁示礼社祀祈祖祝神祟"
+              +  "祠祥票祭祷祸禁禄福离禽私秃秉秋种科秘秣秤秩积称移秽稀程税稚稳"
+              +  "稻穆穗穴究穷穹空穿突窃窍窒窖窗窘窜窝窟窥立竖站竞章童竭端竹笏"
+              +  "笑笔笛笞符第笼等筑筒答策筛筝筹签简箔算箝管箭箱篓篮篱篷簇簧簪"
+              +  "米类粉粒粗粮粹精糊糙糟系素索紧紫累繁纂纠红约级纪纬纯纱纳纵纷"
+              +  "纸纹纺纽线练组绅细织终绊绍经绒结绕绘给绚络绝绞统绥继绩绪续绮"
+              +  "绯绳维绵综绽绿缀缄缅缆缇缉缎缓缕编缘缚缝缠缩缪缰缸缺罅网罔罗"
+              +  "罚罡罩罪置羁羊美羚羞群羽翁翅翎翔翠翡翰翱翻翼耀老考者而耍耐耕"
+              +  "耗耘耙耳耶职联聚聪肃肆肇肉肌肖肝肠肢肤肥肩肯育肴肺肿胀胁胃胆"
+              +  "背胎胖胜胞胡胧胫胶胸能脂脆脉脊脏脑脓脚脱脸腐腔腕腥腱腹腾腿膂"
+              +  "膏膛膜膝臂臃臣自臭至致舌舍舒舞舟航般舰舱船艇良艰色艺艾节芒芙"
+              +  "芜芥芬芭芮花芳芽苇苍苏苔苗苛苜苟若苦英茁茂范茉茎茜茧茨茫茸荆"
+              +  "草荒荚荡荣荨荫药荷莉莎莓莫莱莲莳获莽菁菇菊菌菜菲萃萌萍萎萝营"
+              +  "萦萧萨萼落著葛葬葵蒂蒙蒸蓄蓑蓝蓟蓿蔑蔓蔚蔷蔻蔽蕈蕊蕨蕴蕾薄薇"
+              +  "薙薪藏藐藓藤藻虎虏虐虑虔虚虫虱虹蚀蚁蚊蚋蚣蚺蛆蛇蛊蛋蛎蛙蛛蛞"
+              +  "蛭蛮蛰蛸蛾蜂蜈蜉蜒蜕蜗蜘蜜蜡蜥蜴蜷蜿蝇蝎蝓蝗蝙蝠蝣蝾螂螅融螫"
+              +  "螳螺蟀蟋蟑蟒蟹蠕蠢血行衍街衡衣补表衫衰袂袋袍袖被袭裁裂装裔裘"
+              +  "褐褛褪褫褴褶襄西要覆见观规觅视览觉觊角解触言詹誉誓警计认讧讨"
+              +  "让训议讯记讲许论讽设访诀证评诅识诈诉词试诗诘诚诛话诞诡该详诫"
+              +  "语误诱诲说诵请诸诺读调谆谈谊谋谍谐谕谗谜谟谢谣谦谧谨谬谭谱谴"
+              +  "谵谷豁象豪豹豺貂貌贝贞负贡财责贤败货质贩贪贫贬购贮贯贱贴贵贷"
+              +  "贸费贺贼贾贿赂赃资赋赌赎赏赐赖赘赛赞赠赢赤赦赫走赶起超越趋足"
+              +  "跃跑跖跚跛距跟跨路跳践跺踏踝踢踩踪踵踽蹂蹄蹊蹋蹒蹦蹬躁躏身躯"
+              +  "躲車车轨轩转轭轮软轰轴轻载较辉辑输辖辗辙辛辜辞辟辨辩辫辰辱边"
+              +  "达迁迂迅过迈迎运近返还这进远违连迟迦迩迪迫迭述迳迷迸迹追退送"
+              +  "适逃逆选逊透逐递途通逝逞速造逢逮逸逻逼遁遇遍遏道遗遣遥遨遭遮"
+              +  "避邀還那邦邪邬邸郊郎部都鄙酋配酒酬酷酸酿醉醒采釉释里重野量金"
+              +  "鉴针钉钓钗钙钜钝钟钢钥钦钨钩钮钯钱钳钵钻钽铁铃铅铎铜铠铬铭铲"
+              +  "银铸铺链销锁锄锅锈锋锐错锡锢锤锥锦锭键锯锻镇镖镜镬镰镶长間闇"
+              +  "门闩闪闭问闯闲间闷闸闹闻阀阁阅队阱防阳阴阵阶阻阿陀附际陆陋降"
+              +  "限院除陨险陪陲陵陶陷隆随隐隔隘障隧隶隼难雀雄雅集雇雏雕雨雪雯"
+              +  "雳零雷雹雾需霆震霉霍霓霖霜霞霰露霸霹青靖静非靠靡面革靴靶鞍鞑"
+              +  "鞭韧音韵韶页顶项顺须顽顾顿颂预颅领颈颊题颚颜额颠颤风飒飓飘飙"
+              +  "飞食餍餐餮饕饥饭饮饰饱饵饶饿馆馈馐馑首香馨马驭驮驯驰驱驳驹驻"
+              +  "驼驽驾驿骁骂骄骆骇验骏骐骑骗骚骤骨骰骷骸骼髅髓高鬃鬓鬣鬼魁魂"
+              +  "魄魅魇魈魏魔鰴鱼鲁鲜鲤鲨鲮鲸鲽鳃鳄鳍鳐鳗鳝鳞鸟鸠鸡鸢鸣鸦鸽鹅"
+              +  "鹉鹊鹏鹗鹞鹤鹦鹫鹭鹰鹿麋麒麟麦麻黄黎黏黑默黛黜點黠黯鼎鼓鼠鼬"
+              +  "鼹鼻齐齑齿龇龙龟！（），／：；？～";
 
         final PixmapPacker packer = new PixmapPacker(pageSize, pageSize, Pixmap.Format.RGBA8888, 2, false);
         final FreeTypeFontParameter parameter = new FreeTypeFontParameter();
diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index d9b8c2dc78d..b111fa139f4 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -272,13 +272,13 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
             updateDeck(i);//TODO: Investigate why AI names cannot be overriden?
             updateName(i, getPlayerName(i));
         }
-        //set this so we cant get any multi/rapid tap on start button
-        Forge.setLoadingaMatch(true);
         FThreads.invokeInBackgroundThread(new Runnable() { //must call startGame in background thread in case there are alerts
             @Override
             public void run() {
                 final Runnable startGame = lobby.startGame();
                 if (startGame != null) {
+                    //set this so we cant get any multi/rapid tap on start button
+                    Forge.setLoadingaMatch(true);
                     FThreads.invokeInEdtLater(new Runnable() {
                         @Override
                         public void run() {
diff --git a/forge-gui/res/cardsfolder/d/dark_petition.txt b/forge-gui/res/cardsfolder/d/dark_petition.txt
index 43559e5a5b4..c9e04c820f2 100644
--- a/forge-gui/res/cardsfolder/d/dark_petition.txt
+++ b/forge-gui/res/cardsfolder/d/dark_petition.txt
@@ -2,7 +2,7 @@ Name:Dark Petition
 ManaCost:3 B B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 B B | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SubAbility$ DBMana | SpellDescription$ Search your library for a card and put that card into your hand. Then shuffle your library. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B}.
-SVar:DBMana:DB$ Mana | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | Produced$ B | Amount$ 3
+SVar:DBMana:DB$ Mana | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ GE2 | Produced$ B | Amount$ 3
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 #TODO: Improve the tutoring logic for the AI. Currently will generally look for the most expensive castable thing in the library (which can, of course, be used to advantage in properly constructed AI decks).
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/e/endless_atlas.txt b/forge-gui/res/cardsfolder/e/endless_atlas.txt
index 7cede437bbe..1bb6efb56da 100644
--- a/forge-gui/res/cardsfolder/e/endless_atlas.txt
+++ b/forge-gui/res/cardsfolder/e/endless_atlas.txt
@@ -1,6 +1,6 @@
 Name:Endless Atlas
 ManaCost:2
 Types:Artifact
-A:AB$ Draw | Cost$ 2 T | CheckSvar$ X | SVarCompare$ GE3 | References$ X | SpellDescription$ Draw a card. Activate this ability only if you control three or more lands with the same name.
+A:AB$ Draw | Cost$ 2 T | CheckSVar$ X | SVarCompare$ GE3 | References$ X | SpellDescription$ Draw a card. Activate this ability only if you control three or more lands with the same name.
 SVar:X:Count$MostCardName Land.YouCtrl
 Oracle:2, T: Draw a card. Activate this ability only if you control three or more lands with the same name.
diff --git a/forge-gui/res/cardsfolder/f/force_of_negation.txt b/forge-gui/res/cardsfolder/f/force_of_negation.txt
index 0bfe3e7f8b1..5c84d3dc9e6 100644
--- a/forge-gui/res/cardsfolder/f/force_of_negation.txt
+++ b/forge-gui/res/cardsfolder/f/force_of_negation.txt
@@ -3,5 +3,4 @@ ManaCost:1 U U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target nonCreature Spell | ValidTgts$ Card.nonCreature | Destination$ Exile | SpellDescription$ Counter target noncreature spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyayrd.
 SVar:AltCost:Cost$ ExileFromHand<1/Card.Blue> | OpponentTurn$ True | Description$ If it's not your turn, you may exile a blue card from your hand rather than pay this spell's mana cost. 
-Svar:Picture:http://mythicspoiler.com/mh1/cards/forceofnegation.jpg
 Oracle:If it's not your turn, you may exile a blue card from your hand rather than pay this spell's mana cost.\nCounter target noncreature spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyayrd.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/grinning_totem.txt b/forge-gui/res/cardsfolder/g/grinning_totem.txt
index 8194fd08f06..f5f2bce00a6 100644
--- a/forge-gui/res/cardsfolder/g/grinning_totem.txt
+++ b/forge-gui/res/cardsfolder/g/grinning_totem.txt
@@ -4,13 +4,13 @@ Types:Artifact
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Player.Opponent | IsCurse$ True | Chooser$ You | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | RememberChanged$ True | SubAbility$ TotemEffect | SpellDescription$ Search target opponent's library for a card and exile it. Then that player shuffles their library. Until the beginning of your next upkeep, you may play that card. At the beginning of your next upkeep, if you haven't played it, put it into its owner's graveyard. | StackDescription$ SpellDescription
 SVar:TotemEffect:DB$ Effect | StaticAbilities$ STGrinning | Duration$ Permanent | RememberObjects$ Remembered | Triggers$ TrigDuration,TrigReturn,TrigLandPlayed,TrigCast | SVars$ DBDuration,ActiveTotem,RemoveEffect,DBReturn | SubAbility$ DBResetSVar 
 # Even though the Effect is "Permanent", it's not really permanent
-SVar:DBResetSVar:DB$ StoreSvar | SVar$ ActiveTotem | Type$ Number | Expression$ 1 | SubAbility$ DBCleanup
+SVar:DBResetSVar:DB$ StoreSVar | SVar$ ActiveTotem | Type$ Number | Expression$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:ActiveTotem:Number$1
 SVar:STGrinning:Mode$ Continuous | Affected$ Card.IsRemembered+OppOwn | MayPlay$ True | EffectZone$ Command | AffectedZone$ Exile | CheckSVar$ ActiveTotem | Description$ Until the beginning of your next upkeep, you may play that card.
 # Turn off the duration at the beginning of the upkeep statically
 SVar:TrigDuration:Mode$ Phase | Phase$ Upkeep | Player$ You | Static$ True | TriggerZones$ Command | Execute$ DBDuration
-SVar:DBDuration:DB$ StoreSvar | SVar$ ActiveTotem | Type$ Number | Expression$ 0
+SVar:DBDuration:DB$ StoreSVar | SVar$ ActiveTotem | Type$ Number | Expression$ 0
 # Return the card as a normal trigger
 SVar:TrigReturn:Mode$ Phase | Phase$ Upkeep | Player$ You | Static$ True | TriggerZones$ Command | Execute$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Graveyard | SubAbility$ RemoveEffect
diff --git a/forge-gui/res/cardsfolder/h/hollow_one.txt b/forge-gui/res/cardsfolder/h/hollow_one.txt
index feccc64423e..a5899c928f7 100644
--- a/forge-gui/res/cardsfolder/h/hollow_one.txt
+++ b/forge-gui/res/cardsfolder/h/hollow_one.txt
@@ -2,8 +2,8 @@ Name:Hollow One
 ManaCost:5
 Types:Artifact Creature Golem
 PT:4/4
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ Y | EffectZone$ All | Description$ CARDNAME costs {2} less to cast for each card you've cycled or discarded this turn.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ Y | Relative$ True | EffectZone$ All | Description$ This spell costs {2} less to cast for each card you've cycled or discarded this turn.
 K:Cycling:2
 SVar:Y:PlayerCountPropertyYou$CardsDiscardedThisTurn/Twice
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hollow_one.jpg
-Oracle:Hollow One costs {2} less to cast for each card you've cycled or discarded this turn.\nCycling {2} ({2}, Discard this card: Draw a card.)
\ No newline at end of file
+Oracle:This spell costs {2} less to cast for each card you've cycled or discarded this turn.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/p/psychic_theft.txt b/forge-gui/res/cardsfolder/p/psychic_theft.txt
index ee8aa45d7e8..a771d08d6de 100644
--- a/forge-gui/res/cardsfolder/p/psychic_theft.txt
+++ b/forge-gui/res/cardsfolder/p/psychic_theft.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Player | Origin$ Hand | Destination$ Exile | ChangeType$ Instant,Sorcery | IsCurse$ True | Chooser$ You | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ TheftEffect | SpellDescription$ Target player reveals their hand. You choose an instant or sorcery card from it and exile that card. You may cast that card for as long as it remains exiled. At the beginning of the next end step, if you haven't cast the card, return it to its owner's hand. | StackDescription$ SpellDescription
 SVar:TheftEffect:DB$ Effect | StaticAbilities$ STThieving | Duration$ Permanent | RememberObjects$ Remembered | Triggers$ TrigReturn,TrigCast | SVars$ ActivePsychic,RemoveEffect,DBReturn | SubAbility$ DBResetSVar
 # Even though the Effect is "Permanent", it's not really permanent
-SVar:DBResetSVar:DB$ StoreSvar | SVar$ ActivePsychic | Type$ Number | Expression$ 1 | SubAbility$ DBCleanup
+SVar:DBResetSVar:DB$ StoreSVar | SVar$ ActivePsychic | Type$ Number | Expression$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:ActivePsychic:Number$1
 SVar:STThieving:Mode$ Continuous | Affected$ Card.IsRemembered+OppOwn | MayPlay$ True | EffectZone$ Command | AffectedZone$ Exile | CheckSVar$ ActivePsychic | Description$ You may cast that card for as long as it remains exiled.
diff --git a/forge-gui/res/cardsfolder/upcoming/acclaimed_contender.txt b/forge-gui/res/cardsfolder/upcoming/acclaimed_contender.txt
new file mode 100644
index 00000000000..1b3a5160860
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/acclaimed_contender.txt
@@ -0,0 +1,7 @@
+Name:Acclaimed Contender
+ManaCost:2 W
+Types:Creature Human Knight
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Knight.YouCtrl+Other | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, if you control another Knight, look at the top five cards of your library. You may reveal a Knight, Aura, Equipment, or legendary artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | ChangeValid$ Card.Knight,Aura,Equipment,Artifact.Legendary | RestRandomOrder$ True
+Oracle:When Acclaimed Contender enters the battlefield, if you control another Knight, look at the top five cards of your library. You may reveal a Knight, Aura, Equipment, or legendary artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/archon_of_absolution.txt b/forge-gui/res/cardsfolder/upcoming/archon_of_absolution.txt
new file mode 100644
index 00000000000..25c9de6f2c4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/archon_of_absolution.txt
@@ -0,0 +1,8 @@
+Name:Archon of Absolution
+ManaCost:3 W
+Types:Creature Archon
+PT:3/2
+K:Flying
+K:Protection from white
+S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You,Planeswalker.YouCtrl | Cost$ 1 | Description$ Creatures can't attack you or a planeswalker you control unless their controller pays {1} for each of those creatures.
+Oracle:Flying\nProtection from white (This creature can't be blocked, targeted, dealt damage, enchanted, or equipped by anything white.)\nCreatures can't attack you or a planeswalker you control unless their controller pays {1} for each of those creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/ardenvale_paladin.txt b/forge-gui/res/cardsfolder/upcoming/ardenvale_paladin.txt
new file mode 100644
index 00000000000..74fbc6bddca
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ardenvale_paladin.txt
@@ -0,0 +1,6 @@
+Name:Ardenvale Paladin
+ManaCost:3 W
+Types:Creature Human Knight
+PT:2/5
+K:etbCounter:P1P1:1:Adamant$ White:Adamant — If at least three white mana was spent to cast this spell, CARDNAME enters the battlefield with a +1/+1 counter on it.
+Oracle:Adamant — If at least three white mana was spent to cast this spell, Ardenvale Paladin enters the battlefield with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/barge_in.txt b/forge-gui/res/cardsfolder/upcoming/barge_in.txt
new file mode 100644
index 00000000000..07a14c80710
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/barge_in.txt
@@ -0,0 +1,6 @@
+Name:Barge In
+ManaCost:R
+Types:Instant
+A:SP$ Pump | Cost$ R | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBPump | SpellDescription$ Target attacking creature gets +2/+2 until end of turn. Each attacking non-Human creature gains trample until end of turn.
+SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.nonHuman+attacking | KW$ Trample
+Oracle:Target attacking creature gets +2/+2 until end of turn. Each attacking non-Human creature gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/bartered_cow.txt b/forge-gui/res/cardsfolder/upcoming/bartered_cow.txt
new file mode 100644
index 00000000000..323eac840f0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bartered_cow.txt
@@ -0,0 +1,10 @@
+Name:Bartered Cow
+ManaCost:3 W
+Types:Creature Ox
+PT:3/3
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | TriggerController$ TriggeredCardController | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies or blocks you discard it, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+T:Mode$ Discarded | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies or blocks you discard it, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | LegacyImage$ c a food sac eld
+SVar:SacMe:1
+SVar:DiscardMe:3
+Oracle:When Bartered Cow dies or when you discard it, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/upcoming/blacklance_paragon.txt b/forge-gui/res/cardsfolder/upcoming/blacklance_paragon.txt
new file mode 100644
index 00000000000..48693c7c552
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/blacklance_paragon.txt
@@ -0,0 +1,8 @@
+Name:Blacklance Paragon
+ManaCost:1 B
+Types:Creature Human Knight
+PT:3/1
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target Knight gains deathtouch and lifelink until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Knight | TgtPrompt$ Select target Knight | KW$ Deathtouch & Lifelink
+Oracle:Flash\nWhen Blacklance Paragon enters the battlefield, target Knight gains deathtouch and lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_ardenvale.txt b/forge-gui/res/cardsfolder/upcoming/castle_ardenvale.txt
new file mode 100644
index 00000000000..7a11b90efd0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/castle_ardenvale.txt
@@ -0,0 +1,10 @@
+Name:Castle Ardenvale
+ManaCost:no cost
+Types:Land
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Plains.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Plains.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Token | Cost$ 2 W W T | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ You | LegacyImage$ w 1 1 human eld | SpellDescription$ Create a 1/1 white Human creature token.
+DeckHints:Type$Human
+DeckHas:Ability$Token
+Oracle:Castle Ardenvale enters the battlefield tapped unless you control a Plains.\n{T}: Add {W}.\n{2}{W}{W}, {T}: Create a 1/1 white Human creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_embereth.txt b/forge-gui/res/cardsfolder/upcoming/castle_embereth.txt
new file mode 100644
index 00000000000..1a506611e16
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/castle_embereth.txt
@@ -0,0 +1,9 @@
+Name:Castle Embereth
+ManaCost:no cost
+Types:Land
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Mountain.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Mountain.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+SVar:PlayMain1:TRUE
+A:AB$ PumpAll | Cost$ 1 R R T | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | SpellDescription$ Creatures you control get +1/+0 until end of turn.
+Oracle:Castle Embereth enters the battlefield tapped unless you control a Mountain.\n{T}: Add {R}.\n{1}{R}{R}, {T}: Creatures you control get +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_garenbrig.txt b/forge-gui/res/cardsfolder/upcoming/castle_garenbrig.txt
new file mode 100644
index 00000000000..0a5a271a550
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/castle_garenbrig.txt
@@ -0,0 +1,8 @@
+Name:Castle Garenbrig
+ManaCost:no cost
+Types:Land
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Forest.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Forest.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ 2 G G T | Produced$ G | Amount$ 6 | RestrictValid$ Spell.Creature,Activated.Creature | SpellDescription$ Add six {G}. Spend this mana only to cast creature spells or activate abilities of creatures.
+Oracle:Castle Garenbrig enters the battlefield tapped unless you control a Forest.\n{T}: Add {G}.\n{2}{G}{G}, {T}: Add six {G}. Spend this mana only to cast creature spells or activate abilities of creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_locthwain.txt b/forge-gui/res/cardsfolder/upcoming/castle_locthwain.txt
new file mode 100644
index 00000000000..3112cad52ad
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/castle_locthwain.txt
@@ -0,0 +1,10 @@
+Name:Castle Locthwain
+ManaCost:no cost
+Types:Land
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Swamp.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Draw | Cost$ 1 B B T | NumCards$ 1 | SpellDescription$ Draw a card, then you lose life equal to the number of cards in your hand. | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | References$ X
+SVar:X:Count$InYourHand
+Oracle:Castle Locthwain enters the battlefield tapped unless you control a Swamp.\n{T}: Add {B}.\n{1}{B}{B}, {T}: Draw a card, then you lose life equal to the number of cards in your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_vantress.txt b/forge-gui/res/cardsfolder/upcoming/castle_vantress.txt
new file mode 100644
index 00000000000..15be04c43b1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/castle_vantress.txt
@@ -0,0 +1,8 @@
+Name:Castle Vantress
+ManaCost:no cost
+Types:Land
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Island.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control an Island.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Scry | Cost$ 2 U U T | ScryNum$ 2 | SpellDescription$ Scry 2.
+Oracle:Castle Vantress enters the battlefield tapped unless you control an Island.\n{T}: Add {U}.\n{2}{U}{U}, {T}: Scry 2.
diff --git a/forge-gui/res/cardsfolder/upcoming/cauldrons_gift.txt b/forge-gui/res/cardsfolder/upcoming/cauldrons_gift.txt
new file mode 100644
index 00000000000..da233a0b65b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cauldrons_gift.txt
@@ -0,0 +1,7 @@
+Name:Cauldron's Gift
+ManaCost:4 B
+Types:Sorcery
+A:SP$ Mill | Cost$ 4 B | NumCards$ 4 | Defined$ You | SubAbility$ DBChangeZone | ConditionCheckSVar$ X | References$ X | SpellDescription$ Adamant — If at least three black mana was spent to cast this spell, put the top four cards of your library into your graveyard. You may choose a creature card in your graveyard. If you do, return it to the battlefield with an additional +1/+1 counter on it.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouOwn | Hidden$ True | ChangeNum$ 1 | WithCounters$ P1P1_1
+SVar:X:Count$Adamant.Black.1.0
+Oracle:Adamant — If at least three black mana was spent to cast this spell, put the top four cards of your library into your graveyard.\nYou may choose a creature card in your graveyard. If you do, return it to the battlefield with an additional +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/clackbridge_troll.txt b/forge-gui/res/cardsfolder/upcoming/clackbridge_troll.txt
new file mode 100644
index 00000000000..8a640e10fc2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/clackbridge_troll.txt
@@ -0,0 +1,13 @@
+Name:Clackbridge Troll
+ManaCost:3 B B
+Types:Creature Troll
+PT:8/8
+K:Haste
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TripleGoat | TriggerDescription$ When CARDNAME enters the battlefield, target opponent creates three 0/1 white Goat creature tokens.
+SVar:TripleGoat:DB$ Token | TokenAmount$ 3 | TokenScript$ w_0_1_goat | LegacyImage$ w 0 1 goat eld | ValidTgts$ Opponent | TokenOwner$ Targeted
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, any opponent may sacrifice a creature. If a player does, tap CARDNAME, you gain 3 life, and you draw a card.
+SVar:TrigTap:DB$ Tap | Defined$ Self | SubAbility$ DBDraw | UnlessCost$ Sac<1/Creature> | UnlessPayer$ Player.Opponent | UnlessSwitched$ True | UnlessAI$ LifeLE10 | UnlessResolveSubs$ WhenPaid | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | Defined$ You
+Oracle:Trample, haste\nWhen Clackbridge Troll enters the battlefield, target opponent creates three 0/1 white Goat creature tokens.\nAt the beginning of combat on your turn, any opponent may sacrifice a creature. If a player does, tap Clackbridge Troll, you gain 3 life, and you draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/dance_of_the_manse.txt b/forge-gui/res/cardsfolder/upcoming/dance_of_the_manse.txt
new file mode 100644
index 00000000000..b9d1a86e96f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/dance_of_the_manse.txt
@@ -0,0 +1,8 @@
+Name:Dance of the Manse
+ManaCost:X W U
+Types:Sorcery
+A:SP$ ChangeZone | Cost$ X W U | Announce$ X | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Artifact.cmcLEX,Enchantment.cmcLEX | TgtPrompt$ Select target artifact or enchantment in your graveyard | TargetMin$ 0 | TargetMax$ X | SubAbility$ DBAnimate | SpellDescription$ Return up to X target artifact and/or non-Aura enchantment cards with converted mana cost X or less from your graveyard to the battlefield. If X is 6 or more, those permanents are 4/4 creatures in addition to their other types.
+SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Types$ Creature | Power$ 4 | Toughness$ 4 | Permanent$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6 | References$ X
+SVar:X:Count$xPaid
+AI:RemoveDeck:All
+Oracle:Return up to X target artifact and/or non-Aura enchantment cards each with converted mana cost X or less from your graveyard to the battlefield. If X is 6 or more, those permanents are 4/4 creatures in addition to their other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/escape_to_the_wilds.txt b/forge-gui/res/cardsfolder/upcoming/escape_to_the_wilds.txt
new file mode 100644
index 00000000000..ef196ed4c5e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/escape_to_the_wilds.txt
@@ -0,0 +1,12 @@
+Name:Escape to the Wilds
+ManaCost:3 R G
+Types:Sorcery
+A:SP$ Mill | Cost$ 3 R G | Destination$ Exile | NumCards$ 5 | RememberMilled$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top five cards of your library. You may play cards exiled this way until the end of your next turn.
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | ForgetOnMoved$ Exile | StaticAbilities$ Play | Duration$ UntilTheEndOfYourNextTurn | SubAbility$ DBEffect2
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play cards exiled this the end of your next turn.
+SVar:DBEffect2$ Effect | Cost$ 3 R G | Name$ CARDNAME Effect | StaticAbilities$ Exploration | AILogic$ Always | SpellDescription$ You may play an additional land this turn. | SubAbility$ DBCleanup
+SVar:Exploration:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:1 | EffectZone$ Command | Description$ You may play an additional land this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NeedsToPlayVar:ZZ GE1
+SVar:ZZ:Count$ValidHand Land.YouOwn
+Oracle:Exile the top five cards of your library. You may play cards exiled this way until the end of your next turn.\nYou may play an additional land this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/ferocity_of_the_wilds.txt b/forge-gui/res/cardsfolder/upcoming/ferocity_of_the_wilds.txt
new file mode 100644
index 00000000000..6d09ef063be
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ferocity_of_the_wilds.txt
@@ -0,0 +1,6 @@
+Name:Ferocity of the Wilds
+ManaCost:2 R
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Creature.nonHuman+attacking+YouCtrl | AddPower$ 1 | AddKeyword$ Trample | Description$ Attacking non-Human creatures you control get +1/+0 and have trample.
+SVar:PlayMain1:TRUE
+Oracle:Attacking non-Human creatures you control get +1/+0 and have trample.
diff --git a/forge-gui/res/cardsfolder/upcoming/fortifying_provisions.txt b/forge-gui/res/cardsfolder/upcoming/fortifying_provisions.txt
new file mode 100644
index 00000000000..6db938168b6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/fortifying_provisions.txt
@@ -0,0 +1,8 @@
+Name:Fortifying Provisions
+ManaCost:2 W
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddToughness$ 1 | Description$ Creatures you control get +0/+1.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | LegacyImage$ c a food sac eld
+SVar:PlayMain1:TRUE
+Oracle:Creatures you control get +0/+1.\nWhen Fortifying Provisions enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/upcoming/giants_skewer.txt b/forge-gui/res/cardsfolder/upcoming/giants_skewer.txt
new file mode 100644
index 00000000000..d2ecf989060
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/giants_skewer.txt
@@ -0,0 +1,9 @@
+Name:Giant's Skewer
+ManaCost:1 B
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 1 | Description$ Equipped creature gets +2/+1.
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever equipped creature deals combat damage to a creature, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | LegacyImage$ c a food sac eld
+DeckHas:Ability$LifeGain
+K:Equip:3
+Oracle:Equipped creature gets +2/+1.\nWhenever equipped creature deals combat damage to a creature, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/grumgully_the_generous.txt b/forge-gui/res/cardsfolder/upcoming/grumgully_the_generous.txt
new file mode 100644
index 00000000000..ab653e8e3c8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/grumgully_the_generous.txt
@@ -0,0 +1,7 @@
+Name:Grumgully, the Generous
+ManaCost:1 R G
+Types:Legendary Creature Goblin Shaman
+PT:3/3
+K:ETBReplacement:Other:AddExtraCounter:Mandatory:Battlefield:Creature.YouCtrl+Other+nonHuman
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Each other non-Human creature you controls enters the battlefield with an additional +1/+1 counter on it.
+Oracle:Each other non-Human creature you controls enters the battlefield with an additional +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/idyllic_grange.txt b/forge-gui/res/cardsfolder/upcoming/idyllic_grange.txt
new file mode 100644
index 00000000000..bb0830870b0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/idyllic_grange.txt
@@ -0,0 +1,10 @@
+Name:Idyllic Grange
+ManaCost:no cost
+Types:Land Plains
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | Description$ CARDNAME enters the battlefield tapped unless you control three or more other Plains.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar | ConditionSVarCompare$ LT3 | References$ ETBCheckSVar | SubAbility$ MoveToPlay
+SVar:MoveToPlay:DB$ ChangeZone | Defined$ Self | Origin$ All | Destination$ Battlefield
+SVar:ETBCheckSVar:Count$Valid Plains.YouCtrl+Other
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+untapped | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield untapped, put a +1/+1 counter on target creature you control.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
+Oracle:({T}: Add {W}.)\nIdyllic Grange enters the battlefield tapped unless you control three or more other Plains.\nWhen Idyllic Grange enters the battlefield untapped, put a +1/+1 counter on target creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/linden_the_steadfast_queen.txt b/forge-gui/res/cardsfolder/upcoming/linden_the_steadfast_queen.txt
new file mode 100644
index 00000000000..9936a7111b3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/linden_the_steadfast_queen.txt
@@ -0,0 +1,8 @@
+Name:Linden, the Steadfast Queen
+ManaCost:W W W
+Types:Legendary Creature Human Noble
+PT:3/3
+K:Vigilance
+T:Mode$ Attacks | ValidCard$ Creature.White+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a white creature you control attacks, you gain 1 life.
+SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 | Defined$ You
+Oracle:Vigilance\nWhenever a white creature you control attacks, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/loch_dragon.txt b/forge-gui/res/cardsfolder/upcoming/loch_dragon.txt
new file mode 100644
index 00000000000..97faf198374
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/loch_dragon.txt
@@ -0,0 +1,9 @@
+Name:Loch Dragon
+ManaCost:U/R U/R U/R U/R
+Types:Creature Dragon
+PT:3/2
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may discard a card. If you do, draw a card.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may discard a card. If you do, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card> | NumCards$ 1
+Oracle:Flying\nWhenever Loch Dragon enters the battlefield or attacks, you may discard a card. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/mistford_river_turtle.txt b/forge-gui/res/cardsfolder/upcoming/mistford_river_turtle.txt
new file mode 100644
index 00000000000..533e41737a7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mistford_river_turtle.txt
@@ -0,0 +1,7 @@
+Name:Mistford River Turtle
+ManaCost:3 U
+Types:Creature Turtle
+PT:1/5
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature can't be blocked this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.nonHuman+Other+attacking | TgtPrompt$ Select another target attacking non-Human creature | KW$ HIDDEN Unblockable
+Oracle:Whenever Mistford River Turtle attacks, another target attacking non-Human creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/mystical_dispute.txt b/forge-gui/res/cardsfolder/upcoming/mystical_dispute.txt
new file mode 100644
index 00000000000..2bc300fc49a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mystical_dispute.txt
@@ -0,0 +1,8 @@
+Name:Mystical Dispute
+ManaCost:2 U
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ XBlue | Relative$ True | EffectZone$ All | Description$ CARDNAME costs {2} less to cast if it targets a blue spell.
+SVar:XBlue:Count$Compare CheckTgt GE1.2.0
+SVar:CheckTgt:Targeted$Valid Card.Blue
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 3 | References$ XBlue,CheckTgt | SpellDescription$ This spell costs {2} less to cast if it targets a blue spell. Counter target spell unless its controller pays {3}.
+Oracle:This spell costs {2} less to cast if it targets a blue spell.\nCounter target spell unless its controller pays {3}.
diff --git a/forge-gui/res/cardsfolder/upcoming/oakhame_adversary.txt b/forge-gui/res/cardsfolder/upcoming/oakhame_adversary.txt
new file mode 100644
index 00000000000..f0eb3973ad3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/oakhame_adversary.txt
@@ -0,0 +1,9 @@
+Name:Oakhame Adversary
+ManaCost:3 G
+Types:Creature Elf Warrior
+PT:2/3
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | IsPresent$ Permanent.Green+OppCtrl | Description$ CARDNAME costs {2} less to cast if your opponent controls a green permanent.
+K:Deathtouch
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, draw a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+Oracle:This spell costs {2} less to cast if your opponent controls a green permanent.\nDeathtouch\nWhenever Oakhame Adversary deals combat damage to a player, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/once_and_future.txt b/forge-gui/res/cardsfolder/upcoming/once_and_future.txt
new file mode 100644
index 00000000000..aac1b9d2b82
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/once_and_future.txt
@@ -0,0 +1,12 @@
+Name:Once and Future
+ManaCost:3 G
+Types:Instant
+A:SP$ ChangeZone | Cost$ 3 G | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target card in your graveyard | ValidTgts$ Card.YouOwn | SubAbility$ DBPump | SpellDescription$ Return target card from your graveyard to your hand. Put up to one other target card from your graveyard on top of your library. Exile CARDNAME. Adamant — If at least three green mana was spent to cast this spell, instead return those cards to your hand and exile CARDNAME.
+SVar:DBPump:DB$ Pump | TargetMin$ 0 | TargetMax$ 1 | TgtZone$ Graveyard | TgtPrompt$ Choose target card in your graveyard | ValidTgts$ Card.YouOwn | TargetUnique$ True | RememberObjects$ ThisTargetedCard | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | Hidden$ True | Defined$ Remembered | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ DBReturn2
+SVar:DBReturn2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Hidden$ True | Defined$ Remembered | ConditionCheckSVar$ X | References$ X | SubAbility$ DBExile
+SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Exile | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemebered$ True
+SVar:X:Count$Adamant.Green.1.0
+AI:RemoveDeck:Random
+Oracle:Return target card from your graveyard to your hand. Put up to one other target card from your graveyard on top of your library. Exile Once and Future.\nAdamant — If at least three green mana was spent to cast this spell, instead return those cards to your hand and exile Once and Future.
diff --git a/forge-gui/res/cardsfolder/upcoming/once_upon_a_time.txt b/forge-gui/res/cardsfolder/upcoming/once_upon_a_time.txt
new file mode 100644
index 00000000000..d4a0ca42d5f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/once_upon_a_time.txt
@@ -0,0 +1,7 @@
+Name:Once Upon a Time
+ManaCost:1 G
+Types:Instant
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | CheckSVar$ X | SVarCompare$ EQ0 | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | Description$ If this spell is the first spell you've cast this game, you may cast it without paying its mana cost.
+SVar:X:Count$YouCastThisGame
+A:SP$ Dig | Cost$ 1 G | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Card.Creature,Card.Land | RestRandomOrder$ True | SpellDescription$ Look at the top five cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+Oracle:If this spell is the first spell you've cast this game, you may cast it without paying its mana cost.\nLook at the top five cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/overwhelmed_apprentice.txt b/forge-gui/res/cardsfolder/upcoming/overwhelmed_apprentice.txt
new file mode 100644
index 00000000000..34dc290b974
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/overwhelmed_apprentice.txt
@@ -0,0 +1,8 @@
+Name:Overwhelmed Apprentice
+ManaCost:U
+Types:Creature Human Wizard
+PT:1/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, each opponent puts the top two cards of their library into their graveyard. Then you scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+SVar:TrigMill:DB$ Mill | Defined$ Player.Opponent | NumCards$ 2 | SubAbility$ DBScry
+SVar:DBScry:DB$ Scry | ScryNum$ 2
+Oracle:When Overwhelmed Apprentice enters the battlefield, each opponent puts the top two cards of their library into their graveyard. Then you scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/rally_for_the_throne.txt b/forge-gui/res/cardsfolder/upcoming/rally_for_the_throne.txt
new file mode 100644
index 00000000000..38416eb5e4d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rally_for_the_throne.txt
@@ -0,0 +1,8 @@
+Name:Rally for the Throne
+ManaCost:2 W
+Types:Instant
+A:SP$ Token | Cost$ 2 W | TokenAmount$ 2 | TokenScript$ w_1_1_human | TokenOwner$ You | LegacyImage$ w 1 1 human eld | SubAbility$ DBGainLife | SpellDescription$ Create two 1/1 white Human creature tokens. Adamant — If at least three white mana was spent to cast this spell, you gain 1 life for each creature you control.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ Y | ConditionCheckSVar$ X | References$ X,Y
+SVar:X:Count$Adamant.White.1.0
+SVar:Y:Count$Valid Creature.YouCtrl
+Oracle:Create two 1/1 white Human creature tokens.\nAdamant — If at least three white mana was spent to cast this spell, you gain 1 life for each creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/rampart_smasher.txt b/forge-gui/res/cardsfolder/upcoming/rampart_smasher.txt
new file mode 100644
index 00000000000..dca21af2bcb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rampart_smasher.txt
@@ -0,0 +1,6 @@
+Name:Rampart Smasher
+ManaCost:R/G R/G R/G R/G
+Types:Creature Giant
+PT:5/5
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.Knight,Creature.Wall | Description$ CARDNAME can't be blocked by Knights or Walls.
+Oracle:Rampart Smasher can't be blocked by Knights or Walls.
diff --git a/forge-gui/res/cardsfolder/upcoming/redcap_raiders.txt b/forge-gui/res/cardsfolder/upcoming/redcap_raiders.txt
new file mode 100644
index 00000000000..11b60b9d93d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/redcap_raiders.txt
@@ -0,0 +1,7 @@
+Name:Redcap Raiders
+ManaCost:2 R
+Types:Creature Goblin Warrior
+PT:3/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may tap an untapped non-Human creature you control. If you do, CARDNAME gets +1/+1 and gains trample until end of turn.
+SVar:TrigPump:AB$ Pump | Cost$ tapXType<1/Creature.nonHuman/non-Human creature> | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Trample
+Oracle:Whenever Redcap Raiders attacks, you may tap an untapped non-Human creature you control. If you do, Redcap Raiders gets +1/+1 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/revenge_of_ravens.txt b/forge-gui/res/cardsfolder/upcoming/revenge_of_ravens.txt
new file mode 100644
index 00000000000..262ffd25dd6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/revenge_of_ravens.txt
@@ -0,0 +1,7 @@
+Name:Revenge of Ravens
+ManaCost:3 B
+Types:Enchantment
+T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature attacks you or a planeswalker you control, that creature's controller loses 1 life and you gain 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredAttackerController | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1
+Oracle:Whenever a creature attacks you or a planeswalker you control, that creature's controller loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/robber_of_the_rich.txt b/forge-gui/res/cardsfolder/upcoming/robber_of_the_rich.txt
new file mode 100644
index 00000000000..575d5a15686
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/robber_of_the_rich.txt
@@ -0,0 +1,15 @@
+Name:Robber of the Rich
+ManaCost:1 R
+Types:Creature Human Archer Rogue
+PT:2/2
+K:Reach
+K:Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | CheckSVar$ X | SVarCompare$ GTY | References$ X,Y | TriggerDescription$ Whenever CARDNAME attacks, if defending player has more cards in hand than you, exile the top card of their library. During any turn you attacked with a Rogue, you may cast that card and you may spend mana as though it were mana of any color to cast that spell.
+SVar:TrigExile:DB$ Mill | Defined$ TriggeredDefendingPlayer | NumCards$ 1 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SVars$ Z | SubAbility$ DBCleanup | ExileOnMoved$ Exile | Duration$ Permanent
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreColor$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | CheckSVar$ Z | References$ Z | Description$ During any turn you attacked with a Rogue, you may cast that card and you may spend mana as though it were mana of any color to cast that spell.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$ValidHand Card.DefenderCtrl
+SVar:Y:Count$InYourHand
+SVar:Z:Count$CreaturesAttackedThisTurn_Rogue
+Oracle:Reach, haste\nWhenever Robber of the Rich attacks, if defending player has more cards in hand than you, exile the top card of their library. During any turn you attacked with a Rogue, you may cast that card and you may spend mana as though it were mana of any color to cast that spell.
diff --git a/forge-gui/res/cardsfolder/upcoming/sorcerers_broom.txt b/forge-gui/res/cardsfolder/upcoming/sorcerers_broom.txt
new file mode 100644
index 00000000000..94a6a2c8eea
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sorcerers_broom.txt
@@ -0,0 +1,8 @@
+Name:Sorcerer's Broom
+ManaCost:2
+Types:Artifact Creature Spirit
+PT:2/1
+T:Mode$ Sacrificed | ValidCard$ Permanent.Other | Execute$ TrigCopy | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice another permanent, you may pay {3}. If you do, create a token that's a copy of CARDNAME.
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ 3 | Defined$ Self | NumCopies$ 1
+AI:RemoveDeck:All
+Oracle:Whenever you sacrifice another permanent, you may pay {3}. If you do, create a token that's a copy of Sorcerer's Broom.
diff --git a/forge-gui/res/cardsfolder/upcoming/stonecoil_serpent.txt b/forge-gui/res/cardsfolder/upcoming/stonecoil_serpent.txt
new file mode 100644
index 00000000000..dd379d1423c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/stonecoil_serpent.txt
@@ -0,0 +1,10 @@
+Name:Stonecoil Serpent
+ManaCost:X
+Types:Artifact Creature Snake
+PT:0/0
+K:Reach
+K:Trample
+K:Protection from multicolored
+K:etbCounter:P1P1:X
+SVar:X:Count$xPaid
+Oracle:Reach, trample, protection from multicolored\nStonecoil Serpent enters the battlefield with X +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/stormfist_crusader.txt b/forge-gui/res/cardsfolder/upcoming/stormfist_crusader.txt
new file mode 100644
index 00000000000..6f2481fa7f8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/stormfist_crusader.txt
@@ -0,0 +1,9 @@
+Name:Stormfist Crusader
+ManaCost:B R
+Types:Creature Human Knight
+PT:2/2
+K:Menace
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, each player draws a card and loses 1 life.
+SVar:TrigDraw:DB$ Draw | Defined$ Player | NumCards$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Player | LifeAmount$ 1
+Oracle:Menace\nAt the beginning of your upkeep, each player draws a card and loses 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_alin_the_lions_claw.txt b/forge-gui/res/cardsfolder/upcoming/syr_alin_the_lions_claw.txt
new file mode 100644
index 00000000000..641984a1f42
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/syr_alin_the_lions_claw.txt
@@ -0,0 +1,8 @@
+Name:Syr Alin, the Lion's Claw
+ManaCost:3 W W
+Types:Legendary Creature Human Knight
+PT:4/4
+K:First Strike
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME attacks, other creatures you control get +1/+1 until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.Other+YouCtrl | NumAtt$ +1 | NumDef$ +1
+Oracle:First strike\nWhenever Syr Alin, the Lion's Claw attacks, other creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_faren_the_hengehammer.txt b/forge-gui/res/cardsfolder/upcoming/syr_faren_the_hengehammer.txt
new file mode 100644
index 00000000000..3415ec81776
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/syr_faren_the_hengehammer.txt
@@ -0,0 +1,8 @@
+Name:Syr Faren, the Hengehammer
+ManaCost:G G
+Types:Legendary Creature Human Knight
+PT:2/2
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gets +X/+X until end of turn, where X is CARDNAME's power.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X | NumDef$ X | References$ X
+SVar:X:Count$CardPower
+Oracle:Whenever Syr Faren, the Hengehammer attacks, another target attacking creature gets +X/+X until end of turn, where X is Syr Faren's power.
diff --git a/forge-gui/res/cardsfolder/upcoming/tall_as_a_beanstalk.txt b/forge-gui/res/cardsfolder/upcoming/tall_as_a_beanstalk.txt
new file mode 100644
index 00000000000..1d5b16a59ca
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/tall_as_a_beanstalk.txt
@@ -0,0 +1,7 @@
+Name:Tall as a Beanstalk
+ManaCost:3 G
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 3 G | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Reach | AddType$ Giant | Description$ Enchanted creature gets +3/+3, has reach, and is a Giant in addition to its other types.
+Oracle:Enchant creature\nEnchanted creature gets +3/+3, has reach, and is a Giant in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/tempting_witch.txt b/forge-gui/res/cardsfolder/upcoming/tempting_witch.txt
new file mode 100644
index 00000000000..34ba26dbdb6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/tempting_witch.txt
@@ -0,0 +1,9 @@
+Name:Tempting Witch
+ManaCost:2 B
+Types:Creature Human Warlock
+PT:1/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | LegacyImage$ c a food sac eld
+DeckHas:Ability$LifeGain
+A:AB$ LoseLife | Cost$ 2 T Sac<1/Food> | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SpellDescription$ Target player loses 3 life.
+Oracle:When Tempting Witch enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")\n{2}, {T}, Sacrifice a Food: Target player loses 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_cauldron_of_eternity.txt b/forge-gui/res/cardsfolder/upcoming/the_cauldron_of_eternity.txt
new file mode 100644
index 00000000000..fdd657ee8a5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_cauldron_of_eternity.txt
@@ -0,0 +1,10 @@
+Name:The Cauldron of Eternity
+ManaCost:10 B B
+Types:Legendary Artifact
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | References$ X | EffectZone$ All | Description$ CARDNAME costs {2} less for each creature card in your graveyard.
+SVar:X:Count$TypeInYourYard.Creature
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever a creature you control dies, put it on the bottom of its owner's library.
+SVar:TrigChange:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1
+SVar:BuffedBy:Creature
+A:AB$ ChangeZone | Cost$ 2 B T PayLife<2> | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | SpellDescription$ Return target creature card from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery.
+Oracle:This spell costs {2} less for each creature card in your graveyard.\nWhenever a creature you control dies, put it on the bottom of its owner's library.\n{2}{B}, {T}, Pay 2 life: Return target creature card from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_great_henge.txt b/forge-gui/res/cardsfolder/upcoming/the_great_henge.txt
new file mode 100644
index 00000000000..4628b019329
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_great_henge.txt
@@ -0,0 +1,11 @@
+Name:The Great Henge
+ManaCost:7 G G
+Types:Legendary Artifact
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | References$ X | EffectZone$ All | Description$ CARDNAME costs {X} less to cast, where X is the greatest power among creatures you control.
+SVar:X:Count$GreatestPower_Creature.YouCtrl
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SubAbility$ DBGainLife | SpellDescription$ Add {G}{G}. You gain 2 life.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, put a +1/+1 counter on it and draw a card.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
+Oracle:This spell costs {X} less to cast, where X is the greatest power among creatures you control.\n{T}: Add {G}{G}. You gain 2 life.\nWhenever a nontoken creature enters the battlefield under your control, put a +1/+1 counter on it and draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/torbran_thane_of_red_fell.txt b/forge-gui/res/cardsfolder/upcoming/torbran_thane_of_red_fell.txt
new file mode 100644
index 00000000000..b22438badd9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/torbran_thane_of_red_fell.txt
@@ -0,0 +1,9 @@
+Name:Torbran, Thane of Red Fell
+ManaCost:1 R R R
+Types:Legendary Creature Dwarf Noble
+PT:2/4
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.RedSource+YouCtrl | ValidTarget$ Player.Opponent,Permanent.OppCtrl | ReplaceWith$ DmgPlus2 | Description$ If a red source you control would deal damage to an opponent or a permanent an opponent controls, it deals that much damage plus 2 instead.
+SVar:DmgPlus2:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
+SVar:X:ReplaceCount$DamageAmount/Plus.2
+SVar:PlayMain1:TRUE
+Oracle:If a red source you control would deal damage to an opponent or a permanent an opponent controls, it deals that much damage plus 2 instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/unexplained_vision.txt b/forge-gui/res/cardsfolder/upcoming/unexplained_vision.txt
new file mode 100644
index 00000000000..7f484b8a997
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/unexplained_vision.txt
@@ -0,0 +1,7 @@
+Name:Unexplained Vision
+ManaCost:4 U
+Types:Sorcery
+A:SP$ Draw | Cost$ 4 U | NumCards$ 3 | SubAbility$ DBScry | SpellDescription$ Draw three cards. Adamant — If at least three blue mana was spent to cast this spell, scry 3.
+SVar:DBScry:DB$ Scry | ScryNum$ 3 | ConditionCheckSVar$ X | References$ X
+SVar:X:Count$Adamant.Blue.1.0
+Oracle:Draw three cards.\nAdamant — If at least three blue mana was spent to cast this spell, scry 3.
diff --git a/forge-gui/res/cardsfolder/upcoming/vantress_paladin.txt b/forge-gui/res/cardsfolder/upcoming/vantress_paladin.txt
new file mode 100644
index 00000000000..3b0476c39c0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/vantress_paladin.txt
@@ -0,0 +1,7 @@
+Name:Vantress Paladin
+ManaCost:3 U
+Types:Creature Human Knight
+PT:2/2
+K:Flying
+K:etbCounter:P1P1:1:Adamant$ Blue:Adamant — If at least three blue mana was spent to cast this spell, CARDNAME enters the battlefield with a +1/+1 counter on it.
+Oracle:Flying\nAdamant — If at least three blue mana was spent to cast this spell, Vantress Paladin enters the battlefield with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/witchs_cottage.txt b/forge-gui/res/cardsfolder/upcoming/witchs_cottage.txt
index b6b9625fad9..f961ea09bbd 100644
--- a/forge-gui/res/cardsfolder/upcoming/witchs_cottage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/witchs_cottage.txt
@@ -5,6 +5,6 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar | ConditionSVarCompare$ LT3 | References$ ETBCheckSVar | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Defined$ Self | Origin$ All | Destination$ Battlefield
 SVar:ETBCheckSVar:Count$Valid Swamp.YouCtrl+Other
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may put target creature card from your graveyard on top of your library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+untapped | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield untapped, you may put target creature card from your graveyard on top of your library.
 SVar:TrigChange:DB$ ChangeZone | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Library
 Oracle:({T}: Add {B}.)\nWitch's Cottage enters the battlefield tapped unless you control three or more other Swamps.\nWhen Witch's Cottage enters the battlefield untapped, you may put target creature card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/yorvo_lord_of_garenbrig.txt b/forge-gui/res/cardsfolder/upcoming/yorvo_lord_of_garenbrig.txt
new file mode 100644
index 00000000000..06d4ac10138
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/yorvo_lord_of_garenbrig.txt
@@ -0,0 +1,12 @@
+Name:Yorvo, Lord of Garenbrig
+ManaCost:G G G
+Types:Legendary Creature Giant Noble
+PT:0/0
+K:etbCounter:P1P1:4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl+Green | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another green creature enters the battlefield under your control, put a +1/+1 counter on CARDNAME. Then if that creature's power is greater than CARDNAME's power, put another +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | COnditionCheckSVar$ X | ConditionSVarCompare$ GEY | References$ X,Y
+SVar:X:TriggeredCard$CardPower
+SVar:Y:Count$CardPower
+DeckHas:Ability$Counters
+Oracle:Yorvo, Lord of Garenbrig enters the battlefield with four +1/+1 counters on it.\nWhenever another green creature enters the battlefield under your control, put a +1/+1 counter on Yorvo. Then if that creature's power is greater than Yorvo's power, put another +1/+1 counter on Yorvo.
diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index 71643ddb8f7..994f8550aed 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -176,11 +176,11 @@ nlEnableMusic=Hintergrundmusik während des Spiels
 nlAltSoundSystem=Nutze alternatives Sound-System (nur nutzen, wenn es Probleme mit fehlenden Geräuschen gibt)
 KeyboardShortcuts=Tastenkombinationen
 # VSubmenuAchievements.java
-lblAchievements=Erfolge
+lblAchievements=Errungenschaften 
 # VSubmenuDownloaders.java
 btnDownloadSetPics=Bilder(LQ) Sets herunterladen
+btnDownloadPicsHQ=Bilder(HQ Karten herunterladen (Sehr langsam!)
 btnDownloadPics=Bilder(LQ) Karten herunterladen
-btnDownloadPicsHQ=Bilder(HQ) Karten herunterladen (Sehr langsam!)
 btnDownloadQuestImages=Bilder für Quests herunterladen
 btnDownloadAchievementImages=Bilder für Erfolge herunterladen
 btnReportBug=Einen Fehler melden
@@ -191,7 +191,7 @@ btnHowToPlay=Wie man spielt
 btnDownloadPrices=Kartenpreise herunterladen
 btnLicensing=Lizenzhinweis
 lblDownloadPics=Lädt ein Standardbild pro Karte.
-lblDownloadPicsHQ=Lädt ein Standardbild (HQ) pro Karte.
+lblDownloadPicsHQ=Lädt ein HQ-Standardbild pro Karte.
 lblDownloadSetPics=Lädt alle Bilder pro Karte. Eines für jedes Set, in welchem die Karte auftauchte.
 lblDownloadQuestImages=Lädt die Bilder für den Quest-Modus.
 lblDownloadAchievementImages=Lädt die Bilder zu den möglichen Erfolgen. Verschönert die Trophäensammlung.
@@ -389,7 +389,7 @@ lblVanguardDesc=Jeder Spieler hat eine eigene spielbeeinflussende \"Avatar\"-Kar
 lblCommander=Commander
 lblCommanderDesc=Jeder Spieler hat eine legendäre \"General\"-Karte, welche (fast) jederzeit gespielt werden kann und die Farben des Decks bestimmt.
 lblOathbreaker=Eidbrecher
-lblOathbreakerDesc=Jeder Spieler hat eine Planeswalker-Karte als "Eidbrecher", die jederzeit gewirkt werden kann und die Deckfarben festlegt. Jeder Spieler hat auch einen Signaturzauber, der gewirkt werden kann, wenn sein Eidbrecher auf dem Schlachtfeld ist.
+lblOathbreakerDesc=Jeder Spieler hat eine Plainswalker-Karte als seinen "Eidbrecher", welche jederzeit gespielt werdeb kann und die Farben des Decks festlegt. Jeder Spieler hat außerdem noch einnen "Signatur"-Spruch, welcher gespielt werden kann, solange der Eidbrecher im Spiel ist.
 lblTinyLeaders=Kleine Anführer
 lblTinyLeadersDesc=Jeder Spieler hat eine legendäre \"General\"-Karte, welche (fast) jederzeit gespielt werden kann und die Farben des Decks bestimmt. Alle Karten haben umgewandelte Manakosten von max. 3.
 lblBrawl=Brawl
@@ -523,12 +523,12 @@ lblQuestDesc2=Erstelle und verbessere dein Deck mit Karten aus deiner wachsenden
 lblQuestDesc3=Dann wechsle zu Duellen und Herausforderungen um durch Kämpfe weitere Karten zu erhalten.
 lblBuildaNewDeck=Erstelle ein neues Deck
 #Decktype.java
-lblCustomUserDecks=Benutzererzeugte Decks
+lblCustomUserDecks=Selbsterstelles Decks
 lblConstructedDecks=Konstruierte Decks
 lblCommanderDecks=Commander Decks
 lblRandomCommanderDecks=Zufälliges Commander Deck
 lblRandomCommanderCard-basedDecks=Zufälliges Commander Deck (kartenbasiert)
-lblOathbreakerDecks=Eidbrecher-Decks
+lblOathbreakerDecks=Oathbreaker-Decks
 lblTinyLeadersDecks=Kleine-Anführer-Decks
 lblBrawlDecks=Brawl Decks
 lblSchemeDecks=Komplott-Decks
@@ -785,8 +785,8 @@ lblfromdeck=vom Deck
 lbltosideboard=zum Sideboard
 lblfromsideboard=vom Sideboard
 lblascommander=als Kommandeur
-lblasoathbreaker=als Eidbrecher
-lblassignaturespell=als Signaturzauber
+lblasoathbreaker=als "Eidbrecher"
+lblassignaturespell=als "Signatur"-Spruch
 lblasavatar=als Avatar
 lblfromschemedeck=vom Komplottdeck
 lblfromplanardeck=vom Weltendeck
@@ -796,7 +796,7 @@ lbltoplanardeck=zum Weltendeck
 lbltoconspiracydeck=zum Verschwörungsdeck
 lblMove=Verschieben
 #VDock.java
-lblDock=Symbolleiste
+lblDock=Anhängen
 lblViewDeckList=Zeige Deckliste
 lblRevertLayout=Layout zurücksetzen
 lblOpenLayout=Lade Layout
@@ -849,8 +849,8 @@ ttbtnRandDeck5=Erzeugt konstuiertes Deck in fünf Farben
 lblCurrentDeck2=aktuelles Deck
 lblUntitled=Unbenannt
 #VPrompt.java
-lblPrompt=Meldungen
-lblGameSetup=Spielvorbereitung
+lblPrompt=Abfrage
+lblGameSetup=Spielaufbau
 #ColumnDef.java
 lblAIStatus=KI-Status
 lblCMC=UMK
@@ -885,88 +885,92 @@ ttToughness=Widerstand
 ttType=Typ
 #HomeScreen.java
 lblNewGame=Neues Spiel
-lblLoadGame=Spiel laden
-lblPlayOnline=Online spielen
-lblSettings=Spieleinstellungen
+lblLoadGame=Lade Spiel
+lblPlayOnline=Spiele im Netz
+lblSettings=Einstellungen
 #SettingsPage.java
-lblAutomaticBugReports=Automatic Bug Reports
-lblBattlefieldTextureFiltering=Battlefield Texture Filtering
-lblCompactListItems=Compact List Items
-lblCompactTabs=Compact Tabs
-lblCardOverlays=Card Overlays
-lblDisableCardEffect=Disable Card 'Effect' Images
-lblDynamicBackgroundPlanechase=Dynamic Background Planechase
-lblGameplayOptions=Gameplay Options
-lblGeneralSettings=General Settings
-lblHotSeatMode=Hot Seat Mode
-lblLandscapeMode=Landscape Mode
-lblLater=Later
-lblMinimizeScreenLock=Minimize on Screen Lock
-lblOrderGraveyard=Order Graveyard
-lblRestartForge=Restart Forge
-lblRestartForgeDescription=You must restart Forge for this change to take effect.
-lblRotateZoomPlanesPhenomena=Rotate Zoom Image of Planes/Phenomena
-lblRotateZoomSplit=Rotate Zoom Image of Split Cards
-lblShowCardIDOverlays=Show Card ID Overlays
-lblShowCardManaCostOverlays=Show Card Mana Cost Overlays
-lblShowCardNameOverlays=Show Card Name Overlays
-lblShowCardOverlays=Show Card Overlays
-lblShowCardPTOverlays=Show Card P/T Overlays
-lblShowMatchBackground=Show Match Background
-lblVibrateAfterLongPress=Vibrate After Long Press
-lblVibrateWhenLosingLife=Vibrate When Losing Life
-lblVibrationOptions=Vibration Options
-nlAutomaticBugReports=Automatically send bug reports to the developers, without prompting.
-nlBattlefieldTextureFiltering=Filter card art on battlefield to make it less pixelated on large screens (restart required, may reduce performance).
-nlCompactListItems=Show only a single line of text for cards and decks on all list views by default.
-nlCompactTabs=Show smaller tabs on the top of tab page screens (such as this screen).
-nlDisableCardEffect=Disable the zoomed image for the 'Effect' cards.
-nlDynamicBackgroundPlanechase=Use current plane images as background (Planes Card images must be on the cache/pics/planechase folder).
-nlHotSeatMode=When starting a game with 2 human players, use single prompt to control both players.
-nlLandscapeMode=Use landscape (horizontal) orientation for app instead of portrait (vertical).
-nlMinimizeScreenLock=Minimize Forge when screen is locked (enable if you experience graphic glitches after locking your screen).
-nlOrderGraveyard=Determines when to allow to order cards going to graveyard (never/always/only with relevant cards).
-nlRotateZoomPlanesPhenomena=Rotates the zoomed image of Plane or Phenomenon cards.
-nlRotateZoomSplit=Rotates the zoomed image of split cards.
-nlShowCardIDOverlays=Show id overlays for cards, otherwise they're hidden.
-nlShowCardManaCostOverlays=Show mana cost overlays for cards, otherwise they're hidden.
-nlShowCardNameOverlays=Show name overlays for cards, otherwise they're hidden.
-nlShowCardOverlays=Show name, mana cost, p/t, and id overlays for cards, otherwise they're hidden.
-nlShowCardPTOverlays=Show power/toughness/loyalty overlays for cards, otherwise they're hidden.
-nlShowMatchBackground=Show match background image on battlefield, otherwise background texture shown instead.
-nlTheme=Sets the theme that determines how display components are skinned.
-nlVibrateAfterLongPress=Enable quick vibration to signify a long press, such as for card zooming.
-nlVibrateWhenLosingLife=Enable vibration when your player loses life or takes damage during a game.
+lblAutomaticBugReports=Automatischer Fehlerbericht
+lblBattlefieldTextureFiltering=Texturenfilter Spielfeld
+lblCompactListItems=kompakte Liste
+lblCompactTabs=kompakte Tabs
+lblCardOverlays=Karten-Overlays
+lblDisableCardEffect=Karten-"Effekt"-Anzeige abschalten
+lblDynamicBackgroundPlanechase=Weltenjagd dynamischer Hintergrund
+lblGameplayOptions=Spiel-Optionen
+lblGeneralSettings=allgem. Einstellungen
+lblHotSeatMode=Hot-Seat-Modus
+lblLandscapeMode=Querformat
+lblLater=Später
+lblMinimizeScreenLock=Minimiere bei Bildschirmsperre
+lblOrderGraveyard=Friedhof-Reihenfolge
+lblRestartForge=Neustart
+lblRestartForgeDescription=Um die Änderung zu übernehmen mußt du Forge neu starten.
+lblRotateZoomPlanesPhenomena=Drehe die Bilder von Welten und Phänomenen
+lblRotateZoomSplit=Drehe vergößerte Bilder von geteilten Karten
+lblShowCardIDOverlays=Blende die ID der Karten ein
+lblShowCardManaCostOverlays=Blende die Manakosten der Karten ein
+lblShowCardNameOverlays=Blende den Namen der Karten ein
+lblShowCardOverlays=Zeige Karten-Einblendungen an
+lblShowCardPTOverlays=Blende Stärke und Widerstand ein
+lblShowMatchBackground=Zeige Duell hintergund an
+lblVibrateAfterLongPress=Vibieren nach langem Tastendruck
+lblVibrateWhenLosingLife=Vibrieren nach Lebenspunktverlust
+lblVibrationOptions=Vibrationsoptionen
+nlAutomaticBugReports=Sende automatisch einen Fehlerbericht, ohne Bestätigung.
+nlBattlefieldTextureFiltering=Nutze den Texturenfilter um Kartenbilder auf großen Anzeigen weniger grob wirken zu lassen (bedingt Neustart).
+nlCompactListItems=Zeige in allen Listen für jeder Karte und jedes Deck nur eine Zeile.
+nlCompactTabs=Nutz kompaktere Karteikartenreiter (Tabulatoren/Tabs).
+nlDisableCardEffect=Schaltet Effekt-Anzeigen für vergrößerte Karten ab.
+nlDynamicBackgroundPlanechase=Nutzt das Bild der aktuellen Weltenkarte als Hintergrund (Die Bilder müssen sich im Pfad cache/pics/planechase befinden).
+nlHotSeatMode=Bei Start eines Spiels mit zwei menschlichen Spielern nutzen beide die selben Steuerelemente!
+nlLandscapeMode=Nutze die horizontale Anzeige statt der vertikalen.
+nlMinimizeScreenLock=Minimiere Forge wenn der Sperrbildschirm aktiviert wird. Hilft manchmal bei Grafikproblemen in diesem Zusammenhang.
+nlOrderGraveyard=Entscheidet, wann auf die Reihenfolge, in welcher Karten auf den Friedhof wandern, geachtet wird. (Niemals, immer oder nur wenn bestimmte Karten es nötig machen.)
+nlRotateZoomPlanesPhenomena=Rotiert die vergrößerte Anzeige von Welten- und Phänomen-Karten.
+nlRotateZoomSplit=Rotiert die vergrößerte Anzeige von geteilten Karten.
+nlShowCardIDOverlays=Blendet die ID-Nummer über die Karten.
+nlShowCardManaCostOverlays=Blendet die Manakosten über die Karten.
+nlShowCardNameOverlays=Blendet die Namen über die Karten.
+nlShowCardOverlays=Aktiviert die Einblendungen übder den Karten.
+nlShowCardPTOverlays=Blendet die Stärke und Widerstand über die Karten.
+nlShowMatchBackground=Zeige Bilder im Spielfeldhintergrund.
+nlTheme=Wähle ein Thema um die Bildschirmanzeigen anzupassen.
+nlVibrateAfterLongPress=Aktiviert Vabration bei langen Druck, z.B. beim Zoomen.
+nlVibrateWhenLosingLife=Aktiviert eine Vibration bei jedem Lebenspunktverlust.
 #MatchScreen.java
-lblPlayers=Players
-lblLog=Log
-lblDev=Dev
-lblStack=Stack
-lblMustWaitPriority=Must wait for priority...
+lblPlayers=Spieler
+lblLog=Bericht
+lblDev=Entw.
+lblStack=Stapel
+lblMustWaitPriority=Warte auf Priorität...
 #FDeckEditor.java
-lblImportFromClipboard=Import from Clipboard
-lblSaveAs=Save As...
-lblNameNewCopyDeck=Enter name for new copy of deck
-lblRenameDeck=Rename Deck
-lblNewNameDeck=Enter new name for deck
-lblDeleteDeck=Delete Deck
-lblDelete=Delete
-lblConfirmDelete=Are you sure you want to delete
-lblNameNewDeck=Enter name for new deck
-lblSaveChangesCurrentDeck=Save changes to current deck?
-lblAddFavorites=Add to Favorites
-lblRemoveFavorites=Remove from Favorites
-lblChangePreferredArt=Change Preferred Art
-lblSelectPreferredArt=Select preferred art for
-lblTo=to
+lblImportFromClipboard=Aus Zwischenablage
+lblSaveAs=Speichern als...
+lblNameNewCopyDeck=Name für das neue Deck
+lblRenameDeck=Umbenennen
+lblNewNameDeck=Gib eine neuen Namen ein
+lblDeleteDeck=Deck löschen
+lblDelete=Löschen
+lblConfirmDelete=Willst du wirklich löschen
+lblNameNewDeck=Gib einen Namen ein
+lblSaveChangesCurrentDeck=Änderungen sichern?
+lblAddFavorites=Zu den Favoriten hinzufügen
+lblRemoveFavorites=Von den Favoriten entfernen
+lblChangePreferredArt=Setze bevorzugte Form
+lblSelectPreferredArt=Wähle bevorzugte Form für
+lblTo=zu
 lblAvatar=Avatar
-lblCards=Cards
-lblPlanes=Planes
-lblSchemes=Schemes
-lblToMainDeck=to Main Deck
-lblHowMany=how many?
-lblInventory=Inventory
-lblCollection=Collection
-lblCatalog=Catalog
-lblCommanders=Commanders
-lblOathbreakers=Oathbreakers
\ No newline at end of file
+lblCards=Karten
+lblPlanes=Welten
+lblSchemes=Verschwörungen
+lblToMainDeck=zum Haupt-Deck
+lblHowMany=wie viel?
+lblInventory=Inhaltsverzeichnis
+lblCollection=Sammlung
+lblCatalog=Katalog
+lblCommanders=Komandeure
+lblOathbreakers=Eidbrecher
+#Forge.java
+lblLoadingFonts=Loading fonts...
+lblLoadingCardTranslations=Loading card translations...
+lblFinishingStartup=Finishing startup...
\ No newline at end of file
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index f94a7edc84c..86f39905691 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -969,4 +969,8 @@ lblInventory=Inventory
 lblCollection=Collection
 lblCatalog=Catalog
 lblCommanders=Commanders
-lblOathbreakers=Oathbreakers
\ No newline at end of file
+lblOathbreakers=Oathbreakers
+#Forge.java
+lblLoadingFonts=Loading fonts...
+lblLoadingCardTranslations=Loading card translations...
+lblFinishingStartup=Finishing startup...
\ No newline at end of file
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 5e916608fcd..968fbf9fc48 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -969,4 +969,8 @@ lblInventory=Inventario
 lblCollection=Colección
 lblCatalog=Catálogo
 lblCommanders=Commanders
-lblOathbreakers=Oathbreakers
\ No newline at end of file
+lblOathbreakers=Oathbreakers
+#Forge.java
+lblLoadingFonts=Loading fonts...
+lblLoadingCardTranslations=Loading card translations...
+lblFinishingStartup=Finishing startup...
\ No newline at end of file
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index b23a8408ba6..a588789c5db 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -969,4 +969,8 @@ lblInventory=库存
 lblCollection=珍藏
 lblCatalog=目录
 lblCommanders=指挥官
-lblOathbreakers=破誓者
\ No newline at end of file
+lblOathbreakers=破誓者
+#Forge.java
+lblLoadingFonts=加载字体中
+lblLoadingCardTranslations=加载卡牌翻译中
+lblFinishingStartup=完成启动
\ No newline at end of file
diff --git a/forge-gui/res/tokenscripts/g_7_7_giant.txt b/forge-gui/res/tokenscripts/g_7_7_giant.txt
new file mode 100644
index 00000000000..ab0ad7d07b6
--- /dev/null
+++ b/forge-gui/res/tokenscripts/g_7_7_giant.txt
@@ -0,0 +1,6 @@
+Name:Giant
+Colors:green
+ManaCost:no cost
+PT:7/7
+Types:Creature Giant
+Oracle:
\ No newline at end of file
diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
index 67dd9217b04..2ccc98d7e08 100644
--- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
+++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
@@ -282,7 +282,7 @@ public class DeckgenUtil {
         }
         List<String> restrictedCardsAdded = new ArrayList<>();
         for (PaperCard c:selectedCards){
-            if (format.getRestrictedCards().contains(c.getName())&&!restrictedCardsAdded.contains(c)){
+            if (format.getRestrictedCards().contains(c.getName())&&!restrictedCardsAdded.contains(c.getName())){
                 playsetList.add(c);
                 restrictedCardsAdded.add(c.getName());
                 continue;
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index fa694747a27..c3504690564 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -21,6 +21,7 @@ import forge.deck.DeckSection;
 import forge.events.UiEventNextGameDecision;
 import forge.game.*;
 import forge.game.ability.AbilityFactory;
+import forge.game.ability.AbilityKey;
 import forge.game.ability.ApiType;
 import forge.game.ability.effects.CharmEffect;
 import forge.game.card.*;
@@ -631,15 +632,15 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
                     "CARDNAME", regtrig.getHostCard().getName()));
             buildQuestion.append(")");
         }
-        final Map<String, Object> tos = sa.getTriggeringObjects();
-        if (tos.containsKey("Attacker")) {
-            buildQuestion.append("\nAttacker: ").append(tos.get("Attacker"));
+        final Map<AbilityKey, Object> tos = sa.getTriggeringObjects();
+        if (tos.containsKey(AbilityKey.Attacker)) {
+            buildQuestion.append("\nAttacker: ").append(tos.get(AbilityKey.Attacker));
         }
-        if (tos.containsKey("Card")) {
-            final Card card = (Card) tos.get("Card");
+        if (tos.containsKey(AbilityKey.Card)) {
+            final Card card = (Card) tos.get(AbilityKey.Card);
             if (card != null && (card.getController() == player || game.getZoneOf(card) == null
                     || game.getZoneOf(card).getZoneType().isKnown())) {
-                buildQuestion.append("\nTriggered by: ").append(tos.get("Card"));
+                buildQuestion.append("\nTriggered by: ").append(tos.get(AbilityKey.Card));
             }
         }