diff --git a/forge-gui/res/cardsfolder/c/corpse_dance.txt b/forge-gui/res/cardsfolder/c/corpse_dance.txt
index 76d2ea9a98c..80cf4925617 100644
--- a/forge-gui/res/cardsfolder/c/corpse_dance.txt
+++ b/forge-gui/res/cardsfolder/c/corpse_dance.txt
@@ -3,8 +3,9 @@ ManaCost:2 B
 Types:Instant
 K:Buyback 2
 A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.TopGraveyardCreature+YouCtrl | Hidden$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Return the top creature card of your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, exile CARDNAME. | Permanent$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigExile | RememberObjects$ Remembered | TriggerDescription$ CARDNAME - Exile it at the beginning of the next end step. | SubAbility$ DBCleanup | AILogic$ Always
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/corpse_dance.jpg
 Oracle:Buyback {2} (You may pay an additional {2} as you cast this spell. If you do, put this card into your hand as it resolves.)\nReturn the top creature card of your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/dark_maze.txt b/forge-gui/res/cardsfolder/d/dark_maze.txt
index 53d505c62e7..1252a394a18 100644
--- a/forge-gui/res/cardsfolder/d/dark_maze.txt
+++ b/forge-gui/res/cardsfolder/d/dark_maze.txt
@@ -3,8 +3,9 @@ ManaCost:4 U
 Types:Creature Wall
 PT:4/5
 K:Defender
-A:AB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME can attack as though it didn't have defender. | SubAbility$ DBPump | SpellDescription$ CARDNAME can attack this turn as though it didn't have defender. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, exile CARDNAME. | Permannt$ True
+A:AB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME can attack as though it didn't have defender. | SubAbility$ DelTrig | SpellDescription$ CARDNAME can attack this turn as though it didn't have defender. Exile it at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigExile | TriggerDescription$ Exile CARDNAME at the beginning of the next end step. | AILogic$ Always
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Exile
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dark_maze.jpg
 Oracle:Defender (This creature can't attack.)\n{0}: Dark Maze can attack this turn as though it didn't have defender.  Exile it at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/dawn_of_the_dead.txt b/forge-gui/res/cardsfolder/d/dawn_of_the_dead.txt
index 8e629c8df2a..774a18997e5 100644
--- a/forge-gui/res/cardsfolder/d/dawn_of_the_dead.txt
+++ b/forge-gui/res/cardsfolder/d/dawn_of_the_dead.txt
@@ -5,8 +5,9 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may return target creature card from your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Haste | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Targeted | KW$ HIDDEN At the beginning of the end step, exile CARDNAME. | Permanent$ True
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Haste | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigExile | RememberObjects$ Targeted | TriggerDescription$ Exile it at the beginning of the next end step. | AILogic$ Always
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dawn_of_the_dead.jpg
 Oracle:At the beginning of your upkeep, you lose 1 life.\nAt the beginning of your upkeep, you may return target creature card from your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/elemental_appeal.txt b/forge-gui/res/cardsfolder/e/elemental_appeal.txt
index 9da24a584e3..ae143f5130b 100644
--- a/forge-gui/res/cardsfolder/e/elemental_appeal.txt
+++ b/forge-gui/res/cardsfolder/e/elemental_appeal.txt
@@ -2,7 +2,11 @@ Name:Elemental Appeal
 ManaCost:R R R R
 Types:Sorcery
 K:Kicker 5
-A:SP$ Token | Cost$ R R R R | TokenAmount$ 1 | TokenImage$ R 7 1 Elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenPower$ 7 | TokenToughness$ 1 | TokenKeywords$ Haste<>Trample | TokenHiddenKeywords$ At the beginning of the end step, exile CARDNAME. | TokenOwner$ You | TokenAmount$ 1 | RememberTokens$ True | SubAbility$ KickerPump | SpellDescription$ Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. If CARDNAME was kicked, that creature gets +7/+0 until end of turn.
-SVar:KickerPump:DB$ Pump | Defined$ Remembered | NumAtt$ +7 | Condition$ Kicked | ConditionDescription$ If it was kicked,
+A:SP$ Token | Cost$ R R R R | TokenAmount$ 1 | TokenImage$ R 7 1 Elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenPower$ 7 | TokenToughness$ 1 | TokenKeywords$ Haste<>Trample | TokenSVars$ EOTExile | RememberTokens$ True | SubAbility$ DelTrig | TokenOwner$ You | TokenAmount$ 1 | SubAbility$ DelTrig | SpellDescription$ Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. If CARDNAME was kicked, that creature gets +7/+0 until end of turn.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigExile | RememberObjects$ Remembered | TriggerDescription$ Exile the token at the beginning of the next end step. | SubAbility$ KickerPump | AILogic$ Always
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
+SVar:KickerPump:DB$ Pump | Defined$ Remembered | NumAtt$ +7 | Condition$ Kicked | ConditionDescription$ If it was kicked, | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:EOTExile:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_appeal.jpg
 Oracle:Kicker {5} (You may pay an additional {5} as you cast this spell.)\nPut a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. If Elemental Appeal was kicked, that creature gets +7/+0 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/elemental_mastery.txt b/forge-gui/res/cardsfolder/e/elemental_mastery.txt
index e1ba99ff8b8..f7ef0d68b8f 100644
--- a/forge-gui/res/cardsfolder/e/elemental_mastery.txt
+++ b/forge-gui/res/cardsfolder/e/elemental_mastery.txt
@@ -3,8 +3,12 @@ ManaCost:3 R
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Token | AddSVar$ ElementalMasteryCount | Description$ Enchanted creature has "{T}: Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step."
-SVar:Token:AB$Token | Cost$ T | TokenAmount$ ElementalMasteryCount | TokenImage$ r 1 1 elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenKeywords$ Haste | TokenHiddenKeywords$ At the beginning of the end step, exile CARDNAME. | TokenPower$ 1 | TokenToughness$ 1 | References$ ElementalMasteryCount | SpellDescription$ Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Token | AddSVar$ ElementalMasteryCount & ElementalMasteryDelTrig & ElementalMasteryExile & ElementalMasteryCleanup | Description$ Enchanted creature has "{T}: Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step."
+SVar:Token:AB$ Token | Cost$ T | TokenAmount$ ElementalMasteryCount | TokenImage$ r 1 1 elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenKeywords$ Haste | RememberTokens$ True | SubAbility$ ElementalMasteryDelTrig | TokenPower$ 1 | TokenToughness$ 1 | References$ ElementalMasteryCount | SpellDescription$ Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step.
+SVar:ElementalMasteryDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ ElementalMasteryExile | RememberObjects$ Remembered | TriggerDescription$ Exile the token at the beginning of the next end step. | SubAbility$ ElementalMasteryCleanup | AILogic$ Always
+SVar:ElementalMasteryExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
+SVar:ElementalMasteryCleanup:DB$ Cleanup | ClearRemembered$ True
+#there is a bug if the creature has a remembered list
 SVar:ElementalMasteryCount:Count$CardPower
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_mastery.jpg
diff --git a/forge-gui/res/cardsfolder/f/feral_lightning.txt b/forge-gui/res/cardsfolder/f/feral_lightning.txt
index 8d9616e3f61..37f97a76444 100644
--- a/forge-gui/res/cardsfolder/f/feral_lightning.txt
+++ b/forge-gui/res/cardsfolder/f/feral_lightning.txt
@@ -1,7 +1,11 @@
 Name:Feral Lightning
 ManaCost:3 R R R
 Types:Sorcery
-A:SP$ Token | Cost$ 3 R R R | TokenAmount$ 3 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenHiddenKeywords$ At the beginning of the end step, exile CARDNAME. | SpellDescription$ Put three 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step.
+A:SP$ Token | Cost$ 3 R R R | TokenAmount$ 3 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenSVars$ FeralLightningEOT | RememberTokens$ True | SubAbility$ DelTrig | SpellDescription$ Put three 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigExile | RememberObjects$ Remembered | TriggerDescription$ Exile the token at the beginning of the next end step. | SubAbility$ DBCleanup | AILogic$ Always
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:FeralLightningEOT:SVar:EndOfTurnLeavePlay:True
 SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/sok/en-us/card84373.jpg
 Oracle:Put three 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/mimic_vat.txt b/forge-gui/res/cardsfolder/m/mimic_vat.txt
index 379ecd50cbf..b2eafc87d51 100644
--- a/forge-gui/res/cardsfolder/m/mimic_vat.txt
+++ b/forge-gui/res/cardsfolder/m/mimic_vat.txt
@@ -6,8 +6,9 @@ SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Graveyar
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | SubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | Cost$ 0 | Imprint$ True | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredCard | ChangeNum$ 1
 A:AB$ CopyPermanent | Cost$ 3 T | Defined$ Imprinted | SubAbility$ DBPump | SpellDescription$ Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | Cost$ 0 | Defined$ Clones | KW$ Haste | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Cost$ 0 | Defined$ Clones | KW$ HIDDEN At the beginning of the end step, exile CARDNAME. | Permanent$ True
+SVar:DBPump:DB$ Pump | Cost$ 0 | Defined$ Clones | KW$ Haste | Permanent$ True | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBExile | RememberObjects$ Clones | TriggerDescription$ Exile the token at the beginning of the next end step. | AILogic$ Always
+SVar:DBExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
 SVar:NonStackingEffect:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mimic_vat.jpg
diff --git a/forge-gui/res/cardsfolder/p/postmortem_lunge.txt b/forge-gui/res/cardsfolder/p/postmortem_lunge.txt
index b4fba21117f..c21aeae29ca 100644
--- a/forge-gui/res/cardsfolder/p/postmortem_lunge.txt
+++ b/forge-gui/res/cardsfolder/p/postmortem_lunge.txt
@@ -1,8 +1,9 @@
 Name:Postmortem Lunge
 ManaCost:X PB
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X PB | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPromp$ Choose target creature with CMC equal to X. | References$ X | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target creature card with converted mana cost X from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ Haste & HIDDEN At the beginning of the end step, exile CARDNAME. | Permanent$ True
+A:SP$ ChangeZone | Cost$ X PB | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPromp$ Choose target creature with CMC equal to X. | References$ X | SubAbility$ DelTrig | AILogic$ BeforeCombat | SpellDescription$ Return target creature card with converted mana cost X from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBExile | RememberObjects$ Targeted | TriggerDescription$ Exile the creature at the beginning of the next end step. | AILogic$ Always
+SVar:DBExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
 SVar:X:Targeted$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/postmortem_lunge.jpg