diff --git a/projects/mtg/bin/Res/sets/DIS/_cards.dat b/projects/mtg/bin/Res/sets/DIS/_cards.dat
index da945daf0..7f2a65a06 100644
--- a/projects/mtg/bin/Res/sets/DIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DIS/_cards.dat
@@ -47,6 +47,30 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=({T}: Add {B} or {R} to your mana pool.)   As Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped.
+id=97102
+name=Blood Crypt
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {B}
+auto={T}:Add {R}
+type=Land
+subtype=Swamp Mountain
+[/card]
+[card]
+text=({T}: Add {G} or {U} to your mana pool.)   As Breeding Pool enters the battlefield, you may pay 2 life. If you don't, Breeding Pool enters the battlefield tapped.
+id=97088
+name=Breeding Pool
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {G}
+auto={T}:Add {U}
+type=Land
+subtype=Forest Island
+[/card]
+[card]
 text=Flying Whenever you cast an enchantment spell, put a +1/+1 counter on each creature you control.
 auto=@movedTo(enchantment|mystack):all(creature|mybattlefield) counter(1/1,1)
 id=107317
@@ -98,6 +122,18 @@ power=1
 toughness=1
 [/card]
 [card]
+text=({T}: Add {W} or {U} to your mana pool.)   As Hallowed Fountain enters the battlefield, you may pay 2 life. If you don't, Hallowed Fountain enters the battlefield tapped.
+id=97071
+name=Hallowed Fountain
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {W}
+auto={T}:Add {U}
+type=Land
+subtype=Plains Island
+[/card]
+[card]
 text=Flying
 id=107260
 name=Mistral Charger
@@ -192,7 +228,7 @@ text=({GU} can be paid with either {G} or {U}.)   Enchant creature.   When Shiel
 id=97084
 target=creature
 auto=opponentshroud
-auto=draw:1
+auto=draw:1 controller
 name=Shielding Plax
 rarity=C
 mana={2}{GU}
diff --git a/projects/mtg/bin/Res/sets/DIS/todo.dat b/projects/mtg/bin/Res/sets/DIS/todo.dat
index 4ae1dedf3..6d55cb6b5 100644
--- a/projects/mtg/bin/Res/sets/DIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/DIS/todo.dat
@@ -114,15 +114,6 @@ text=Enchant creature Enchanted creature gets +1/+1 for each of its colors.
 rarity=U
 [/card]
 [card]
-id=97102
-name=Blood Crypt
-mana=
-type=Land
-subtype=Swamp Mountain
-text=({T}: Add {B} or {R} to your mana pool.) As Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped.
-rarity=R
-[/card]
-[card]
 id=107306
 name=Bond of Agony
 mana={X}{B}
@@ -154,15 +145,6 @@ text=Name a nonland card. Target player reveals his or her hand. That player dis
 rarity=U
 [/card]
 [card]
-id=97088
-name=Breeding Pool
-mana=
-type=Land
-subtype=Forest Island
-text=({T}: Add {G} or {U} to your mana pool.) As Breeding Pool enters the battlefield, you may pay 2 life. If you don't, Breeding Pool enters the battlefield tapped.
-rarity=R
-[/card]
-[card]
 id=107327
 name=Bronze Bombshell
 mana={4}
@@ -550,15 +532,6 @@ text=At the beginning of your upkeep, sacrifice Haazda Shield Mate unless you pa
 rarity=R
 [/card]
 [card]
-id=97071
-name=Hallowed Fountain
-mana=
-type=Land
-subtype=Plains Island
-text=({T}: Add {W} or {U} to your mana pool.) As Hallowed Fountain enters the battlefield, you may pay 2 life. If you don't, Hallowed Fountain enters the battlefield tapped.
-rarity=R
-[/card]
-[card]
 id=107535
 name=Helium Squirter
 mana={4}{U}
diff --git a/projects/mtg/bin/Res/sets/GPT/_cards.dat b/projects/mtg/bin/Res/sets/GPT/_cards.dat
index b8afb9ffa..46c9b70af 100644
--- a/projects/mtg/bin/Res/sets/GPT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/GPT/_cards.dat
@@ -177,6 +177,18 @@ toughness=1
 abilities=trample,haste,shroud
 [/card]
 [card]
+text=({T}: Add {W} or {B} to your mana pool.)   As Godless Shrine enters the battlefield, you may pay 2 life. If you don't, Godless Shrine enters the battlefield tapped.
+id=96935
+name=Godless Shrine
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {W}
+auto={T}:Add {B}
+type=Land
+subtype=Plains Swamp
+[/card]
+[card]
 text={3}{R}, Sacrifice a land: Gruul Guildmage deals 2 damage to target player.   {3}{G}: Target creature gets +2/+2 until end of turn.
 id=96837
 name=Gruul Guildmage
@@ -441,6 +453,31 @@ power=1
 toughness=1
 [/card]
 [card]
+text=({T}: Add {U} or {R} to your mana pool.)   As Steam Vents enters the battlefield, you may pay 2 life. If you don't, Steam Vents enters the battlefield tapped.
+id=96923
+name=Steam Vents
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {U}
+auto={T}:Add {R}
+type=Land
+subtype=Island Mountain
+[/card]
+[card]
+text=({T}: Add {R} or {G} to your mana pool.)   As Stomping Ground enters the battlefield, you may pay 2 life. If you don't, Stomping Ground enters the battlefield tapped.
+id=96896
+name=Stomping Ground
+rarity=R
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {U}
+auto={T}:Add {R}
+type=Land
+subtype=Mountain Forest
+[/card]
+[card]
 text=Flying   Stratozeppelid can block only creatures with flying.
 id=96927
 name=Stratozeppelid
diff --git a/projects/mtg/bin/Res/sets/GPT/todo.dat b/projects/mtg/bin/Res/sets/GPT/todo.dat
index 15d1cab2f..7dcd6968f 100644
--- a/projects/mtg/bin/Res/sets/GPT/todo.dat
+++ b/projects/mtg/bin/Res/sets/GPT/todo.dat
@@ -351,15 +351,6 @@ text=Sacrifice Goblin Flectomancer: You may change the targets of target instant
 rarity=U
 [/card]
 [card]
-id=96935
-name=Godless Shrine
-mana=
-type=Land
-subtype=Plains Swamp
-text=({T}: Add {W} or {B} to your mana pool.) As Godless Shrine enters the battlefield, you may pay 2 life. If you don't, Godless Shrine enters the battlefield tapped.
-rarity=R
-[/card]
-[card]
 id=97228
 name=Graven Dominator
 mana={4}{W}{W}
@@ -976,15 +967,6 @@ text=Whenever an opponent casts a spell, that player sacrifices a permanent unle
 rarity=R
 [/card]
 [card]
-id=96923
-name=Steam Vents
-mana=
-type=Land
-subtype=Island Mountain
-text=({T}: Add {U} or {R} to your mana pool.) As Steam Vents enters the battlefield, you may pay 2 life. If you don't, Steam Vents enters the battlefield tapped.
-rarity=R
-[/card]
-[card]
 id=97201
 name=Steamcore Weird
 mana={3}{U}
@@ -1004,15 +986,6 @@ text=Flip a coin. If you win the flip, take an extra turn after this one.
 rarity=R
 [/card]
 [card]
-id=96896
-name=Stomping Ground
-mana=
-type=Land
-subtype=Mountain Forest
-text=({T}: Add {R} or {G} to your mana pool.) As Stomping Ground enters the battlefield, you may pay 2 life. If you don't, Stomping Ground enters the battlefield tapped.
-rarity=R
-[/card]
-[card]
 id=96968
 name=Storm Herd
 mana={8}{W}{W}
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index 24b1d49a1..26182009f 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -474,6 +474,18 @@ toughness=6
 abilities=reach
 [/card]
 [card]
+text={T}: Hammerfist Giant deals 4 damage to each creature without flying and each player.
+id=83712
+auto={T}:damage:4 all(creature[-flying]) && damage:4 all(player)
+name=Hammerfist Giant
+rarity=R
+type=Creature
+mana={4}{R}{R}
+power=5
+subtype=Giant Warrior
+toughness=4
+[/card]
+[card]
 text=Islandwalk
 id=87914
 name=Grayscaled Gharial
@@ -652,6 +664,18 @@ toughness=4
 abilities=vigilance
 [/card]
 [card]
+text=({T}: Add {B} or {G} to your mana pool.)  As Overgrown Tomb comes into play, you may pay 2 life. If you don't, Overgrown Tomb comes into play tapped.
+id=89072
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {G}
+auto={T}:Add {B}
+name=Overgrown Tomb
+rarity=R
+type=Land
+subtype=Swamp Forest
+[/card]
+[card]
 text={1}, Sacrifice a creature: Search your library for a land card with a basic land type and put it onto the battlefield tapped. Then shuffle your library.
 auto={1}{S(creature|mybattlefield)}:moveTo(myBattlefield) target(basic|mylibrary) && tap
 id=83744
@@ -767,6 +791,18 @@ power=2
 toughness=1
 [/card]
 [card]
+text=({T}: Add {R} or {W} to your mana pool.)  As Sacred Foundry comes into play, you may pay 2 life. If you don't, Sacred Foundry comes into play tapped.
+id=89066
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {R}
+auto={T}:Add {W}
+name=Sacred Foundry
+rarity=R
+type=Land
+subtype=Mountain Plains
+[/card]
+[card]
 text=Scion of the Wild's power and toughness are each equal to the number of creatures you control.
 id=83647
 auto=foreach(creature|myBattlefield) 1/1 
@@ -956,6 +992,18 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+text=({T}: Add {G} or {W} to your mana pool.)   As Temple Garden comes into play, you may pay 2 life. If you don't, Temple Garden comes into play tapped.
+id=89093
+name=Temple Garden
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {G}
+auto={T}:Add {W}
+type=Land
+subtype=Forest Plains
+[/card]
+[card]
 text=Terrarion enters the battlefield tapped.   {2}, {T}, Sacrifice Terrarion: Add two mana in any combination of colors to your mana pool.     When Terrarion is put into a graveyard from the battlefield, draw a card.
 auto=tap
 auto={2}{T}{S}:Add {G}{G}
@@ -1161,4 +1209,16 @@ type=Creature
 subtype=Wolf
 power=3
 toughness=3
+[/card]
+[card]
+text=({T}: Add {U} or {B} to your mana pool.)  As Watery Grave comes into play, you may pay 2 life. If you don't, Watery Grave comes into play tapped.
+id=83731
+name=Watery Grave
+rarity=R
+auto=tap
+auto=may untap && life:-2 controller
+auto={T}:Add {U}
+auto={T}:Add {B}
+type=Land
+subtype=Island Swamp
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index fe36a8d98..5047ff0d0 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -832,20 +832,6 @@ rarity=U
 type=Enchantment
 mana={1}{U}{U}
 [/card]
-#to test again
-#Hammerfist giant requires a serious update of the targetChooser code before it can work.
-[card]
-text={T}: Hammerfist Giant deals 4 damage to each creature without flying and each player.
-id=83712
-auto={T}:damage:4 all(creature[-flying],player)
-name=Hammerfist Giant
-rarity=R
-type=Creature
-mana={4}{R}{R}
-power=5
-subtype=Giant Warrior
-toughness=4
-[/card]
 [card]
 text={B}{B}{B}, {T}: Destroy target land. If that land was nonbasic, untap Helldozer.
 id=88990
@@ -1253,19 +1239,6 @@ subtype=Minotaur Soldier
 toughness=1
 [/card]
 [card]
-#to test
-text=({T}: Add {B} or {G} to your mana pool.)  As Overgrown Tomb comes into play, you may pay 2 life. If you don't, Overgrown Tomb comes into play tapped.
-id=89072
-auto=tap
-auto=may untap && life:-2 controller
-auto={T}:add {G}
-auto={T}:add {B}
-name=Overgrown Tomb
-rarity=R
-type=Land
-subtype=Swamp Forest
-[/card]
-[card]
 text=Convoke (Each creature you tap while playing this spell reduces its cost by {1} or by one mana of that creature's color.)  Creatures you control get +3/+3 until end of turn.
 id=89044
 name=Overwhelm
@@ -1426,19 +1399,6 @@ subtype=Cat
 toughness=1
 [/card]
 [card]
-#to test
-text=({T}: Add {R} or {W} to your mana pool.)  As Sacred Foundry comes into play, you may pay 2 life. If you don't, Sacred Foundry comes into play tapped.
-id=89066
-auto=tap
-auto=may untap && life:-2 controller
-auto={T}:add{R}
-auto={T}:add{W}
-name=Sacred Foundry
-rarity=R
-type=Land
-subtype=Mountain Plains
-[/card]
-[card]
 text=When Sadistic Augermage is put into a graveyard from play, each player puts a card from his or her hand on top of his or her library.
 id=83745
 name=Sadistic Augermage
@@ -1748,14 +1708,6 @@ type=Instant
 mana={1}{U}
 [/card]
 [card]
-text=({T}: Add {G} or {W} to your mana pool.)  As Temple Garden comes into play, you may pay 2 life. If you don't, Temple Garden comes into play tapped.
-id=89093
-name=Temple Garden
-rarity=R
-type=Land
-subtype=Forest Plains
-[/card]
-[card]
 text={1}: Choose a basic land type. Each land you control becomes that type until end of turn.
 id=87905
 name=Terraformer
@@ -1898,15 +1850,6 @@ type=Sorcery
 mana={5}{R}{R}{R}
 [/card]
 [card]
-#to test
-text=({T}: Add {U} or {B} to your mana pool.)  As Watery Grave comes into play, you may pay 2 life. If you don't, Watery Grave comes into play tapped.
-id=83731
-name=Watery Grave
-rarity=R
-type=Land
-subtype=Island Swamp
-[/card]
-[card]
 text=Flying     Players play with the top card of their libraries revealed.
 id=88971
 name=Wizened Snitches