diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index f0e5d11d0..dbf7f4469 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -185,6 +185,20 @@ type=Sorcery
 mana={2}{B}
 [/card]
 [card]
+text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Aven Fisher is put into a graveyard from play, you may draw a card.
+abilities=flying
+auto=@movedTo(this|graveyard):draw:1
+id=130985
+name=Aven Fisher
+rarity=C
+color=Blue
+type=Creature
+mana={3}{U}
+power=2
+subtype=Bird Soldier
+toughness=2
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {T}: Add {R} or {W} to your mana pool. Battlefield Forge deals 1 damage to you.
 id=129479
 auto={T}:Add {1}
@@ -318,6 +332,19 @@ subtype=Wraith
 toughness=3
 [/card]
 [card]
+text=When Bogardan Firefiend is put into a graveyard from play, it deals 2 damage to target creature.
+auto=@movedTo(this|graveyard):damage:2 target(creature)
+id=130534
+name=Bogardan Firefiend
+rarity=C
+color=Red
+type=Creature
+mana={2}{R}
+power=2
+subtype=Elemental Spirit
+toughness=1
+[/card]
+[card]
 text=Return target permanent to its owner's hand.
 target=*
 auto=moveTo(ownerHand)
@@ -388,6 +415,21 @@ subtype=Spider
 toughness=3
 [/card]
 [card]
+text={1}, {T}, Sacrifice Chromatic Star: Add one mana of any color to your mana pool.     When Chromatic Star is put into a graveyard from play, draw a card.
+auto={1}{T}{S}:Add{B}
+auto={1}{T}{S}:Add{U}
+auto={1}{T}{S}:Add{G}
+auto={1}{T}{S}:Add{R}
+auto={1}{T}{S}:Add{W}
+auto=@movedTo(this|graveyard):draw:1
+id=135279
+name=Chromatic Star
+rarity=U
+color=Artifact
+type=Artifact
+mana={1}
+[/card]
+[card]
 text=As Clone comes into play, you may choose a creature in play. If you do, Clone comes into play as a copy of that creature.
 auto=may copy target(creature)
 id=129501
@@ -801,6 +843,19 @@ subtype=Human Archer
 toughness=2
 [/card]
 [card]
+text=When Festering Goblin is put into a graveyard from play, target creature gets -1/-1 until end of turn.
+auto=@movedTo(this|graveyard):-1/-1 target(creature)
+id=129546
+name=Festering Goblin
+rarity=C
+color=Black
+type=Creature
+mana={B}
+power=1
+subtype=Zombie Goblin
+toughness=1
+[/card]
+[card]
 text=Other Soldier creatures get +1/+1 and have first strike. (They deal combat damage before creatures without first strike.)
 id=135258
 auto=lord(soldier) 1/1 other
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index 39a6c77b2..85d996c73 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -81,18 +81,6 @@ subtype=Bird Soldier
 toughness=2
 [/card]
 [card]
-text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Aven Fisher is put into a graveyard from play, you may draw a card.
-id=130985
-name=Aven Fisher
-rarity=C
-color=Blue
-type=Creature
-mana={3}{U}
-power=2
-subtype=Bird Soldier
-toughness=2
-[/card]
-[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  {1}{U}: Target player reveals the top card of his or her library.
 id=129473
 name=Aven Windreader
@@ -126,18 +114,6 @@ type=Instant
 mana={W}
 [/card]
 [card]
-text=When Bogardan Firefiend is put into a graveyard from play, it deals 2 damage to target creature.
-id=130534
-name=Bogardan Firefiend
-rarity=C
-color=Red
-type=Creature
-mana={2}{R}
-power=2
-subtype=Elemental Spirit
-toughness=1
-[/card]
-[card]
 text=Whenever Cephalid Constable deals combat damage to a player, return up to that many target permanents that player controls to their owners' hands.
 id=135261
 name=Cephalid Constable
@@ -171,15 +147,6 @@ subtype=Human Rebel
 toughness=2
 [/card]
 [card]
-text={1}, {T}, Sacrifice Chromatic Star: Add one mana of any color to your mana pool.     When Chromatic Star is put into a graveyard from play, draw a card.
-id=135279
-name=Chromatic Star
-rarity=U
-color=Artifact
-type=Artifact
-mana={1}
-[/card]
-[card]
 text={X}, {T}: Search your library for a creature card with converted mana cost X or less, reveal it, and put it into your hand. Then shuffle your library.
 id=135244
 name=Citanul Flute
@@ -325,18 +292,6 @@ color=Land
 type=Land
 [/card]
 [card]
-text=When Festering Goblin is put into a graveyard from play, target creature gets -1/-1 until end of turn.
-id=129546
-name=Festering Goblin
-rarity=C
-color=Black
-type=Creature
-mana={B}
-power=1
-subtype=Zombie Goblin
-toughness=1
-[/card]
-[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Fog Elemental attacks or blocks, sacrifice it at end of combat.
 id=132073
 name=Fog Elemental
diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index b22d04e2c..4169fd6b2 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -390,6 +390,18 @@ subtype=Dragon
 toughness=8
 [/card]
 [card]
+text=Whenever another creature is put into a graveyard from play, you may have Hissing Iguanar deal 1 damage to target player.
+auto=@movedTo(this|graveyard):damage:1 target(player)
+id=174873
+name=Hissing Iguanar
+rarity=C
+type=Creature
+mana={2}{R}
+power=3
+subtype=Lizard
+toughness=1
+[/card]
+[card]
 text=
 id=174806
 name=Incurable Ogre
@@ -897,6 +909,18 @@ subtype=Bird Skeleton
 toughness=2
 [/card]
 [card]
+text=When Sprouting Thrinax is put into a graveyard from play, put three 1/1 green Saproling creature tokens into play.
+auto=@movedTo(this|graveyard):token(Saproling,creature saproling, 1/1,green)*3
+id=174863
+name=Sprouting Thrinax
+rarity=U
+type=Creature
+mana={B}{R}{G}
+power=3
+subtype=Lizard
+toughness=3
+[/card]
+[card]
 text=Steelclad Serpent can't attack unless you control another artifact.
 abilities=cantattack
 auto=aslongas(artifact|myinplay) other -cantattack
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index 55ae99cfc..e088b5821 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -597,17 +597,6 @@ type=Instant
 mana={W}{U}
 [/card]
 [card]
-text=Whenever another creature is put into a graveyard from play, you may have Hissing Iguanar deal 1 damage to target player.
-id=174873
-name=Hissing Iguanar
-rarity=C
-type=Creature
-mana={2}{R}
-power=3
-subtype=Lizard
-toughness=1
-[/card]
-[card]
 text={T}, Remove two cards in your graveyard from the game: Draw a card.     If damage would be dealt to you, prevent that damage. Remove a card in your graveyard from the game for each 1 damage prevented this way.     When there are no cards in your graveyard, you lose the game.
 id=175125
 name=Immortal Coil
@@ -615,7 +604,6 @@ rarity=R
 type=Artifact
 mana={2}{B}{B}
 [/card]
-
 [card]
 text=Count the number of cards in your library. Your life total becomes that number.
 id=175039
@@ -1055,7 +1043,6 @@ power=6
 subtype=Beast
 toughness=4
 [/card]
-
 [card]
 text=First strike     Whenever another creature is put into a graveyard from play, you may put a +1/+1 counter on Rockslide Elemental.
 id=174988
@@ -1275,18 +1262,6 @@ power=1
 subtype=Vedalken Wizard
 toughness=1
 [/card]
-[card]
-text=When Sprouting Thrinax is put into a graveyard from play, put three 1/1 green Saproling creature tokens into play.
-id=174863
-name=Sprouting Thrinax
-rarity=U
-type=Creature
-mana={B}{R}{G}
-power=3
-subtype=Lizard
-toughness=3
-[/card]
-
 [card]
 text=Flying, vigilance     Players can't untap more than one creature during their untap steps.
 id=175396
@@ -1439,7 +1414,6 @@ power=4
 subtype=Vampire
 toughness=4
 [/card]
-
 [card]
 text=Whenever a creature is put into a graveyard from play, you may have Vicious Shadows deal damage to target player equal to the number of cards in that player's hand.
 id=175048
diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 261794107..0183dc8a9 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -75,6 +75,19 @@ type=Instant
 mana={1}{W}
 [/card]
 [card]
+text=Trample     When Child of Alara is put into a graveyard from play, destroy all nonland permanents. They can't be regenerated.
+id=180516
+name=Child of Alara
+rarity=M
+type=Creature
+abilities=trample,legendary
+auto=@movedTo(this|graveyard):bury all(*[-land]|inplay)
+mana={W}{U}{B}{R}{G}
+power=6
+subtype=Avatar
+toughness=6
+[/card]
+[card]
 text=Cliffrunner Behemoth has haste as long as you control a red permanent.     Cliffrunner Behemoth has lifelink as long as you control a white permanent.
 auto=aslongas(*[red]|myinplay) haste
 auto=aslongas(*[white]|myinplay) lifelink
@@ -561,6 +574,18 @@ subtype=Elemental Shapeshifter
 toughness=4
 [/card]
 [card]
+text=When Tukatongue Thallid is put into a graveyard from play, put a 1/1 green Saproling creature token into play.
+auto=@movedTo(this|graveyard):token(Saproling,creature Saproling,1/1,green)
+id=184995
+name=Tukatongue Thallid
+rarity=C
+type=Creature
+mana={G}
+power=1
+subtype=Fungus
+toughness=1
+[/card]
+[card]
 text=Return target creature to its owner's hand.
 target=creature
 auto=moveTo(ownerhand)
diff --git a/projects/mtg/bin/Res/sets/CFX/todo.dat b/projects/mtg/bin/Res/sets/CFX/todo.dat
index d5ee34468..bf5b17247 100644
--- a/projects/mtg/bin/Res/sets/CFX/todo.dat
+++ b/projects/mtg/bin/Res/sets/CFX/todo.dat
@@ -110,18 +110,6 @@ power=6
 subtype=Wurm
 toughness=6
 [/card]
-[card]
-text=Trample     When Child of Alara is put into a graveyard from play, destroy all nonland permanents. They can't be regenerated.
-id=180516
-name=Child of Alara
-rarity=M
-type=Legendary Creature
-mana={W}{U}{B}{R}{G}
-power=6
-subtype=Avatar
-toughness=6
-[/card]
-
 [card]
 text=Search your library for a white card, a blue card, a black card, a red card, and a green card. Reveal those cards and put them into your hand. Then shuffle your library.
 id=179437
@@ -807,24 +795,12 @@ type=Instant
 mana={3}{U}{U}
 [/card]
 [card]
-text=When Tukatongue Thallid is put into a graveyard from play, put a 1/1 green Saproling creature token into play.
-id=184995
-name=Tukatongue Thallid
-rarity=C
-type=Creature
-mana={G}
-power=1
-subtype=Fungus
-toughness=1
-[/card]
-[card]
 text={T}: Add {1} to your mana pool.     {T}: Target land you control becomes the basic land type of your choice until end of turn.
 id=189078
 name=Unstable Frontier
 rarity=U
 type=Land
 [/card]
-
 [card]
 text={1}: Regenerate target creature with power 5 or greater.
 id=180344
diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index 6454dddd0..39ff30170 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -10,6 +10,20 @@ power=3
 subtype=Scarecrow
 toughness=3
 [/card]
+[card]
+text=Flying. When Archon of Justice is put into a graveyard from play, remove target permanent from the game.
+abilities=flying
+auto=@movedTo(this|graveyard):moveTo(removedfromgame) target(*|inplay)
+id=146006
+name=Archon of Justice
+rarity=R
+type=Creature
+mana={3}{W}{W}
+power=4
+subtype=Archon
+toughness=4
+[/card]
+[card]
 text=Remove target card in a graveyard from the game. Put a 1/1 white and black Spirit creature token with flying into play.
 target=*|graveyard
 auto=moveTo(removedfromgame)
@@ -146,6 +160,19 @@ rarity=R
 type=Land
 [/card]
 [card]
+text=Flying     {U}, Sacrifice Glen Elendra Archmage: Counter target noncreature spell.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+abilities=flying,persist
+id=157977
+auto={U}{S}:fizzle(*[-creature]|stack)
+name=Glen Elendra Archmage
+rarity=R
+type=Creature
+mana={3}{U}
+power=2
+subtype=Faerie Wizard
+toughness=2
+[/card]
+[card]
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.)
 abilities=wither
 id=152089
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index a29244ef3..8135594a2 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -21,18 +21,6 @@ subtype=Golem
 toughness=*
 [/card]
 [card]
-text=Flying     When Archon of Justice is put into a graveyard from play, remove target permanent from the game.
-abilities=flying
-id=146006
-name=Archon of Justice
-rarity=R
-type=Creature
-mana={3}{W}{W}
-power=4
-subtype=Archon
-toughness=4
-[/card]
-[card]
 text=Whenever Ashling, the Extinguisher deals combat damage to a player, choose target creature that player controls. He or she sacrifices that creature.
 id=151137
 name=Ashling, the Extinguisher
@@ -512,19 +500,6 @@ type=Instant
 mana={1}{U}
 [/card]
 [card]
-text=Flying     {U}, Sacrifice Glen Elendra Archmage: Counter target noncreature spell.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
-abilities=flying,persist
-id=157977
-auto={U}{S}:fizzle(*[-creature]|stack)
-name=Glen Elendra Archmage
-rarity=R
-type=Creature
-mana={3}{U}
-power=2
-subtype=Faerie Wizard
-toughness=2
-[/card]
-[card]
 text={GU}, Sacrifice Grazing Kelpie: Put target card in a graveyard on the bottom of its owner's library.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 id=153428
 name=Grazing Kelpie