diff --git a/forge-gui/res/cardsfolder/g/golden_guardian.txt b/forge-gui/res/cardsfolder/g/golden_guardian.txt
new file mode 100644
index 00000000000..3f81959b4c3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/g/golden_guardian.txt
@@ -0,0 +1,27 @@
+Name:Golden Guardian
+ManaCost:4
+Types:Artifact Creature Golem
+PT:4/4
+K:Defender
+A:AB$ Fight | Cost$ 2 | Defined$ Self | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | SubAbility$ DBDiesEffect | SpellDescription$ CARDNAME fights another target creature you control. When CARDNAME dies this turn, return it to the battlefield transformed under your control.
+
+#TODO: This should be a Delayed Trigger, but AF DelayedTrigger doesn't work at the moment due to timestamp check issues.
+SVar:DBDiesEffect:DB$ Effect | Name$ Golden Guardian Effect | Triggers$ TrigChangesZone | SVars$ TrigChangeZone,EndEffect | References$ TrigChangesZone,TrigChangeZone,EndEffect | RememberObjects$ Self | ExileOnMoved$ Exile
+SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.IsRemembered | Execute$ TrigChangeZone | TriggerDescription$ When EFFECTSOURCE dies this turn, return it to the battlefield transformed under your control.
+SVar:TrigChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Battlefield | Transformed$ True | GainControl$ True | SubAbility$ EndEffect
+SVar:EndEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+
+AlternateMode:DoubleFaced
+DeckHas:Ability$Token
+SVar:Picture:http://www.wizards.com/global/images/magic/general/golden_guardian.jpg
+Oracle:Defender\n{2}: Golden Guardian fights another target creature you control. When Golden Guardian dies this turn, return it to the battlefield transformed under your control.
+
+ALTERNATE
+
+Name:Gold-Forge Garrison
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Golem | TokenTypes$ Artifact,Creature,Golem | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ c 4 4 golem RIX | SpellDescription$ Create a 4/4 colorless Golem artifact creature token.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gold-forge_garrison.jpg
+Oracle:{T}: Add two mana of any one color to your mana pool.\n{4}, {T}: Create a 4/4 colorless Golem artifact creature token.