diff --git a/forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt b/forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
index eff6d60d5b3..fc71107e14d 100644
--- a/forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
+++ b/forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Legendary Creature Cat Warrior
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 2/1 white Cat Warrior creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_1_cat_warrior | TokenOwner$ You
+SVar:TrigToken:DB$ Token | TokenScript$ w_2_1_cat_warrior
 T:Mode$ ChangesZoneAll | TriggerZones$ Battlefield | ValidCards$ Cat.Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever one or more other Cats you control die, you may exile NICKNAME, then return him to the battlefield transformed under his owner's control.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/s/spirited_companion.txt b/forge-gui/res/cardsfolder/s/spirited_companion.txt
index 52689bb83a8..e4bcf3990d4 100644
--- a/forge-gui/res/cardsfolder/s/spirited_companion.txt
+++ b/forge-gui/res/cardsfolder/s/spirited_companion.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Enchantment Creature Dog
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:TrigDraw:DB$ Draw
 Oracle:When Spirited Companion enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/felidar_savior.txt b/forge-gui/res/cardsfolder/upcoming/felidar_savior.txt
new file mode 100644
index 00000000000..8bd4ce38751
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/felidar_savior.txt
@@ -0,0 +1,9 @@
+Name:Felidar Savior
+ManaCost:3 W
+Types:Creature Cat Beast
+PT:2/3
+K:Lifelink
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounters | TriggerDescription$ When this creature enters, put a +1/+1 counter on each of up to two other target creatures you control.
+SVar:TrigPutCounters:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select up to two other target creatures you control
+DeckHas:Ability$LifeGain|Counters
+Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)\nWhen this creature enters, put a +1/+1 counter on each of up to two other target creatures you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/helpful_hunter.txt b/forge-gui/res/cardsfolder/upcoming/helpful_hunter.txt
new file mode 100644
index 00000000000..5aec104465f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/helpful_hunter.txt
@@ -0,0 +1,7 @@
+Name:Helpful Hunter
+ManaCost:1 W
+Types:Creature Cat
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this creature enters, draw a card.
+SVar:TrigDraw:DB$ Draw
+Oracle:When this creature enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/prideful_parent.txt b/forge-gui/res/cardsfolder/upcoming/prideful_parent.txt
new file mode 100644
index 00000000000..1115950cf72
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/prideful_parent.txt
@@ -0,0 +1,8 @@
+Name:Prideful Parent
+ManaCost:2 W
+Types:Creature Cat
+PT:2/2
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a 1/1 white Cat creature token.
+SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_cat
+Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWhen this creature enters, create a 1/1 white Cat creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_bloodwitch.txt b/forge-gui/res/cardsfolder/upcoming/vengeful_bloodwitch.txt
new file mode 100644
index 00000000000..72f4c19ce03
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/vengeful_bloodwitch.txt
@@ -0,0 +1,8 @@
+Name:Vengeful Bloodwitch
+ManaCost:1 B
+PT:1/1
+Types:Creature Vampire Warlock
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever this creature or another creature you control dies, target opponent loses 1 life and you gain 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+Oracle:Whenever this creature or another creature you control dies, target opponent loses 1 life and you gain 1 life.