diff --git a/forge-gui/res/cardsfolder/c/condemn.txt b/forge-gui/res/cardsfolder/c/condemn.txt
index 4e3c15ea309..17b83da519e 100644
--- a/forge-gui/res/cardsfolder/c/condemn.txt
+++ b/forge-gui/res/cardsfolder/c/condemn.txt
@@ -1,8 +1,8 @@
 Name:Condemn
 ManaCost:W
 Types:Instant
-A:SP$ ChangeZone | Cost$ W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SubAbility$ DBGainLife | SpellDescription$ Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness.
-SVar:DBGainLife:DB$GainLife | Defined$ TargetedController | LifeAmount$ X | References$ X
-SVar:X:Targeted$CardToughness
+A:SP$ ChangeZone | Cost$ W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SubAbility$ DBGainLife | RememberLKI$ True | SpellDescription$ Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness.
+SVar:DBGainLife:DB$GainLife | Defined$ RememberedController | LifeAmount$ X | References$ X
+SVar:X:RememberedLKI$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/condemn.jpg
 Oracle:Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness.
diff --git a/forge-gui/res/cardsfolder/upcoming/archmages_charm.txt b/forge-gui/res/cardsfolder/upcoming/archmages_charm.txt
new file mode 100644
index 00000000000..57f48f4963a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/archmages_charm.txt
@@ -0,0 +1,8 @@
+Name:Archmage's Charm
+Types:Instant
+ManaCost:U U U
+A:SP$ Charm | Cost$ U U U | Choices$ DBCounter,DBDraw,DBControl
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
+SVar:DBDraw:DB$ Draw | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws two cards.
+SVar:DBControl:DB$ GainControl | ValidTgts$ Permanent.nonLand+cmcLE1 | TgtPrompt$ Select target nonland permanent with converted mana cost 1 or less. | SpellDescription$ Gain control of target nonland permanent with converted mana cost 1 or less.
+Oracle:Choose one —\n• Counter target spell.\n• Target player draws two cards.\n• Gain control of target nonland permanent with converted mana cost 1 or less.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/ayulas_influence.txt b/forge-gui/res/cardsfolder/upcoming/ayulas_influence.txt
new file mode 100644
index 00000000000..9a07d8bd243
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ayulas_influence.txt
@@ -0,0 +1,6 @@
+Name:Ayula's Influence
+ManaCost:G G G
+Types:Enchantment
+A:AB$ Token | Cost$ Discard<1/Land> | TokenAmount$ 1 | TokenScript$ g_2_2_bear | TokenOwner$ You | LegacyImage$ g 2 2 bear mh1 | SpellDescription$ Create a 2/2 green Bear creature token.
+AI:RemoveDeck:Random
+Oracle:Discard a land card: Create a 2/2 green Bear creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/changeling_outcast.txt b/forge-gui/res/cardsfolder/upcoming/changeling_outcast.txt
new file mode 100644
index 00000000000..c4a3425f460
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/changeling_outcast.txt
@@ -0,0 +1,8 @@
+Name:Changeling Outcast
+ManaCost:B
+Types:Creature Shapeshifter
+PT:1/1
+K:Changeling
+K:CARDNAME can't block.
+K:Unblockable
+Oracle:Changeling (This card is every creature type.)\nChangeling Outcast can't block and can't be blocked.
diff --git a/forge-gui/res/cardsfolder/upcoming/cloudshredder_sliver.txt b/forge-gui/res/cardsfolder/upcoming/cloudshredder_sliver.txt
new file mode 100644
index 00000000000..9055f158585
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cloudshredder_sliver.txt
@@ -0,0 +1,7 @@
+Name:Cloudshredder Sliver
+ManaCost:R W
+Types:Creature Sliver
+PT:1/1
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddKeyword$ Flying & Haste | Description$ Sliver creatures you control have flying and haste.
+SVar:PlayMain1:TRUE
+Oracle:Sliver creatures you control have flying and haste.
diff --git a/forge-gui/res/cardsfolder/upcoming/etchings_of_the_chosen.txt b/forge-gui/res/cardsfolder/upcoming/etchings_of_the_chosen.txt
new file mode 100644
index 00000000000..e2c19dbe0c8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/etchings_of_the_chosen.txt
@@ -0,0 +1,10 @@
+Name:Etchings of the Chosen
+ManaCost:1 W B
+Types:Enchantment
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentInComputerDeck
+S:Mode$ Continuous | Affected$ Creature.ChosenType+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control of the chosen type get +1/+1.
+AI:RemoveDeck:Random
+SVar:PlayMain1:TRUE
+A:AB$ Pump | Cost$ 1 W B Sac<1/Creature.ChosenType/creature of the chosen type> | ValidTgts$ Creature | TgtPrompt$ Select target creature you control | KW$ Indestructible | SpellDescription$ Target creature you control gains indestructible until end of turn.
+Oracle:As Etchings of the Chosen enters the battlefield, choose a creature type.\nCreatures you control of the chosen type get +1/+1.\n{1}, Sacrifice a creature of the chosen type: Target creature you control gains indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt b/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt
index 1a97e521368..5178baa78b0 100644
--- a/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt
+++ b/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt
@@ -5,4 +5,4 @@ PT:3/3
 K:Convoke
 K:Flying
 K:Devour:2
-Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spells pays for 1 or one mana of that creature's color.)\nFlying\nDevour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature entersthe battlefield with twice that many +1/+1 counters on it.) 
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of the creature's color.)\nFlying\nDevour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with twice that many +1/+1 counters on it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/force_of_rage.txt b/forge-gui/res/cardsfolder/upcoming/force_of_rage.txt
new file mode 100644
index 00000000000..7b3bcab9fbb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/force_of_rage.txt
@@ -0,0 +1,9 @@
+Name:Force of Rage
+ManaCost:1 R R
+Types:Instant
+SVar:AltCost:Cost$ ExileFromHand<1/Card.Red> | OpponentTurn$ True | Description$ If it's not your turn, you may exile a red card from your hand rather than pay this spell's mana cost.
+A:SP$ Token | Cost$ 1 R R | TokenAmount$ 2 | TokenScript$ r_3_1_elemental_trample_haste | TokenOwner$ You | LegacyImage$ r 3 1 elemental trample haste mh1 | SubAbility$ DelayedSac | RememberTokens$ True | SpellDescription$ Create two 3/1 red Elemental creature tokens with trample and haste. Sacrifice those tokens at the beginning of your next upkeep.
+SVar:DelayedSac:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBSacToken | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ Sacrifice those tokens at the beginning of your next upkeep.
+SVar:DBSacToken:DB$ SacrificeAll | Defined$ DelayTriggerRemembered | Controller$ You
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:If it's not your turn, you may exile a red card from your hand rather than pay this spell's mana cost.\nCreate two 3/1 red Elemental creature tokens with trample and haste. Sacrifice those tokens at the beginning of your next upkeep.
diff --git a/forge-gui/res/cardsfolder/upcoming/frostwalk_bastion.txt b/forge-gui/res/cardsfolder/upcoming/frostwalk_bastion.txt
new file mode 100644
index 00000000000..c32aaf326b6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/frostwalk_bastion.txt
@@ -0,0 +1,10 @@
+Name:Frostwalk Bastion
+ManaCost:no cost
+Types:Snow Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Animate | Cost$ 1 S | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Creature,Artifact,Construct | Permanent$ True | SpellDescription$ Until end of turn, CARDNAME becomes a 2/3 Construct artifact creature. It's still a land. ({S} can be paid with one mana from a snow permanent.)
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
+SVar:TrigTap:DB$Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
+SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:HasCombatEffect:TRUE
+Oracle:{T}: Add {C}.\n{1}{S}: Until end of turn, Frostwalk Bastion becomes a 2/3 Construct artifact creature. It's still a land. ({S} can be paid with one mana from a snow permanent.)\nWhenever Frostwalk Bastion deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
diff --git a/forge-gui/res/cardsfolder/upcoming/generous_gift.txt b/forge-gui/res/cardsfolder/upcoming/generous_gift.txt
new file mode 100644
index 00000000000..2b7ea7a8bff
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/generous_gift.txt
@@ -0,0 +1,7 @@
+Name:Generous Gift
+ManaCost:2 W
+Types:Instant
+A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | AITgts$ Card.cmcGE4 | SubAbility$ DBToken | SpellDescription$ Destroy target permanent. Its controller creates a 3/3 green Elephant creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_elephant | TokenOwner$ TargetedController | LegacyImage$ g 3 3 elephant mh1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Destroy target permanent. Its controller creates a 3/3 green Elephant creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/goatnap.txt b/forge-gui/res/cardsfolder/upcoming/goatnap.txt
new file mode 100644
index 00000000000..748f3968389
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/goatnap.txt
@@ -0,0 +1,7 @@
+Name:Goatnap
+ManaCost:2 R
+Types:Sorcery
+A:SP$ GainControl | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | Untap$ True | LoseControl$ EOT | SubAbility$ DBPump | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. If that creature is a, it also gets +3/+0 until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | NumAtt$ 3 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X
+SVar:X:Targeted$Valid Goat
+Oracle:Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. If that creature is a goat, it also gets +3/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hollowhead_sliver.txt b/forge-gui/res/cardsfolder/upcoming/hollowhead_sliver.txt
new file mode 100644
index 00000000000..46aaaf8adec
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hollowhead_sliver.txt
@@ -0,0 +1,9 @@
+Name:Hollowhead Sliver
+ManaCost:2 R
+Types:Creature Sliver
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddAbility$ Rummage | Description$ Sliver creatures you control have "{T}, Discard a card: Draw a card."
+SVar:Rummage:AB$ Draw | Cost$ T Discard<1/Card> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:PlayMain1:TRUE
+SVar:BuffedBy:Sliver
+Oracle:Sliver creatures you control have "{T}, Discard a card: Draw a card."
diff --git a/forge-gui/res/cardsfolder/upcoming/king_of_the_pride.txt b/forge-gui/res/cardsfolder/upcoming/king_of_the_pride.txt
new file mode 100644
index 00000000000..5f5010b2f9f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/king_of_the_pride.txt
@@ -0,0 +1,8 @@
+Name:King of the Pride
+ManaCost:2 W
+Types:Creature Cat
+PT:2/1
+S:Mode$ Continuous | Affected$ Cat.Other+YouCtrl | AddPower$ 2 | AddToughness$ 1 | Description$ Other Cats you control get +2/+1.
+SVar:PlayMain1:TRUE
+SVar:BuffedBy:Cat
+Oracle:Other Cats you control get +2/+1.
diff --git a/forge-gui/res/cardsfolder/upcoming/mother_bear.txt b/forge-gui/res/cardsfolder/upcoming/mother_bear.txt
index 8762087ca63..63d7b0041ad 100644
--- a/forge-gui/res/cardsfolder/upcoming/mother_bear.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mother_bear.txt
@@ -4,4 +4,4 @@ Types:Creature Bear
 PT:2/2
 A:AB$ Token | Cost$ 3 G G ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | SorcerySpeed$ True | TokenAmount$ 2 | TokenScript$ g_2_2_bear | TokenOwner$ You | LegacyImage$ g 2 2 bear mh1 | SpellDescription$ Create two 2/2 green Bear creature tokens. Activate this ability only any time you could cast a sorcery.
 DeckHas:Ability$Token
-Oracle:{3}{G}{G}, Exile Mother Bear from your graveyard: Create two 2/2 green Bear creature tokens. Activate this ability only any time you could cast a sorcery. 
\ No newline at end of file
+Oracle:{3}{G}{G}, Exile Mother Bear from your graveyard: Create two 2/2 green Bear creature tokens. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mox_tantalite.txt b/forge-gui/res/cardsfolder/upcoming/mox_tantalite.txt
index fa1266e925a..67549cbd7aa 100644
--- a/forge-gui/res/cardsfolder/upcoming/mox_tantalite.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mox_tantalite.txt
@@ -3,4 +3,4 @@ ManaCost:no cost
 Types:Artifact
 K:Suspend:3:0
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-Oracle:Suspend 3 - 0 (Rather than cast this card from your hand, pay 0 and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.) \n{T}: Add one mana of any color.
\ No newline at end of file
+Oracle:Suspend 3—{0} (Rather than cast this card from your hand, pay {0} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/plague_engineer.txt b/forge-gui/res/cardsfolder/upcoming/plague_engineer.txt
new file mode 100644
index 00000000000..adc1c299dbc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/plague_engineer.txt
@@ -0,0 +1,11 @@
+Name:Plague Engineer
+ManaCost:2 B
+Types:Creature Carrier
+PT:2/2
+K:Deathtouch
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentOppControls | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | StackDescription$ SpellDescription
+AI:RemoveDeck:Random
+S:Mode$ Continuous | Affected$ Creature.ChosenType+OppCtrl | AddPower$ -1 | AddToughness$ -1 | Description$ Creatures of the chosen type your opponents control get -1/-1.
+SVar:PlayMain1:TRUE
+Oracle:Deathtouch\nAs Plague Engineer enters the battlefield, choose a creature type.\nCreatures of the chosen type your opponents control get -1/-1.
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_giant.txt b/forge-gui/res/cardsfolder/upcoming/ravenous_giant.txt
new file mode 100644
index 00000000000..e5e5a058578
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ravenous_giant.txt
@@ -0,0 +1,7 @@
+Name:Ravenous Giant
+ManaCost:2 R R
+Types:Creature Giant
+PT:5/5
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to you.
+SVar:TrigDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 1
+Oracle:At the beginning of your upkeep, Ravenous Giant deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/upcoming/scale_up.txt b/forge-gui/res/cardsfolder/upcoming/scale_up.txt
new file mode 100644
index 00000000000..a3534ca333b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/scale_up.txt
@@ -0,0 +1,6 @@
+Name:Scale Up
+ManaCost:G
+Types:Sorcery
+A:SP$ Animate | Cost$ G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 6 | Toughness$ 4 | Colors$ Green | OverwriteColors$ True | Types$ Wurm | SpellDescription$ Until end of turn, target creature you control becomes a green Wurm with base power and toughness 6/4.
+A:SP$ AnimateAll | Cost$ 4 G G | PrecostDesc$ Overload | CostDesc$ {4}{G}{G} | ValidCards$ Creature.YouCtrl | Power$ 6 | Toughness$ 4 | Colors$ Green | OverwriteColors$ True | Types$ Wurm | SpellDescription$ Until end of turn, target creature you control becomes a green Wurm with base power and toughness 6/4.
+Oracle:Until end of turn, target creature you control becomes a green Wurm with base power and toughness 6/4.\nOverload {4}{G}{G}
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_sinew_and_steel.txt b/forge-gui/res/cardsfolder/upcoming/sword_of_sinew_and_steel.txt
new file mode 100644
index 00000000000..2344104fa67
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sword_of_sinew_and_steel.txt
@@ -0,0 +1,10 @@
+Name:Sword of Sinew and Steel
+ManaCost:3
+Types:Artifact Equipment
+K:Equip:2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddSVar$ SwordOfSinewAndSteelCE | AddKeyword$ Protection from black & Protection from red | Description$ Equipped creature gets +2/+2 and has protection from black and from red.
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDestroyPlaneswalker | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, destroy up to one target planeswalker and up to one target artifact.
+SVar:TrigDestroyPlaneswalker:DB$ Destroy | ValidTgts$ Planeswalker | TgtPrompt$ Select target planeswalker | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DestroyArtifact | SpellDescription$ Destroy up to one target planeswalker.
+SVar:DestroyArtifact:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | TargetMin$ 0 | TargetMax$ 1 | SpellDescription$ Destroy up to one target artifact.
+SVar:SwordOfSinewAndSteelCE:SVar:MustBeBlocked:AttackingPlayerConservative
+Oracle:Equipped creature gets +2/+2 and has protection from white and from blue.\nWhenever equipped creature deals combat damage to a player, destroy up to one target planeswalker and up to one target artifact.\nEquip {2}
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_truth_and_justice.txt b/forge-gui/res/cardsfolder/upcoming/sword_of_truth_and_justice.txt
new file mode 100644
index 00000000000..ec18cb3d7d5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sword_of_truth_and_justice.txt
@@ -0,0 +1,12 @@
+Name:Sword of Truth and Justice
+ManaCost:3
+Types:Artifact Equipment
+K:Equip:2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddSVar$ SwordOfTruthAndJusticeCE | AddKeyword$ Protection from white & Protection from blue | Description$ Equipped creature gets +2/+2 and has protection from white and from blue.
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, put a +1/+1 counter on a creature you control, then proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBProliferate | SpellDescription$ Put a +1/+1 counter on target creature you control and then proliferate.
+SVar:DBProliferate:DB$ Proliferate
+DeckHas:Ability$Proliferate
+DeckNeeds:Ability$Counters
+SVar:SwordOfTruthAndJusticeCE:SVar:MustBeBlocked:AttackingPlayerConservative
+Oracle:Equipped creature gets +2/+2 and has protection from white and from blue.\nWhenever equipped creature deals combat damage to a player, put a +1/+1 counter on a creature you control, then proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)\nEquip {2}
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/thundering_djinn.txt b/forge-gui/res/cardsfolder/upcoming/thundering_djinn.txt
new file mode 100644
index 00000000000..a0453e064c2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/thundering_djinn.txt
@@ -0,0 +1,10 @@
+Name:Thundering Djinn
+ManaCost:3 U R
+Types:Creature Djinn
+PT:3/4
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals damage to any target equal to the number of cards you've drawn this turn.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X
+SVar:X:Count$YouDrewThisTurn
+AI:RemoveDeck:All
+Oracle:Flying\nWhenever Thundering Djinn attacks, it deals damage to any target equal to the number of cards you've drawn this turn.
diff --git a/forge-gui/res/editions/Modern Horizons.txt b/forge-gui/res/editions/Modern Horizons.txt
index 3ab292dca27..9a26ac59da4 100644
--- a/forge-gui/res/editions/Modern Horizons.txt	
+++ b/forge-gui/res/editions/Modern Horizons.txt	
@@ -1,6 +1,6 @@
 [metadata]
 Code=MH1
-Date=2019-6-14
+Date=2019-06-14
 Name=Modern Horizons
 Code2=MH1
 MciCode=mh1
@@ -9,15 +9,24 @@ Type=Other
 [cards]
 1 M Morophon, the Boundless
 3 R Astral Drift
+4 U Battle Screech
 5 U Dismantling Blow
 10 R Force of Virtue
+11 U Generous Gift
 13 R Giver of Runes
 14 C Impostor of the Sixth Pride
+16 U King of the Pride
 19 C Martyr's Soul
 21 M Ranger-Captain of Eos
 26 M Serra the Benevolent
+29 R Sisay, Weatherlight Captain
+31 U Splicer's Skill
 36 C Wall of One Thousand Cuts
+37 R Winds of Abandon
 38 U Wing Shards
+39 U Zhalfirin Decoy
+40 R Archmage's Charm
+41 R Bazaar Trademage
 43 C Chillerpillar
 44 C Choking Tethers
 48 U Exclude
@@ -30,32 +39,50 @@ Type=Other
 71 C Stream of Thought
 75 M Urza, Lord High Artificer
 80 R Cabal Therapist
+82 C Changeling Outcast
 84 U Crypt Rats
 87 C Diabolic Edict
 88 U Dregscape Sliver
+90 U Feaster of Fools
 92 R Force of Despair
 95 C Headless Specter
+100 R Plague Engineer
+111 C Umezawa's Charm
 112 U Undead Augur
 114 C Venomous Changeling
-118 R Blazing Chant
+118 R Aria of Flame
 122 U Firebolt
 123 C Fists of Flame
+124 R Force of Rage
+126 C Goatnap
 128 R Goblin Engineer
 129 U Goblin Matron
 131 C Goblin War Party
+132 U Hollowhead Sliver
 134 C Lava Dart
 140 R Planebound Accomplice
+141 C Pyrophobia
+143 U Ravenous Giant
 145 M Seasoned Pyromancer
+155 R Ayula, Queen Among Bears
+156 R Ayula's Influence
 161 R Deep Forest Hermit
 162 C Elvish Fury
 164 R Force of Vigor
+166 R Genesis
+167 U Glacial Revelation
+168 M Hexdrinker
+171 C Mother Bear
 174 C Nimble Mongoose
 175 U Regrowth
 178 C Savage Swipe
 179 U Scale Up
 180 C Spore Frog
+182 U Squirrel Nest
 183 U Tempered Sliver
+189 M Unbound Flourishing
 194 U Abominable Treefolk
+195 R Cloudshredder Sliver
 196 R Collected Conjuring
 198 U Etchings of the Chosen
 200 M The First Sliver
@@ -65,8 +92,15 @@ Type=Other
 208 R Lightning Skelemental
 209 U Munitions Expert
 215 U Thundering Djinn
+217 M Wrenn and Six
+218 R Altar of Dementia
+222 U Farmstead Gleaner
+226 M Mox Tantalite
 227 R Scrapyard Recombiner
+228 M Sword of Sinew and Steel
+229 M Sword of Truth and Justice
 238 R Fiery Islet
+240 U Frostwalk Bastion
 243 R Nurturing Peatland
 244 R Prismatic Vista
 246 R Silent Clearing
@@ -82,5 +116,9 @@ Type=Other
 
 [tokens]
 w_4_4_angel_flying_vigilance
+c_0_0_a_construct_total_artifacts
 g_1_1_squirrel
 r_1_1_goblin
+g_2_2_bear
+r_1_1_elemental
+g_3_3_elephant