diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index ccfd17a68..5afd3803e 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -89,7 +89,32 @@ mana={1}{B}{R}
 type=Sorcery
 [/card]
 [card]
-text=Flying     When Broodmate Dragon enters the battlefield, put a 4/4 red Dragon creature token with flying onto the battlefield.
+text=Sacrifice Bloodpyre Elemental: Bloodpyre Elemental deals 4 damage to target creature. Play this ability only any time you could play a sorcery.
+id=175117
+name=Bloodpyre Elemental
+rarity=C
+mana={4}{R}
+type=Creature
+subtype=Elemental
+auto={S}:damage:4 target(creature) asSorcery
+power=4
+toughness=1
+[/card]
+[card]
+text=Haste   {T}: Target creature with power 5 or greater gains haste until end of turn.
+id=174821
+name=Bloodthorn Taunter
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Human Scout
+auto={T}:haste target(creature[power>=5])
+power=1
+toughness=1
+abilities=haste
+[/card]
+[card]
+text=Flying   When Broodmate Dragon enters the battlefield, put a 4/4 red Dragon creature token with flying onto the battlefield.
 id=178101
 name=Broodmate Dragon
 rarity=R
@@ -327,6 +352,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=At the end of your turn, if you control a creature with power 5 or greater, you may draw a card.   {T}: Add {1} to your mana pool.
+auto=@each my end:aslongas(creature[power>=5]|myBattlefield) may draw:1
+id=174943
+name=Drumhunter
+rarity=U
+mana={3}{G}
+type=Creature
+subtype=Human Druid Warrior
+auto={T}:Add{1}
+power=2
+toughness=2
+[/card]
+[card]
 text=When Elvish Visionary enters the battlefield, draw a card.
 auto=draw:1
 id=175124
@@ -377,6 +415,19 @@ mana={B}
 type=Artifact
 [/card]
 [card]
+text=At the end of your turn, if you control a creature with power 5 or greater, you may have Exuberant Firestoker deal 2 damage to target player.     {T}: Add {1} to your mana pool.
+auto=@each my end:aslongas(creature[power>=5]|myBattlefield) may damage:2 target(player)
+id=175049
+name=Exuberant Firestoker
+rarity=U
+mana={2}{R}
+type=Creature
+subtype=Human Druid Shaman
+auto={T}:Add{1}
+power=1
+toughness=1
+[/card]
+[card]
 text={2}{U}: Untap target artifact.
 auto={2}{U}:untap target(artifact)
 id=174888
@@ -506,6 +557,18 @@ toughness=4
 abilities=defender,exalted
 [/card]
 [card]
+text=Flying   Sacrifice Gustrider Exuberant: Creatures you control with power 5 or greater gain flying until end of turn.
+id=174805
+name=Gustrider Exuberant
+rarity=C
+mana={2}{W}
+type=Creature
+subtype=Human Wizard
+auto={S}:lord(creature[power>=5]|myBattlefield) flying ueot
+power=1
+toughness=2
+[/card]
+[card]
 text=Choose one - Remove target player's graveyard from the game; or Jund Charm deals 2 damage to each creature; or put two +1/+1 counters on target creature.
 id=137900
 name=Jund Charm
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index f78aec7ec..03caa3e3d 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -24,7 +24,6 @@ mana={2}{R}{W}
 subtype=Ajani
 toughness=3
 [/card]
-
 [card]
 text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)  Whenever a creature you control attacks alone, you may tap target creature.
 id=174826
@@ -44,7 +43,6 @@ power=1
 subtype=Human Cleric
 toughness=1
 [/card]
-
 [card]
 text=Flying, trample     At the beginning of your upkeep, sacrifice a non-Zombie creature, then put a 2/2 black Zombie creature token into play.
 id=174847
@@ -113,29 +111,6 @@ subtype=Human Wizard
 toughness=1
 [/card]
 [card]
-text=Sacrifice Bloodpyre Elemental: Bloodpyre Elemental deals 4 damage to target creature. Play this ability only any time you could play a sorcery.
-id=175117
-auto={S}:damage:4 target(creature)
-name=Bloodpyre Elemental
-rarity=C
-type=Creature
-mana={4}{R}
-power=4
-subtype=Elemental
-toughness=1
-[/card]
-[card]
-text=Haste     {T}: Target creature with power 5 or greater gains haste until end of turn.
-id=174821
-name=Bloodthorn Taunter
-rarity=C
-type=Creature
-mana={1}{R}
-power=1
-subtype=Human Scout
-toughness=1
-[/card]
-[card]
 text=As an additional cost to play Bone Splinters, sacrifice a creature.     Destroy target creature.
 target=creature
 auto=destroy
@@ -242,8 +217,6 @@ power=2
 subtype=Human Wizard
 toughness=2
 [/card]
-
-
 [card]
 text={2}{B}, {T}, Sacrifice a blue creature, a black creature, and a red creature: Search your library for a card named Prince of Thralls and put it into play. Then shuffle your library.
 id=175243
@@ -278,17 +251,6 @@ subtype=Zombie
 toughness=1
 [/card]
 [card]
-text=At the end of your turn, if you control a creature with power 5 or greater, you may draw a card.     {T}: Add {1} to your mana pool.
-id=174943
-name=Drumhunter
-rarity=U
-type=Creature
-mana={3}{G}
-power=2
-subtype=Human Druid Warrior
-toughness=2
-[/card]
-[card]
 text=+1: Put a 1/1 white Soldier creature token into play.     +1: Target creature gets +3/+3 and gains flying until end of turn.     -8: For the rest of the game, artifacts, creatures, enchantments, and lands you control are indestructible.
 id=174859
 name=Elspeth, Knight-Errant
@@ -351,17 +313,6 @@ subtype=Human Cleric
 toughness=2
 [/card]
 [card]
-text=At the end of your turn, if you control a creature with power 5 or greater, you may have Exuberant Firestoker deal 2 damage to target player.     {T}: Add {1} to your mana pool.
-id=175049
-name=Exuberant Firestoker
-rarity=U
-type=Creature
-mana={2}{R}
-power=1
-subtype=Human Druid Shaman
-toughness=1
-[/card]
-[card]
 text={T}: You may tap or untap another target permanent.     Unearth {U} ({U}: Return this card from your graveyard to play. It gains haste. Remove it from the game at end of turn or if it would leave play. Unearth only as a sorcery.)
 id=176456
 name=Fatestitcher
@@ -433,7 +384,6 @@ rarity=C
 type=Sorcery
 mana={2}{G}
 [/card]
-
 [card]
 text={1}{W}, {T}: Prevent all damage that would be dealt to target creature with power 5 or greater this turn.
 id=174822
@@ -465,17 +415,6 @@ type=Instant
 mana={U}{B}{R}
 [/card]
 [card]
-text=Flying     Sacrifice Gustrider Exuberant: Creatures you control with power 5 or greater gain flying until end of turn.
-id=174805
-name=Gustrider Exuberant
-rarity=C
-type=Creature
-mana={2}{W}
-power=1
-subtype=Human Wizard
-toughness=2
-[/card]
-[card]
 text=Flying, haste     At end of turn, sacrifice Hell's Thunder.     Unearth {4}{R} ({4}{R}: Return this card from your graveyard to play. It gains haste. Remove it from the game at end of turn or if it would leave play. Unearth only as a sorcery.)
 id=176455
 name=Hell's Thunder
diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index 24f3d01b5..27ff29f90 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -118,6 +118,18 @@ power=3
 toughness=4
 [/card]
 [card]
+text=Whenever a creature with power 5 or greater enters the battlefield under your control, you may put a +1/+1 counter on Godtracker of Jund.
+auto=@movedTo(creature[power>=5]|myBattlefield):may counter(1/1)
+id=183994
+name=Godtracker of Jund
+rarity=C
+mana={1}{R}{G}
+type=Creature
+subtype=Elf Shaman
+power=2
+toughness=2
+[/card]
+[card]
 text=When you cycle Grixis Sojourners or it's put into a graveyard from the battlefield, you may exile target card in a graveyard.   Cycling {2}{B} ({2}{B}, Discard this card: Draw a card.)
 auto=@movedTo(this|graveyard) from(battlefield):may moveTo(exile) target(*|graveyard)
 autohand={2}{B}:cycling
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 680642cc7..8ae3b2789 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -359,17 +359,6 @@ text=Whenever you play a multicolored spell, Gloryscale Viashino gets +3/+3 unti
 rarity=U
 [/card]
 [card]
-id=183994
-name=Godtracker of Jund
-mana={1}{R}{G}
-type=Creature
-subtype=Elf Shaman
-power=2
-toughness=2
-text=Whenever a creature with power 5 or greater comes into play under your control, you may put a +1/+1 counter on Godtracker of Jund.
-rarity=C
-[/card]
-[card]
 id=179561
 name=Gorger Wurm
 mana={3}{R}{G}
@@ -391,7 +380,6 @@ toughness=1
 text=As long as you control another multicolored permanent, Grixis Grimblade gets +1/+1 and has deathtouch. (Whenever it deals damage to a creature, destroy that creature.)
 rarity=C
 [/card]
-
 [card]
 id=180624
 name=Knotvine Paladin
@@ -403,10 +391,6 @@ toughness=2
 text=Whenever Knotvine Paladin attacks, it gets +1/+1 until end of turn for each untapped creature you control.
 rarity=R
 [/card]
-
-
-
-
 [card]
 id=188973
 name=Jund Hackblade
@@ -418,8 +402,6 @@ toughness=1
 text=As long as you control another multicolored permanent, Jund Hackblade gets +1/+1 and has haste.
 rarity=C
 [/card]
-
-
 [card]
 id=179602
 name=Kathari Bomber
diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 45ec454aa..04bff0ded 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -66,6 +66,18 @@ toughness=*
 abilities=flying
 [/card]
 [card]
+text={1}: Target creature with power 5 or greater gains vigilance until end of turn.
+id=177931
+name=Beacon Behemoth
+rarity=C
+mana={3}{G}{G}
+type=Creature
+subtype=Beast
+auto={1}:vigilance target(creature[power>=5])
+power=5
+toughness=3
+[/card]
+[card]
 text=At the beginning of your upkeep, if you control a black permanent, you may put a +1/+1 counter on Bloodhall Ooze.   At the beginning of your upkeep, if you control a green permanent, you may put a +1/+1 counter on Bloodhall Ooze.
 auto=@each my upkeep:aslongas(*[black]|myBattlefield) may counter(1/1)
 auto=@each my upkeep:aslongas(*[green]|myBattlefield) may counter(1/1)
diff --git a/projects/mtg/bin/Res/sets/CFX/todo.dat b/projects/mtg/bin/Res/sets/CFX/todo.dat
index f8343d294..c13983b23 100644
--- a/projects/mtg/bin/Res/sets/CFX/todo.dat
+++ b/projects/mtg/bin/Res/sets/CFX/todo.dat
@@ -32,18 +32,6 @@ rarity=R
 type=Sorcery
 mana={X}{R}
 [/card]
-[card]
-text={1}: Target creature with power 5 or greater gains vigilance until end of turn.
-id=177931
-name=Beacon Behemoth
-rarity=C
-type=Creature
-mana={3}{G}{G}
-power=5
-subtype=Beast
-toughness=3
-[/card]
-
 [card]
 text=When Brackwater Elemental attacks or blocks, sacrifice it at end of turn.     Unearth {2}{U} ({2}{U}: Return this card from your graveyard to play. It gains haste. Remove it from the game at end of turn or if it would leave play. Unearth only as a sorcery.)
 id=180147
@@ -63,7 +51,6 @@ rarity=M
 type=Sorcery
 mana={3}{W}{U}{B}{R}{G}
 [/card]
-
 [card]
 text=Dark Temper deals 2 damage to target creature. If you control a black permanent, destroy the creature instead.
 id=185143
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 3da20cad1..734df75e0 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -815,6 +815,15 @@ type=Basic Land
 subtype=Island
 [/card]
 [card]
+text=Creatures with power 1 or less don't untap during their controllers' untap steps.
+auto=lord(creature[power<=1]) doesnotuntap
+id=23223
+name=Juntu Stakes
+rarity=R
+mana={2}
+type=Artifact
+[/card]
+[card]
 text=Kicker {4} (You may pay an additional {4} as you play this spell.)  Kavu Aggressor can't block.     If the kicker cost was paid, Kavu Aggressor comes into play with a +1/+1 counter on it.
 id=23063
 name=Kavu Aggressor
@@ -841,6 +850,16 @@ power=3
 toughness=3
 [/card]
 [card]
+text=Whenever a creature with power 4 or greater enters the battlefield, its controller draws a card.
+auto=@movedTo(creature[power>=4|myBattlefield):draw:1 controller
+auto=@movedTo(creature[power>=4|opponentBattlefield):draw:1 opponent
+id=23144
+name=Kavu Lair
+rarity=R
+mana={2}{G}
+type=Enchantment
+[/card]
+[card]
 text=Kavu creatures have trample.   Whenever another Kavu enters the battlefield, put a +1/+1 counter on Kavu Monarch.
 auto=lord(kavu) trample
 auto=@movedTo(other kavu|battlefield):counter(1/1)
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index 9da090509..5020f22aa 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -500,14 +500,6 @@ subtype=Leech
 toughness=5
 [/card]
 [card]
-text=Creatures with power 1 or less don't untap during their controllers' untap steps.
-id=23223
-name=Juntu Stakes
-rarity=R
-type=Artifact
-mana={2}
-[/card]
-[card]
 text=Kicker {2}{X} (You may pay an additional {2}{X} as you play this spell.)  Flying     When Kangee, Aerie Keeper comes into play, if the kicker cost was paid, put X feather counters on it.     Other Bird creatures get +1/+1 for each feather counter on Kangee, Aerie Keeper.
 id=23186
 name=Kangee, Aerie Keeper
@@ -530,14 +522,6 @@ subtype=Kavu
 toughness=4
 [/card]
 [card]
-text=Whenever a creature with power 4 or greater comes into play, its controller draws a card.
-id=23144
-name=Kavu Lair
-rarity=R
-type=Enchantment
-mana={2}{G}
-[/card]
-[card]
 text=Remove target creature you control from the game. Return that card to play under its owner's control at end of turn.
 id=22953
 name=Liberate
diff --git a/projects/mtg/bin/Res/sets/MRQ/_cards.dat b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
index 6de8b88aa..7337442c4 100644
--- a/projects/mtg/bin/Res/sets/MRQ/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
@@ -248,6 +248,15 @@ mana={U}{U}
 type=Instant
 [/card]
 [card]
+text=Nonwhite creatures with power 3 or greater don't untap during their controllers' untap steps.
+auto=lord(creature[power>=3;-white]) doesnotuntap
+id=19664
+name=Crackdown
+rarity=R
+mana={2}{W}
+type=Enchantment
+[/card]
+[card]
 text=Defender (This creature can't attack.)   {T}: Target creature gets +0/+4 until end of turn.
 id=19880
 name=Crenellated Wall
diff --git a/projects/mtg/bin/Res/sets/MRQ/todo.dat b/projects/mtg/bin/Res/sets/MRQ/todo.dat
index 09c320cce..9f0525244 100644
--- a/projects/mtg/bin/Res/sets/MRQ/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/todo.dat
@@ -423,14 +423,6 @@ type=Enchantment
 mana={3}{U}{U}
 [/card]
 [card]
-text=Nonwhite creatures with power 3 or greater don't untap during their controllers' untap steps.
-id=19664
-name=Crackdown
-rarity=R
-type=Enchantment
-mana={2}{W}
-[/card]
-[card]
 text=Whenever a source deals damage to Crag Saurian, that source's controller gains control of Crag Saurian.
 id=19713
 name=Crag Saurian
diff --git a/projects/mtg/bin/Res/sets/PTK/_cards.dat b/projects/mtg/bin/Res/sets/PTK/_cards.dat
index 80e2d5879..7fc6c3288 100644
--- a/projects/mtg/bin/Res/sets/PTK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PTK/_cards.dat
@@ -306,6 +306,18 @@ power=2
 toughness=3
 [/card]
 [card]
+text=When Imperial Recruiter enters the battlefield, search your library for a creature card with power 2 or less, reveal it, and put it into your hand. Then shuffle your library.
+auto=may moveTo(myhand) target(creature[power<=2]|mylibrary)
+id=10539
+name=Imperial Recruiter
+rarity=U
+mana={2}{R}
+type=Creature
+subtype=Human Advisor
+power=1
+toughness=1
+[/card]
+[card]
 id=10541
 name=Independent Troops
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/PTK/todo.dat b/projects/mtg/bin/Res/sets/PTK/todo.dat
index 2b666160b..0baf2b9a6 100644
--- a/projects/mtg/bin/Res/sets/PTK/todo.dat
+++ b/projects/mtg/bin/Res/sets/PTK/todo.dat
@@ -199,17 +199,6 @@ text=Target opponent chooses a creature he or she controls. Destroy it.
 rarity=C
 [/card]
 [card]
-id=10539
-name=Imperial Recruiter
-mana={2}{R}
-type=Creature
-subtype=Human Advisor
-power=1
-toughness=1
-text=When Imperial Recruiter enters the battlefield, search your library for a creature card with power 2 or less, reveal it, and put it into your hand. Then shuffle your library.
-rarity=U
-[/card]
-[card]
 id=10728
 name=Imperial Seal
 mana={B}
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index 81911dbe7..ca95b96c8 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -817,6 +817,18 @@ power=4
 toughness=4
 [/card]
 [card]
+text={T}: Destroy target creature with power 4 or greater.
+id=5678
+name=Intrepid Hero
+rarity=R
+mana={2}{W}
+type=Creature
+subtype=Human Soldier
+auto=destroy target(creature[power>=4])
+power=1
+toughness=1
+[/card]
+[card]
 text={T}: Add {U} to your mana pool.
 auto={T}:add {U}
 id=8326
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index 061705ba4..15dc1bd73 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -710,17 +710,6 @@ type=Sorcery
 mana={2}{B}{B}
 [/card]
 [card]
-text={T}: Destroy target creature with power 4 or greater.
-id=5678
-name=Intrepid Hero
-rarity=R
-type=Creature
-mana={2}{W}
-power=1
-subtype=Human Soldier
-toughness=1
-[/card]
-[card]
 text=Jagged Lightning deals 3 damage to target creature and 3 damage to another target creature.
 id=5658
 name=Jagged Lightning
diff --git a/projects/mtg/bin/Res/sets/VIS/_cards.dat b/projects/mtg/bin/Res/sets/VIS/_cards.dat
index df9c3b6ab..71c4ffc96 100644
--- a/projects/mtg/bin/Res/sets/VIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/VIS/_cards.dat
@@ -174,15 +174,26 @@ auto={T}:Add {1}
 auto={T}:1/1 target(griffin) && untap
 [/card]
 [card]
-id=3715
-name=Hope Charm
-mana={W}
+text=Choose one - Destroy target artifact creature; or attacking creatures get +1/+0 until end of turn; or target creature with power 2 or less is unblockable this turn.
+id=3689
+auto=may destroy target(creature[artifact])
+auto=may lord(creature[attacking]) 1/0
+auto=may unblockable target(creature[power<=2])
+name=Hearth Charm
+rarity=C
+mana={R}
 type=Instant
+[/card]
+[card]
 text=Choose one - Target creature gains first strike until end of turn; or target player gains 2 life; or destroy target Aura.
+id=3715
 auto=may first strike target(creature)
 auto=may life:2 target(player)
 auto=may destroy target(aura)
+name=Hope Charm
 rarity=C
+mana={W}
+type=Instant
 [/card]
 [card]
 text=Hulking Cyclops can't block.
diff --git a/projects/mtg/bin/Res/sets/VIS/todo.dat b/projects/mtg/bin/Res/sets/VIS/todo.dat
index 16f623dde..41f262660 100644
--- a/projects/mtg/bin/Res/sets/VIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/VIS/todo.dat
@@ -354,14 +354,6 @@ text=Flying {T}: If the top card of target player's graveyard is a creature card
 rarity=R
 [/card]
 [card]
-id=3689
-name=Hearth Charm
-mana={R}
-type=Instant
-text=Choose one - Destroy target artifact creature; or attacking creatures get +1/+0 until end of turn; or target creature with power 2 or less is unblockable this turn.
-rarity=C
-[/card]
-[card]
 id=3690
 name=Heat Wave
 mana={2}{R}