diff --git a/res/cardsfolder/accelerate.txt b/res/cardsfolder/accelerate.txt
index 76d347a2bb1..ad4edbd9630 100644
--- a/res/cardsfolder/accelerate.txt
+++ b/res/cardsfolder/accelerate.txt
@@ -2,8 +2,8 @@ Name:Accelerate
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accelerate.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/90.jpg
diff --git a/res/cardsfolder/afflict.txt b/res/cardsfolder/afflict.txt
index 30a7e4c292a..eda478f5dd5 100644
--- a/res/cardsfolder/afflict.txt
+++ b/res/cardsfolder/afflict.txt
@@ -2,8 +2,8 @@ Name:Afflict
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/afflict.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/115.jpg
diff --git a/res/cardsfolder/aggressive_urge.txt b/res/cardsfolder/aggressive_urge.txt
index 4ff29433e45..2d9ec830485 100644
--- a/res/cardsfolder/aggressive_urge.txt
+++ b/res/cardsfolder/aggressive_urge.txt
@@ -2,8 +2,8 @@ Name:Aggressive Urge
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature gets +1/+1 until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature gets +1/+1 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aggressive_urge.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/181.jpg
diff --git a/res/cardsfolder/annihilate.txt b/res/cardsfolder/annihilate.txt
index eda5061a9b8..a51c4c982e5 100644
--- a/res/cardsfolder/annihilate.txt
+++ b/res/cardsfolder/annihilate.txt
@@ -2,8 +2,8 @@ Name:Annihilate
 ManaCost:3 B B
 Types:Instant
 Text:no text
-A:SP$Destroy | Cost$ 3 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SpellDescription$ Destroy target nonblack creature. It can't be regenerated.
-K:Draw a card.
+A:SP$Destroy | Cost$ 3 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/annihilate.jpg
 SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/94.jpg
diff --git a/res/cardsfolder/aura_blast.txt b/res/cardsfolder/aura_blast.txt
index 83e03ccead9..fa714bd12ba 100644
--- a/res/cardsfolder/aura_blast.txt
+++ b/res/cardsfolder/aura_blast.txt
@@ -2,8 +2,8 @@ Name:Aura Blast
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Destroy | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
-K:Draw a card.
+A:SP$Destroy | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_blast.jpg
 SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/1.jpg
diff --git a/res/cardsfolder/bewilder.txt b/res/cardsfolder/bewilder.txt
index dd022b883fd..a9d33641d9a 100644
--- a/res/cardsfolder/bewilder.txt
+++ b/res/cardsfolder/bewilder.txt
@@ -2,8 +2,8 @@ Name:Bewilder
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | IsCurse$ True | SpellDescription$ Target creature gets -3/-0 until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | IsCurse$ True | SpellDescription$ Target creature gets -3/-0 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bewilder.jpg
diff --git a/res/cardsfolder/bind.txt b/res/cardsfolder/bind.txt
index 5e4240a8c59..ce069faaa91 100644
--- a/res/cardsfolder/bind.txt
+++ b/res/cardsfolder/bind.txt
@@ -2,8 +2,8 @@ Name:Bind
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 G | Type$ Ability | SpellDescription$ Counter target activated ability.
-K:Draw a card.
+A:SP$ Counter | Cost$ 1 G | Type$ Ability | SpellDescription$ Counter target activated ability. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bind.jpg
 SetInfo:INV|Rare|http://magiccards.info/scans/en/in/182.jpg
diff --git a/res/cardsfolder/boiling_blood.txt b/res/cardsfolder/boiling_blood.txt
index 1101ad6c3dd..79fea57e901 100644
--- a/res/cardsfolder/boiling_blood.txt
+++ b/res/cardsfolder/boiling_blood.txt
@@ -2,8 +2,8 @@ Name:Boiling Blood
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 2 R | ValidTgts$ Creature | KW$ HIDDEN CARDNAME attacks each turn if able. | TgtPrompt$ Select target creature | SpellDescription$ Target creature attacks this turn if able.
-K:Draw a card.
+A:SP$Pump | Cost$ 2 R | ValidTgts$ Creature | KW$ HIDDEN CARDNAME attacks each turn if able. | TgtPrompt$ Select target creature | SpellDescription$ Target creature attacks this turn if able. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boiling_blood.jpg
diff --git a/res/cardsfolder/brainbite.txt b/res/cardsfolder/brainbite.txt
index 069fb484341..1244e02b037 100644
--- a/res/cardsfolder/brainbite.txt
+++ b/res/cardsfolder/brainbite.txt
@@ -2,8 +2,8 @@ Name:Brainbite
 ManaCost:2 U B
 Types:Sorcery
 Text:no text
-K:Draw a card.
-A:SP$Discard | Cost$ 2 U B | ValidTgts$ Opponent | NumCards$ 1 | Mode$ RevealYouChoose | SpellDescription$ Target opponent reveals his or her hand. You choose a card from it. That player discards that card.
+A:SP$Discard | Cost$ 2 U B | ValidTgts$ Opponent | NumCards$ 1 | Mode$ RevealYouChoose | SpellDescription$ Target opponent reveals his or her hand. You choose a card from it. That player discards that card. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brainbite.jpg
 SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/18.jpg
diff --git a/res/cardsfolder/cloak_of_feathers.txt b/res/cardsfolder/cloak_of_feathers.txt
index 8165303b989..4561844736d 100644
--- a/res/cardsfolder/cloak_of_feathers.txt
+++ b/res/cardsfolder/cloak_of_feathers.txt
@@ -2,8 +2,8 @@ Name:Cloak of Feathers
 ManaCost:U
 Types:Sorcery
 Text:no text
-A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cloak_of_feathers.jpg
 SetInfo:POR|Common|http://magiccards.info/scans/en/po/45.jpg
diff --git a/res/cardsfolder/cremate.txt b/res/cardsfolder/cremate.txt
index abadec404e7..22e371356c2 100644
--- a/res/cardsfolder/cremate.txt
+++ b/res/cardsfolder/cremate.txt
@@ -2,8 +2,8 @@ Name:Cremate
 ManaCost:B
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cremate.jpg
 SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/45.jpg
diff --git a/res/cardsfolder/dosans_oldest_chant.txt b/res/cardsfolder/dosans_oldest_chant.txt
index 32b211baf77..5775a9bda0f 100644
--- a/res/cardsfolder/dosans_oldest_chant.txt
+++ b/res/cardsfolder/dosans_oldest_chant.txt
@@ -2,8 +2,8 @@ Name:Dosan's Oldest Chant
 ManaCost:4 G
 Types:Sorcery
 Text:no text
-A:SP$GainLife | Cost$ 4 G | LifeAmount$ 6 | SpellDescription$ You gain 6 life.
-K:Draw a card.
+A:SP$GainLife | Cost$ 4 G | LifeAmount$ 6 | SpellDescription$ You gain 6 life. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dosans_oldest_chant.jpg
 SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/127.jpg
diff --git a/res/cardsfolder/dredge.txt b/res/cardsfolder/dredge.txt
index 01406a30a87..363a6e884b1 100644
--- a/res/cardsfolder/dredge.txt
+++ b/res/cardsfolder/dredge.txt
@@ -2,8 +2,8 @@ Name:Dredge
 ManaCost:B
 Types:Instant
 Text:no text
-A:SP$Sacrifice | Cost$ B | SacValid$ Creature,Land | SacMessage$ Creature or Land | SpellDescription$ Sacrifice a creature or land.
-K:Draw a card.
+A:SP$Sacrifice | Cost$ B | SacValid$ Creature,Land | SacMessage$ Creature or Land | SpellDescription$ Sacrifice a creature or land. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dredge.jpg
diff --git a/res/cardsfolder/ember_shot.txt b/res/cardsfolder/ember_shot.txt
index ef45d349302..05121987a8d 100644
--- a/res/cardsfolder/ember_shot.txt
+++ b/res/cardsfolder/ember_shot.txt
@@ -2,8 +2,8 @@ Name:Ember Shot
 ManaCost:6 R
 Types:Instant
 Text:no text
-A:SP$DealDamage | Cost$ 6 R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ Ember Shot deals 3 damage to target creature or player.
-K:Draw a card.
+A:SP$DealDamage | Cost$ 6 R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ Ember Shot deals 3 damage to target creature or player. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ember_shot.jpg
 SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/87.jpg
diff --git a/res/cardsfolder/execute.txt b/res/cardsfolder/execute.txt
index 230810d1f29..f2b756f1832 100644
--- a/res/cardsfolder/execute.txt
+++ b/res/cardsfolder/execute.txt
@@ -2,8 +2,8 @@ Name:Execute
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$Destroy | Cost$ 2 B | ValidTgts$ Creature.White | TgtPrompt$ Select target white creature | NoRegen$ True | SpellDescription$ Destroy target white creature. It can't be regenerated.
-K:Draw a card.
+A:SP$Destroy | Cost$ 2 B | ValidTgts$ Creature.White | TgtPrompt$ Select target white creature | NoRegen$ True | SpellDescription$ Destroy target white creature. It can't be regenerated. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/execute.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/132.jpg
diff --git a/res/cardsfolder/fleeting_distraction.txt b/res/cardsfolder/fleeting_distraction.txt
index 73c64d01701..b1370cf154e 100644
--- a/res/cardsfolder/fleeting_distraction.txt
+++ b/res/cardsfolder/fleeting_distraction.txt
@@ -2,8 +2,8 @@ Name:Fleeting Distraction
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-0 until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-0 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fleeting_distraction.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/67.jpg
diff --git a/res/cardsfolder/footbottom_feast.txt b/res/cardsfolder/footbottom_feast.txt
index 14ae2c1e66a..5beb325aa22 100644
--- a/res/cardsfolder/footbottom_feast.txt
+++ b/res/cardsfolder/footbottom_feast.txt
@@ -2,8 +2,8 @@ Name:Footbottom Feast
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Library | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Put any number of target creature cards from your graveyard on top of your library.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Library | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Put any number of target creature cards from your graveyard on top of your library. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:X:Count$TypeInYourYard.Creature
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/gallantry.txt b/res/cardsfolder/gallantry.txt
index 32124a75f5c..4c8cdecf10d 100644
--- a/res/cardsfolder/gallantry.txt
+++ b/res/cardsfolder/gallantry.txt
@@ -2,8 +2,8 @@ Name:Gallantry
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 W | ValidTgts$ Creature.blocking | NumAtt$ +4 | NumDef$ +4 | SpellDescription$ Target blocking creature gets +4/+4 until end of turn. | TgtPrompt$Select target blocking creature.
-K:Draw a card.
+A:SP$Pump | Cost$ 1 W | ValidTgts$ Creature.blocking | NumAtt$ +4 | NumDef$ +4 | SpellDescription$ Target blocking creature gets +4/+4 until end of turn. | TgtPrompt$Select target blocking creature. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gallantry.jpg
diff --git a/res/cardsfolder/guided_strike.txt b/res/cardsfolder/guided_strike.txt
index d923ac99fb8..41577822614 100644
--- a/res/cardsfolder/guided_strike.txt
+++ b/res/cardsfolder/guided_strike.txt
@@ -2,8 +2,8 @@ Name:Guided Strike
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/guided_strike.jpg
 SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/132.jpg
diff --git a/res/cardsfolder/implode.txt b/res/cardsfolder/implode.txt
index e52a7223cd4..963afea3830 100644
--- a/res/cardsfolder/implode.txt
+++ b/res/cardsfolder/implode.txt
@@ -2,8 +2,8 @@ Name:Implode
 ManaCost:4 R
 Types:Sorcery
 Text:no text
-A:SP$Destroy | Cost$ 4 R | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Destroy target land.
-K:Draw a card.
+A:SP$Destroy | Cost$ 4 R | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Destroy target land. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/implode.jpg
 SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/62.jpg
diff --git a/res/cardsfolder/inside_out.txt b/res/cardsfolder/inside_out.txt
index 66d42875dd5..45391beb3b7 100644
--- a/res/cardsfolder/inside_out.txt
+++ b/res/cardsfolder/inside_out.txt
@@ -2,8 +2,8 @@ Name:Inside Out
 ManaCost:1 UR
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 UR | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch target creature's power and toughness until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 1 UR | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch target creature's power and toughness until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inside_out.jpg
diff --git a/res/cardsfolder/instill_infection.txt b/res/cardsfolder/instill_infection.txt
index f1c3f4cdeb0..783e99454cc 100644
--- a/res/cardsfolder/instill_infection.txt
+++ b/res/cardsfolder/instill_infection.txt
@@ -2,8 +2,8 @@ Name:Instill Infection
 ManaCost:3 B
 Types:Instant
 Text:no text
-A:SP$PutCounter | Cost$ 3 B | Tgt$ TgtC | CounterType$ M1M1 | CounterNum$ 1 | IsCurse$ True | SpellDescription$ Put a -1/-1 counter on target creature.
-K:Draw a card.
+A:SP$PutCounter | Cost$ 3 B | Tgt$ TgtC | CounterType$ M1M1 | CounterNum$ 1 | IsCurse$ True | SpellDescription$ Put a -1/-1 counter on target creature. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/instill_infection.jpg
diff --git a/res/cardsfolder/lace_with_moonglove.txt b/res/cardsfolder/lace_with_moonglove.txt
index 450b8dbfda2..f8eeba28a3e 100644
--- a/res/cardsfolder/lace_with_moonglove.txt
+++ b/res/cardsfolder/lace_with_moonglove.txt
@@ -2,8 +2,8 @@ Name:Lace with Moonglove
 ManaCost:2 G
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Deathtouch | SpellDescription$ Target creature gains deathtouch until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Deathtouch | SpellDescription$ Target creature gains deathtouch until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lace_with_moonglove.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/225.jpg
diff --git a/res/cardsfolder/leap.txt b/res/cardsfolder/leap.txt
index 3625d42ccd4..e98d5236dd2 100644
--- a/res/cardsfolder/leap.txt
+++ b/res/cardsfolder/leap.txt
@@ -2,8 +2,8 @@ Name:Leap
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leap.jpg
 SetInfo:STH|Common|http://magiccards.info/scans/en/sh/35.jpg
diff --git a/res/cardsfolder/manipulate_fate.txt b/res/cardsfolder/manipulate_fate.txt
index 0a14dc8cf0f..68ecd6a3c98 100644
--- a/res/cardsfolder/manipulate_fate.txt
+++ b/res/cardsfolder/manipulate_fate.txt
@@ -2,8 +2,8 @@ Name:Manipulate Fate
 ManaCost:1 U
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | SpellDescription$ Search your library for three cards, exile them, then shuffle your library.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | SpellDescription$ Search your library for three cards, exile them, then shuffle your library. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manipulate_fate.jpg
diff --git a/res/cardsfolder/nighthaze.txt b/res/cardsfolder/nighthaze.txt
index 4f843d12f5c..7de0744b42f 100644
--- a/res/cardsfolder/nighthaze.txt
+++ b/res/cardsfolder/nighthaze.txt
@@ -2,8 +2,8 @@ Name:Nighthaze
 ManaCost:B
 Types:Sorcery
 Text:no text
-A:SP$Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Swampwalk | SpellDescription$ Target creature gains swampwalk until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Swampwalk | SpellDescription$ Target creature gains swampwalk until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nighthaze.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/118.jpg
diff --git a/res/cardsfolder/recover.txt b/res/cardsfolder/recover.txt
index 5ed275c8bb7..4485699ab51 100644
--- a/res/cardsfolder/recover.txt
+++ b/res/cardsfolder/recover.txt
@@ -2,8 +2,8 @@ Name:Recover
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to your hand.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to your hand. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/recover.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/122.jpg
diff --git a/res/cardsfolder/refresh.txt b/res/cardsfolder/refresh.txt
index 3f0e46a9c3f..9bcf523e6b2 100644
--- a/res/cardsfolder/refresh.txt
+++ b/res/cardsfolder/refresh.txt
@@ -2,8 +2,8 @@ Name:Refresh
 ManaCost:2 G
 Types:Instant
 Text:no text
-A:SP$Regenerate | Cost$ 2 G | Tgt$ TgtC | SpellDescription$ Regenerate target creature.
-K:Draw a card.
+A:SP$Regenerate | Cost$ 2 G | Tgt$ TgtC | SpellDescription$ Regenerate target creature. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/refresh.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/264.jpg
diff --git a/res/cardsfolder/repel_the_darkness.txt b/res/cardsfolder/repel_the_darkness.txt
index 96211fb6cee..dd90b523d84 100644
--- a/res/cardsfolder/repel_the_darkness.txt
+++ b/res/cardsfolder/repel_the_darkness.txt
@@ -2,8 +2,8 @@ Name:Repel the Darkness
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$Tap | Cost$ 2 W | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SpellDescription$ Tap up to two target creatures.
-K:Draw a card.
+A:SP$Tap | Cost$ 2 W | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SpellDescription$ Tap up to two target creatures. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/repel_the_darkness.jpg
diff --git a/res/cardsfolder/repulse.txt b/res/cardsfolder/repulse.txt
index 778ff7de207..00b8a0c1731 100644
--- a/res/cardsfolder/repulse.txt
+++ b/res/cardsfolder/repulse.txt
@@ -2,8 +2,8 @@ Name:Repulse
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card22985.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/70.jpg
diff --git a/res/cardsfolder/reviving_dose.txt b/res/cardsfolder/reviving_dose.txt
index ace44577204..79560b8bbc9 100644
--- a/res/cardsfolder/reviving_dose.txt
+++ b/res/cardsfolder/reviving_dose.txt
@@ -2,8 +2,8 @@ Name:Reviving Dose
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$GainLife | Cost$ 2 W | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
-K:Draw a card.
+A:SP$GainLife | Cost$ 2 W | LifeAmount$ 3 | SpellDescription$ You gain 3 life. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card22941.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/31.jpg
diff --git a/res/cardsfolder/second_thoughts.txt b/res/cardsfolder/second_thoughts.txt
index 11d4274a522..b57cddba62a 100644
--- a/res/cardsfolder/second_thoughts.txt
+++ b/res/cardsfolder/second_thoughts.txt
@@ -2,8 +2,8 @@ Name:Second Thoughts
 ManaCost:4 W
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 4 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ 4 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/second_thoughts.jpg
diff --git a/res/cardsfolder/shadow_rift.txt b/res/cardsfolder/shadow_rift.txt
index f278d639f9e..dc894644108 100644
--- a/res/cardsfolder/shadow_rift.txt
+++ b/res/cardsfolder/shadow_rift.txt
@@ -2,8 +2,8 @@ Name:Shadow Rift
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Shadow | SpellDescription$ Target creature gains shadow until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Shadow | SpellDescription$ Target creature gains shadow until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadow_rift.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/86.jpg
diff --git a/res/cardsfolder/slay.txt b/res/cardsfolder/slay.txt
index 0b91ea2524e..e2fdd09909c 100644
--- a/res/cardsfolder/slay.txt
+++ b/res/cardsfolder/slay.txt
@@ -2,8 +2,8 @@ Name:Slay
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$Destroy | Cost$ 2 B | ValidTgts$ Creature.Green | TgtPrompt$ Select target green creature | NoRegen$ True | SpellDescription$ Destroy target green creature. It can't be regenerated.
-K:Draw a card.
+A:SP$Destroy | Cost$ 2 B | ValidTgts$ Creature.Green | TgtPrompt$ Select target green creature | NoRegen$ True | SpellDescription$ Destroy target green creature. It can't be regenerated. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slay.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/164.jpg
diff --git a/res/cardsfolder/slice_in_twain.txt b/res/cardsfolder/slice_in_twain.txt
index d3c1f10c908..24ccd6411e3 100644
--- a/res/cardsfolder/slice_in_twain.txt
+++ b/res/cardsfolder/slice_in_twain.txt
@@ -2,8 +2,8 @@ Name:Slice in Twain
 ManaCost:2 G G
 Types:Instant
 Text:no text
-A:SP$Destroy | Cost$ 2 G G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
-K:Draw a card.
+A:SP$Destroy | Cost$ 2 G G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slice_in_twain.jpg
 SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/127.jpg
diff --git a/res/cardsfolder/smash.txt b/res/cardsfolder/smash.txt
index 33ecf8b1ddf..e1be10614a7 100644
--- a/res/cardsfolder/smash.txt
+++ b/res/cardsfolder/smash.txt
@@ -2,8 +2,8 @@ Name:Smash
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$Destroy | Cost$ 2 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
-K:Draw a card.
+A:SP$Destroy | Cost$ 2 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/smash.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/143.jpg
diff --git a/res/cardsfolder/stun.txt b/res/cardsfolder/stun.txt
index 41bd298a600..160d5086c59 100644
--- a/res/cardsfolder/stun.txt
+++ b/res/cardsfolder/stun.txt
@@ -2,8 +2,8 @@ Name:Stun
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stun.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/207.jpg
diff --git a/res/cardsfolder/sudden_strength.txt b/res/cardsfolder/sudden_strength.txt
index e8a749cd27f..29ec9cae674 100644
--- a/res/cardsfolder/sudden_strength.txt
+++ b/res/cardsfolder/sudden_strength.txt
@@ -2,8 +2,8 @@ Name:Sudden Strength
 ManaCost:3 G
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 3 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 3 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SpellDescription$ Target creature gets +3/+3 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sudden_strength.jpg
 SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/132.jpg
diff --git a/res/cardsfolder/symbol_of_unsummoning.txt b/res/cardsfolder/symbol_of_unsummoning.txt
index f1407e1153c..cab82dbd0a5 100644
--- a/res/cardsfolder/symbol_of_unsummoning.txt
+++ b/res/cardsfolder/symbol_of_unsummoning.txt
@@ -2,8 +2,8 @@ Name:Symbol of Unsummoning
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/symbol_of_unsummoning.jpg
 SetInfo:POR|Common|http://magiccards.info/scans/en/po/71.jpg
diff --git a/res/cardsfolder/tel_jilad_defiance.txt b/res/cardsfolder/tel_jilad_defiance.txt
index 9a9a683b3f9..b5706b7412a 100644
--- a/res/cardsfolder/tel_jilad_defiance.txt
+++ b/res/cardsfolder/tel_jilad_defiance.txt
@@ -2,8 +2,8 @@ Name:Tel-Jilad Defiance
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Protection from artifacts | SpellDescription$ Target creature gains protection from artifacts until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Protection from artifacts | SpellDescription$ Target creature gains protection from artifacts until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tel_jilad_defiance.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/129.jpg