diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index 2b441cdd4..a29244ef3 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -239,17 +239,7 @@ power=2
 subtype=Shapeshifter
 toughness=4
 [/card]
-[card]
-text={BG}{BG}: Remove target card in a graveyard from the game. You gain 1 life.
-id=157206
-name=Creakwood Ghoul
-rarity=U
-type=Creature
-mana={4}{B}
-power=3
-subtype=Plant Zombie
-toughness=3
-[/card]
+
 [card]
 text=Other black creatures you control get +1/+1.     Other green creatures you control get +1/+1.     At the beginning of your upkeep, you may put a 1/1 black and green Worm creature token into play.
 id=157406
diff --git a/projects/mtg/bin/Res/sets/ONS/_cards.dat b/projects/mtg/bin/Res/sets/ONS/_cards.dat
index 9132a18dd..052ec6a43 100644
--- a/projects/mtg/bin/Res/sets/ONS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ONS/_cards.dat
@@ -85,6 +85,24 @@ toughness=5
 rarity=R
 [/card]
 [card]
+id=41156
+name=Blatant Thievery
+mana={4}{U}{U}{U}
+type=Sorcery
+text=For each opponent, gain control of target permanent that player controls. (This effect doesn't end at end of turn.)
+target=*|opponentInPlay
+auto=moveTo(myInplay)
+rarity=R
+[/card]
+[card]
+id=39505
+name=Bloodstained Mire
+type=Land
+text={T}, Pay 1 life, Sacrifice Bloodstained Mire: Search your library for a Swamp or Mountain card and put it into play. Then shuffle your library.
+auto={T},{S}:moveTo(myinplay) target(swamp,mountain|mylibrary) && life:-1
+rarity=R
+[/card]
+[card]
 id=39846
 name=Brightstone Ritual
 mana={R}
@@ -640,6 +658,14 @@ subtype=Plains
 rarity=L
 [/card]
 [card]
+id=39504
+name=Polluted Delta
+type=Land
+text={T}, Pay 1 life, Sacrifice Polluted Delta: Search your library for an Island or Swamp card and put it into play. Then shuffle your library.
+auto={T},{S}:moveTo(myinplay) target(island,swamp|mylibrary) && life:-1
+rarity=R
+[/card]
+[card]
 id=39845
 name=Profane Prayers
 mana={2}{B}{B}
@@ -650,6 +676,15 @@ auto=foreach(Cleric)life:1
 rarity=C
 [/card]
 [card]
+id=40173
+name=Psychic Trance
+mana={2}{U}{U}
+type=Instant
+text=Until end of turn, Wizards you control gain "{T}: Counter target spell."
+auto=lord(wizard|myinplay) {T}:fizzle target(*|stack)
+rarity=R
+[/card]
+[card]
 text=Sacrifice a Beast: You gain 4 life.
 id=12444
 name=Ravenous Baloth
@@ -683,6 +718,15 @@ auto=moveTo(ownerlibrary) all(*|ownergraveyard)
 rarity=U
 [/card]
 [card]
+id=40656
+name=Righteous Cause
+mana={3}{W}{W}
+type=Enchantment
+text=Whenever a creature attacks, you gain 1 life.
+auto=@each blockers step:foreach(creature[attacking]) life:1
+rarity=U
+[/card]
+[card]
 text={T}: Add {1} to your mana pool. {1}{U}, {T}: Return target Wizard you control to its owner's hand.
 id=10704
 name=Riptide Laboratory
@@ -794,6 +838,15 @@ toughness=1
 rarity=C
 [/card]
 [card]
+id=39696
+name=Slate of Ancestry
+mana={4}
+type=Artifact
+text={4}, {T}, Discard your hand: Draw a card for each creature you control.
+auto={4}{T}:all(*|myhand) moveTo(mygraveyard) && foreach(creature|myinplay) draw:1
+rarity=R
+[/card]
+[card]
 id=39745
 name=Soulless One
 mana={3}{B}
diff --git a/projects/mtg/bin/Res/sets/ONS/todo.dat b/projects/mtg/bin/Res/sets/ONS/todo.dat
index 7248a6a0f..b9a74c23f 100644
--- a/projects/mtg/bin/Res/sets/ONS/todo.dat
+++ b/projects/mtg/bin/Res/sets/ONS/todo.dat
@@ -242,14 +242,7 @@ type=Sorcery
 text=Target player reveals three cards from his or her hand and you choose one of them. That player discards that card.
 rarity=U
 [/card]
-[card]
-id=41156
-name=Blatant Thievery
-mana={4}{U}{U}{U}
-type=Sorcery
-text=For each opponent, gain control of target permanent that player controls. (This effect doesn't end at end of turn.)
-rarity=R
-[/card]
+
 [card]
 id=39737
 name=Blistering Firecat
@@ -272,13 +265,7 @@ toughness=1
 text={T}: Choose a creature type. Reveal the top card of your library. If that card is a creature card of the chosen type, put it into your hand. Otherwise, put it into your graveyard.
 rarity=U
 [/card]
-[card]
-id=39505
-name=Bloodstained Mire
-type=Land
-text={T}, Pay 1 life, Sacrifice Bloodstained Mire: Search your library for a Swamp or Mountain card and put it into play. Then shuffle your library.
-rarity=R
-[/card]
+
 [card]
 id=39547
 name=Boneknitter
@@ -1065,6 +1052,8 @@ name=Grand Melee
 mana={3}{R}
 type=Enchantment
 text=All creatures attack each turn if able.  All creatures block each turn if able.
+auto=lord(creature) mustattack
+auto=lord(creature) mustblock
 rarity=R
 [/card]
 [card]
@@ -1594,13 +1583,7 @@ type=Instant
 text=Choose one: Destroy target Aura attached to a creature; or target Soldier creature gets +2/+2 until end of turn; or creatures you control gain vigilance until end of turn.
 rarity=C
 [/card]
-[card]
-id=39504
-name=Polluted Delta
-type=Land
-text={T}, Pay 1 life, Sacrifice Polluted Delta: Search your library for an Island or Swamp card and put it into play. Then shuffle your library.
-rarity=R
-[/card]
+
 [card]
 id=41145
 name=Primal Boost
@@ -1620,14 +1603,7 @@ toughness=5
 text=When Prowling Pangolin comes into play, any player may sacrifice two creatures. If a player does, sacrifice Prowling Pangolin.
 rarity=U
 [/card]
-[card]
-id=40173
-name=Psychic Trance
-mana={2}{U}{U}
-type=Instant
-text=Until end of turn, Wizards you control gain "{T}: Counter target spell."
-rarity=R
-[/card]
+
 [card]
 id=39539
 name=Quicksilver Dragon
@@ -1655,14 +1631,7 @@ type=Instant
 text=You gain 6 life. Cycling {1}{W} ({1}{W}, Discard this card: Draw a card.) When you cycle Renewed Faith, you may gain 2 life.
 rarity=C
 [/card]
-[card]
-id=40656
-name=Righteous Cause
-mana={3}{W}{W}
-type=Enchantment
-text=Whenever a creature attacks, you gain 1 life.
-rarity=U
-[/card]
+
 [card]
 id=39848
 name=Riptide Biologist
@@ -1751,6 +1720,7 @@ name=Run Wild
 mana={G}
 type=Instant
 text=Until end of turn, target creature gains trample and "{G}: Regenerate this creature."
+target=creature
 rarity=U
 [/card]
 [card]
@@ -1912,14 +1882,7 @@ toughness=5
 text=At the beginning of your upkeep, flip a coin. If you lose the flip, turn Skittish Valesk face down. Morph {5}{R} (You may play this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
 rarity=U
 [/card]
-[card]
-id=39696
-name=Slate of Ancestry
-mana={4}
-type=Artifact
-text={4}, {T}, Discard your hand: Draw a card for each creature you control.
-rarity=R
-[/card]
+
 [card]
 id=41171
 name=Slice and Dice
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 148f25497..ada43c276 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -120,12 +120,14 @@ protomatter_powder.txt
 pyroclasm.txt
 recover.txt
 resurrection.txt
+righteous_cause.txt
 rootwalla.txt
 royal_assassin.txt
 seismic_assault.txt
 siege_gang_commander.txt
 shivan_hellkite.txt
 shock.txt
+slate_of_ancestry.txt
 sphinx_summoner.txt
 spitting_earth.txt
 spark_elemental.txt
@@ -150,4 +152,4 @@ zombify.txt
 #Momir Basic Tests
 ########################
 momir/keldon_warlord.txt
-momir/overcost.txt
+momir/overcost.txt
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/righteous_cause.txt b/projects/mtg/bin/Res/test/righteous_cause.txt
new file mode 100644
index 000000000..b8d7c2144
--- /dev/null
+++ b/projects/mtg/bin/Res/test/righteous_cause.txt
@@ -0,0 +1,24 @@
+#Testing Righteous Cause
+# text=Whenever a creature attacks, you gain 1 life.
+[INIT]
+COMBATATTACKERS
+[PLAYER1]
+inplay:Righteous Cause,grizzly bears,raging goblin,dragon engine
+[PLAYER2]
+[DO]
+grizzly bears
+raging goblin
+next
+#blockers
+next
+#damage
+next
+#end
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Righteous Cause,grizzly bears,raging goblin,dragon engine
+life:22
+[PLAYER2]
+life:17
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/slate_of_ancestry.txt b/projects/mtg/bin/Res/test/slate_of_ancestry.txt
new file mode 100644
index 000000000..6e314cf3f
--- /dev/null
+++ b/projects/mtg/bin/Res/test/slate_of_ancestry.txt
@@ -0,0 +1,23 @@
+#Testing Slate of ancestry
+# text={4}, {T}, Discard your hand: Draw a card for each creature you control.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Slate of Ancestry,grizzly bears,raging goblin
+library:dragon engine,bayou,forest
+hand:swamp,mountain,island,plains
+manapool:{4}
+[PLAYER2]
+[DO]
+Slate of Ancestry
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Slate of Ancestry,grizzly bears,raging goblin
+graveyard:swamp,mountain,island,plains
+hand:bayou,forest
+library:dragon engine
+manapool:{0}
+[PLAYER2]
+life:20
+[END]
\ No newline at end of file