diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index a903557a2..7fda03039 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -1313,6 +1313,18 @@ subtype=Spirit
 toughness=3
 [/card]
 [card]
+text=Equipped creature gets +1/+1.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+id=135277
+name=Leonin Scimitar
+rarity=U
+color=Artifact
+type=Artifact
+mana={1}
+auto={1}:equip
+auto=1/1
+subtype=Equipment
+[/card]
+[card]
 text=Haste (This creature can attack and {T} as soon as it comes under your control.)
 abilities=haste
 id=129624
@@ -1397,6 +1409,20 @@ subtype=Elephant Cleric
 toughness=3
 [/card]
 [card]
+text=Equipped creature gets +3/+0 and has lifelink and trample. (When it deals damage, you gain that much life. If it would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.)  Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
+id=129630
+name=Loxodon Warhammer
+rarity=R
+color=Artifact
+type=Artifact
+mana={3}
+auto={3}:equip
+auto=3/0
+auto=lifelink
+auto=trample
+subtype=Equipment
+[/card]
+[card]
 text=
 id=129631
 name=Lumengrid Warden
@@ -2927,6 +2953,18 @@ type=Instant
 mana={2}{W}
 [/card]
 [card]
+text=Equipped creature is unblockable and has shroud. (It can't be the target of spells or abilities.)  Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+id=135278
+name=Whispersilk Cloak
+rarity=U
+type=Artifact
+mana={3}
+auto={2}:equip
+auto=unblockable
+auto=shroud
+subtype=Equipment
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)
 abilities=flying
 id=129557
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index d2b6f74bf..82d108ecb 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -547,16 +547,7 @@ abilities=legendary
 type=Artifact
 mana={7}
 [/card]
-[card]
-text=Equipped creature gets +1/+1.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-id=135277
-name=Leonin Scimitar
-rarity=U
-color=Artifact
-type=Artifact
-mana={1}
-subtype=Equipment
-[/card]
+
 [card]
 text=When Llanowar Sentinel comes into play, you may pay {1}{G}. If you do, search your library for a card named Llanowar Sentinel and put that card into play. Then shuffle your library.
 id=129536
@@ -572,16 +563,7 @@ power=2
 subtype=Elf
 toughness=3
 [/card]
-[card]
-text=Equipped creature gets +3/+0 and has lifelink and trample. (When it deals damage, you gain that much life. If it would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.)  Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
-id=129630
-name=Loxodon Warhammer
-rarity=R
-color=Artifact
-type=Artifact
-mana={3}
-subtype=Equipment
-[/card]
+
 [card]
 text=When Loyal Sentry blocks a creature, destroy that creature and Loyal Sentry.
 id=129798
@@ -1205,15 +1187,7 @@ color=Red
 type=Sorcery
 mana={5}{R}{R}{R}
 [/card]
-[card]
-text=Equipped creature is unblockable and has shroud. (It can't be the target of spells or abilities.)  Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
-id=135278
-name=Whispersilk Cloak
-rarity=U
-type=Artifact
-mana={3}
-subtype=Equipment
-[/card]
+
 [card]
 #Technically correct could be added to the card.dat but this card is too powerfull the AI does not understand and simply never attack... in WTH 0.8.1
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 7517f6e12..2bb6bdadb 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -8,6 +8,8 @@ generic/doesnotuntap2.txt
 generic/double_strike.txt
 generic/equip_landfall_buff.txt
 generic/equip_reach.txt
+generic/equip_shroud.txt
+generic/equip_shroud2.txt
 generic/fear.txt
 generic/fear_i147.txt
 generic/first_and_double_strike1_i187.txt
diff --git a/projects/mtg/bin/Res/test/generic/equip_shroud.txt b/projects/mtg/bin/Res/test/generic/equip_shroud.txt
new file mode 100644
index 000000000..b53b300a3
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/equip_shroud.txt
@@ -0,0 +1,37 @@
+#Test:equipment
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Whispersilk Cloak
+manapool:{5}
+inplay:Runeclaw Bear
+[PLAYER2]
+hand:Hideous End
+inplay:129754,129756,129755
+[DO]
+Whispersilk Cloak
+Whispersilk Cloak
+Runeclaw Bear
+eot
+next
+#upkeeep
+next
+#draw
+next
+#firstmain
+129754
+129756
+129755
+Hideous End
+Runeclaw Bear
+[ASSERT]
+firstmain
+[PLAYER1]
+life:20
+inplay:Runeclaw Bear,Whispersilk Cloak
+[PLAYER2]
+hand:Hideous End
+manapool:{B}{B}{B}
+inplay:129754,129756,129755
+life:20
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/generic/equip_shroud2.txt b/projects/mtg/bin/Res/test/generic/equip_shroud2.txt
new file mode 100644
index 000000000..864f59984
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/equip_shroud2.txt
@@ -0,0 +1,37 @@
+#Test:testing to see if shroud creature can can targeted of equipment
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Whispersilk Cloak,Adventuring Gear,195161
+manapool:{7}
+inplay:Runeclaw Bear,Vampire Nighthawk
+[PLAYER2]
+[DO]
+Whispersilk Cloak
+Whispersilk Cloak
+Runeclaw Bear
+Adventuring Gear
+Adventuring Gear
+Runeclaw Bear
+Vampire Nighthawk
+195161
+next
+#begin
+next
+#attackers
+Runeclaw Bear
+Vampire Nighthawk
+next
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+life:24
+inplay:Whispersilk Cloak,Adventuring Gear,195161,Runeclaw Bear,Vampire Nighthawk
+[PLAYER2]
+life:14
+[END]
\ No newline at end of file