diff --git a/forge-gui/res/cardsfolder/f/funeral_charm.txt b/forge-gui/res/cardsfolder/f/funeral_charm.txt
index 1c056370d79..e49f3fa68f0 100644
--- a/forge-gui/res/cardsfolder/f/funeral_charm.txt
+++ b/forge-gui/res/cardsfolder/f/funeral_charm.txt
@@ -1,9 +1,10 @@
 Name:Funeral Charm
 ManaCost:B
 Types:Instant
-A:SP$ Discard | Cost$ B | ValidTgts$ Player | TgtPrompt$ Choose a player | NumCards$ 1 | Mode$ TgtChoose | PrecostDesc$ Choose one - | SpellDescription$ Target player discards a card;
-A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ -1 | SpellDescription$ or target creature gets +2/-1 until end of turn;
-A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Swampwalk | SpellDescription$ or target creature gains swampwalk until end of turn.
+A:SP$ Charm | Cost$ B | Choices$ DBDiscard,DBPump,DBPump2 | SpellDescription$ Choose one - Target player discards a card; or target creature gets +2/-1 until end of turn; or target creature gains swampwalk until end of turn.
+SVar:DBDiscard:DB$ Discard | ValidTgts$ Player | TgtPrompt$ Choose a player | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ Target player discards a card;
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ -1 | SpellDescription$ Ttarget creature gets +2/-1 until end of turn;
+SVar:DBPump2:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Swampwalk | SpellDescription$ Target creature gains swampwalk until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/tsb/en-us/card108895.jpg
 Oracle:Choose one - Target player discards a card; or target creature gets +2/-1 until end of turn; or target creature gains swampwalk until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/ghoulcallers_chant.txt b/forge-gui/res/cardsfolder/g/ghoulcallers_chant.txt
index 6b2abca44f0..6824b12adb5 100644
--- a/forge-gui/res/cardsfolder/g/ghoulcallers_chant.txt
+++ b/forge-gui/res/cardsfolder/g/ghoulcallers_chant.txt
@@ -1,8 +1,9 @@
 Name:Ghoulcaller's Chant
 ManaCost:B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | PrecostDesc$ Choose one - | SpellDescription$ Return target creature card from your graveyard to your hand
-A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select two target Zombie cards in your graveyard | ValidTgts$ Zombie.YouOwn | TargetMin$ 2 | TargetMax$ 2 | PrecostDesc$ or | SpellDescription$ return two target Zombie cards from your graveyard to your hand.
+A:SP$ Charm | Cost$ B | CharmNum$ 1 | Choices$ DBChangeZone1,DBChangeZone2 | SpellDescription$ Choose one - Return target creature card from your graveyard to your hand; or return two target Zombie cards from your graveyard to your hand.
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return target creature card from your graveyard to your hand
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select two target Zombie cards in your graveyard | ValidTgts$ Zombie.YouOwn | TargetMin$ 2 | TargetMax$ 2 | SpellDescription$ return two target Zombie cards from your graveyard to your hand.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghoulcallers_chant.jpg
 Oracle:Choose one - Return target creature card from your graveyard to your hand; or return two target Zombie cards from your graveyard to your hand.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/grixis_charm.txt b/forge-gui/res/cardsfolder/g/grixis_charm.txt
index 8d11ffd93db..605a8f0f570 100644
--- a/forge-gui/res/cardsfolder/g/grixis_charm.txt
+++ b/forge-gui/res/cardsfolder/g/grixis_charm.txt
@@ -1,9 +1,10 @@
 Name:Grixis Charm
 ManaCost:U B R
 Types:Instant
-A:SP$ ChangeZone | Cost$ U B R | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Choose one - Return target permanent to its owner's hand;
-A:SP$ Pump | Cost$ U B R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True | SpellDescription$ or target creature gets -4/-4 until end of turn.
-A:SP$ PumpAll | Cost$ U B R | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ 0 | SpellDescription$ or creatures you control get +2/+0 until end of turn.
+A:SP$ Charm | Cost$ U B R | Choices$ DBChangeZone,DBPump,DBPumpAll | CharmNum$ 1 | SpellDescription$ Choose one - Return target permanent to its owner's hand; or target creature gets -4/-4 until end of turn; or creatures you control get +2/+0 until end of turn.
+SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand;
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True | SpellDescription$ Target creature gets -4/-4 until end of turn.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ 0 | SpellDescription$ Creatures you control get +2/+0 until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grixis_charm.jpg
 Oracle:Choose one - Return target permanent to its owner's hand; or target creature gets -4/-4 until end of turn; or creatures you control get +2/+0 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/healing_leaves.txt b/forge-gui/res/cardsfolder/h/healing_leaves.txt
index 633b0a9ac02..3a42f5bea28 100644
--- a/forge-gui/res/cardsfolder/h/healing_leaves.txt
+++ b/forge-gui/res/cardsfolder/h/healing_leaves.txt
@@ -1,7 +1,8 @@
 Name:Healing Leaves
 ManaCost:G
 Types:Instant
-A:SP$ GainLife | Cost$ G | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | PrecostDesc$ Choose one - | SpellDescription$ Target player gains 3 life;
-A:SP$ PreventDamage | Cost$ G | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 3 | PrecostDesc$ or | SpellDescription$ prevent the next 3 damage that would be dealt to target creature or player this turn.
+A:SP$ Charm | Cost$ G | Choices$ DBGainLife,DBPreventDmg | CharmNum$ 1 | SpellDescription$ Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn.
+SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | SpellDescription$ Target player gains 3 life;
+SVar:DBPreventDmg:DB$ PreventDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 3 | SpellDescription$ Prevent the next 3 damage that would be dealt to target creature or player this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/healing_leaves.jpg
 Oracle:Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/healing_salve.txt b/forge-gui/res/cardsfolder/h/healing_salve.txt
index 034f6dfd63d..76379490fbd 100644
--- a/forge-gui/res/cardsfolder/h/healing_salve.txt
+++ b/forge-gui/res/cardsfolder/h/healing_salve.txt
@@ -1,7 +1,8 @@
 Name:Healing Salve
 ManaCost:W
 Types:Instant
-A:SP$ GainLife | Cost$ W | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | PrecostDesc$ Choose one - | SpellDescription$ Target player gains 3 life;
-A:SP$ PreventDamage | Cost$ W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 3 | PrecostDesc$ or | SpellDescription$ prevent the next 3 damage that would be dealt to target creature or player this turn.
+A:SP$ Charm | Cost$ W | Choices$ DBGainLife,DBPreventDmg | CharmNum$ 1 | SpellDescription$ Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn.
+SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | SpellDescription$ Target player gains 3 life;
+SVar:DBPreventDmg:DB$ PreventDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 3 | SpellDescription$ Prevent the next 3 damage that would be dealt to target creature or player this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/healing_salve.jpg
 Oracle:Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hearth_charm.txt b/forge-gui/res/cardsfolder/h/hearth_charm.txt
index 5a91dda0339..3b3fb66aaa2 100644
--- a/forge-gui/res/cardsfolder/h/hearth_charm.txt
+++ b/forge-gui/res/cardsfolder/h/hearth_charm.txt
@@ -1,9 +1,10 @@
 Name:Hearth Charm
 ManaCost:R
 Types:Instant
-A:SP$ Destroy | Cost$ R | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature | PrecostDesc$ Choose one - | SpellDescription$ Destroy target artifact creature;
-A:SP$ PumpAll | Cost$ R | ValidCards$ Creature.attacking | NumAtt$ +1 | SpellDescription$ or attacking creatures get +1/+0 until end of turn;
-A:SP$ Pump | Cost$ R | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | KW$ HIDDEN Unblockable | SpellDescription$ or target creature with power 2 or less can't be blocked this turn.
+A:SP$ Charm | Cost$ R | Choices$ DBDestroy,DBPumpAll,DBPump | CharmNum$ 1 | SpellDescription$ Choose one - Destroy target artifact creature; or attacking creatures get +1/+0 until end of turn; or target creature with power 2 or less can't be blocked this turn.
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature | PrecostDesc$ Choose one - | SpellDescription$ Destroy target artifact creature;
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking | NumAtt$ +1 | SpellDescription$ or attacking creatures get +1/+0 until end of turn;
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | KW$ HIDDEN Unblockable | SpellDescription$ or target creature with power 2 or less can't be blocked this turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hearth_charm.jpg
 Oracle:Choose one - Destroy target artifact creature; or attacking creatures get +1/+0 until end of turn; or target creature with power 2 or less can't be blocked this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hope_charm.txt b/forge-gui/res/cardsfolder/h/hope_charm.txt
index 27aa576936f..4a8f84778d9 100644
--- a/forge-gui/res/cardsfolder/h/hope_charm.txt
+++ b/forge-gui/res/cardsfolder/h/hope_charm.txt
@@ -1,9 +1,10 @@
 Name:Hope Charm
 ManaCost:W
 Types:Instant
-A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | PrecostDesc$ Choose one - | SpellDescription$ Target creature gains first strike until end of turn;
-A:SP$ GainLife | Cost$ W | LifeAmount$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ or target player gains 2 life;
-A:SP$ Destroy | Cost$ W | ValidTgts$ Aura | TgtPrompt$ Select target Aura | SpellDescription$ or destroy target Aura.
+A:SP$ Charm | Cost$ W | Choices$ DBPump,DBGainLife,DBDestroy | CharmNum$ 1 | SpellDescription$ Choose one - Target creature gains first strike until end of turn; or target player gains 2 life; or destroy target Aura.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn;
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player gains 2 life;
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Aura | TgtPrompt$ Select target Aura | SpellDescription$ Destroy target Aura.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hope_charm.jpg
 Oracle:Choose one - Target creature gains first strike until end of turn; or target player gains 2 life; or destroy target Aura.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hull_breach.txt b/forge-gui/res/cardsfolder/h/hull_breach.txt
index 2ee4ff94655..1bf48a55eba 100644
--- a/forge-gui/res/cardsfolder/h/hull_breach.txt
+++ b/forge-gui/res/cardsfolder/h/hull_breach.txt
@@ -1,10 +1,11 @@
 Name:Hull Breach
 ManaCost:R G
 Types:Sorcery
-A:SP$ Destroy | Cost$ R G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | PrecostDesc$ Choose one -  | SpellDescription$ Destroy target artifact;
-A:SP$ Destroy | Cost$ R G | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | PrecostDesc$ or | SpellDescription$ destroy target enchantment;
-A:SP$ Destroy | Cost$ R G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | PrecostDesc$ or | SpellDescription$ destroy target artifact and target enchantment. | SubAbility$ DestroyEnch
-SVar:DestroyEnch:DB$ Destroy | Cost$ 0 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment
+A:SP$ Charm | Cost$ R G | Choices$ DBDestroy1,DBDestroy2,DBDestroy3 | CharmNum$ 1 | SpellDescription$ Choose one -  Destroy target artifact; or destroy target enchantment; or destroy target artifact and target enchantment.
+SVar:DBDestroy1:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact;
+SVar:DBDestroy2:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment;
+SVar:DBDestroy3:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact and target enchantment. | SubAbility$ DestroyEnch
+SVar:DestroyEnch:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hull_breach.jpg
 Oracle:Choose one - Destroy target artifact; or destroy target enchantment; or destroy target artifact and target enchantment.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hurly_burly.txt b/forge-gui/res/cardsfolder/h/hurly_burly.txt
index e97a4168e5c..729f87dcbdf 100644
--- a/forge-gui/res/cardsfolder/h/hurly_burly.txt
+++ b/forge-gui/res/cardsfolder/h/hurly_burly.txt
@@ -1,7 +1,8 @@
 Name:Hurly-Burly
 ManaCost:1 R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ 1 R | NumDmg$ 1 | ValidCards$ Creature.withoutFlying | ValidDescription$ each creature without flying. | PrecostDesc$ Choose one - | SpellDescription$ CARDNAME deals 1 damage to each creature without flying;
-A:SP$ DamageAll | Cost$ 1 R | NumDmg$ 1 | ValidCards$ Creature.withFlying | ValidDescription$ each creature with flying. | SpellDescription$ or CARDNAME deals 1 damage to each creature with flying.
+A:SP$ Charm | Cost$ 1 R | Choices$ DBDmg1,DBDmg2 | CharmNum$ 1 | SpellDescription$ Choose one - CARDNAME deals 1 damage to each creature without flying; or CARDNAME deals 1 damage to each creature with flying.
+SVar:DBDmg1:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.withoutFlying | ValidDescription$ each creature without flying. | SpellDescription$ CARDNAME deals 1 damage to each creature without flying;
+SVar:DBDmg2:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.withFlying | ValidDescription$ each creature with flying. | SpellDescription$ CARDNAME deals 1 damage to each creature with flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hurly_burly.jpg
 Oracle:Choose one - Hurly-Burly deals 1 damage to each creature without flying; or Hurly-Burly deals 1 damage to each creature with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hydroblast.txt b/forge-gui/res/cardsfolder/h/hydroblast.txt
index 300cb435880..4226a2c8777 100644
--- a/forge-gui/res/cardsfolder/h/hydroblast.txt
+++ b/forge-gui/res/cardsfolder/h/hydroblast.txt
@@ -1,8 +1,9 @@
 Name:Hydroblast
 ManaCost:U
 Types:Instant
-A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | AITgts$ Card.Red | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | PrecostDesc$ Choose one -  | References$ X | SpellDescription$ Counter target spell if it's red;
-A:SP$ Destroy | Cost$ U | ValidTgts$ Permanent | AITgts$ Card.Red | TgtPrompt$ Select target permanent | ConditionDefined$ Targeted | ConditionPresent$ Card.Red | ConditionCompare$ GE1 | SpellDescription$  or destroy target permanent if it's red.
+A:SP$ Charm | Cost$ U | Choices$ DBCounter,DBDestroy | CharmNum$ 1 | SpellDescription$ Choose one - Counter target spell if it's red; or destroy target permanent if it's red.
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | AITgts$ Card.Red | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SpellDescription$ Counter target spell if it's red;
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Permanent | AITgts$ Card.Red | TgtPrompt$ Select target permanent | ConditionDefined$ Targeted | ConditionPresent$ Card.Red | ConditionCompare$ GE1 | SpellDescription$ Destroy target permanent if it's red.
 SVar:X:Targeted$Valid Card.Red
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hydroblast.jpg