diff --git a/forge-gui/res/cardsfolder/e/ensoul_artifact.txt b/forge-gui/res/cardsfolder/e/ensoul_artifact.txt
index df090ca4b79..32c2df02109 100644
--- a/forge-gui/res/cardsfolder/e/ensoul_artifact.txt
+++ b/forge-gui/res/cardsfolder/e/ensoul_artifact.txt
@@ -2,7 +2,8 @@ Name:Ensoul Artifact
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant artifact
-A:SP$ Attach | Cost$ 1 U | ValidTgts$ Artifact | AITgts$ Card.nonCreature | AILogic$ Animate
-S:Mode$ Continuous | Affected$ Card.AttachedBy | SetPower$ 5 | SetToughness$ 5 | AddType$ Creature | Description$ Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
+A:SP$ Attach | ValidTgts$ Artifact | AITgts$ Card.nonCreature | AILogic$ Animate
+S:Mode$ Continuous | Affected$ Artifact.EnchantedBy | SetPower$ 5 | SetToughness$ 5 | AddType$ Creature | Description$ Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
+DeckNeeds:Type$Artifact
 AI:RemoveDeck:Random
 Oracle:Enchant artifact\nEnchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/lorans_escape.txt b/forge-gui/res/cardsfolder/upcoming/lorans_escape.txt
new file mode 100644
index 00000000000..cce16cf352d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/lorans_escape.txt
@@ -0,0 +1,6 @@
+Name:Loran's Escape
+ManaCost:W
+Types:Instant
+A:SP$ Pump | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | KW$ Hexproof & Indestructible | SubAbility$ DBScry | SpellDescription$ Target artifact or creature gains hexproof and indestructible until end of turn.
+SVar:DBScry:DB$ Scry | SpellDescription$ Scry 1.
+Oracle:Target artifact or creature gains hexproof and indestructible until end of turn. Scry 1.
diff --git a/forge-gui/res/cardsfolder/upcoming/machine_over_matter.txt b/forge-gui/res/cardsfolder/upcoming/machine_over_matter.txt
new file mode 100644
index 00000000000..e1c8b5eba99
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/machine_over_matter.txt
@@ -0,0 +1,6 @@
+Name:Machine Over Matter
+ManaCost:1 U
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | IsPresent$ Creature.Artifact+YouCtrl | Description$ This spell costs {1} less to cast if you control an artifact creature.
+A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target nonland permanent to its owner's hand.
+Oracle:This spell costs {1} less to cast if you control an artifact creature.\nReturn target nonland permanent to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/mask_of_the_jadecrafter.txt b/forge-gui/res/cardsfolder/upcoming/mask_of_the_jadecrafter.txt
new file mode 100644
index 00000000000..205f45d411e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mask_of_the_jadecrafter.txt
@@ -0,0 +1,8 @@
+Name:Mask of the Jadecrafter
+ManaCost:2
+Types:Artifact
+A:AB$ Token | Cost$ X T Sac<1/CARDNAME> | TokenScript$ c_x_x_a_golem | TokenPower$ X | TokenToughness$ X | SorcerySpeed$ True | SpellDescription$ Create an X/X colorless Golem artifact creature token. Activate only as a sorcery.
+SVar:X:Count$xPaid
+K:Unearth:2 G
+DeckHas:Ability$Graveyard
+Oracle:{X}, {T}, Sacrifice Mask of the Jadecrafter: Create an X/X colorless Golem artifact creature token. Activate only as a sorcery.\nUnearth {2}{G} ({2}{G}: Return this card from your graveyard to the battlefield. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/mightstones_animation.txt b/forge-gui/res/cardsfolder/upcoming/mightstones_animation.txt
new file mode 100644
index 00000000000..da7fcef8a0a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mightstones_animation.txt
@@ -0,0 +1,10 @@
+Name:Mightstone's Animation
+ManaCost:3 U
+Types:Enchantment Aura
+K:Enchant artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+SVar:TrigDraw:DB$ Draw
+A:SP$ Attach | ValidTgts$ Artifact | AITgts$ Card.nonCreature | AILogic$ Animate
+S:Mode$ Continuous | Affected$ Artifact.EnchantedBy | SetPower$ 4 | SetToughness$ 4 | AddType$ Creature | Description$ Enchanted artifact is a creature with base power and toughness 4/4 in addition to its other types.
+DeckNeeds:Type$Artifact
+Oracle:Enchant artifact\nWhen Mightstone's Animation enters the battlefield, draw a card.\nEnchanted artifact is a creature with base power and toughness 4/4 in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/military_discipline.txt b/forge-gui/res/cardsfolder/upcoming/military_discipline.txt
new file mode 100644
index 00000000000..d120af1f331
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/military_discipline.txt
@@ -0,0 +1,11 @@
+Name:Military Discipline
+ManaCost:W
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, enchanted creature gains first strike until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Enchanted | KW$ First Strike
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | Description$ Enchanted creature gets +1/+0.
+SVar:PlayMain1:TRUE
+Oracle:Flash\nEnchant creature\nWhen Military Discipline enters the battlefield, enchanted creature gains first strike until end of turn.\nEnchanted creature gets +1/+0.
diff --git a/forge-gui/res/tokenscripts/c_a_food_sac.txt b/forge-gui/res/tokenscripts/c_a_food_sac.txt
index 78b90b13f14..935a1465729 100644
--- a/forge-gui/res/tokenscripts/c_a_food_sac.txt
+++ b/forge-gui/res/tokenscripts/c_a_food_sac.txt
@@ -1,5 +1,5 @@
 Name:Food Token
 ManaCost:no cost
 Types:Artifact Food
-A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
+A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME/this artifact> | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
 Oracle:{2}, {T}, Sacrifice this artifact: You gain 3 life.
diff --git a/forge-gui/res/tokenscripts/c_a_gold_sac.txt b/forge-gui/res/tokenscripts/c_a_gold_sac.txt
index 973cd884491..cce99b7a65a 100644
--- a/forge-gui/res/tokenscripts/c_a_gold_sac.txt
+++ b/forge-gui/res/tokenscripts/c_a_gold_sac.txt
@@ -1,5 +1,5 @@
 Name:Gold Token
 ManaCost:no cost
 Types:Artifact Gold
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME/this artifact> | Produced$ Any | SpellDescription$ Add one mana of any color.
 Oracle:Sacrifice this artifact: Add one mana of any color.