diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index f4d9ebac2..2329a3c8a 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -172,6 +172,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 Cloudchaser comes into play, destroy target enchantment.
+id=129470
+name=Aven Cloudchaser
+target=enchantment
+auto=destroy
+rarity=C
+color=White
+type=Creature
+mana={3}{W}
+power=2
+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.
 abilities=flying
 auto=@movedTo(this|graveyard):draw:1
@@ -2955,3 +2969,17 @@ power=2
 subtype=Human Knight
 toughness=1
 [/card]
+[card]
+text=When Viridian Shaman comes into play, destroy target artifact.
+id=129792
+name=Viridian Shaman
+target=artifact
+auto=destroy
+rarity=U
+color=Green
+type=Creature
+mana={2}{G}
+power=2
+subtype=Elf Shaman
+toughness=2
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index f4ad1be16..5c8505be1 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -68,19 +68,7 @@ power=8
 subtype=Avatar
 toughness=8
 [/card]
-[card]
-text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser comes into play, destroy target enchantment.
-id=129470
-name=Aven Cloudchaser
-auto=destroy target(enchantment)
-rarity=C
-color=White
-type=Creature
-mana={3}{W}
-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
@@ -1148,19 +1136,7 @@ power=3
 subtype=Viashino
 toughness=2
 [/card]
-[card]
-text=When Viridian Shaman comes into play, destroy target artifact.
-id=129792
-name=Viridian Shaman
-auto=destroy target(artifact) #does not work in 0.8
-rarity=U
-color=Green
-type=Creature
-mana={2}{G}
-power=2
-subtype=Elf Shaman
-toughness=2
-[/card]
+
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  As Voice of All comes into play, choose a color.      Voice of All has protection from the chosen color. (It can't be blocked, targeted, dealt damage, or enchanted by anything of the chosen color.)
 id=136290
diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index 361e89bc5..238a5eeb5 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -387,6 +387,19 @@ auto={T}:Untap target(*)
 type=Artifact
 [/card]
 [card]
+text=When Vithian Renegades comes into play, destroy target artifact.
+id=179535
+target=artifact
+auto=destroy
+name=Vithian Renegades
+rarity=U
+mana={1}{R}{G}
+type=Creature
+subtype=Human Shaman
+power=3
+toughness=2
+[/card]
+[card]
 text=Defender, flying, shroud
 id=179601
 name=Wall of Denial
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 346bd682a..0dc092bab 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -1064,18 +1064,7 @@ type=Instant
 text=Cascade (When you play this spell, remove cards from the top of your library from the game until you remove a nonland card that costs less. You may play it without paying its mana cost. Put the removed cards on the bottom in a random order.) Creatures you control get +1/+0 until end of turn.
 rarity=C
 [/card]
-[card]
-text=When Vithian Renegades comes into play, destroy target artifact.
-id=179535
-auto=destroy target(artifact)
-name=Vithian Renegades
-rarity=U
-mana={1}{R}{G}
-type=Creature
-subtype=Human Shaman
-power=3
-toughness=2
-[/card]
+
 [card]
 id=180592
 name=Wargate
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index f279b00fd..b7a7b84fb 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -593,7 +593,8 @@ mana={2}{W}{W}
 [/card]
 [card]
 text=When Marshdrinker Giant comes into play, destroy target Island or Swamp an opponent controls.
-auto=destroy target(island,swamp|opponentinplay)
+target=island,swamp|opponentinplay
+auto=destroy
 id=142015
 name=Marshdrinker Giant
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index 8ae0be179..61e67004c 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -364,6 +364,19 @@ toughness=1
 abilities=haste
 [/card]
 [card]
+text=When Ravenous Baboons comes into play, destroy target nonbasic land.
+id=5207
+name=Ravenous Baboons
+target=land[-basic]
+mana={3}{R}
+type=Creature
+subtype=Ape
+auto=destroy
+power=2
+toughness=2
+rarity=R
+[/card]
+[card]
 text=Put target card from your graveyard on top of your library.
 target=*|mygraveyard
 auto=moveTo(myLibrary)
diff --git a/projects/mtg/bin/Res/sets/EXO/todo.dat b/projects/mtg/bin/Res/sets/EXO/todo.dat
index 71e721a4c..bd3ce77b1 100644
--- a/projects/mtg/bin/Res/sets/EXO/todo.dat
+++ b/projects/mtg/bin/Res/sets/EXO/todo.dat
@@ -532,18 +532,7 @@ toughness=1
 text={X}{X}{B}: Destroy target nonblack creature with converted mana cost X.
 rarity=R
 [/card]
-[card]
-text=When Ravenous Baboons comes into play, destroy target nonbasic land.
-id=5207
-name=Ravenous Baboons
-rarity=R
-mana={3}{R}
-type=Creature
-subtype=Ape
-auto=destroy target(land[-basic])
-power=2
-toughness=2
-[/card]
+
 [card]
 id=6037
 name=Reaping the Rewards
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index a393320ee..e19518086 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -1338,4 +1338,17 @@ subtype=Soldier
 power=1
 toughness=4
 abilities=vigilance
+[/card]
+[card]
+text=When Viridian Shaman comes into play, destroy target artifact.
+target=artifact
+auto=destroy
+id=46119
+name=Viridian Shaman
+rarity=U
+type=Creature
+mana={2}{G}
+power=2
+subtype=Elf Shaman
+toughness=2
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index ab84ef042..be0e638bb 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -1595,18 +1595,7 @@ type=Artifact
 mana={1}
 subtype=Equipment
 [/card]
-[card]
-text=When Viridian Shaman comes into play, destroy target artifact.
-auto=destroy target(artifact) #does not work in 0.8
-id=46119
-name=Viridian Shaman
-rarity=U
-type=Creature
-mana={2}{G}
-power=2
-subtype=Elf Shaman
-toughness=2
-[/card]
+
 [card]
 text=Equipped creature has trample and can't be blocked by more than one creature.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
 id=46053
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index b37f2c7ad..ef6905a92 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -713,6 +713,20 @@ auto={T}{S}:moveTo(myinplay) target(basic|mylibrary) && tap
 rarity=C
 [/card]
 [card]
+id=116736
+name=Tivadar of Thorn
+mana={1}{W}{W}
+type=Creature
+subtype=Human Knight
+text=First strike, protection from red When Tivadar of Thorn comes into play, destroy target Goblin.
+abilities=first strike, protection from red, legendary
+target=goblin
+auto=destroy
+power=2
+toughness=2
+rarity=R
+[/card]
+[card]
 id=108907
 name=Tolarian Sentinel
 mana={3}{U}
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index a749f8540..b4e3f2297 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -2001,19 +2001,7 @@ type=Artifact
 text={T}: Add {W} to your mana pool. {1}{W}{W}: Thunder Totem becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
 rarity=U
 [/card]
-[card]
-id=116736
-name=Tivadar of Thorn
-mana={1}{W}{W}
-type=Creature
-subtype=Human Knight
-power=2
-toughness=2
-text=First strike, protection from red When Tivadar of Thorn comes into play, destroy target Goblin.
-abilities=first strike, protection from red, legendary
-auto=destroy target(goblin)
-rarity=R
-[/card]
+
 [card]
 id=108857
 name=Traitor's Clutch
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 639c7b3d0..28df4a890 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -210,6 +210,7 @@ terror.txt
 terror2.txt
 titanic_ultimatum.txt
 tranquil_domain.txt
+viridian_shaman.txt
 volcanic_island.txt
 unstable_mutation.txt
 wall_of_diffusion.txt
diff --git a/projects/mtg/bin/Res/test/viridian_shaman.txt b/projects/mtg/bin/Res/test/viridian_shaman.txt
new file mode 100644
index 000000000..2e97b235f
--- /dev/null
+++ b/projects/mtg/bin/Res/test/viridian_shaman.txt
@@ -0,0 +1,21 @@
+#comes into play, destroy target artifact
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Viridian Shaman
+manapool:{2}{G}
+[PLAYER2]
+inplay:Bottle Gnomes
+[DO]
+Viridian Shaman
+Bottle Gnomes
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Viridian Shaman
+manapool:{0}
+life:20
+[PLAYER2]
+graveyard:Bottle Gnomes
+life:20
+[END]
\ No newline at end of file