diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 54c679d68..46c8a6bf3 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -463,7 +463,7 @@ text=Trample (If this creature would deal enough combat damage to its blockers t
 id=135268
 name=Colossus of Sardia
 abilities=doesnotuntap,trample
-auto={9}:untap
+auto={9}:untap myUpkeepOnly
 rarity=R 
 type=Artifact Creature
 mana={9}
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index cacc02a6b..c13af18e4 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -867,9 +867,11 @@ subtype=Devil
 toughness=3
 [/card]
 [card]
+#Require Testing
 text={T}, Sacrifice Scourglass: Destroy all permanents except for artifacts and lands. Play this ability only during your upkeep.
 id=174853
 name=Scourglass
+auto={S}:destroy all(creature,enchantment) myUpkeepOnly
 rarity=R
 type=Artifact
 mana={3}{W}{W}
diff --git a/projects/mtg/bin/Res/sets/ATQ/_cards.dat b/projects/mtg/bin/Res/sets/ATQ/_cards.dat
index 418da019a..bdcaf5b58 100644
--- a/projects/mtg/bin/Res/sets/ATQ/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ATQ/_cards.dat
@@ -82,7 +82,7 @@ rarity=R
 mana={9}
 type=Artifact Creature
 subtype=Golem
-auto={9}:untap
+auto={9}:untap myUpkeepOnly
 power=9
 toughness=9
 abilities=doesnotuntap,trample
@@ -154,7 +154,7 @@ toughness=1
 [/card]
 [card]
 text=Sacrifice a creature: Destroy target artifact. Activate this ability only during your upkeep and only once each turn.
-auto={S(creature|myBattlefield)}:destroy target(artifact) limit:1 myTurnOnly
+auto={S(creature|myBattlefield)}:destroy target(artifact) limit:1 myUpkeepOnly
 id=1039
 name=Gate to Phyrexia
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/FEM/_cards.dat b/projects/mtg/bin/Res/sets/FEM/_cards.dat
index ce9558914..ddaaa0713 100644
--- a/projects/mtg/bin/Res/sets/FEM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/FEM/_cards.dat
@@ -477,6 +477,18 @@ rarity=U
 type=Land
 [/card]
 [card]
+id=1890
+name=Svyelunite Priest
+mana={1}{U}
+type=Creature
+subtype=Merfolk Cleric
+power=1
+toughness=1
+text={U}{U}, {T}: Target creature gains shroud until end of turn. Play this ability only during your upkeep. (It can't be the target of spells or abilities.)
+auto={U}{U}{T}:shroud target(creature) myUpkeepOnly
+rarity=U
+[/card]
+[card]
 text=Svyelunite Temple enters the battlefield tapped.   {T}: Add {U} to your mana pool.   {T}, Sacrifice Svyelunite Temple: Add {U}{U} to your mana pool.
 id=2013
 name=Svyelunite Temple
diff --git a/projects/mtg/bin/Res/sets/FEM/todo.dat b/projects/mtg/bin/Res/sets/FEM/todo.dat
index c2453dbef..4b71985e4 100644
--- a/projects/mtg/bin/Res/sets/FEM/todo.dat
+++ b/projects/mtg/bin/Res/sets/FEM/todo.dat
@@ -119,6 +119,7 @@ text=Whenever Dwarven Soldier blocks or becomes blocked by one or more Orcs, Dwa
 rarity=C
 [/card]
 [card]
+#Require Testing
 id=1848
 name=Ebon Praetor
 mana={4}{B}{B}
@@ -130,8 +131,8 @@ text=First strike, trample At the beginning of your upkeep, put a -2/-2 counter
 rarity=R
 abilities=first strike,trample
 auto=@each my upkeep:counter(-2/-2,1)
-auto={S(creature|myinplay)}:counter(-2/-2,-1) limit:1
-auto={S(creature[thrull]|myBattlefield)}:counter(-2/-2,-1) && counter(1/0,1) limit:1
+auto={S(creature|myinplay)}:counter(-2/-2,-1) limit:1 myUpkeepOnly
+auto={S(creature[thrull]|myBattlefield)}:counter(-2/-2,-1) && counter(1/0,1) limit:1 myUpkeepOnly
 [/card]
 [card]
 id=1908
@@ -601,17 +602,6 @@ text=At the beginning of your upkeep, put a spore counter on Spore Flower. Remov
 rarity=U
 [/card]
 [card]
-id=1890
-name=Svyelunite Priest
-mana={1}{U}
-type=Creature
-subtype=Merfolk Cleric
-power=1
-toughness=1
-text={U}{U}, {T}: Target creature gains shroud until end of turn. Play this ability only during your upkeep. (It can't be the target of spells or abilities.)
-rarity=U
-[/card]
-[card]
 id=1925
 name=Thallid
 mana={G}
diff --git a/projects/mtg/bin/Res/sets/FUT/_cards.dat b/projects/mtg/bin/Res/sets/FUT/_cards.dat
index 4a89edc11..ac13b7161 100644
--- a/projects/mtg/bin/Res/sets/FUT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/FUT/_cards.dat
@@ -15,6 +15,19 @@ auto=lord(creature|myBattlefield) protection from black
 abilities=legendary
 [/card]
 [card]
+id=132212
+name=Augur il-Vec
+mana={1}{W}
+type=Creature
+subtype=Human Cleric
+power=1
+toughness=3
+text=Shadow (This creature can block or be blocked by only creatures with shadow.) Sacrifice Augur il-Vec: You gain 4 life. Play this ability only during your upkeep.
+abilities=shadow
+auto={S}:life:4 controller myUpkeepOnly
+rarity=C
+[/card]
+[card]
 id=130676
 name=Blade of the Sixth Pride
 rarity=C
@@ -73,6 +86,18 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+id=132214
+name=Emberwilde Augur
+mana={1}{R}
+type=Creature
+subtype=Goblin Shaman
+power=2
+toughness=1
+text=Sacrifice Emberwilde Augur: Emberwilde Augur deals 3 damage to target player. Play this ability only during your upkeep.
+auto={S}:damage:3 target(player) myUpkeepOnly
+rarity=C
+[/card]
+[card]
 text=Enchant creature you control (Target a creature as you cast this. This card enters the battlefield attached to that creature.)   Creatures you control have haste.
 id=136215
 target=creature|myBattlefield
diff --git a/projects/mtg/bin/Res/sets/FUT/todo.dat b/projects/mtg/bin/Res/sets/FUT/todo.dat
index e0ff45e08..62646ec7b 100644
--- a/projects/mtg/bin/Res/sets/FUT/todo.dat
+++ b/projects/mtg/bin/Res/sets/FUT/todo.dat
@@ -26,17 +26,7 @@ subtype=Aura
 text=Enchant creature Enchanted creature has flying. Aura swap {2}{U} ({2}{U}: Exchange this Aura with an Aura card in your hand.)
 rarity=U
 [/card]
-[card]
-id=132212
-name=Augur il-Vec
-mana={1}{W}
-type=Creature
-subtype=Human Cleric
-power=1
-toughness=3
-text=Shadow (This creature can block or be blocked by only creatures with shadow.) Sacrifice Augur il-Vec: You gain 4 life. Play this ability only during your upkeep.
-rarity=C
-[/card]
+
 [card]
 id=132224
 name=Augur of Skulls
@@ -297,17 +287,6 @@ text=If you control four or fewer lands, search your library for a basic land ca
 rarity=C
 [/card]
 [card]
-id=132214
-name=Emberwilde Augur
-mana={1}{R}
-type=Creature
-subtype=Goblin Shaman
-power=2
-toughness=1
-text=Sacrifice Emberwilde Augur: Emberwilde Augur deals 3 damage to target player. Play this ability only during your upkeep.
-rarity=C
-[/card]
-[card]
 id=136143
 name=Epochrasite
 mana={2}
@@ -588,6 +567,7 @@ text={X}{U}{U}, {T}: Return target creature with converted mana cost X to its ow
 rarity=R
 [/card]
 [card]
+#Require Testing
 id=132213
 name=Llanowar Augur
 mana={G}
@@ -596,6 +576,7 @@ subtype=Elf Shaman
 power=0
 toughness=3
 text=Sacrifice Llanowar Augur: Target creature gets +3/+3 and gains trample until end of turn. Play this ability only during your upkeep.
+auto={S}:3/3 && trample target(creature) myUpkeepOnly
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/HML/_cards.dat b/projects/mtg/bin/Res/sets/HML/_cards.dat
index 9b662534c..d32a0542a 100644
--- a/projects/mtg/bin/Res/sets/HML/_cards.dat
+++ b/projects/mtg/bin/Res/sets/HML/_cards.dat
@@ -237,8 +237,7 @@ power=4
 toughness=4
 text=Trample Black Carriage doesn't untap during your untap step. Sacrifice a creature: Untap Black Carriage. Activate this ability only during your upkeep.
 abilities=trample,doesnotuntap
-auto={S(creature|myBattlefield)}:untap myturnonly
-#not 100% correct same as brass man, colossus of sardia, etc.
+auto={S(creature|myBattlefield)}:untap myUpkeepOnly
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/HML/todo.dat b/projects/mtg/bin/Res/sets/HML/todo.dat
index 0865ef9c3..ab265e4ff 100644
--- a/projects/mtg/bin/Res/sets/HML/todo.dat
+++ b/projects/mtg/bin/Res/sets/HML/todo.dat
@@ -445,7 +445,7 @@ power=8
 toughness=8
 text=Marjhan doesn't untap during your untap step. Marjhan can't attack unless defending player controls an Island. When you control no Islands, sacrifice Marjhan. {U}{U}, Sacrifice a creature: Untap Marjhan. Activate this ability only during your upkeep. {U}{U}: Marjhan gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying.
 abilities=islandhome,doesnotuntap
-auto={U}{U}{S(creature|myBattlefield)}:untap myturnonly
+auto={U}{U}{S(creature|myBattlefield)}:untap myUpkeepnonly
 auto={U}{U}:damage:1 target(creature[attacking;-flying]) && -1/0 all(this)
 rarity=R
 [/card]
diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat
index f53db19a6..d60b0dd5f 100644
--- a/projects/mtg/bin/Res/sets/LEG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat
@@ -540,7 +540,7 @@ type=Instant
 [/card]
 [card]
 text={B}, {T}, Sacrifice a creature: Return target creature card from your graveyard to play. Play this ability only during your upkeep.
-auto={B}{T}{S(creature|myBattlefield)}:moveTo(myBattlefield) target(creature|mygraveyard)
+auto={B}{T}{S(creature|myBattlefield)}:moveTo(myBattlefield) target(creature|mygraveyard) myUpkeepOnly
 id=1444
 name=Hell's Caretaker
 rarity=R
diff --git a/projects/mtg/bin/Res/sets/MOR/todo.dat b/projects/mtg/bin/Res/sets/MOR/todo.dat
index 51c0f7d8b..3640aee10 100644
--- a/projects/mtg/bin/Res/sets/MOR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MOR/todo.dat
@@ -1026,7 +1026,7 @@ type=Creature
 subtype=Goblin Shaman
 power=3
 toughness=2
-text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Squeaking Pie Grubfellows, you may reveal it. If you do, each opponent discards a card.
+text=Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Squeaking Pie Grubfellows, you may reveal it. If you do, each opponent discards a card.
 rarity=C
 [/card]
 [card]
@@ -1037,6 +1037,8 @@ type=Creature
 subtype=Elemental
 power=6
 toughness=5
+auto=@each my endofturn:aslongas(goblin|myinplay)regenerate
+auto=@each my endofturn:destroy
 text=Flying At the beginning of the end step, if you control no Goblins, sacrifice Stenchskipper.
 rarity=R
 [/card]
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index 75d42dcfc..b90eb7014 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -401,6 +401,19 @@ mana={5}
 type=Artifact
 [/card]
 [card]
+text=Flying     Goblin Dirigible doesn't untap during your untap step.     At the beginning of your upkeep, you may pay {4}. If you do, untap Goblin Dirigible.
+id=48077
+abilities=doesnotuntap,flying
+auto={4}:untap myUpkeepOnly
+name=Goblin Dirigible
+rarity=U
+type=Artifact Creature
+mana={6}
+power=4
+subtype=Construct
+toughness=4
+[/card]
+[card]
 text={3}{R}, Sacrifice Goblin Replica: Destroy target artifact.
 id=46049
 auto={3}{R}{S}:destroy target(artifact)
@@ -425,6 +438,19 @@ toughness=1
 abilities=first strike,haste
 [/card]
 [card]
+text=Goblin War Wagon doesn't untap during your untap step.     At the beginning of your upkeep, you may pay {2}. If you do, untap Goblin War Wagon.
+id=46044
+name=Goblin War Wagon
+rarity=C
+abilities=doesnotuntap
+auto={2}:untap myUpkeepOnly
+type=Artifact Creature
+mana={4}
+power=3
+subtype=Juggernaut
+toughness=3
+[/card]
+[card]
 text={T}: Add {W} to your mana pool.
 id=46024
 auto={T}:Add {W}
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index e7400db67..2d1cf1546 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -454,32 +454,6 @@ type=Artifact
 mana={4}
 [/card]
 [card]
-text=Flying     Goblin Dirigible doesn't untap during your untap step.     At the beginning of your upkeep, you may pay {4}. If you do, untap Goblin Dirigible.
-id=48077
-abilities=doesnotuntap,flying
-auto={4}:untap
-name=Goblin Dirigible
-rarity=U
-type=Artifact Creature
-mana={6}
-power=4
-subtype=Construct
-toughness=4
-[/card]
-[card]
-text=Goblin War Wagon doesn't untap during your untap step.     At the beginning of your upkeep, you may pay {2}. If you do, untap Goblin War Wagon.
-id=46044
-name=Goblin War Wagon
-rarity=C
-abilities=doesnotuntap
-auto={2}:untap
-type=Artifact Creature
-mana={4}
-power=3
-subtype=Juggernaut
-toughness=3
-[/card]
-[card]
 text=Equipped creature gets +1/+0 for each Equipment attached to it.     Equip {2} ({2}: 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=46061
 name=Golem-Skin Gauntlets
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index e4b8ffbb0..f90fda924 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -991,18 +991,6 @@ power=4
 toughness=3
 [/card]
 [card]
-text=When Minotaur Explorer enters the battlefield, sacrifice it unless you discard a card at random.
-id=31786
-auto=discard:1
-name=Minotaur Explorer
-rarity=U
-mana={1}{R}
-type=Creature
-subtype=Minotaur Scout
-power=3
-toughness=3
-[/card]
-[card]
 text=Mortivore's power and toughness are each equal to the number of creature cards in all graveyards. {B}: Regenerate Mortivore. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
 id=29946
 name=Mortivore
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index 2836146b3..a9b2c0c4d 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -857,6 +857,20 @@ subtype=Human Cleric
 toughness=2
 [/card]
 [card]
+text=When Minotaur Explorer enters the battlefield, sacrifice it unless you discard a card at random.
+id=31786
+#Reomved does not work in WTH 0.10 see also Balduvian Horde (ALL)
+auto=@movedto(this|myBattlefield):aslongas(*|myHand) bury <1
+auto=discard:1 controller
+name=Minotaur Explorer
+rarity=U
+mana={1}{R}
+type=Creature
+subtype=Minotaur Scout
+power=3
+toughness=3
+[/card]
+[card]
 text=Target player discards X cards, where X is one plus the number of cards named Mind Burst in all graveyards.
 id=29746
 name=Mind Burst
diff --git a/projects/mtg/bin/Res/sets/PLS/todo.dat b/projects/mtg/bin/Res/sets/PLS/todo.dat
index c51c4af0a..09100e048 100644
--- a/projects/mtg/bin/Res/sets/PLS/todo.dat
+++ b/projects/mtg/bin/Res/sets/PLS/todo.dat
@@ -216,11 +216,19 @@ text=Flash When Fleetfoot Panther enters the battlefield, return a green or whit
 rarity=U
 [/card]
 [card]
+#Require Testing
 id=25893
 name=Forsaken City
 mana=
 type=Land
 text=Forsaken City doesn't untap during your untap step. At the beginning of your upkeep, you may exile a card from your hand. If you do, untap Forsaken City. {T}: Add one mana of any color to your mana pool.
+abilities=doesuntap
+auto={0}:moveto(exile) target(*|myHand) && untap all(this) myUpkeepOnly
+auto={T}:add{G}
+auto={T}:add{W}
+auto={T}:add{R}
+auto={T}:add{B}
+auto={T}:add{U}
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat
index 4756e9e18..197f2f1ce 100644
--- a/projects/mtg/bin/Res/sets/RV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RV/_cards.dat
@@ -621,7 +621,7 @@ toughness=1
 text={T}, Sacrifice an artifact: Put a +1/+1 counter on target creature. Play this ability only during your upkeep.
 id=1286
 name=Dwarven Weaponsmith
-auto={T}{S(artifact|myBattlefield)}:counter(1/1,1) target(creature)
+auto={T}{S(artifact|myBattlefield)}:counter(1/1,1) target(creature) myUpkeepOnly
 rarity=U
 mana={1}{R}
 type=Creature
@@ -1126,7 +1126,7 @@ subtype=Island
 [card]
 text=Island Fish Jasconius can't attack unless defending player controls an Island.   Jasconius doesn't untap during your untap step.   At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap Jasconius.   When you control no Islands, sacrifice Island Fish Jasconius.
 id=1203
-auto={U}{U}{U}:untap
+auto={U}{U}{U}:untap myUpkeepOnly
 name=Island Fish Jasconius
 rarity=R
 mana={4}{U}{U}{U}
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index e113399cf..fc793ac61 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -120,7 +120,8 @@ toughness=2
 [card]
 text=Flying   Brass Gnat doesn't untap during your untap step. At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Gnat.
 id=118876
-alias=1099
+abilities=doesnotuntap
+auto={1}:untap myUpkeepOnly
 name=Brass Gnat
 rarity=C
 mana={1}
diff --git a/projects/mtg/bin/Res/sets/ZEN/_cards.dat b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
index f0af4808a..841f8ec6a 100644
--- a/projects/mtg/bin/Res/sets/ZEN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
@@ -888,7 +888,7 @@ toughness=2
 [/card]
 [card]
 text=Return target permanent you control to its owner's hand. You gain 4 life.
-target=*(myBattlefield)
+target=*|myBattlefield
 auto=moveTo(ownerhand)
 auto=life:4 controller
 id=180360