diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index a4d2b98b1..d042016ff 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -24,6 +24,16 @@ toughness=1
 abilities=shroud
 [/card]
 [card]
+text=Prevent all combat damage that would be dealt this turn.     Cycling {2} ({2}, Discard this card: Draw a card.)
+id=175000
+name=Angelsong
+auto=preventAllcombatDamage ueot
+autohand={2}:cycling
+rarity=C
+type=Instant
+mana={1}{W}
+[/card]
+[card]
 text=Arcane Sanctum enters the battlefield tapped.   {T}: Add {W}, {U}, or {B} to your mana pool.
 auto=tap
 auto={T}:Add {W}
@@ -508,6 +518,19 @@ mana={B}{R}{G}
 type=Instant
 [/card]
 [card]
+text=Reach (This can block creatures with flying.)  Cycling {2} ({2}, Discard this card: Draw a card.)
+id=175262
+name=Jungle Weaver
+rarity=C
+type=Creature
+mana={5}{G}{G}
+autohand={2}:cycling
+abilities=reach
+power=5
+subtype=Spider
+toughness=6
+[/card]
+[card]
 text=Flying, trample, haste   {R}: Hellkite Overlord gets +1/+0 until end of turn.   {B}{G}: Regenerate Hellkite Overlord.
 id=175057
 name=Hellkite Overlord
@@ -956,6 +979,17 @@ mana={W}{U}{U}{B}
 type=Instant
 [/card]
 [card]
+text=Target creature gets +3/+3 until end of turn.     Cycling {5}{R}{G}{W} ({5}{R}{G}{W}, Discard this card: Draw a card.)  When you cycle Resounding Roar, target creature gets +6/+6 until end of turn.
+id=174901
+name=Resounding Roar
+target=creature
+auto=3/3
+autohand={5}{R}{G}{W}:cycling && 6/6 target(creature)
+rarity=C
+type=Instant
+mana={1}{G}
+[/card]
+[card]
 text=Trample   Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)
 id=174959
 name=Rhox Charger
@@ -1328,6 +1362,16 @@ power=2
 toughness=1
 [/card]
 [card]
+text=Destroy target artifact or land.     Cycling {2} ({2}, Discard this card: Draw a card.)
+id=174889
+name=Volcanic Submersion
+target=artifact,land
+autohand={2}:cycling
+rarity=C
+type=Sorcery
+mana={4}{R}
+[/card]
+[card]
 text=Flying   Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)
 id=174955
 name=Waveskimmer Aven
@@ -1374,4 +1418,16 @@ type=Creature
 subtype=Beast
 power=5
 toughness=4
+[/card]
+[card]
+text=Cycling {2} ({2}, Discard this card: Draw a card.)
+id=175078
+name=Yoked Plowbeast
+rarity=C
+type=Creature
+mana={5}{W}{W}
+power=5
+subtype=Beast
+toughness=5
+autohand={2}:cycling
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index 67aca1903..35588a6e4 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -44,14 +44,7 @@ power=1
 subtype=Human Cleric
 toughness=1
 [/card]
-[card]
-text=Prevent all combat damage that would be dealt this turn.     Cycling {2} ({2}, Discard this card: Draw a card.)
-id=175000
-name=Angelsong
-rarity=C
-type=Instant
-mana={1}{W}
-[/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
@@ -520,17 +513,7 @@ type=Sorcery
 mana={6}{W}{W}
 [/card]
 
-[card]
-text=Reach (This can block creatures with flying.)  Cycling {2} ({2}, Discard this card: Draw a card.)
-id=175262
-name=Jungle Weaver
-rarity=C
-type=Creature
-mana={5}{G}{G}
-power=5
-subtype=Spider
-toughness=6
-[/card]
+
 [card]
 text=Flying     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=174837
@@ -818,14 +801,7 @@ rarity=C
 type=Artifact
 mana={1}
 [/card]
-[card]
-text=Target creature gets +3/+3 until end of turn.     Cycling {5}{R}{G}{W} ({5}{R}{G}{W}, Discard this card: Draw a card.)  When you cycle Resounding Roar, target creature gets +6/+6 until end of turn.
-id=174901
-name=Resounding Roar
-rarity=C
-type=Instant
-mana={1}{G}
-[/card]
+
 [card]
 text=Target player discards a card at random.     Cycling {5}{U}{B}{R} ({5}{U}{B}{R}, Discard this card: Draw a card.)  When you cycle Resounding Scream, target player discards two cards at random.
 id=176444
@@ -909,6 +885,10 @@ rarity=C
 type=Enchantment
 mana={2}{G}
 subtype=Aura
+target=creature
+auto=1/0
+auto=trample
+autohand={2}:cycling
 [/card]
 
 [card]
@@ -1219,6 +1199,8 @@ name=Viscera Dragger
 rarity=C
 type=Creature
 mana={3}{B}
+autohand={2}:cycling
+autograveyard={1}{B}:moveTo(myhand) && haste && @end of turn:moveto(removedfromgame) ## ar... too bad it is 100% correct
 power=3
 subtype=Zombie Ogre Warrior
 toughness=3
@@ -1234,14 +1216,7 @@ power=0
 subtype=Human Shaman
 toughness=1
 [/card]
-[card]
-text=Destroy target artifact or land.     Cycling {2} ({2}, Discard this card: Draw a card.)
-id=174889
-name=Volcanic Submersion
-rarity=C
-type=Sorcery
-mana={4}{R}
-[/card]
+
 [card]
 text=Flying. When Welkin Guide comes into play, target creature gets +2/+2 and gains flying until end of turn.
 #"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
@@ -1265,17 +1240,4 @@ name=Where Ancients Tread
 rarity=R
 type=Enchantment
 mana={4}{R}
-[/card]
-
-
-[card]
-text=Cycling {2} ({2}, Discard this card: Draw a card.)
-id=175078
-name=Yoked Plowbeast
-rarity=C
-type=Creature
-mana={5}{W}{W}
-power=5
-subtype=Beast
-toughness=5
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/DST/_cards.dat b/projects/mtg/bin/Res/sets/DST/_cards.dat
index 84e549a5c..c3625be12 100644
--- a/projects/mtg/bin/Res/sets/DST/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DST/_cards.dat
@@ -466,7 +466,8 @@ auto={2}:equip
 auto=protection from white
 auto=protection from black
 auto=2/2
-auto=@damaged(player) from(mytgt):may moveTo(myhand) target(creature|mygraveyard) && life:3
+auto=@damaged(player) from(mytgt):life:3
+auto=@damaged(player) from(mytgt):may moveTo(myhand) target(creature|mygraveyard)
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/ZEN/todo.dat b/projects/mtg/bin/Res/sets/ZEN/todo.dat
index 49b2eb0a2..6caf65ca8 100644
--- a/projects/mtg/bin/Res/sets/ZEN/todo.dat
+++ b/projects/mtg/bin/Res/sets/ZEN/todo.dat
@@ -482,6 +482,7 @@ subtype=Vampire Spirit
 power=2
 toughness=1
 text=Bloodghast can't block. Bloodghast has haste as long as an opponent has 10 or less life. Landfall - Whenever a land enters the battlefield under your control, you may return Bloodghast from your graveyard to the battlefield.
+autograveyard=@movedTo(land|myBattlefield):may moveTo(myhand)
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 11441a966..836bb5676 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -106,7 +106,6 @@ belligerent_hatchling.txt
 benalish_knight.txt
 black_vise.txt
 blessed_wine.txt
-blight_sickle.txt
 blinking_spirit.txt
 bloodfire_colossus.txt
 bloodhall_ooze.txt
@@ -288,6 +287,7 @@ reclusive_wight.txt
 reclusive_wight2.txt
 recover.txt
 regal_force.txt
+resounding_roar.txt
 resurrection.txt
 rhox_meditant.txt
 rhox_meditant2.txt
@@ -352,8 +352,6 @@ wall_of_diffusion.txt
 wall_of_diffusion2.txt
 warren_instigator.txt
 welkin_hawk.txt
-whispersilk_cloak.txt
-whispersilk_cloak2.txt
 white_knight1.txt
 windswept_heath.txt
 wrath_of_god.txt
diff --git a/projects/mtg/bin/Res/test/whispersilk_cloak.txt b/projects/mtg/bin/Res/test/generic/equip_shroud.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/whispersilk_cloak.txt
rename to projects/mtg/bin/Res/test/generic/equip_shroud.txt
diff --git a/projects/mtg/bin/Res/test/whispersilk_cloak2.txt b/projects/mtg/bin/Res/test/generic/equip_shroud2.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/whispersilk_cloak2.txt
rename to projects/mtg/bin/Res/test/generic/equip_shroud2.txt
diff --git a/projects/mtg/bin/Res/test/blight_sickle.txt b/projects/mtg/bin/Res/test/generic/equip_wither.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/blight_sickle.txt
rename to projects/mtg/bin/Res/test/generic/equip_wither.txt
diff --git a/projects/mtg/bin/Res/test/resounding_roar.txt b/projects/mtg/bin/Res/test/resounding_roar.txt
new file mode 100644
index 000000000..b4fed03b6
--- /dev/null
+++ b/projects/mtg/bin/Res/test/resounding_roar.txt
@@ -0,0 +1,28 @@
+#Testing Cycling
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Resounding Roar
+inplay:Runeclaw Bear
+library:forest
+manapool:{5}{R}{G}{W}
+[PLAYER2]
+[DO]
+Resounding Roar
+choice 1
+Runeclaw Bear
+next
+next
+Runeclaw Bear
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Runeclaw Bear
+graveyard:Resounding Roar
+hand:forest
+[PLAYER2]
+life:12
+[END]
\ No newline at end of file