diff --git a/forge-gui/res/cardsfolder/s/sacellum_archers.txt b/forge-gui/res/cardsfolder/s/sacellum_archers.txt
index 9cd9dc8d232..91f0b187df5 100644
--- a/forge-gui/res/cardsfolder/s/sacellum_archers.txt
+++ b/forge-gui/res/cardsfolder/s/sacellum_archers.txt
@@ -3,6 +3,5 @@ ManaCost:2 G
 Types:Creature Elf Archer
 PT:2/3
 A:AB$ DealDamage | Cost$ R W T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sacellum_archers.jpg
 Oracle:{R}{W}, {T}: Sacellum Archers deals 2 damage to target attacking or blocking creature.
diff --git a/forge-gui/res/cardsfolder/s/sage_of_ancient_lore_werewolf_of_ancient_hunger.txt b/forge-gui/res/cardsfolder/s/sage_of_ancient_lore_werewolf_of_ancient_hunger.txt
index f609841284c..f6ab381b45b 100644
--- a/forge-gui/res/cardsfolder/s/sage_of_ancient_lore_werewolf_of_ancient_hunger.txt
+++ b/forge-gui/res/cardsfolder/s/sage_of_ancient_lore_werewolf_of_ancient_hunger.txt
@@ -8,6 +8,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 
 T:Mode$ Phase | Phase$ Upkeep | WerewolfTransformCondition$ True | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of each upkeep, if no spells were cast last turn, transform CARDNAME.
 SVar:TrigTransform:AB$ SetState | Cost$ 0 | Defined$ Self | Mode$ Transform
+#TODO: update logic for the AI to play around this
 SVar:RemAIDeck:True
 SVar:NeedsToPlayVar:X GE3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sage_of_ancient_lore.jpg
diff --git a/forge-gui/res/cardsfolder/s/samite_alchemist.txt b/forge-gui/res/cardsfolder/s/samite_alchemist.txt
index 393113cbd14..4925aee18bc 100644
--- a/forge-gui/res/cardsfolder/s/samite_alchemist.txt
+++ b/forge-gui/res/cardsfolder/s/samite_alchemist.txt
@@ -5,6 +5,5 @@ PT:0/2
 A:AB$ PreventDamage | Cost$ W W T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Amount$ 4 | SubAbility$ DBTap | SpellDescription$ Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.
 SVar:DBTap:DB$Tap | Cost$ 0 | Defined$ Targeted | SubAbility$ DBStayTapped
 SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Targeted | Permanent$ True | IsCurse$ True
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/samite_alchemist.jpg
 Oracle:{W}{W}, {T}: Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/s/screeching_griffin.txt b/forge-gui/res/cardsfolder/s/screeching_griffin.txt
index 334fbfadad0..8b7d7545e55 100644
--- a/forge-gui/res/cardsfolder/s/screeching_griffin.txt
+++ b/forge-gui/res/cardsfolder/s/screeching_griffin.txt
@@ -4,6 +4,5 @@ Types:Creature Griffin
 PT:2/2
 K:Flying
 A:AB$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | IsCurse$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/screeching_griffin.jpg
 Oracle:Flying\n{R}: Target creature can't block Screeching Griffin this turn.
diff --git a/forge-gui/res/cardsfolder/s/scroll_of_origins.txt b/forge-gui/res/cardsfolder/s/scroll_of_origins.txt
index 976abeae0f4..27f1343abfa 100644
--- a/forge-gui/res/cardsfolder/s/scroll_of_origins.txt
+++ b/forge-gui/res/cardsfolder/s/scroll_of_origins.txt
@@ -1,8 +1,8 @@
 Name:Scroll of Origins
 ManaCost:2
 Types:Artifact
-A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | SpellDescription$ Draw a card if you have seven or more cards in hand.
+A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | References$ X | AILogic$ CheckCondition | SpellDescription$ Draw a card if you have seven or more cards in hand.
 SVar:X:Count$InYourHand
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scroll_of_origins.jpg
 Oracle:{2}, {T}: Draw a card if you have seven or more cards in hand.
diff --git a/forge-gui/res/cardsfolder/s/secretkeeper.txt b/forge-gui/res/cardsfolder/s/secretkeeper.txt
index 85c88eab626..b8039fe2ad2 100644
--- a/forge-gui/res/cardsfolder/s/secretkeeper.txt
+++ b/forge-gui/res/cardsfolder/s/secretkeeper.txt
@@ -5,6 +5,6 @@ PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GTY | Description$ As long as you have more cards in hand than each opponent, CARDNAME gets +2/+2 and has flying.
 SVar:X:Count$InYourHand
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/secretkeeper.jpg
 Oracle:As long as you have more cards in hand than each opponent, Secretkeeper gets +2/+2 and has flying.
diff --git a/forge-gui/res/cardsfolder/s/shifting_wall.txt b/forge-gui/res/cardsfolder/s/shifting_wall.txt
index 824ce5f2f08..39ffc2aa3f5 100644
--- a/forge-gui/res/cardsfolder/s/shifting_wall.txt
+++ b/forge-gui/res/cardsfolder/s/shifting_wall.txt
@@ -5,6 +5,6 @@ PT:0/0
 K:Defender
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
-SVar:RemAIDeck:True
+SVar:NoZeroToughnessAI:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shifting_wall.jpg
 Oracle:Defender (This creature can't attack.)\nShifting Wall enters the battlefield with X +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/s/shrewd_hatchling.txt b/forge-gui/res/cardsfolder/s/shrewd_hatchling.txt
index 178bb24fae7..1c341ce71b4 100644
--- a/forge-gui/res/cardsfolder/s/shrewd_hatchling.txt
+++ b/forge-gui/res/cardsfolder/s/shrewd_hatchling.txt
@@ -7,7 +7,6 @@ A:AB$ Pump | Cost$ UR | ValidTgts$ Creature | TgtPrompt$ Select target creature
 T:Mode$ SpellCast | ValidCard$ Card.Red | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a red spell, remove a -1/-1 counter from CARDNAME.
 T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a blue spell, remove a -1/-1 counter from CARDNAME.
 SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1
-SVar:RemAIDeck:True
 SVar:BuffedBy:Card.Red,Card.Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shrewd_hatchling.jpg
 Oracle:Shrewd Hatchling enters the battlefield with four -1/-1 counters on it.\n{U/R}: Target creature can't block Shrewd Hatchling this turn.\nWhenever you cast a blue spell, remove a -1/-1 counter from Shrewd Hatchling.\nWhenever you cast a red spell, remove a -1/-1 counter from Shrewd Hatchling.
diff --git a/forge-gui/res/cardsfolder/s/shrouded_serpent.txt b/forge-gui/res/cardsfolder/s/shrouded_serpent.txt
index dff2622eccc..e342ab4eb74 100644
--- a/forge-gui/res/cardsfolder/s/shrouded_serpent.txt
+++ b/forge-gui/res/cardsfolder/s/shrouded_serpent.txt
@@ -3,7 +3,6 @@ ManaCost:4 U U U
 Types:Creature Serpent
 PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, defending player may pay {4}. If he or she doesn't, CARDNAME can't be blocked this turn.
-SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN Unblockable | UnlessCost$ 4 | UnlessPayer$ DefendingPlayer
-SVar:RemAIDeck:True
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable | UnlessCost$ 4 | UnlessPayer$ DefendingPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shrouded_serpent.jpg
 Oracle:Whenever Shrouded Serpent attacks, defending player may pay {4}. If he or she doesn't, Shrouded Serpent can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/s/sigil_of_distinction.txt b/forge-gui/res/cardsfolder/s/sigil_of_distinction.txt
index 8ebac5a3481..4e09294e50e 100644
--- a/forge-gui/res/cardsfolder/s/sigil_of_distinction.txt
+++ b/forge-gui/res/cardsfolder/s/sigil_of_distinction.txt
@@ -2,10 +2,11 @@ Name:Sigil of Distinction
 ManaCost:X
 Types:Artifact Equipment
 K:etbCounter:CHARGE:X
-S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddPower$ Y | AddToughness$ Y | Description$ Equipped creature gets +1/+1 for each charge counter on CARDNAME.
+S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddPower$ Y | AddToughness$ Y | References$ Y | Description$ Equipped creature gets +1/+1 for each charge counter on CARDNAME.
 K:Equip SubCounter<1/CHARGE>
 SVar:X:Count$xPaid
 SVar:Y:Count$CardCounters.CHARGE
-SVar:RemAIDeck:True
+SVar:NeedsToPlayVar:Z GE3
+SVar:Z:Count$Valid Land.YouCtrl+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_of_distinction.jpg
 Oracle:Sigil of Distinction enters the battlefield with X charge counters on it.\nEquipped creature gets +1/+1 for each charge counter on Sigil of Distinction.\nEquip—Remove a charge counter from Sigil of Distinction.
diff --git a/forge-gui/res/cardsfolder/s/skull_collector.txt b/forge-gui/res/cardsfolder/s/skull_collector.txt
index e0bc119a4eb..12a609b35ed 100644
--- a/forge-gui/res/cardsfolder/s/skull_collector.txt
+++ b/forge-gui/res/cardsfolder/s/skull_collector.txt
@@ -5,6 +5,8 @@ PT:3/3
 A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, return a black creature you control to its owner's hand.
 SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Mandatory$ True | Hidden$ True | ChangeType$ Creature.Black+YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlayVar:Z GE2
+SVar:Z:Count$Valid Creature.Black+YouCtrl+inZoneBattlefield
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skull_collector.jpg
 Oracle:At the beginning of your upkeep, return a black creature you control to its owner's hand.\n{1}{B}: Regenerate Skull Collector.
diff --git a/forge-gui/res/cardsfolder/s/skull_of_ramos.txt b/forge-gui/res/cardsfolder/s/skull_of_ramos.txt
index 93d0c86d9bb..a06337f98c0 100644
--- a/forge-gui/res/cardsfolder/s/skull_of_ramos.txt
+++ b/forge-gui/res/cardsfolder/s/skull_of_ramos.txt
@@ -3,6 +3,5 @@ ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
 A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skull_of_ramos.jpg
 Oracle:{T}: Add {B} to your mana pool.\nSacrifice Skull of Ramos: Add {B} to your mana pool.
diff --git a/forge-gui/res/cardsfolder/s/skullmead_cauldron.txt b/forge-gui/res/cardsfolder/s/skullmead_cauldron.txt
index 5d99a58eae8..9b5bd77bd5d 100644
--- a/forge-gui/res/cardsfolder/s/skullmead_cauldron.txt
+++ b/forge-gui/res/cardsfolder/s/skullmead_cauldron.txt
@@ -3,6 +3,5 @@ ManaCost:4
 Types:Artifact
 A:AB$ GainLife | Cost$ T | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
 A:AB$ GainLife | Cost$ T Discard<1/Card>| LifeAmount$ 3 | SpellDescription$ You gain 3 life.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skullmead_cauldron.jpg
 Oracle:{T}: You gain 1 life.\n{T}, Discard a card: You gain 3 life.
diff --git a/forge-gui/res/cardsfolder/s/skullwinder.txt b/forge-gui/res/cardsfolder/s/skullwinder.txt
index 83ee2a7c58d..c9759c3736a 100644
--- a/forge-gui/res/cardsfolder/s/skullwinder.txt
+++ b/forge-gui/res/cardsfolder/s/skullwinder.txt
@@ -8,6 +8,5 @@ SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$
 SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Card.ChosenCtrl | Chooser$ ChosenPlayer | ChangeNum$ 1 | Origin$ Graveyard | Destination$ Hand | SubAbility$ Cleanup
 SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skullwinder.jpg
 Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Skullwinder enters the battlefield, return target card from your graveyard to your hand, then choose an opponent. That player returns a card from his or her graveyard to his or her hand.
diff --git a/forge-gui/res/cardsfolder/s/sky_eel_school.txt b/forge-gui/res/cardsfolder/s/sky_eel_school.txt
index ccf829cade7..4e813ea339e 100644
--- a/forge-gui/res/cardsfolder/s/sky_eel_school.txt
+++ b/forge-gui/res/cardsfolder/s/sky_eel_school.txt
@@ -4,8 +4,7 @@ Types:Creature Fish
 PT:3/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoot | TriggerDescription$ When CARDNAME enters the battlefield, draw a card, then discard a card.
-SVar:TrigLoot:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
-SVar:RemAIDeck:True
+SVar:TrigLoot:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sky_eel_school.jpg
 Oracle:Flying\nWhen Sky-Eel School enters the battlefield, draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/s/sky_swallower.txt b/forge-gui/res/cardsfolder/s/sky_swallower.txt
index c8824a6ebcd..9595bfaa385 100644
--- a/forge-gui/res/cardsfolder/s/sky_swallower.txt
+++ b/forge-gui/res/cardsfolder/s/sky_swallower.txt
@@ -5,6 +5,6 @@ PT:8/8
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ When CARDNAME enters the battlefield, target opponent gains control of all other permanents you control.
 SVar:TrigGainControl:DB$ GainControl | ValidTgts$ Opponent | AllValid$ Permanent.Other+YouCtrl | NewController$ Opponent
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card96835.jpg
 Oracle:Flying\nWhen Sky Swallower enters the battlefield, target opponent gains control of all other permanents you control.
diff --git a/forge-gui/res/cardsfolder/s/slab_hammer.txt b/forge-gui/res/cardsfolder/s/slab_hammer.txt
index cd6e5ff3703..80caa96d85b 100644
--- a/forge-gui/res/cardsfolder/s/slab_hammer.txt
+++ b/forge-gui/res/cardsfolder/s/slab_hammer.txt
@@ -4,6 +4,6 @@ Types:Artifact Equipment
 K:Equip 2
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigPump | TriggerDescription$ Whenever equipped creature attacks, you may return a land you control to its owner's hand. If you do, the creature gets +2/+2 until end of turn.
 SVar:TrigPump:AB$ Pump | Cost$ Return<1/Land> | Defined$ TriggeredAttacker | NumAtt$ 2 | NumDef$ 2
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slab_hammer.jpg
 Oracle:Whenever equipped creature attacks, you may return a land you control to its owner's hand. If you do, the creature gets +2/+2 until end of turn.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/s/solarion.txt b/forge-gui/res/cardsfolder/s/solarion.txt
index 5e0160652a3..8c43757edfd 100644
--- a/forge-gui/res/cardsfolder/s/solarion.txt
+++ b/forge-gui/res/cardsfolder/s/solarion.txt
@@ -5,6 +5,7 @@ PT:0/0
 K:Sunburst
 A:AB$ MultiplyCounter | Cost$ T | Defined$ Self | CounterType$ P1P1 | SpellDescription$ Double the number of +1/+1 counters on CARDNAME.
 DeckHas:Ability$Counters
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:NoZeroToughnessAI:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/solarion.jpg
 Oracle:Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)\n{T}: Double the number of +1/+1 counters on Solarion.
diff --git a/forge-gui/res/cardsfolder/s/songstitcher.txt b/forge-gui/res/cardsfolder/s/songstitcher.txt
index e9a02d2cc28..6f52b4f101f 100644
--- a/forge-gui/res/cardsfolder/s/songstitcher.txt
+++ b/forge-gui/res/cardsfolder/s/songstitcher.txt
@@ -3,6 +3,5 @@ ManaCost:W
 Types:Creature Human Cleric
 PT:1/1
 A:AB$ Pump | Cost$ 1 W | ValidTgts$ Creature.attacking+withFlying | TgtPrompt$ Select target attacking creature with flying | IsCurse$ True | KW$ Prevent all combat damage that would be dealt by CARDNAME. | SpellDescription$ Target attacking creature with flying deals no combat damage this turn.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/songstitcher.jpg
 Oracle:{1}{W}: Prevent all combat damage that would be dealt this turn by target attacking creature with flying.
diff --git a/forge-gui/res/cardsfolder/s/soul_foundry.txt b/forge-gui/res/cardsfolder/s/soul_foundry.txt
index 9269729654c..ca5b0401d6e 100644
--- a/forge-gui/res/cardsfolder/s/soul_foundry.txt
+++ b/forge-gui/res/cardsfolder/s/soul_foundry.txt
@@ -3,14 +3,13 @@ ManaCost:4
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters the battlefield, you may exile a creature card from your hand.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Imprint$ True | Origin$ Hand | Destination$ Exile | ChangeType$ Creature | ChangeNum$ 1
-A:AB$CopyPermanent | Cost$ X T | Defined$ Imprinted.ExiledWithSource | References$ X | SpellDescription$ Create a token that's a copy of the exiled card. X is the converted mana cost of that card.
+A:AB$CopyPermanent | Cost$ X T | Defined$ Imprinted.ExiledWithSource | References$ X | AILogic$ AtEOT | SpellDescription$ Create a token that's a copy of the exiled card. X is the converted mana cost of that card.
 SVar:X:Imprinted$CardManaCost
 T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsImprinted+ExiledWithSource | Execute$ DBForget
 SVar:DBForget:DB$ Pump | ForgetImprinted$ TriggeredCard
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:NeedsToPlayVar:Y GE1
-SVar:Y:Count$ValidHand Creature
-SVar:RemAIDeck:True
+SVar:Y:Count$ValidHand Creature.YouOwn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_foundry.jpg
 Oracle:Imprint — When Soul Foundry enters the battlefield, you may exile a creature card from your hand.\n{X}, {T}: Create a token that's a copy of the exiled card. X is the converted mana cost of that card.
diff --git a/forge-gui/res/cardsfolder/s/species_gorger.txt b/forge-gui/res/cardsfolder/s/species_gorger.txt
index 1805be0b8c6..55335d1b417 100644
--- a/forge-gui/res/cardsfolder/s/species_gorger.txt
+++ b/forge-gui/res/cardsfolder/s/species_gorger.txt
@@ -4,6 +4,8 @@ Types:Creature Frog Beast
 PT:6/6
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, return a creature you control to its owner's hand.
 SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Mandatory$ True | Hidden$ True | ChangeType$ Creature.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlayVar:Z GE2
+SVar:Z:Count$Valid Creature.YouCtrl+inZoneBattlefield
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/species_gorger.jpg
 Oracle:At the beginning of your upkeep, return a creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/spell_burst.txt b/forge-gui/res/cardsfolder/s/spell_burst.txt
index bfe82ce7a56..d2ab8d00a07 100644
--- a/forge-gui/res/cardsfolder/s/spell_burst.txt
+++ b/forge-gui/res/cardsfolder/s/spell_burst.txt
@@ -1,9 +1,8 @@
 Name:Spell Burst
 ManaCost:X U
 Types:Instant
-A:SP$Counter | Cost$ X U | TargetType$ Spell | ValidTgts$ Card | SpellDescription$ Counter target spell with converted mana cost X.
+A:SP$Counter | Cost$ X U | TargetType$ Spell | ValidTgts$ Card | References$ X | SpellDescription$ Counter target spell with converted mana cost X.
 SVar:X:Targeted$CardManaCost
 K:Buyback 3
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_burst.jpg
 Oracle:Buyback {3} (You may pay an additional {3} as you cast this spell. If you do, put this card into your hand as it resolves.)\nCounter target spell with converted mana cost X.
diff --git a/forge-gui/res/cardsfolder/s/spiketail_hatchling.txt b/forge-gui/res/cardsfolder/s/spiketail_hatchling.txt
index f297f895d54..7d18f4bd07c 100644
--- a/forge-gui/res/cardsfolder/s/spiketail_hatchling.txt
+++ b/forge-gui/res/cardsfolder/s/spiketail_hatchling.txt
@@ -4,6 +4,5 @@ Types:Creature Drake
 PT:1/1
 K:Flying
 A:AB$ Counter | Cost$ Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays {1}.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spiketail_hatchling.jpg
 Oracle:Flying\nSacrifice Spiketail Hatchling: Counter target spell unless its controller pays {1}.
diff --git a/forge-gui/res/cardsfolder/s/squelch.txt b/forge-gui/res/cardsfolder/s/squelch.txt
index bd80bbf9b7f..afe7ddc7f84 100644
--- a/forge-gui/res/cardsfolder/s/squelch.txt
+++ b/forge-gui/res/cardsfolder/s/squelch.txt
@@ -3,6 +3,5 @@ ManaCost:1 U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U | TgtPrompt$ Select target Activated Ability | ValidTgts$ Card | TargetType$ Activated | SubAbility$ DBDraw | SpellDescription$ Counter target activated ability. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/squelch.jpg
 Oracle:Counter target activated ability. (Mana abilities can't be targeted.)\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/s/stonecloaker.txt b/forge-gui/res/cardsfolder/s/stonecloaker.txt
index d5a28b93a8e..888f120da1b 100644
--- a/forge-gui/res/cardsfolder/s/stonecloaker.txt
+++ b/forge-gui/res/cardsfolder/s/stonecloaker.txt
@@ -8,6 +8,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouCtrl | ChangeNum$ 1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange2 | TriggerDescription$ When CARDNAME enters the battlefield, exile target card from a graveyard.
 SVar:TrigChange2:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TgtPrompt$ Select target card from any graveyard
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Creature.YouCtrl+cmcLE2+inZoneBattlefield
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stonecloaker.jpg
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\nWhen Stonecloaker enters the battlefield, return a creature you control to its owner's hand.\nWhen Stonecloaker enters the battlefield, exile target card from a graveyard.
diff --git a/forge-gui/res/cardsfolder/s/stormcallers_boon.txt b/forge-gui/res/cardsfolder/s/stormcallers_boon.txt
index d280f4490f3..4f282ce4dca 100644
--- a/forge-gui/res/cardsfolder/s/stormcallers_boon.txt
+++ b/forge-gui/res/cardsfolder/s/stormcallers_boon.txt
@@ -4,6 +4,5 @@ Types:Enchantment
 K:Cascade
 A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl | KW$ Flying | SpellDescription$ Creatures you control gain flying until end of turn.
 SVar:PlayMain1:TRUE
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormcallers_boon.jpg
 Oracle:Sacrifice Stormcaller's Boon: Creatures you control gain flying until end of turn.\nCascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)
diff --git a/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt b/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt
index 50b19dbeca5..e6901f934e0 100644
--- a/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt
+++ b/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt
@@ -3,7 +3,6 @@ ManaCost:U
 Types:Tribal Instant Wizard
 A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | IsCurse$ True | SubAbility$ DBDraw | SpellDescription$ Target creature gets -4/-0 until end of turn. If you control a Wizard, draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | ConditionPresent$ Wizard.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Wizard,
-SVar:RemRandomDeck:True
-SVar:RemAIDeck:True
+DeckHints:Type$Wizard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stream_of_unconsciousness.jpg
 Oracle:Target creature gets -4/-0 until end of turn. If you control a Wizard, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/stronghold_rats.txt b/forge-gui/res/cardsfolder/s/stronghold_rats.txt
index f05624e82d3..88f5ef1e737 100644
--- a/forge-gui/res/cardsfolder/s/stronghold_rats.txt
+++ b/forge-gui/res/cardsfolder/s/stronghold_rats.txt
@@ -5,6 +5,6 @@ PT:2/1
 K:Shadow
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, each player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_rats.jpg
 Oracle:Shadow (This creature can block or be blocked by only creatures with shadow.)\nWhenever Stronghold Rats deals combat damage to a player, each player discards a card.