diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
index 4e25ad7ea63..6e6c2e78931 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
@@ -279,6 +279,14 @@ public class EffectEffect extends SpellAbilityEffect {
                 eff.setNamedCard(hostCard.getNamedCard());
             }
 
+            // chosen number
+            if (sa.hasParam("SetChosenNumber")) {
+                eff.setChosenNumber(AbilityUtils.calculateAmount(sa.getHostCard(),
+                        sa.getParam("SetChosenNumber"), sa));
+            } else if (hostCard.hasChosenNumber()) {
+                eff.setChosenNumber(hostCard.getChosenNumber());
+            }
+
             if (sa.hasParam("CopySVar")) {
                 eff.setSVar(sa.getParam("CopySVar"), hostCard.getSVar(sa.getParam("CopySVar")));
             }
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 0ab2bdc8877..602ddd0728c 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -2119,12 +2119,18 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
                     sbLong.append("Trample over planeswalkers").append(" (").append(inst.getReminderText()).append(")").append("\r\n");
                 } else if (keyword.startsWith("Hexproof:")) {
                     final String[] k = keyword.split(":");
-                    sbLong.append("Hexproof from ");
-                    if (k[2].equals("chosen")) {
-                        k[2] = k[1].substring(5).toLowerCase();
+                    if(!k[2].equals("Secondary")) {
+                        sbLong.append("Hexproof from ");
+                        if (k[2].equals("chosen")) {
+                            k[2] = k[1].substring(5).toLowerCase();
+                        }
+                        sbLong.append(k[2]);
+                        if (!k[2].contains(" and ")) { // skip reminder text for more complicated Hexproofs
+                            sbLong.append(" (").append(inst.getReminderText().replace("chosen", k[2]));
+                            sbLong.append(")");
+                        }
+                        sbLong.append("\r\n");
                     }
-                    sbLong.append(k[2]).append(" (").append(inst.getReminderText().replace("chosen", k[2]))
-                            .append(")").append("\r\n");
                 } else if (inst.getKeyword().equals(Keyword.COMPANION)) {
                     sbLong.append("Companion — ");
                     sbLong.append(((Companion)inst).getDescription());
diff --git a/forge-gui/res/cardsfolder/h/herald_of_the_forgotten.txt b/forge-gui/res/cardsfolder/h/herald_of_the_forgotten.txt
index a20e4ddcd60..b50d547415d 100644
--- a/forge-gui/res/cardsfolder/h/herald_of_the_forgotten.txt
+++ b/forge-gui/res/cardsfolder/h/herald_of_the_forgotten.txt
@@ -3,7 +3,7 @@ ManaCost:6 W W
 Types:Creature Cat Beast
 PT:6/6
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCast | Destination$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, return any number of target permanent cards with cycling abilities from your graveyard to the battlefield.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouOwn+withCycling,Permanent.YouOwn+withTypeCycling | SelectPrompt$ Select any number of target permanent cards with cycling abilities to return to the battlefield | TargetMin$ 0 | TargetMax$ X
+T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, return any number of target permanent cards with cycling abilities from your graveyard to the battlefield.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouOwn+withCycling,Permanent.YouOwn+withTypeCycling | TgtPrompt$ Select any number of target permanent cards with cycling abilities | TargetMin$ 0 | TargetMax$ X
 SVar:X:TriggeredCardController$ValidGraveyard Permanent.YouOwn+withCycling,Permanent.YouOwn+withTypeCycling
 Oracle:Flying\nWhen Herald of the Forgotten enters the battlefield, if you cast it, return any number of target permanent cards with cycling abilities from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/Belakor_the_dark_master.txt b/forge-gui/res/cardsfolder/upcoming/Belakor_the_dark_master.txt
new file mode 100644
index 00000000000..eab6dc1f151
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/Belakor_the_dark_master.txt
@@ -0,0 +1,15 @@
+Name:Be'lakor, the Dark Master
+ManaCost:3 U B R
+Types:Legendary Creature Demon Noble
+PT:6/5
+K:Flying
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Prince of Chaos — When CARDNAME enters the battlefield, you draw X cards and you lose X life, where X is the number of Demons you control.
+SVar:TrigDraw:DB$ Draw | NumCards$ X | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Demon.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Lord of Torment — Whenever another Demon enters the battlefield under your control, it deals damage equal to its power to any target.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ Y
+SVar:X:Count$Valid Demon.YouCtrl
+SVar:Y:TriggeredCard$CardPower
+SVar:BuffedBy:Demon
+DeckHints:Type$Demon
+Oracle:Flying\nPrince of Chaos — When Be'lakor, the Dark Master enters the battlefield, you draw X cards and you lose X life, where X is the number of Demons you control.\nLord of Torment — Whenever another Demon enters the battlefield under your control, it deals damage equal to its power to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/acolyte_hybrid.txt b/forge-gui/res/cardsfolder/upcoming/acolyte_hybrid.txt
new file mode 100644
index 00000000000..3d209b514da
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/acolyte_hybrid.txt
@@ -0,0 +1,10 @@
+Name:Acolyte Hybrid
+ManaCost:2 R
+Types:Creature Tyranid Human
+PT:2/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ Heavy Rock Cutter — Whenever CARDNAME attacks, destroy up to one target artifact. If an artifact is destroyed this way, its controller draws a card.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TargetMin$ 0 | TargetMax$ 1 | RememberDestroyed$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ RememberedController | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+HasAttackEffect:True
+Oracle:Heavy Rock Cutter — Whenever Acolyte Hybrid attacks, destroy up to one target artifact. If an artifact is destroyed this way, its controller draws a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/atlan_jackal.txt b/forge-gui/res/cardsfolder/upcoming/atlan_jackal.txt
new file mode 100644
index 00000000000..3d0a5698afd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/atlan_jackal.txt
@@ -0,0 +1,10 @@
+Name:Atalan Jackal
+ManaCost:1 R G
+Types:Creature Human Tyranid Scout
+PT:2/2
+K:Trample
+K:Haste
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigSearch | CombatDamage$ True | TriggerDescription$ Skilled Outrider — Whenever CARDNAME deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | Optional$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+HasAttackEffect:True
+Oracle:Trample, haste\nSkilled Outrider — Whenever Atalan Jackal deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/biophagus.txt b/forge-gui/res/cardsfolder/upcoming/biophagus.txt
new file mode 100644
index 00000000000..3b9ed9f1008
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/biophagus.txt
@@ -0,0 +1,11 @@
+Name:Biophagus
+ManaCost:1 G
+Types:Creature Human Tyranid Wizard
+PT:1/3
+A:AB$ Mana | Cost$ T | Produced$ Any | PrecostDesc$ Genomic Enhancement — | TriggersWhenSpent$ TrigSpent | SpellDescription$ Add one mana of any color. If this mana is spent to cast a creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
+SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigEffect | TriggerDescription$ If this mana is spent to cast a creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack | ReplacementEffects$ ETBCreat
+SVar:ETBCreat:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated | Description$ That creature enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn.
+SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 1
+DeckHas:Ability$Counter
+Oracle:Genomic Enhancement — {T}: Add one mana of any color. If this mana is spent to cast a creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/boareskyr_tollkeeper.txt b/forge-gui/res/cardsfolder/upcoming/boareskyr_tollkeeper.txt
new file mode 100644
index 00000000000..a267ed00115
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/boareskyr_tollkeeper.txt
@@ -0,0 +1,11 @@
+Name:Boareskyr Tollkeeper
+ManaCost:1 W
+Types:Creature Orc Knight
+PT:3/1
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals all creature and land cards in their hand. Choose one of them. That card perpetually gains "This permanent enters the battlefield tapped."
+SVar:TrigReveal:DB$ Reveal | ValidTgts$ Opponent | RevealAllValid$ Creature.TargetedPlayerOwn,Land.TargetedPlayerOwn | SubAbility$ DBChooseCard | RememberRevealed$ True
+SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.IsRemembered | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualAbility | Name$ Boareskyr Tollkeeper's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.ChosenCard | EffectZone$ Command | AddKeyword$ CARDNAME enters the battlefield tapped. | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gains "This permanent enters the battlefield tapped."
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
+Oracle:When Boareskyr Tollkeeper enters the battlefield, target opponent reveals all creature and land cards in their hand. Choose one of them. That card perpetually gains "This permanent enters the battlefield tapped."
diff --git a/forge-gui/res/cardsfolder/upcoming/bone_sabres.txt b/forge-gui/res/cardsfolder/upcoming/bone_sabres.txt
new file mode 100644
index 00000000000..f27a0163d7d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bone_sabres.txt
@@ -0,0 +1,9 @@
+Name:Bone Sabres
+ManaCost:2 G
+Types:Artifact Equipment
+K:Equip:3
+T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigCounter | TriggerDescription$ Whenever equipped creature attacks, put four +1/+1 counters on it.
+SVar:TrigCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1 | CounterNum$ 4
+DeckHas:Ability$Counter
+HasAttackEffect:True
+Oracle:Whenever equipped creature attacks, put four +1/+1 counters on it.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/dragonborn_immolator.txt b/forge-gui/res/cardsfolder/upcoming/dragonborn_immolator.txt
index 9431e2971c9..651d1a51101 100644
--- a/forge-gui/res/cardsfolder/upcoming/dragonborn_immolator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dragonborn_immolator.txt
@@ -7,8 +7,9 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigNote:DB$ StoreSVar | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SVar$ NotedPower | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
 SVar:NotedPower:Number$0
 SVar:X:Count$CardPower
-SVar:DBEffect:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | CopySVar$ NotedPower
+SVar:DBEffect:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | SetChosenNumber$ NotedPower
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | OneOff$ True | ActivationLimit$ 1 | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Flaming Fist Duskguard's Boon's Perpetual Effect | CopySVar$ NotedPower
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ NotedPower | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +X/+0, where X is the noted number.
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Flaming Fist Duskguard's Boon's Perpetual Effect
+SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ Y | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +X/+0, where X is the noted number.
+SVar:Y:Count$ChosenNumber
 Oracle:{2}{R}: Dragonborn Immolator gets +2/+0 until end of turn.\nGift of Tiamat — When Dragonborn Immolator dies, if its power is greater than 0, note its power. You get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
diff --git a/forge-gui/res/cardsfolder/upcoming/jaheira_harper_emissary.txt b/forge-gui/res/cardsfolder/upcoming/jaheira_harper_emissary.txt
new file mode 100644
index 00000000000..c5cd24b72f3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jaheira_harper_emissary.txt
@@ -0,0 +1,79 @@
+Name:Jaheira, Harper Emissary
+ManaCost:1 G
+Types:Legendary Creature Human Elf Druid
+PT:2/3
+K:Specialize:2
+K:Hexproof:Card.Artifact:artifacts and enchantments
+K:Hexproof:Card.Enchantment:Secondary
+AlternateMode:Specialize
+Oracle:Specialize {2}\nHexproof from artifacts and enchantments
+
+SPECIALIZE:WHITE
+
+Name:Jaheira, Heroic Harper
+ManaCost:1 G W
+Types:Legendary Creature Human Elf Druid
+PT:3/4
+K:Hexproof:Card.Artifact:artifacts and enchantments
+K:Hexproof:Card.Enchantment:Secondary
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature specializes, destroy up to one target artifact or enchantment. Put a +1/+1 counter on each of up to two other target creatures.
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select up to one target artifact or enchantment | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature.Other | TgtPrompt$ Select up to two other target creatures
+DeckHas:Ability$Counters
+Oracle:Hexproof from artifacts and enchantments\nWhen this creature specializes, destroy up to one target artifact or enchantment. Put a +1/+1 counter on each of up to two other target creatures.
+
+SPECIALIZE:BLUE
+
+Name:Jaheira, Insightful Harper
+ManaCost:1 G U
+Types:Legendary Creature Human Elf Druid
+PT:3/4
+K:Hexproof:Card.Artifact:artifacts and enchantments
+K:Hexproof:Card.Enchantment:Secondary
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature specializes, destroy up to one target artifact or enchantment. Scry 2.
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select up to one target artifact or enchantment | SubAbility$ DBScry
+SVar:DBScry:DB$ Scry | ScryNum$ 2
+Oracle:Hexproof from artifacts and enchantments\nWhen this creature specializes, destroy up to one target artifact or enchantment. Scry 2.
+
+SPECIALIZE:BLACK
+
+Name:Jaheira, Ruthless Harper
+ManaCost:1 B G
+Types:Legendary Creature Human Elf Druid
+PT:3/4
+K:Hexproof:Card.Artifact:artifacts and enchantments
+K:Hexproof:Card.Enchantment:Secondary
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature specializes, destroy up to one target artifact or enchantment. Each opponent loses 3 life.
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select up to one target artifact or enchantment | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 3
+Oracle:Hexproof from artifacts and enchantments\nWhen this creature specializes, destroy up to one target artifact or enchantment. Each opponent loses 3 life.
+
+SPECIALIZE:RED
+
+Name:Jaheira, Stirring Harper
+ManaCost:1 R G
+Types:Legendary Creature Human Elf Druid
+PT:3/4
+K:Hexproof:Card.Artifact:artifacts and enchantments
+K:Hexproof:Card.Enchantment:Secondary
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature specializes, destroy up to one target artifact or enchantment. You get a boon with "When you cast your next creature spell, it perpetually gets +1/+0 and gains haste."
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select up to one target artifact or enchantment | SubAbility$ DBBoon
+SVar:DBBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast
+SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | OneOff$ True | ActivationLimit$ 1 | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +1/+0 and gains haste.
+SVar:TrigEffect:DB$ Effect | Name$ Jaheira, Stirring Harper's Boon's Perpetual Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualAbility | Duration$ Permanent
+SVar:PerpetualAbility:Mode$ Continuous | AddPower$ 1 | AddKeyword$ Haste | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+0 and gains haste.
+Oracle:Hexproof from artifacts and enchantments\nWhen this creature specializes, destroy up to one target artifact or enchantment. You get a boon with "When you cast your next creature spell, it perpetually gets +1/+0 and gains haste."
+
+SPECIALIZE:GREEN
+
+Name:Jaheira, Merciful Harper {1}{G}{G}
+ManaCost:1 R G
+Types:Legendary Creature Human Elf Druid
+PT:3/4
+K:Hexproof:Card.Artifact:artifacts and enchantments
+K:Hexproof:Card.Enchantment:Secondary
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature specializes, destroy up to one target artifact or enchantment. You gain 4 life.
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select up to one target artifact or enchantment | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 4
+DeckHas:Ability$LifeGain
+Oracle:Hexproof from artifacts and enchantments\nWhen this creature specializes, destroy up to one target artifact or enchantment. You gain 4 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt b/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt
new file mode 100644
index 00000000000..4a1ab90db09
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt
@@ -0,0 +1,86 @@
+Name:Lae'zel, Githyanki Warrior
+ManaCost:3 W
+Types:Legendary Creature Gith Warrior
+PT:2/4
+K:Double Strike
+K:Specialize:1
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When you cast this spell, it gains "When this creature becomes the target of a spell or ability an opponent controls, you may exile this creature, then return it to the battlefield under its owner's control."
+SVar:TrigAnimate:DB$ Animate | Triggers$ BecomesTarget
+SVar:BecomesTarget:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigBlink | OptionalDecider$ You | TriggerDescription$ When this creature becomes the target of a spell or ability an opponent controls, you may exile this creature, then return it to the battlefield under its owner's control.
+SVar:TrigBlink:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ TriggeredTargetLKICopy | SubAbility$ DBReturn | RememberChanged$ True
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+AlternateMode:Specialize
+Oracle:Double strike\nSpecialize {1}\nWhen you cast this spell, it gains "When this creature becomes the target of a spell or ability an opponent controls, you may exile this creature, then return it to the battlefield under its owner's control."
+
+SPECIALIZE:WHITE
+
+Name:Lae'zel, Blessed Warrior
+ManaCost:3 W W
+Types:Legendary Creature Gith Warrior
+PT:3/6
+K:Double Strike
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSeek | TriggerDescription$ When this creature enters the battlefield or specializes, seek a nonland permanent card with mana value 3 or less.
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigSeek | Secondary$ True | TriggerDescription$ When this creature enters the battlefield or specializes, seek a nonland permanent card with mana value 3 or less.
+SVar:TrigSeek:DB$ ChangeZone | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeType$ Permanent.nonLand+cmcLE3
+Oracle:Double strike\nWhen this creature enters the battlefield or specializes, seek a nonland permanent card with mana value 3 or less.
+
+SPECIALIZE:BLUE
+
+Name:Lae'zel, Illithid Thrall
+ManaCost:3 W U
+Types:Legendary Creature Gith Horror Warrior
+PT:3/6
+K:Double Strike
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When this creature enters the battlefield or specializes, conjure a duplicate of a random creature card from an opponent's library into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigChoose | Secondary$ True | TriggerDescription$ When this creature enters the battlefield or specializes, conjure a duplicate of a random creature card from an opponent's library into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.OppCtrl | ChoiceZone$ Library | AtRandom$ True | SubAbility$ DBConjure
+SVar:DBConjure:DB$ MakeCard | DefinedName$ ChosenCard | Zone$ Hand | RememberMade$ True | SubAbility$ DBClearChosen
+SVar:DBClearChosen:DB$ Cleanup | ClearChosenCard$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Lae'zel, Illithid Thrall's Perpetual Effect | SubAbility$ DBCleanup
+SVar:PerpetualAbility:Mode$ Continuous | AddStaticAbility$ SpendAnyMana | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+SVar:SpendAnyMana:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AffectedZone$ Stack | AddHiddenKeyword$ May spend mana as though it were mana of any color to cast CARDNAME | Description$ You may spend mana as though it were mana of any color to cast this spell.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:Update:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ DBUpdate
+SVar:DBUpdate:DB$ UpdateRemember
+Oracle:Double strike\nWhen this creature enters the battlefield or specializes, conjure a duplicate of a random creature card from an opponent's library into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+
+SPECIALIZE:BLACK
+
+Name:Lae'zel, Callous Warrior
+ManaCost:3 W B
+Types:Legendary Creature Gith Warrior
+PT:3/6
+K:Double Strike
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When this creature enters the battlefield or specializes, return up to two target creature cards with total mana value 3 or less from your graveyard to the battlefield.
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigReturn | Secondary$ True | TriggerDescription$ When this creature enters the battlefield or specializes, return up to two target creature cards with total mana value 3 or less from your graveyard to the battlefield.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 2 | MaxTotalTargetCMC$ 3 | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select up to two target creature cards with total mana value 3 or less
+Oracle:Double strike\nWhen this creature enters the battlefield or specializes, return up to two target creature cards with total mana value 3 or less from your graveyard to the battlefield.
+
+SPECIALIZE:RED
+
+Name:Lae'zel, Wrathful Warrior
+ManaCost:3 R W
+Types:Legendary Creature Gith Warrior
+PT:3/6
+K:Double Strike
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters the battlefield or specializes, create two 1/1 white Soldier creature tokens.
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When this creature enters the battlefield or specializes, create two 1/1 white Soldier creature tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier
+DeckHas:Ability$Token & Type$Soldier
+Oracle:Double strike\nWhen this creature enters the battlefield or specializes, create two 1/1 white Soldier creature tokens.
+
+SPECIALIZE:GREEN
+
+Name:Lae'zel, Primal Warrior
+ManaCost:3 G W
+Types:Legendary Creature Gith Warrior
+PT:3/6
+K:Double Strike
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When this creature enters the battlefield or specializes, other creatures you control and creature cards in your hand perpetually get +1/+1.
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigEffect | Secondary$ True | TriggerDescription$ When this creature enters the battlefield or specializes, other creatures you control and creature cards in your hand perpetually get +1/+1.
+SVar:TrigEffect:DB$ Effect | RememberObjects$ Creature.YouCtrl+Other,ValidHand Creature.YouOwn | StaticAbilities$ PerpetualP1P1 | Duration$ Permanent | Triggers$ Update | Name$ Lae'zel, Primal Warrior's Perpetual Effect
+SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ These creature cards perpetually get +1/+1.
+SVar:Update:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ DBUpdate
+SVar:DBUpdate:DB$ UpdateRemember
+Oracle:Double strike\nWhen this creature enters the battlefield or specializes, other creatures you control and creature cards in your hand perpetually get +1/+1.
diff --git a/forge-gui/res/cardsfolder/upcoming/marneus_calgar.txt b/forge-gui/res/cardsfolder/upcoming/marneus_calgar.txt
new file mode 100644
index 00000000000..3223dc5199d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/marneus_calgar.txt
@@ -0,0 +1,11 @@
+Name:Marneus Calgar
+ManaCost:2 W U B
+Types:Legendary Creature Astartes Warrior
+PT:3/5
+K:Double Strike
+T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ DBDraw | TriggerDescription$ Master Tactician — Whenever one or more tokens enter the battlefield under your control, draw a card.
+SVar:DBDraw:DB$ Draw
+A:AB$ Token | Cost$ 6 | PrecostDesc$ Chapter Master — | TokenAmount$ 2 | TokenScript$ w_2_2_astartes_warrior_vigilance | TokenOwner$ You | SpellDescription$ Create two 2/2 white Astartes Warrior creature tokens with vigilance.
+DeckHints:Ability$Tokens
+DeckHas:Ability$Tokens
+Oracle:Double strike\nMaster Tactician — Whenever one or more tokens enter the battlefield under your control, draw a card.\nChapter Master — {6}: Create two 2/2 white Astartes Warrior creature tokens with vigilance.
diff --git a/forge-gui/res/cardsfolder/upcoming/mephits_enthusiasm.txt b/forge-gui/res/cardsfolder/upcoming/mephits_enthusiasm.txt
new file mode 100644
index 00000000000..9dddc91ab6a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mephits_enthusiasm.txt
@@ -0,0 +1,10 @@
+Name:Mephit's Enthusiasm
+ManaCost:1 R
+Types:Sorcery
+A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 4 | ExcessSVar$ Excess | SubAbility$ DBEffect | SpellDescription$ CARDNAME deals 4 damage to target creature or planeswalker.
+SVar:DBEffect:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | SetChosenNumber$ Excess | SpellDescription$ If excess damage was dealt this way, note that excess damage, then you get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
+SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | OneOff$ True | ActivationLimit$ 1 | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number.
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Mephit's Enthusiasm's Boon's Perpetual Effect
+SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ X | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +X/+0, where X is the noted number.
+SVar:X:Count$ChosenNumber
+Oracle:Mephit's Enthusiasm deals 4 damage to target creature or planeswalker. If excess damage was dealt this way, note that excess damage, then you get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
diff --git a/forge-gui/res/cardsfolder/upcoming/noise_marine.txt b/forge-gui/res/cardsfolder/upcoming/noise_marine.txt
new file mode 100644
index 00000000000..e38b950d008
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/noise_marine.txt
@@ -0,0 +1,9 @@
+Name:Noise Marine
+ManaCost:4 R
+Types:Creature Astartes Warrior
+PT:3/2
+K:Cascade
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Sonic Blaster — When CARDNAME enters the battlefield, it deals damage equal to the number of spells you’ve cast this turn to any target.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X
+SVar:X:Count$ThisTurnCast_Card.YouCtrl
+Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)\nSonic Blaster — When Noise Marine enters the battlefield, it deals damage equal to the number of spells you’ve cast this turn to any target.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/tatyova_steward_of_tides.txt b/forge-gui/res/cardsfolder/upcoming/tatyova_steward_of_tides.txt
index 9fd4e56b1c5..45d24159fef 100644
--- a/forge-gui/res/cardsfolder/upcoming/tatyova_steward_of_tides.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tatyova_steward_of_tides.txt
@@ -7,4 +7,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.Y
 SVar:TrigAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | Duration$ Permanent | TgtPrompt$ Select up to one target land you control | Power$ 3 | Toughness$ 3 | Types$ Elemental,Creature | Keywords$ Haste
 DeckHints:Type$Land
 SVar:BuffedBy:Land
-Oracle:Land creatures you control have flying.\nWhenever a land enters the battlefield under your control, if you control seven or more lands, up to one target land you control becomes a 3/3 Elemental creature with haste. It's still a land.
\ No newline at end of file
+Oracle:Land creatures you control have flying.\nWhenever a land enters the battlefield under your control, if you control seven or more lands, up to one target land you control becomes a 3/3 Elemental creature with haste. It's still a land.
diff --git a/forge-gui/res/cardsfolder/upcoming/toxicrene.txt b/forge-gui/res/cardsfolder/upcoming/toxicrene.txt
new file mode 100644
index 00000000000..8dc47d1ea36
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/toxicrene.txt
@@ -0,0 +1,9 @@
+Name:Toxicrene
+ManaCost:3 G
+Types:Creature Tyranid
+PT:2/4
+K:Reach
+K:Deathtouch
+S:Mode$ Continuous | Affected$ Land | AddAbility$ Mana | RemoveAllAbilities$ True | Description$ Hypertoxic Miasma — All lands have "{T}: Add one mana of any color" and lose all other abilities.
+SVar:Mana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+Oracle:Reach, deathtouch\nAll lands have "{T}: Add one mana of any color" and lose all other abilities.
diff --git a/forge-gui/res/cardsfolder/upcoming/vhal_eager_scholar.txt b/forge-gui/res/cardsfolder/upcoming/vhal_eager_scholar.txt
new file mode 100644
index 00000000000..b1f71fe00c2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/vhal_eager_scholar.txt
@@ -0,0 +1,96 @@
+Name:Vhal, Eager Scholar
+ManaCost:2 U
+Types:Legendary Creature Human Wizard
+PT:2/2
+K:Specialize:5
+A:AB$ Draw | Cost$ T | SubAbility$ DBDiscard | SpellDescription$ Draw a card,
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | SubAbility$ DBPutCounter | SpellDescription$ then discard a card.
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ STUDY | SpellDescription$ Put a study counter on CARDNAME.
+AlternateMode:Specialize
+DeckHas:Ability$Discard|Counters
+Oracle:Specialize {5}\n{T}: Draw a card, then discard a card. Put a study counter on Vhal, Eager Scholar.
+
+SPECIALIZE:WHITE
+
+Name:Vhal, Scholar of Tactics
+ManaCost:2 W U
+Types:Legendary Creature Human Wizard
+PT:4/4
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigRemoveCounters | TriggerDescription$ When this creature specializes, remove all study counters from it. When you do, distribute that many +1/+1 counters among any number of target creatures.
+SVar:TrigRemoveCounters:DB$ RemoveCounter | CounterType$ STUDY | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBImmediateTrig
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionCheckSVar$ X | Execute$ TrigPutCounters | TriggerDescription$ When you do, distribute that many +1/+1 counters among any number of target creatures.
+SVar:TrigPutCounters:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select any number of target creatures | CounterType$ P1P1 | CounterNum$ X | TargetMin$ 1 | TargetMax$ X | DividedAsYouChoose$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$RememberedSize
+A:AB$ Draw | Cost$ T | SubAbility$ DBDiscard | SpellDescription$ Draw a card,
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | SpellDescription$ then discard a card.
+DeckHas:Ability$Discard|Counters
+Oracle:When this creature specializes, remove all study counters from it. When you do, distribute that many +1/+1 counters among any number of target creatures.\n{T}: Draw a card, then discard a card.
+
+SPECIALIZE:BLUE
+
+Name:Vhal, Scholar of Prophecy
+ManaCost:2 U U
+Types:Legendary Creature Human Wizard
+PT:4/4
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigRemoveCounters | TriggerDescription$ When this creature specializes, remove all study counters from it. Look at that many cards from the top of your library. Put one of those cards into your hand and the rest on the bottom of your library in a random order.
+SVar:TrigRemoveCounters:DB$ RemoveCounter | CounterType$ STUDY | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBDig
+SVar:DBDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$RememberedSize
+A:AB$ Draw | Cost$ T | SubAbility$ DBDiscard | SpellDescription$ Draw a card,
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | SpellDescription$ then discard a card.
+DeckHas:Ability$Discard
+Oracle:When this creature specializes, remove all study counters from it. Look at that many cards from the top of your library. Put one of those cards into your hand and the rest on the bottom of your library in a random order.\n{T}: Draw a card, then discard a card.
+
+SPECIALIZE:BLACK
+
+Name:Vhal, Scholar of Mortality
+ManaCost:2 U B
+Types:Legendary Creature Human Wizard
+PT:4/4
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigRemoveCounters | TriggerDescription$ When this creature specializes, remove all study counters from it. When you do, put target creature card with mana value less than or equal to the number of study counters removed this way from a graveyard onto the battlefield under your control.
+SVar:TrigRemoveCounters:DB$ RemoveCounter | CounterType$ STUDY | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBImmediateTrig
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionCheckSVar$ X | Execute$ TrigChangeZone | TriggerDescription$ When you do, put target creature card with mana value less than or equal to the number of study counters removed this way from a graveyard onto the battlefield under your control.
+SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Creature.cmcLEX | TgtPrompt$ Select target creature card with mana value less than or equal to the number of study counters removed | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$RememberedSize
+A:AB$ Draw | Cost$ T | SubAbility$ DBDiscard | SpellDescription$ Draw a card,
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | SpellDescription$ then discard a card.
+DeckHas:Ability$Discard|Graveyard
+Oracle:When this creature specializes, remove all study counters from it. When you do, put target creature card with mana value less than or equal to the number of study counters removed this way from a graveyard onto the battlefield under your control.\n{T}: Draw a card, then discard a card.
+
+SPECIALIZE:RED
+
+Name:Vhal, Scholar of Elements
+ManaCost:2 U R
+Types:Legendary Creature Human Wizard
+PT:4/4
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigRemoveCounters | TriggerDescription$ When this creature specializes, remove all study counters from it. When you do, CARDNAME deals that much damage to target creature or planeswalker an opponent controls.
+SVar:TrigRemoveCounters:DB$ RemoveCounter | CounterType$ STUDY | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBImmediateTrig
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionCheckSVar$ X | Execute$ TrigDealDamage | TriggerDescription$ When you do, CARDNAME deals that much damage to target creature or planeswalker an opponent controls.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select target creature or planeswalker an opponent controls | NumDmg$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$RememberedSize
+A:AB$ Draw | Cost$ T | SubAbility$ DBDiscard | SpellDescription$ Draw a card,
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | SpellDescription$ then discard a card.
+DeckHas:Ability$Discard
+Oracle:When this creature specializes, remove all study counters from it. When you do, Vhal, Scholar of Elements deals that much damage to target creature or planeswalker an opponent controls.\n{T}: Draw a card, then discard a card.
+
+SPECIALIZE:GREEN
+
+Name:Vhal, Scholar of Creation
+ManaCost:2 G U
+Types:Legendary Creature Human Wizard
+PT:4/4
+T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigRemoveCounters | TriggerDescription$ When this creature specializes, remove all study counters from it. Seek two creature cards with mana value less than or equal to the number of study counters removed this way. Put one of them onto the battlefield and shuffle the other into your library.
+SVar:TrigRemoveCounters:DB$ RemoveCounter | CounterType$ STUDY | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBSeek
+SVar:DBSeek:DB$ ChangeZone | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 2 | ChangeType$ Creature.cmcLEX | RememberChanged$ True | SubAbility$ DBBattlefield
+SVar:DBBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | SelectPrompt$ Select one to put onto the battlefield | ChangeType$ Card.IsRemembered | ForgetChanged$ True | SubAbility$ DBShuffle
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Hand | Destination$ Library | Shuffle$ True | Defined$ RememberedCard | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$RememberedSize
+A:AB$ Draw | Cost$ T | SubAbility$ DBDiscard | SpellDescription$ Draw a card,
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | SpellDescription$ then discard a card.
+DeckHas:Ability$Discard
+Oracle:When this creature specializes, remove all study counters from it. Seek two creature cards with mana value less than or equal to the number of study counters removed this way. Put one of them onto the battlefield and shuffle the other into your library.\n{T}: Draw a card, then discard a card.
diff --git a/forge-gui/res/tokenscripts/w_2_2_astartes_warrior_vigilance.txt b/forge-gui/res/tokenscripts/w_2_2_astartes_warrior_vigilance.txt
new file mode 100644
index 00000000000..b50f939ce4d
--- /dev/null
+++ b/forge-gui/res/tokenscripts/w_2_2_astartes_warrior_vigilance.txt
@@ -0,0 +1,7 @@
+Name:Astartes Warrior Token
+ManaCost:no cost
+Types:Creature Astartes Warrior
+Colors:white
+PT:2/2
+K:Vigilance
+Oracle:Vigilance