diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 7d2cea481..f0e5d11d0 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -2947,6 +2947,20 @@ subtype=Elemental
 toughness=7
 [/card]
 [card]
+text=Haste (This creature can attack and {T} as soon as it comes under your control.)  At end of turn, return Viashino Sandscout to its owner's hand. (Return it only if it's in play.)
+id=130387
+name=Viashino Sandscout
+auto=@next end step:moveTo(hand)
+abilities=haste
+rarity=C
+color=Red
+type=Creature
+mana={1}{R}
+power=2
+subtype=Viashino Scout
+toughness=1
+[/card]
+[card]
 text=When Viridian Shaman comes into play, destroy target artifact.
 id=129792
 name=Viridian Shaman
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index 898518b8f..39a6c77b2 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -1239,19 +1239,7 @@ power=3
 subtype=Viashino
 toughness=2
 [/card]
-[card]
-text=Haste (This creature can attack and {T} as soon as it comes under your control.)  At end of turn, return Viashino Sandscout to its owner's hand. (Return it only if it's in play.)
-id=130387
-name=Viashino Sandscout
-auto=@next endofturn:moveTo(hand)
-rarity=C
-color=Red
-type=Creature
-mana={1}{R}
-power=2
-subtype=Viashino Scout
-toughness=1
-[/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 34361d28f..b410ba616 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -24,6 +24,18 @@ mana={R}{G}
 type=Instant
 [/card]
 [card]
+id=180614
+name=Dauntless Escort
+mana={1}{G}{W}
+type=Creature
+subtype=Rhino Soldier
+power=3
+toughness=3
+text=Sacrifice Dauntless Escort: Creatures you control are indestructible this turn.
+auto={S}:lord(creature|mybattlefield) indestructible
+rarity=R
+[/card]
+[card]
 text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)
 id=179542
 name=Ethercaste Knight
@@ -50,6 +62,15 @@ auto=foreach(artifact|myinplay)life:3
 rarity=R
 [/card]
 [card]
+id=179605
+name=Flurry of Wings
+mana={G}{W}{U}
+type=Instant
+text=Put X 1/1 white Bird Soldier creature tokens with flying into play, where X is the number of attacking creatures.
+auto=foreach(creature[attacking]) token(Bird Soldier,Creature Bird Soldier,1/1,white flying)
+rarity=U
+[/card]
+[card]
 text=
 id=189647
 name=Grizzled Leotau
@@ -73,6 +94,18 @@ auto=moveTo(removedfromgame) all(*|graveyard)
 rarity=R
 [/card]
 [card]
+id=179596
+name=Illusory Demon
+mana={1}{U}{B}
+type=Creature
+subtype=Demon Illusion
+power=4
+toughness=3
+text=Flying When you play a spell, sacrifice Illusory Demon.
+auto=@movedTo(*|mystack):bury
+rarity=U
+[/card]
+[card]
 id=179568
 name=Intimidation Bolt
 mana={1}{R}{W}
@@ -85,6 +118,33 @@ target=creature
 rarity=U
 [/card]
 [card]
+id=180587
+name=Karrthus, Tyrant of Jund
+mana={4}{B}{R}{G}
+type=Creature
+subtype=Dragon
+power=7
+toughness=7
+text=Flying, haste When Karrthus, Tyrant of Jund comes into play, gain control of all Dragons, then untap all Dragons. Other Dragon creatures you control have haste.
+abilities=flying,haste,legendary
+auto=moveTo(myInPlay) all(dragon)
+auto=untap all(dragon)
+auto=lord(dragon|mybattlefield) haste other
+rarity=M
+[/card]
+[card]
+id=180606
+name=Leonin Armorguard
+mana={2}{G}{W}
+type=Creature
+subtype=Cat Soldier
+power=3
+toughness=3
+text=When Leonin Armorguard comes into play, creatures you control get +1/+1 until end of turn.
+auto=all(creature|myinplay) 1/1
+rarity=C
+[/card]
+[card]
 text=Lord of Extinction's power and toughness are each equal to the number of cards in all graveyards.
 id=177922
 name=Lord of Extinction 
@@ -215,6 +275,18 @@ toughness=4
 abilities=exalted
 [/card]
 [card]
+id=188971
+name=Slave of Bolas
+mana={3}{(}{U}{/}{R}{)}{B}
+type=Sorcery
+text=Gain control of target creature. Untap that creature. It gains haste until end of turn. Sacrifice it at end of turn.
+target=creature
+auto=@next end:bury
+auto=untap
+auto=haste
+rarity=U
+[/card]
+[card]
 id=179409
 name=Soulquake
 mana={3}{U}{U}{B}{B}
@@ -238,6 +310,18 @@ toughness=6
 abilities=flying,first strike,vigilance,lifelink,protection from red,protection from green
 [/card]
 [card]
+id=179589
+name=Stun Sniper
+mana={R}{W}
+type=Creature
+subtype=Human Archer
+power=1
+toughness=1
+text={1}, {T}: Stun Sniper deals 1 damage to target creature. Tap that creature.
+auto={1}{T}:damage::1 target(creature) && tap
+rarity=U
+[/card]
+[card]
 text=Flying
 id=179537
 name=Talon Trooper
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index af0db5344..11523f7a8 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -152,17 +152,7 @@ subtype=Aura
 text=Enchant creature Enchanted creature can't attack or block. When enchanted creature becomes the target of a spell or ability, remove that creature from the game.
 rarity=C
 [/card]
-[card]
-id=180614
-name=Dauntless Escort
-mana={1}{G}{W}
-type=Creature
-subtype=Rhino Soldier
-power=3
-toughness=3
-text=Sacrifice Dauntless Escort: Creatures you control are indestructible this turn.
-rarity=R
-[/card]
+
 [card]
 id=179543
 name=Deadshot Minotaur
@@ -362,14 +352,7 @@ type=Artifact
 text=You may pay {1} and return a basic land you control to its owner's hand rather than pay Firewild Borderpost's mana cost. Firewild Borderpost comes into play tapped. {T}: Add {R} or {G} to your mana pool.
 rarity=C
 [/card]
-[card]
-id=179605
-name=Flurry of Wings
-mana={G}{W}{U}
-type=Instant
-text=Put X 1/1 white Bird Soldier creature tokens with flying into play, where X is the number of attacking creatures.
-rarity=U
-[/card]
+
 [card]
 id=179598
 name=Giant Ambush Beetle
@@ -479,17 +462,7 @@ abilities=haste
 auto={2}{S}:moveTo(myHand) target(mountain,swamp|myLibrary) #Not quite right :(
 rarity=C
 [/card]
-[card]
-id=179596
-name=Illusory Demon
-mana={1}{U}{B}
-type=Creature
-subtype=Demon Illusion
-power=4
-toughness=3
-text=Flying When you play a spell, sacrifice Illusory Demon.
-rarity=U
-[/card]
+
 [card]
 id=180605
 name=Jenara, Asura of War
@@ -534,17 +507,7 @@ toughness=2
 text=When you cycle Jund Sojourners or it's put into a graveyard from play, you may have it deal 1 damage to target creature or player. Cycling {2}{R} ({2}{R}, Discard this card: Draw a card.)
 rarity=C
 [/card]
-[card]
-id=180587
-name=Karrthus, Tyrant of Jund
-mana={4}{B}{R}{G}
-type=Legendary Creature
-subtype=Dragon
-power=7
-toughness=7
-text=Flying, haste When Karrthus, Tyrant of Jund comes into play, gain control of all Dragons, then untap all Dragons. Other Dragon creatures you control have haste.
-rarity=M
-[/card]
+
 [card]
 id=179602
 name=Kathari Bomber
@@ -587,17 +550,7 @@ type=Sorcery
 text=Lavalanche deals X damage to target player and each creature he or she controls.
 rarity=R
 [/card]
-[card]
-id=180606
-name=Leonin Armorguard
-mana={2}{G}{W}
-type=Creature
-subtype=Cat Soldier
-power=3
-toughness=3
-text=When Leonin Armorguard comes into play, creatures you control get +1/+1 until end of turn.
-rarity=C
-[/card]
+
 [card]
 id=179555
 name=Lich Lord of Unx
@@ -947,14 +900,7 @@ toughness=4
 text=Whenever Skyclaw Thrash attacks, flip a coin. If you win the flip, Skyclaw Thrash gets +1/+1 and gains flying until end of turn.
 rarity=U
 [/card]
-[card]
-id=188971
-name=Slave of Bolas
-mana={3}{(}{U}{/}{R}{)}{B}
-type=Sorcery
-text=Gain control of target creature. Untap that creature. It gains haste until end of turn. Sacrifice it at end of turn.
-rarity=U
-[/card]
+
 [card]
 id=183008
 name=Soul Manipulation
@@ -1004,17 +950,7 @@ type=Enchantment
 text=Sacrifice Stormcaller's Boon: Creatures you control gain flying until end of turn. 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.)
 rarity=C
 [/card]
-[card]
-id=179589
-name=Stun Sniper
-mana={R}{W}
-type=Creature
-subtype=Human Archer
-power=1
-toughness=1
-text={1}, {T}: Stun Sniper deals 1 damage to target creature. Tap that creature.
-rarity=U
-[/card]
+
 [card]
 id=180618
 name=Tainted Sigil
diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index b04fc384b..261794107 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -1,4 +1,17 @@
 [card]
+text=Flying     {1}{G}{U}: Creatures you control gain shroud until end of turn.
+abilities=flying
+auto={1}{G}{U}:lord(creature|mybattlefield) shroud
+id=153946
+name=Aerie Mystics
+rarity=U
+type=Creature
+mana={4}{W}
+power=3
+subtype=Bird Wizard
+toughness=3
+[/card]
+[card]
 text=Enchant creature     Enchanted creature has flying, first strike, and vigilance.
 target=creature
 auto=flying
@@ -75,6 +88,17 @@ subtype=Rhino Beast
 toughness=3
 [/card]
 [card]
+text=Enchant red or green creature     Enchanted creature doesn't untap during its controller's untap step.
+target=creature[green;red]
+auto=doesnotuntap
+id=183053
+name=Controlled Instincts
+rarity=U
+type=Enchantment
+mana={U}
+subtype=Aura
+[/card]
+[card]
 text=Enchant Forest or Plains     Whenever enchanted land becomes tapped, its controller loses 2 life.
 id=183054
 target=forest,plains
@@ -107,6 +131,18 @@ type=Artifact
 mana={3}{U}
 [/card]
 [card]
+text={R}{G}{W}: Cylian Sunsinger and each other creature with the same name as it get +3/+3 until end of turn.
+auto={R}{G}{W}:lord(Cylian Sunsinger) 3/3
+id=189081
+name=Cylian Sunsinger
+rarity=R
+type=Creature
+mana={1}{G}
+power=2
+subtype=Elf Shaman
+toughness=2
+[/card]
+[card]
 text=Flying     {B}: Darklit Gargoyle gets +2/-1 until end of turn.
 abilities=flying
 auto={B}:2/-1
@@ -120,6 +156,32 @@ subtype=Gargoyle
 toughness=2
 [/card]
 [card]
+text=Domain - Target creature gets -1/-1 until end of turn for each basic land type among lands you control.
+id=179239
+target=creature
+name=Drag Down
+auto=aslongas(forest|myinplay) -1/-1 
+auto=aslongas(island|myinplay) -1/-1
+auto=aslongas(plains|myinplay) -1/-1
+auto=aslongas(mountain|myinplay) -1/-1
+auto=aslongas(swamp|myinplay) -1/-1
+rarity=C
+type=Instant
+mana={2}{B}
+[/card]
+[card]
+text={1}{U}{R}: Dreadwing gets +3/+0 and gains flying until end of turn.
+auto={1}{U}{R}: 3/0 && flying
+id=159629
+name=Dreadwing
+rarity=U
+type=Creature
+mana={B}
+power=1
+subtype=Zombie
+toughness=1
+[/card]
+[card]
 text=Reach (This can block creatures with flying.)  As long as you control a red permanent, Ember Weaver gets +1/+0 and has first strike.
 auto=aslongas(*[red]|myinplay) 1/0
 auto=aslongas(*[red]|myinplay) first strike
@@ -194,20 +256,17 @@ subtype=Leviathan
 toughness=11
 [/card]
 [card]
-text=Domain - Matca Rioters's power and toughness are each equal to the number of basic land types among lands you control.
-id=179248
-name=Matca Rioters
-rarity=C
+text=Knight of the Reliquary gets +1/+1 for each land card in your graveyard.     {T}, Sacrifice a Forest or Plains: Search your library for a land card, put it into play, then shuffle your library.
+auto=foreach(land|mygraveyard) 1/1
+auto={T},{S(forest,plains|myinplay)}:moveTo(myInPlay) target(land|mylibrary)
+id=189145
+name=Knight of the Reliquary
+rarity=R
 type=Creature
-mana={2}{G}
-auto=aslongas(forest|myinplay) 1/1
-auto=aslongas(island|myinplay) 1/1
-auto=aslongas(plains|myinplay) 1/1
-auto=aslongas(mountain|myinplay) 1/1
-auto=aslongas(swamp|myinplay) 1/1
-power=*
-subtype=Human Warrior
-toughness=*
+mana={1}{G}{W}
+power=2
+subtype=Human Knight
+toughness=2
 [/card]
 [card]
 text=When Kaleidostone comes into play, draw a card.     {5}, {T}, Sacrifice Kaleidostone: Add {W}{U}{B}{R}{G} to your mana pool.
@@ -269,6 +328,36 @@ mana={1}{R}
 subtype=Aura
 [/card]
 [card]
+text=Domain - Matca Rioters's power and toughness are each equal to the number of basic land types among lands you control.
+id=179248
+name=Matca Rioters
+rarity=C
+type=Creature
+mana={2}{G}
+auto=aslongas(forest|myinplay) 1/1
+auto=aslongas(island|myinplay) 1/1
+auto=aslongas(plains|myinplay) 1/1
+auto=aslongas(mountain|myinplay) 1/1
+auto=aslongas(swamp|myinplay) 1/1
+power=*
+subtype=Human Warrior
+toughness=*
+[/card]
+[card]
+text=Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control.
+auto=aslongas(forest|myInPlay) 1/1
+auto=aslongas(mountain|myInPlay) 1/1
+auto=aslongas(plains|myInPlay) 1/1
+auto=aslongas(swamp|myInPlay) 1/1
+auto=aslongas(island|myInPlay) 1/1
+id=150810
+name=Might of Alara
+target=creature
+rarity=C
+type=Instant
+mana={G}
+[/card]
+[card]
 text=Protection from blue
 abilities=protection from blue
 id=185140
@@ -401,6 +490,27 @@ type=Artifact
 mana={1}{U}{U}
 [/card]
 [card]
+text={W}{B}: Scornful AEther-Lich gains fear and vigilance until end of turn.
+auto={W}{B}:fear && vigilance
+id=186328
+name=Scornful AEther-Lich
+rarity=U
+type=Artifact Creature
+mana={3}{U}
+power=2
+subtype=Zombie Wizard
+toughness=4
+[/card]
+[card]
+text=Whenever you play an enchantment spell, put a 4/4 white Angel creature token with flying into play.
+auto=@movedTo(enchantment|mystack):token(Angel,Creature Angel,4/4,white flying)
+id=180271
+name=Sigil of the Empty Throne
+rarity=R
+type=Enchantment
+mana={3}{W}{W}
+[/card]
+[card]
 text=Flying     When Sphinx Summoner comes into play, you may search your library for an artifact creature card, reveal it, and put it into your hand. If you do, shuffle your library.
 auto=may moveTo(myHand) target(creature[artifact]|myLibrary)
 id=189079
@@ -414,6 +524,28 @@ subtype=Sphinx
 toughness=3
 [/card]
 [card]
+text=Domain - Put a 1/1 green Saproling creature token into play for each basic land type among lands you control.
+auto=aslongas(forest|myinplay) token(Saproling,Creature Saproling,1/1,green)
+auto=aslongas(mountain|myinplay) token(Saproling,Creature Saproling,1/1,green)
+auto=aslongas(plains|myinplay) token(Saproling,Creature Saproling,1/1,green)
+auto=aslongas(swamp|myinplay) token(Saproling,Creature Saproling,1/1,green)
+auto=aslongas(island|myinplay) token(Saproling,Creature Saproling,1/1,green)
+id=185829
+name=Spore Burst
+rarity=U
+type=Sorcery
+mana={3}{G}
+[/card]
+[card]
+text=Sacrifice Suicidal Charge: Creatures your opponents control get -1/-1 until end of turn. Those creatures attack this turn if able.
+auto={S}:lord(creature|opponentBattlefield) -1/-1 && lord(creature|opponentBattlefield) mustattack
+id=180345
+name=Suicidal Charge
+rarity=C
+type=Enchantment
+mana={3}{B}{R}
+[/card]
+[card]
 text={G}: Thornling gains haste until end of turn.     {G}: Thornling gains trample until end of turn.     {G}: Thornling is indestructible this turn.     {1}: Thornling gets +1/-1 until end of turn.     {1}: Thornling gets -1/+1 until end of turn.
 auto={G}:haste
 auto={G}:trample
@@ -462,6 +594,18 @@ subtype=Human Soldier
 toughness=3
 [/card]
 [card]
+text={U}{B}: Vectis Agents gets -2/-0 until end of turn and is unblockable this turn.
+auto={U}{B}:-2/0 && unblockable
+id=183063
+name=Vectis Agents
+rarity=C
+type=Artifact Creature
+mana={3}{U}{B}
+power=4
+subtype=Human Rogue
+toughness=3
+[/card]
+[card]
 text=Protection from red
 abilities=protection from red
 id=185141
@@ -487,6 +631,17 @@ subtype=Viashino Warrior
 toughness=1
 [/card]
 [card]
+text=Enchant creature     When a creature is put into a graveyard from play, destroy enchanted creature.
+target=creature
+auto=@movedTo(creature|graveyard):destroy
+id=179891
+name=Yoke of the Damned
+rarity=C
+type=Enchantment
+mana={1}{B}
+subtype=Aura
+[/card]
+[card]
 text=Protection from green
 abilities=protection from green
 id=185138
diff --git a/projects/mtg/bin/Res/sets/CFX/todo.dat b/projects/mtg/bin/Res/sets/CFX/todo.dat
index 6b43cabc4..d5ee34468 100644
--- a/projects/mtg/bin/Res/sets/CFX/todo.dat
+++ b/projects/mtg/bin/Res/sets/CFX/todo.dat
@@ -6,18 +6,7 @@ rarity=C
 type=Sorcery
 mana={6}{B}
 [/card]
-[card]
-text=Flying     {1}{G}{U}: Creatures you control gain shroud until end of turn.
-id=153946
-name=Aerie Mystics
-rarity=U
-type=Creature
-auto={1}{G}{U}:lord(creature|myinplay) shroud ## want mana + lord funtion to work
-mana={4}{W}
-power=3
-subtype=Bird Wizard
-toughness=3
-[/card]
+
 [card]
 text={T}: Add one mana of any color to your mana pool. Spend this mana only to play creature spells.
 id=189271
@@ -149,15 +138,7 @@ rarity=C
 type=Instant
 mana={U}
 [/card]
-[card]
-text=Enchant red or green creature     Enchanted creature doesn't untap during its controller's untap step.
-id=183053
-name=Controlled Instincts
-rarity=U
-type=Enchantment
-mana={U}
-subtype=Aura
-[/card]
+
 
 [card]
 text=Counter target noncreature spell. Its controller loses 2 life.
@@ -169,17 +150,7 @@ mana={U}{B}
 [/card]
 
 
-[card]
-text={R}{G}{W}: Cylian Sunsinger and each other creature with the same name as it get +3/+3 until end of turn.
-id=189081
-name=Cylian Sunsinger
-rarity=R
-type=Creature
-mana={1}{G}
-power=2
-subtype=Elf Shaman
-toughness=2
-[/card]
+
 [card]
 text=Dark Temper deals 2 damage to target creature. If you control a black permanent, destroy the creature instead.
 id=185143
@@ -189,20 +160,7 @@ type=Instant
 mana={2}{R}
 [/card]
 
-[card]
-text=Domain - Target creature gets -1/-1 until end of turn for each basic land type among lands you control.
-id=179239
-target=creature
-name=Drag Down
-auto=aslongas(forest|myinplay) -1/-1  ## tested.... too bad it works just like lord where it has to remain in play to take effect...
-auto=aslongas(island|myinplay) -1/-1
-auto=aslongas(plains|myinplay) -1/-1
-auto=aslongas(mountain|myinplay) -1/-1
-auto=aslongas(swamp|myinplay) -1/-1
-rarity=C
-type=Instant
-mana={2}{B}
-[/card]
+
 [card]
 text=First strike     {W}{U}{B}{R}{G}: Until end of turn, Dragonsoul Knight becomes a Dragon, gets +5/+3, and gains flying and trample.
 id=186392
@@ -214,18 +172,7 @@ power=2
 subtype=Human Knight
 toughness=2
 [/card]
-[card]
-text={1}{U}{R}: Dreadwing gets +3/+0 and gains flying until end of turn.
-auto={1}{U}{R}: 3/0 && flying ## better && too (i am asking a lot... lol! :P)
-id=159629
-name=Dreadwing
-rarity=U
-type=Creature
-mana={B}
-power=1
-subtype=Zombie
-toughness=1
-[/card]
+
 [card]
 text=Enchant creature     Enchanted creature gets +3/+3 and has flying.     Whenever enchanted creature deals damage to a player, that player discards two cards.
 id=183024
@@ -473,17 +420,7 @@ power=1
 subtype=Horror
 toughness=1
 [/card]
-[card]
-text=Knight of the Reliquary gets +1/+1 for each land card in your graveyard.     {T}, Sacrifice a Forest or Plains: Search your library for a land card, put it into play, then shuffle your library.
-id=189145
-name=Knight of the Reliquary
-rarity=R
-type=Creature
-mana={1}{G}{W}
-power=2
-subtype=Human Knight
-toughness=2
-[/card]
+
 
 
 [card]
@@ -577,15 +514,7 @@ power=6
 subtype=Beast
 toughness=6
 [/card]
-[card]
-text=Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control.
-id=150810
-name=Might of Alara
-target=creature
-rarity=C
-type=Instant
-mana={G}
-[/card]
+
 [card]
 text=Trample     At the beginning of your upkeep, if you control a blue permanent, you may put a token into play that's a copy of Mirror-Sigil Sergeant.
 id=158598
@@ -607,6 +536,9 @@ mana={1}{R}
 [/card]
 [card]
 text=Vigilance     {R}, {T}: Target creature can't block this turn.     {G}, {T}: Target creature blocks this turn if able.
+abilities=vigilance
+auto={R}{T}:cantblock target(creature)
+auto={G}{T}:mustblock target(creature) #Not yet in the engine
 id=138571
 name=Nacatl Hunt-Pride
 rarity=U
@@ -772,18 +704,8 @@ type=Artifact
 mana={B}{B}
 [/card]
 
-[card]
-text={W}{B}: Scornful AEther-Lich gains fear and vigilance until end of turn.
-auto={W}{B}:fear && vigilance
-id=186328
-name=Scornful AEther-Lich
-rarity=U
-type=Artifact Creature
-mana={3}{U}
-power=2
-subtype=Zombie Wizard
-toughness=4
-[/card]
+
+
 [card]
 text=When Sedraxis Alchemist comes into play, if you control a blue permanent, return target nonland permanent to its owner's hand.
 id=182306
@@ -814,14 +736,7 @@ rarity=U
 type=Sorcery
 mana={3}{G}
 [/card]
-[card]
-text=Whenever you play an enchantment spell, put a 4/4 white Angel creature token with flying into play.
-id=180271
-name=Sigil of the Empty Throne
-rarity=R
-type=Enchantment
-mana={3}{W}{W}
-[/card]
+
 [card]
 text=Vigilance     {T}: Reveal the top card of your library. If it's a land card, put it into play. Otherwise, put it into your hand.
 id=174953
@@ -853,22 +768,8 @@ type=Sorcery
 mana={4}{G}
 [/card]
 
-[card]
-text=Domain - Put a 1/1 green Saproling creature token into play for each basic land type among lands you control.
-id=185829
-name=Spore Burst
-rarity=U
-type=Sorcery
-mana={3}{G}
-[/card]
-[card]
-text=Sacrifice Suicidal Charge: Creatures your opponents control get -1/-1 until end of turn. Those creatures attack this turn if able.
-id=180345
-name=Suicidal Charge
-rarity=C
-type=Enchantment
-mana={3}{B}{R}
-[/card]
+
+
 [card]
 text=Target player gains 8 life.     Basic landcycling {1}{G} ({1}{G}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 id=179523
@@ -937,17 +838,7 @@ toughness=6
 [/card]
 
 
-[card]
-text={U}{B}: Vectis Agents gets -2/-0 until end of turn and is unblockable this turn.
-id=183063
-name=Vectis Agents
-rarity=C
-type=Artifact Creature
-mana={3}{U}{B}
-power=4
-subtype=Human Rogue
-toughness=3
-[/card]
+
 
 
 [card]
@@ -1045,13 +936,5 @@ rarity=C
 type=Sorcery
 mana={B}
 [/card]
-[card]
-text=Enchant creature     When a creature is put into a graveyard from play, destroy enchanted creature.
-id=179891
-name=Yoke of the Damned
-rarity=C
-type=Enchantment
-mana={1}{B}
-subtype=Aura
-[/card]
+
 
diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat
index 9239753f0..73cd35a81 100644
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -23,6 +23,15 @@ auto={T}:target(creature|opponentinplay) mustattack
 rarity=U
 [/card]
 [card]
+id=191245
+name=Angel's Feather
+mana={2}
+type=Artifact
+text=Whenever a player casts a white spell, you may gain 1 life.
+auto=@movedTo(*[white]|stack):may life:1
+rarity=U
+[/card]
+[card]
 id=190549
 name=Angel's Mercy
 mana={2}{W}{W}
@@ -307,6 +316,15 @@ target=creature[green;white]
 rarity=U
 [/card]
 [card]
+id=191247
+name=Demon's Horn
+mana={2}
+type=Artifact
+text=Whenever a player casts a black spell, you may gain 1 life.
+auto=@movedTo(*[black]|stack):may life:1
+rarity=U
+[/card]
+[card]
 id=190533
 name=Diabolic Tutor
 mana={2}{B}{B}
@@ -366,6 +384,15 @@ auto=destroy
 rarity=C
 [/card]
 [card]
+id=191244
+name=Dragon's Claw
+mana={2}
+type=Artifact
+text=Whenever a player casts a red spell, you may gain 1 life.
+auto=@movedTo(*[red]|stack):may life:1
+rarity=U
+[/card]
+[card]
 id=191060
 name=Dragon Whelp
 mana={2}{R}{R}
@@ -603,6 +630,18 @@ auto=lord(creature|myBattlefield) 1/1
 rarity=C
 [/card]
 [card]
+id=191092
+name=Goblin Artillery
+mana={1}{R}{R}
+type=Creature
+subtype=Goblin Warrior
+power=1
+toughness=3
+text={T}: Goblin Artillery deals 2 damage to target creature or player and 3 damage to you.
+auto={T}:damage:2 target(player) && damage:3 controller
+rarity=U
+[/card]
+[card]
 id=190558
 name=Goblin Chieftain
 mana={1}{R}{R}
@@ -775,6 +814,15 @@ auto=first strike
 rarity=C
 [/card]
 [card]
+id=191246
+name=Kraken's Eye
+mana={2}
+type=Artifact
+text=Whenever a player casts a blue spell, you may gain 1 life.
+auto=@movedTo(*[blue]|stack): may life:1
+rarity=U
+[/card]
+[card]
 id=191084
 name=Lava Axe
 mana={4}{R}
@@ -851,6 +899,18 @@ auto={B}:1/1
 rarity=C
 [/card]
 [card]
+id=191378
+name=Mesa Enchantress
+mana={1}{W}{W}
+type=Creature
+subtype=Human Druid
+power=0
+toughness=2
+text=Whenever you cast an enchantment spell, you may draw a card.
+auto=@movedTo(enchantment|stack): may draw:1
+rarity=R
+[/card]
+[card]
 id=191087
 name=Merfolk Sovereign
 mana={1}{U}{U}
@@ -1255,6 +1315,18 @@ toughness=2
 rarity=C
 [/card]
 [card]
+id=190571
+name=Soul Warden
+mana={W}
+type=Creature
+subtype=Human Cleric
+power=1
+toughness=1
+text=Whenever another creature enters the battlefield, you gain 1 life.
+auto=@movedTo(*|battlefield): life:1
+rarity=U
+[/card]
+[card]
 id=190163
 name=Snapping Drake
 mana={3}{U}
@@ -1504,6 +1576,15 @@ abilities=flying
 rarity=C
 [/card]
 [card]
+id=191248
+name=Wurm's Tooth
+mana={2}
+type=Artifact
+text=Whenever a player casts a green spell, you may gain 1 life.
+auto=@movedTo(*[green]|stack): may life:1
+rarity=U
+[/card]
+[card]
 id=190167
 name=Zephyr Sprite
 mana={U}
diff --git a/projects/mtg/bin/Res/sets/M10/todo.dat b/projects/mtg/bin/Res/sets/M10/todo.dat
index 073f75c9f..94b927f9b 100644
--- a/projects/mtg/bin/Res/sets/M10/todo.dat
+++ b/projects/mtg/bin/Res/sets/M10/todo.dat
@@ -39,14 +39,7 @@ text=+1: You gain 2 life. -1: Put a +1/+1 counter on each creature you control.
 rarity=M
 [/card]
 
-[card]
-id=191245
-name=Angel's Feather
-mana={2}
-type=Artifact
-text=Whenever a player casts a white spell, you may gain 1 life.
-rarity=U
-[/card]
+
 
 
 
@@ -191,14 +184,7 @@ text=Reach (This creature can block creatures with flying.) Deathtouch (Creature
 rarity=C
 [/card]
 
-[card]
-id=191247
-name=Demon's Horn
-mana={2}
-type=Artifact
-text=Whenever a player casts a black spell, you may gain 1 life.
-rarity=U
-[/card]
+
 
 
 
@@ -217,14 +203,7 @@ rarity=R
 [/card]
 
 
-[card]
-id=191244
-name=Dragon's Claw
-mana={2}
-type=Artifact
-text=Whenever a player casts a red spell, you may gain 1 life.
-rarity=U
-[/card]
+
 [card]
 id=191091
 name=Dragonskull Summit
@@ -293,17 +272,7 @@ text=Glacial Fortress enters the battlefield tapped unless you control a Plains
 rarity=R
 [/card]
 
-[card]
-id=191092
-name=Goblin Artillery
-mana={1}{R}{R}
-type=Creature
-subtype=Goblin Warrior
-power=1
-toughness=3
-text={T}: Goblin Artillery deals 2 damage to target creature or player and 3 damage to you.
-rarity=U
-[/card]
+
 
 
 [card]
@@ -442,14 +411,7 @@ text=Jackal Familiar can't attack or block alone.
 rarity=C
 [/card]
 
-[card]
-id=191246
-name=Kraken's Eye
-mana={2}
-type=Artifact
-text=Whenever a player casts a blue spell, you may gain 1 life.
-rarity=U
-[/card]
+
 
 
 
@@ -544,17 +506,7 @@ text={T}: Draw a card, then discard a card.
 rarity=U
 [/card]
 
-[card]
-id=191378
-name=Mesa Enchantress
-mana={1}{W}{W}
-type=Creature
-subtype=Human Druid
-power=0
-toughness=2
-text=Whenever you cast an enchantment spell, you may draw a card.
-rarity=R
-[/card]
+
 
 
 [card]
@@ -790,17 +742,7 @@ subtype=Aura
 text=Enchant creature At the beginning of the upkeep of enchanted creature's controller, that player loses 1 life.
 rarity=C
 [/card]
-[card]
-id=190571
-name=Soul Warden
-mana={W}
-type=Creature
-subtype=Human Cleric
-power=1
-toughness=1
-text=Whenever another creature enters the battlefield, you gain 1 life.
-rarity=U
-[/card]
+
 [card]
 id=191053
 name=Sparkmage Apprentice
@@ -974,14 +916,7 @@ type=Instant
 text=Windstorm deals X damage to each creature with flying.
 rarity=U
 [/card]
-[card]
-id=191248
-name=Wurm's Tooth
-mana={2}
-type=Artifact
-text=Whenever a player casts a green spell, you may gain 1 life.
-rarity=U
-[/card]
+
 [card]
 id=189885
 name=Xathrid Demon