diff --git a/forge-gui/res/cardsfolder/upcoming/jumbo_cactuar.txt b/forge-gui/res/cardsfolder/upcoming/jumbo_cactuar.txt
new file mode 100644
index 00000000000..8497d635074
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jumbo_cactuar.txt
@@ -0,0 +1,7 @@
+Name:Jumbo Cactuar
+ManaCost:5 G G
+Types:Creature Plant
+PT:1/7
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ 10,000 Needles — Whenever this creature attacks, it gets +9999/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 9999
+Oracle:10,000 Needles — Whenever this creature attacks, it gets +9999/+0 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sazhs_chocobo.txt b/forge-gui/res/cardsfolder/upcoming/sazhs_chocobo.txt
new file mode 100644
index 00000000000..4e48e0c8d11
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sazhs_chocobo.txt
@@ -0,0 +1,9 @@
+Name:Sazh's Chocobo
+ManaCost:G
+Types:Creature Bird
+PT:0/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Landfall — Whenever a land you control enters, put a +1/+1 counter on this creature.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:BuffedBy:Land
+DeckHas:Ability$Counters
+Oracle:Landfall — Whenever a land you control enters, put a +1/+1 counter on this creature.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sephiroth_planets_heir.txt b/forge-gui/res/cardsfolder/upcoming/sephiroth_planets_heir.txt
new file mode 100644
index 00000000000..46711920811
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sephiroth_planets_heir.txt
@@ -0,0 +1,11 @@
+Name:Sephiroth, Planet's Heir
+ManaCost:4 U B
+Types:Legendary Creature Human Avatar Soldier
+PT:4/4
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When NICKNAME enters, creatures your opponents control get -2/-2 until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | NumAtt$ -2 | NumDef$ -2 | ValidCards$ Creature.OppCtrl | IsCurse$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature an opponent controls dies, put a +1/+1 counter on NICKNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:PlayMain1:TRUE
+Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWhen Sephiroth enters, creatures your opponents control get -2/-2 until end of turn.\nWhenever a creature an opponent controls dies, put a +1/+1 counter on Sephiroth.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sidequest_catch_a_fish_cooking_campsite.txt b/forge-gui/res/cardsfolder/upcoming/sidequest_catch_a_fish_cooking_campsite.txt
new file mode 100644
index 00000000000..a56651f26e9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sidequest_catch_a_fish_cooking_campsite.txt
@@ -0,0 +1,20 @@
+Name:Sidequest: Catch a Fish
+ManaCost:2 W
+Types:Enchantment
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPeek | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. If it's an artifact or creature card, you may reveal it and put it into your hand. If you put a card into your hand this way, create a Food token and transform this enchantment.
+SVar:TrigPeek:DB$ PeekAndReveal | PeekAmount$ 1 | RevealValid$ Artifact,Creature | RevealOptional$ True | RememberRevealed$ True | SubAbility$ DBToHand
+SVar:DBToHand:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | ConditionDefined$ Remembered | ConditionPresent$ Card.inZoneHand | ConditionCompare$ EQ1 | SubAbility$ DBTransform
+SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | ConditionDefined$ Remembered | ConditionPresent$ Card.inZoneHand | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+AlternateMode:DoubleFaced
+Oracle:At the beginning of your upkeep, look at the top card of your library. If it's an artifact or creature card, you may reveal it and put it into your hand. If you put a card into your hand this way, create a Food token and transform this enchantment.
+
+ALTERNATE
+
+Name:Cooking Campsite
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SpellDescription$ Add {W}.
+A:AB$ PutCounterAll | Cost$ 3 T Sac<1/Artifact> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SorcerySpeed$ True | SpellDescription$ Put a +1/+1 counter on each creature you control. Activate only as a sorcery.
+Oracle:{T}: Add {W}.\n{3}, {T}, Sacrifice an artifact: Put a +1/+1 counter on each creature you control. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/sin_spiras_punishment.txt b/forge-gui/res/cardsfolder/upcoming/sin_spiras_punishment.txt
new file mode 100644
index 00000000000..24e8d30a547
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sin_spiras_punishment.txt
@@ -0,0 +1,13 @@
+Name:Sin, Spira's Punishment
+ManaCost:4 B G U
+Types:Legendary Creature Leviathan Avatar
+PT:7/7
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeat | TriggerDescription$ Whenever NICKNAME enters or attacks, exile a permanent card from your graveyard at random, then create a tapped token that's a copy of that card. If the exiled card is a land card, repeat this process.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigRepeat | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, exile a permanent card from your graveyard at random, then create a tapped token that's a copy of that card. If the exiled card is a land card, repeat this process.
+SVar:TrigRepeat:DB$ Repeat | RepeatSubAbility$ DBChange | RepeatDefined$ Remembered | RepeatPresent$ Land | RepeatSVarCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:DBChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | AtRandom$ True | ChangeType$ Permanent.YouOwn | ChangeNum$ 1 | RememberChanged$ True | ForgetOtherRemembered$ True | Hidden$ True | SubAbility$ DBCopy
+SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | TokenTapped$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:HasAttackEffect:TRUE
+Oracle:Flying\nWhenever Sin enters or attacks, exile a permanent card from your graveyard at random, then create a tapped token that's a copy of that card. If the exiled card is a land card, repeat this process.
diff --git a/forge-gui/res/cardsfolder/upcoming/stiltzkin_moogle_merchant.txt b/forge-gui/res/cardsfolder/upcoming/stiltzkin_moogle_merchant.txt
new file mode 100644
index 00000000000..8a48f656dc1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/stiltzkin_moogle_merchant.txt
@@ -0,0 +1,11 @@
+Name:Stiltzkin, Moogle Merchant
+ManaCost:W
+Types:Legendary Creature Moogle
+PT:1/2
+K:Lifelink
+A:AB$ Pump | Cost$ 2 T | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBGainControl | AILogic$ DonateTargetPerm | SpellDescription$ Target opponent gains control of another target permanent you control. If they do, you draw a card.
+SVar:DBGainControl:DB$ GainControl | ValidTgts$ Permanent.Other+YouCtrl | TgtPrompt$ Select another target permanent you control | NewController$ ParentTarget | RememberControlled$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$LifeGain
+Oracle:Lifelink\n{2}, {T}: Target opponent gains control of another target permanent you control. If they do, you draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_shiva.txt b/forge-gui/res/cardsfolder/upcoming/summon_shiva.txt
new file mode 100644
index 00000000000..9c14ab72731
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/summon_shiva.txt
@@ -0,0 +1,11 @@
+Name:Summon: Shiva
+ManaCost:3 U U
+Types:Enchantment Creature Saga Elemental
+PT:4/5
+K:Chapter:3:DBTap,DBTap,DBDraw
+SVar:DBTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBPutCounter | SpellDescription$ Heavenly Strike — Tap target creature an opponent controls. Put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
+SVar:DBDraw:DB$ Draw | NumCards$ X | SpellDescription$ Diamond Dust — Draw a card for each tapped creature your opponents control.
+SVar:X:Count$Valid Creature.tapped+OppCtrl
+SVar:PlayMain1:TRUE
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI, II — Heavenly Strike — Tap target creature an opponent controls. Put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)\nIII — Diamond Dust — Draw a card for each tapped creature your opponents control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/tonberry.txt b/forge-gui/res/cardsfolder/upcoming/tonberry.txt
new file mode 100644
index 00000000000..ff68a67712c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/tonberry.txt
@@ -0,0 +1,10 @@
+Name:Tonberry
+ManaCost:B
+Types:Creature Salamander Horror
+PT:2/1
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ EntersTapped | ReplacementResult$ Updated | Description$ This creature enters tapped with a stun counter on it. (If it would become untapped, remove a stun counter from it instad.)
+SVar:EntersTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ STUN | CounterNum$ 1
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ First Strike & Deathtouch | Condition$ PlayerTurn | Description$ Chef's Knife — During your turn, this creature has first strike and deathtouch.
+DeckHas:Ability$Counters
+Oracle:This creature enters tapped with a stun counter on it. (If it would become untapped, remove a stun counter from it instad.)\nChef's Knife — During your turn, this creature has first strike and deathtouch.
\ No newline at end of file
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 735453f8b7c..ad9f0d985bc 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -185,6 +185,7 @@ Monger:Mongers
 Mongoose:Mongooses
 Monk:Monks
 Monkey:Monkeys
+Moogle:Moogles
 Moonfolk:Moonfolk
 Mount:Mounts
 Mouse:Mice