diff --git a/forge-gui/res/cardsfolder/a/agent_of_the_shadow_thieves.txt b/forge-gui/res/cardsfolder/a/agent_of_the_shadow_thieves.txt
index 0cfa6aeff57..7b93c42c2f9 100644
--- a/forge-gui/res/cardsfolder/a/agent_of_the_shadow_thieves.txt
+++ b/forge-gui/res/cardsfolder/a/agent_of_the_shadow_thieves.txt
@@ -3,8 +3,8 @@ ManaCost:1 B
 Types:Legendary Enchantment Background
 S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddTrigger$ AttacksPlayer | Description$ Commander creatures you own have "Whenever this creature attacks a player, if no opponent has more life than that player, put a +1/+1 counter on this creature. It gains deathtouch and indestructible until end of turn."
 SVar:AttacksPlayer:Mode$ Attacks | ValidCard$ Card.Self | Attacked$ Player | Condition$ NoOpponentHasMoreLifeThanAttacked | Execute$ TrigPutCounter | TriggerDescription$ Whenever this creature attacks a player, if no opponent has more life than that player, put a +1/+1 counter on this creature. It gains deathtouch and indestructible until end of turn.
-SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | KW$ Deathtouch & Indestructible
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ Self | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Deathtouch & Indestructible
 DeckHas:Ability$Counters
 AI:RemoveDeck:NonCommander
 Oracle:Commander creatures you own have "Whenever this creature attacks a player, if no opponent has more life than that player, put a +1/+1 counter on this creature. It gains deathtouch and indestructible until end of turn."
diff --git a/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt b/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
index 68effb418b3..2716b2a2514 100644
--- a/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
+++ b/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
@@ -2,7 +2,7 @@ Name:Druid of the Emerald Grove
 ManaCost:3 G
 Types:Creature Dwarf Druid
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, search your library for up to two basic land cards and reveal them,
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, search your library for up to two basic land cards and reveal them, then ABILITY
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 2 | ChangeType$ Land.Basic | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBRollDice
 SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TutuDaDome,10-19:WonTwoField,20:ToFourField | SpellDescription$ then roll a d20.
 SVar:TutuDaDome:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | SubAbility$ DBCleanup | SpellDescription$ 1-9 VERT Put those cards into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/bilbos_ring.txt b/forge-gui/res/cardsfolder/upcoming/bilbos_ring.txt
new file mode 100644
index 00000000000..b7af488a759
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bilbos_ring.txt
@@ -0,0 +1,12 @@
+Name:Bilbo's Ring
+ManaCost:3
+Types:Legendary Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Hexproof | Condition$ PlayerTurn | Description$ As long as it's your turn, equipped creature has hexproof and can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.EquippedBy | Secondary$ True | Condition$ PlayerTurn | Description$ As long as it's your turn, equipped creature has hexproof and can't be blocked.
+T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Alone$ True | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks alone, you draw a card and you lose 1 life.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
+K:Equip:4
+K:Equip:1:Halfling.YouCtrl:Halfling you control
+DeckHints:Type$Halfling
+Oracle:As long as it's your turn, equipped creature has hexproof and can't be blocked.\nWhenever equipped creature attacks alone, you draw a card and you lose 1 life.\nEquip Halfling {1} ({1}: Attach to target Halfling you control. Equip only as a sorcery.)\nEquip {4} ({4}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/book_of_mazarbul.txt b/forge-gui/res/cardsfolder/upcoming/book_of_mazarbul.txt
new file mode 100644
index 00000000000..ca5ac2f9930
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/book_of_mazarbul.txt
@@ -0,0 +1,9 @@
+Name:Book of Mazarbul
+ManaCost:2 R
+Types:Enchantment Saga
+K:Saga:3:Amass1,Amass2,PumpAll
+SVar:Amass1:DB$ Amass | Type$ Orc | Num$ 1 | SpellDescription$ Amass Orcs 1. (Put a +1/+1 counter on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
+SVar:Amass2:DB$ Amass | Type$ Orc | Num$ 2 | SpellDescription$ Amass Orcs 2
+SVar:PumpAll:DB$ PumpAll | NumAtt$ +1 | ValidCards$ Creature.YouCtrl | KW$ Menace | SpellDescription$ Creatures you control get +1/+0 and gain menace until end of turn.
+DeckHas:Ability$Token|Counters & Type$Orc|Army
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Amass Orcs 1. (Put a +1/+1 counter on an Army you control. It's also an Orc. If you don"t control an Army, create a 0/0 black Orc Army creature token first.)\nII — Amass Orcs 2.\nIII — Creatures you control get +1/+0 and gain menace until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/brandywine_farmer.txt b/forge-gui/res/cardsfolder/upcoming/brandywine_farmer.txt
new file mode 100644
index 00000000000..ea77d338114
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/brandywine_farmer.txt
@@ -0,0 +1,9 @@
+Name:Brandywine Farmer
+ManaCost:2 G
+Types:Creature Halfling Peasant
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When CARDNAME enters or leaves the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigFood | Secondary$ True | TriggerDescription$ When CARDNAME enters or leaves the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+DeckHas:Ability$Sacrifice|Token|LifeGain & Type$Artifact|Food
+Oracle:When Brandywine Farmer enters or leaves the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/captain_of_umbar.txt b/forge-gui/res/cardsfolder/upcoming/captain_of_umbar.txt
new file mode 100644
index 00000000000..84caf5dc21f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/captain_of_umbar.txt
@@ -0,0 +1,8 @@
+Name:Captain of Umbar
+ManaCost:2 U
+Types:Creature Human Pirate
+PT:2/3
+A:AB$ Draw | Cost$ 1 T | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card.
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose
+DeckHas:Ability$Discard
+Oracle:{1}, {T}: Draw a card, then discard a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/chance_met_elves.txt b/forge-gui/res/cardsfolder/upcoming/chance_met_elves.txt
new file mode 100644
index 00000000000..5907cebc294
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/chance_met_elves.txt
@@ -0,0 +1,8 @@
+Name:Chance-Met Elves
+ManaCost:2 G
+Types:Creature Elf Warrior
+PT:3/2
+T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | ActivationLimit$ 1 | TriggerDescription$ Whenever you scry, put a +1/+1 counter on CARDNAME. This ability triggers only once each turn.
+SVar:TrigPutCounter:DB$ PutCounter | CounterNum$ 1 | CounterType$ P1P1 | Defined$ Self 
+DeckHas:Ability$Counters
+Oracle:Whenever you scry, put a +1/+1 counter on Chance-Met Elves. This ability triggers only once each turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/cirith_ungol_patrol.txt b/forge-gui/res/cardsfolder/upcoming/cirith_ungol_patrol.txt
new file mode 100644
index 00000000000..012243010c2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cirith_ungol_patrol.txt
@@ -0,0 +1,8 @@
+Name:Cirith Ungol Patrol
+ManaCost:4 B
+Types:Creature Orc Soldier
+PT:4/5
+A:AB$ Draw | Cost$ 1 T Sac<1/Creature.Other/another creature> | NumCards$ 1 | SubAbility$ DBFood | SpellDescription$ Draw a card, then create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:DBFood:DB$ Token | TokenScript$ c_a_food_sac | TokenOwner$ You | TokenAmount$ 1
+DeckHas:Ability$Sacrifice|Token|LifeGain & Type$Artifact|Food
+Oracle:{1}, {T}, Sacrifice another creature: Draw a card, then create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/deceive_the_messenger.txt b/forge-gui/res/cardsfolder/upcoming/deceive_the_messenger.txt
new file mode 100644
index 00000000000..adbefc4da5c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/deceive_the_messenger.txt
@@ -0,0 +1,8 @@
+Name:Deceive the Messenger
+ManaCost:U
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ -3 | IsCurse$ True | SubAbility$ DBAmass | SpellDescription$ Target creature gets -3/-0 until end of turn.
+SVar:DBAmass:DB$ Amass | Type$ Orc | Num$ 1 | SpellDescription$ Amass Orcs 1. (Put a +1/+1 counter on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
+DeckHas:Ability$Token|Counters & Type$Orc|Army
+DeckHints:Type$Orc|Goblin
+Oracle:Target creature gets -3/-0 until end of turn.\nAmass Orcs 1. (Put a +1/+1 counter on an Army you control. It"s also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/denethor_ruling_steward.txt b/forge-gui/res/cardsfolder/upcoming/denethor_ruling_steward.txt
new file mode 100644
index 00000000000..ba8e71a7d70
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/denethor_ruling_steward.txt
@@ -0,0 +1,11 @@
+Name:Denethor, Ruling Steward
+ManaCost:1 W B
+Types:Legendary Creature Human Noble
+PT:2/4
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if a creature died under your control this turn, create a 1/1 white Human Soldier creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human_soldier | TokenOwner$ You
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
+A:AB$ LoseLife | Cost$ 2 Sac<1/Creature.Other/another creature> | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 1 life and you gain 1 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$Token|LifeGain|Sacrifice & type$Soldier
+Oracle:At the beginning of your end step, if a creature died under your control this turn, create a 1/1 white Human Soldier creature token.\n{2}, Sacrifice another creature: Each opponent loses 1 life and you gain 1 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/dunland_crebain.txt b/forge-gui/res/cardsfolder/upcoming/dunland_crebain.txt
new file mode 100644
index 00000000000..e243a2eacd9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/dunland_crebain.txt
@@ -0,0 +1,9 @@
+Name:Dunland Crebain
+ManaCost:2 R
+Types:Creature Bird Horror
+PT:1/1
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAmass | TriggerDescription$ When CARDNAME enters the battlefield, amass Orcs 2. (Put two +1/+1 counters on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
+SVar:TrigAmass:DB$ Amass | Type$ Orc | Num$ 2
+DeckHas:Ability$Token|Counters & Type$Orc|Army
+Oracle:Flying\nWhen Dunland Crebain enters the battlefield, amass Orcs 2. (Put two +1/+1 counters on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/easterling_vanguard.txt b/forge-gui/res/cardsfolder/upcoming/easterling_vanguard.txt
new file mode 100644
index 00000000000..932d6d0bc40
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/easterling_vanguard.txt
@@ -0,0 +1,8 @@
+Name:Easterling Vanguard
+ManaCost:1 B
+Types:Creature Human Warrior
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigAmass | TriggerDescription$ When CARDNAME dies, amass Orcs 1. (Put a +1/+1 counter on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
+SVar:TrigAmass:DB$ Amass | Type$ Orc | Num$ 1 
+DeckHas:Ability$Token|Counters & Type$Orc|Army
+Oracle:When Easterling Vanguard dies, amass Orcs 1. (Put a +1/+1 counter on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/king_of_the_oathbreakers.txt b/forge-gui/res/cardsfolder/upcoming/king_of_the_oathbreakers.txt
index 5ec5953a29e..4bcf6b309f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/king_of_the_oathbreakers.txt
+++ b/forge-gui/res/cardsfolder/upcoming/king_of_the_oathbreakers.txt
@@ -6,7 +6,7 @@ K:Flying
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self,Spirit.YouCtrl+Other | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPhaseOut| TriggerDescription$ Whenever CARDNAME or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)
 SVar:TrigPhaseOut:DB$ Phases | Defined$ TriggeredTargetLKICopy
 T:Mode$ PhaseIn | ValidCard$ Card.Self,Spirit.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Spirit you control phases in, create a tapped 1/1 white Spirit creature token with flying.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You | TokenTapped$ True
 DeckHints:Type$Spirit
 DeckHas:Ability$Token
 Oracle:Flying\nWhenever King of the Oathbreakers or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)\nWhenever King of the Oathbreakers or another Spirit you control phases in, create a tapped 1/1 white Spirit creature token with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shire_shirriff.txt b/forge-gui/res/cardsfolder/upcoming/shire_shirriff.txt
index 11cba0118ba..69f90bfc9c3 100644
--- a/forge-gui/res/cardsfolder/upcoming/shire_shirriff.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shire_shirriff.txt
@@ -8,4 +8,4 @@ SVar:TrigSac:AB$ ImmediateTrigger | Cost$ Sac<1/Card.token/token> | Execute$ Tri
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | Duration$ UntilHostLeavesPlay
 DeckHas:Ability$Sacrifice
 DeckHints:Ability$Token
-Oracle:When CARDNAME enters the battlefield, you may sacrifice a token. When you do, exile target creature an opponent controls until Shire Shirriff leaves the battlefield.
+Oracle:Vigilance\nWhen Shire Shirriff enters the battlefield, you may sacrifice a token. When you do, exile target creature an opponent controls until Shire Shirriff leaves the battlefield.
diff --git a/forge-gui/res/cardsfolder/w/whippoorwill.txt b/forge-gui/res/cardsfolder/w/whippoorwill.txt
index b9933496a58..e4501430aca 100644
--- a/forge-gui/res/cardsfolder/w/whippoorwill.txt
+++ b/forge-gui/res/cardsfolder/w/whippoorwill.txt
@@ -2,9 +2,9 @@ Name:Whippoorwill
 ManaCost:G
 Types:Creature Bird
 PT:1/1
-A:AB$ Pump | Cost$ G G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Curse | KW$ HIDDEN CARDNAME can't be regenerated. & HIDDEN Damage that would be dealt to CARDNAME can't be redirected. | SubAbility$ DBEffect | StackDescription$ {c:Targeted} can't be regenerated this turn. Damage that would be dealt to that card this turn can't be prevented or dealt instead to another permanent or player. SpellDescription$ Target creature can't be regenerated this turn. Damage that would be dealt to that creature this turn can't be prevented or dealt instead to another permanent or player. When the creature dies this turn, exile the creature.
+A:AB$ Pump | Cost$ G G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Curse | KW$ HIDDEN CARDNAME can't be regenerated. & HIDDEN Damage that would be dealt to CARDNAME can't be redirected. | SubAbility$ DBEffect | StackDescription$ {c:Targeted} can't be regenerated this turn. Damage that would be dealt to that card this turn can't be prevented or dealt instead to another permanent or player. | SpellDescription$ Target creature can't be regenerated this turn. Damage that would be dealt to that creature this turn can't be prevented or dealt instead to another permanent or player. When the creature dies this turn, exile the creature.
 SVar:DBEffect:DB$ Effect | Name$ Whippoorwill Effect | EffectOwner$ TargetedOwner | RememberObjects$ Targeted | StaticAbilities$ NoPrevent | SubAbility$ DBDelayedTrigger
 SVar:NoPrevent:Mode$ CantPreventDamage | Affected$ Creature.IsRemembered | EffectZone$ Command | Description$ Damage that would be dealt to that creature this turn can't be prevented.
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigExile | TriggerDescription$ When the creature dies this turn, exile the creature.
 SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Exile
-Oracle:{G}{G}, {T}: Target creature can't be regenerated this turn. Damage that would be dealt to that creature this turn can't be prevented or dealt instead to another permanent or player. When the creature dies this turn, exile the creature.
+Oracle:{G}{G},{T}: Target creature can't be regenerated this turn. Damage that would be dealt to that creature this turn can't be prevented or dealt instead to another permanent or player. When the creature dies this turn, exile the creature.
\ No newline at end of file