diff --git a/projects/mtg/bin/Res/sets/5DN/_cards.dat b/projects/mtg/bin/Res/sets/5DN/_cards.dat
index e5949cbf7..cf5fc9697 100644
--- a/projects/mtg/bin/Res/sets/5DN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/5DN/_cards.dat
@@ -46,6 +46,16 @@ power=2
 toughness=6
 [/card]
 [card]
+id=73566
+name=Armed Response
+mana={2}{W}
+type=Instant
+text=Armed Response deals damage to target attacking creature equal to the number of Equipment you control.
+target=creature[attacking]
+auto=foreach(equipment|mybattlefield) damage:1
+rarity=C
+[/card]
+[card]
 text=Protection from black and from red   Whenever another creature enters the battlefield, you may gain 1 life.
 id=72921
 auto=@movedTo(creature|battlefield):may life:1 controller
@@ -189,9 +199,9 @@ mana={2}
 type=Artifact
 subtype=Equipment
 text=Equipped creature gets +1/+0 for each artifact you control. {B}{B}: Attach Cranial Plating to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-auto={1}:equip
-auto=foreach(artifact|myBattlefield) 1/0
+auto=foreach(artifact|mybattlefield) 1/0
 auto={B}{B}:attach
+auto={1}:equip
 rarity=C
 [/card]
 [card]
@@ -293,27 +303,6 @@ toughness=2
 abilities=flying
 [/card]
 [card]
-text=First strike   Goblin Brawler can't be equipped.
-id=51170
-name=Goblin Brawler
-rarity=C
-mana={2}{R}
-type=Creature
-subtype=Goblin Warrior
-power=2
-toughness=2
-abilities=first strike
-[/card]
-[card]
-id=48215
-name=Goblin Cannon
-mana={4}
-type=Artifact
-text={2}: Goblin Cannon deals 1 damage to target creature or player. Sacrifice Goblin Cannon.
-auto={2}{S}:damage:1 target(creature,player)
-rarity=U
-[/card]
-[card]
 text={T}, Sacrifice an artifact: Target player puts the top three cards of his or her library into his or her graveyard.   Whenever an artifact enters the battlefield, you may untap Grinding Station
 auto=@movedTo(artifact|battlefield):may untap
 auto={T}{S(artifact|myBattlefield)}:deplete:3 target(player)
@@ -324,16 +313,35 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+id=47449
+name=Helm of Kaldra
+mana={3}
+type=Artifact
+subtype=Equipment
+text=Equipped creature has first strike, trample, and haste. {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it. Equip {2}
+auto=first strike
+auto=trample
+auto=haste
+auto={2}:equip
+# Following line does not work yet: It's not possible to specify
+# a target for an equip action. Even if that gets implemented,
+# targetting a token that's just being created might not work.
+# It currently doesn't matter though since the sword can't be
+# implemented anyway.
+# auto --- aslongas(Sword of Kaldra|mybattlefield) aslongas(Shield of Kaldra|mybattlefield) {1}:token(Kaldra,Creature Avatar,4/4,legendary) && attach target(Kaldra)
+rarity=R
+[/card]
+[card]
 id=51186
 name=Horned Helm
 mana={2}
 type=Artifact
 subtype=Equipment
 text=Equipped creature gets +1/+1 and has trample. {G}{G}: Attach Horned Helm to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-auto={1}:equip
-auto={G}{G}:attach
 auto=1/1
 auto=trample
+auto={G}{G}:attach
+auto={1}:equip
 rarity=C
 [/card]
 [card]
@@ -451,9 +459,9 @@ mana={2}
 type=Artifact
 subtype=Equipment
 text=Equipped creature has shroud. (It can't be the target of spells or abilities.) {U}{U}: Attach Neurok Stealthsuit to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-auto={1}:equip
-auto={U}{U}:attach
 auto=shroud
+auto={U}{U}:attach
+auto={1}:equip
 rarity=C
 [/card]
 [card]
@@ -599,9 +607,9 @@ mana={2}
 type=Artifact
 subtype=Equipment
 text=Equipped creature has first strike. {R}{R}: Attach Sparring Collar to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-auto={1}:equip
-auto={R}{R}:attach
 auto=first strike
+auto={R}{R}:attach
+auto={1}:equip
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/5DN/todo.dat b/projects/mtg/bin/Res/sets/5DN/todo.dat
index 223675067..d2333423b 100644
--- a/projects/mtg/bin/Res/sets/5DN/todo.dat
+++ b/projects/mtg/bin/Res/sets/5DN/todo.dat
@@ -26,14 +26,6 @@ text=Modular -- Sunburst (This enters the battlefield with a +1/+1 counter on it
 rarity=U
 [/card]
 [card]
-id=73566
-name=Armed Response
-mana={2}{W}
-type=Instant
-text=Armed Response deals damage to target attacking creature equal to the number of Equipment you control.
-rarity=C
-[/card]
-[card]
 id=50172
 name=Artificer's Intuition
 mana={1}{U}
@@ -213,7 +205,6 @@ toughness=6
 text=Trample At the beginning of your upkeep, sacrifice Cosmic Larva unless you sacrifice two lands.
 rarity=R
 [/card]
-
 [card]
 text=You may play land cards from your graveyard.
 # Following line does not work: "May moveto" from graveyards does
@@ -398,6 +389,32 @@ text={2}: Put a charge counter on Gemstone Array. Remove a charge counter from G
 rarity=U
 [/card]
 [card]
+text=First strike   Goblin Brawler can't be equipped.
+id=51170
+name=Goblin Brawler
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Goblin Warrior
+power=2
+toughness=2
+abilities=first strike
+[/card]
+[card]
+id=48215
+name=Goblin Cannon
+mana={4}
+type=Artifact
+text={2}: Goblin Cannon deals 1 damage to target creature or player. Sacrifice Goblin Cannon.
+# Following line does not work: The common usage for Goblin Cannon
+# is to interrupt and activate itself repeatedly. It will go to
+# the graveyard before the first damage event resolves, but all
+# damage events will stay on the stack. This can't be done
+# currently since Goblin Cannon cannot interrupt itself.
+auto={2}{S}:damage:1 target(creature,player)
+rarity=U
+[/card]
+[card]
 id=50927
 name=Grafted Wargear
 mana={3}
@@ -439,16 +456,6 @@ type=Artifact
 text=Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.) {2}, Sacrifice Heliophial: Heliophial deals damage to target creature or player equal to the number of charge counters on Heliophial.
 rarity=C
 [/card]
-[card]
-id=47449
-name=Helm of Kaldra
-mana={3}
-type=Legendary Artifact
-subtype=Equipment
-text=Equipped creature has first strike, trample, and haste. {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it. Equip {2}
-rarity=R
-[/card]
-
 [card]
 id=51086
 name=Hoverguard Sweepers
@@ -493,11 +500,8 @@ subtype=Goblin Artificer
 power=2
 toughness=2
 text={R}, Sacrifice two artifacts: Destroy target artifact.
-# Following line doesn't work, or expects an extremely unintuitive
-# input sequence. It would work with *one* sacrifice, the user
-# then has to click on Engineers -> then target to destroy ->
-# then artifavt to sacrifice. However I can't find a way to
-# sacrifice *two* artifacts.
+# Following line doesn't work, the game can't handle two
+# sacrifices in the same line yet
 auto={R}{S(artifact|mybattlefield)}{S(artifact|mybattlefield)}:destroy target(artifact)
 rarity=U
 [/card]
@@ -599,7 +603,6 @@ toughness=4
 text={3}: Switch Myr Quadropod's power and toughness until end of turn.
 rarity=C
 [/card]
-
 [card]
 id=50158
 name=Opaline Bracers
@@ -628,7 +631,8 @@ type=Artifact
 subtype=Equipment
 text=Equipped creature has "{T}: Add one mana of any color to your mana pool." Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 auto={1}:equip
-##doesnt work
+##doesnt work - Equipment will tap itself, ability will not be
+# transferred to equipped creature.
 auto={T}:Add:{W}
 auto={T}:Add:{U}
 auto={T}:Add:{B}
@@ -649,7 +653,7 @@ id=72681
 name=Plunge into Darkness
 mana={1}{B}
 type=Instant
-text=Choose one  ESacrifice any number of creatures, then you gain 3 life for each sacrificed creature; or pay X life, then look at the top X cards of your library, put one of those cards into your hand, and exile the rest. Entwine {B} (Choose both if you pay the entwine cost.)
+text=Choose one: Sacrifice any number of creatures, then you gain 3 life for each sacrificed creature; or pay X life, then look at the top X cards of your library, put one of those cards into your hand, and exile the rest. Entwine {B} (Choose both if you pay the entwine cost.)
 rarity=R
 [/card]
 [card]
@@ -807,13 +811,12 @@ toughness=0
 text=Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.) {T}: Double the number of +1/+1 counters on Solarion.
 rarity=R
 [/card]
-
 [card]
 id=73572
 name=Spectral Shift
 mana={1}{U}
 type=Instant
-text=Choose one - Change the text of target spell or permanent by replacing all instances of one basic land type with another; or change the text of target spell or permanent by replacing all instances of one color word with another. (These effects last indefinitely.) Entwine {2} (Choose both if you pay the entwine cost.)
+text=Choose one: Change the text of target spell or permanent by replacing all instances of one basic land type with another; or change the text of target spell or permanent by replacing all instances of one color word with another. (These effects last indefinitely.) Entwine {2} (Choose both if you pay the entwine cost.)
 rarity=R
 [/card]
 [card]
@@ -844,7 +847,6 @@ subtype=Aura
 text=Enchant artifact Enchanted artifact's activated abilities can't be activated. If enchanted artifact is a creature, it can't attack or block.
 rarity=C
 [/card]
-
 [card]
 id=51075
 name=Summoner's Egg
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index dafed17a7..d70621766 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -145,6 +145,7 @@ counterspell.txt
 counterspell2.txt
 counterspell3.txt
 counterspell4.txt
+cranial_plating.txt
 creature_bond.txt
 curiosity1_i217.txt
 curiosity2_i217.txt
@@ -220,8 +221,10 @@ gravedigger.txt
 hannas_custody.txt
 harpoon_sniper.txt
 hellfire.txt
+helm_of_kaldra1.txt
 holy_day_i226.txt
 hopping_automaton_i232.txt
+horned_helm.txt
 howl_from_beyond.txt
 howl_of_the_night_pack.txt
 hurricane.txt
diff --git a/projects/mtg/bin/Res/test/cranial_plating.txt b/projects/mtg/bin/Res/test/cranial_plating.txt
new file mode 100644
index 000000000..3de1d04f2
--- /dev/null
+++ b/projects/mtg/bin/Res/test/cranial_plating.txt
@@ -0,0 +1,26 @@
+#NAME: Cranial Plating
+#DESC: Checks the card's main effect:
+#DESC: "Equipped creature gets +1/+0 for each
+#DESC: artifact you control."
+#DESC: Also verifies that the "attach" command
+#DESC: works outside of a main phase.
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Cranial Plating,Grizzly Bears,Rod of Ruin
+hand:Swords to Plowshares
+manapool:{W}{B}{B}
+[PLAYER2]
+[DO]
+Cranial Plating
+Grizzly Bears
+Swords to Plowshares
+Grizzly Bears
+[ASSERT]
+combatattackers
+[PLAYER1]
+inplay:Cranial Plating,Rod of Ruin
+graveyard:Swords to Plowshares
+life:24
+[PLAYER2]
+[END]
diff --git a/projects/mtg/bin/Res/test/helm_of_kaldra1.txt b/projects/mtg/bin/Res/test/helm_of_kaldra1.txt
new file mode 100644
index 000000000..c900603e5
--- /dev/null
+++ b/projects/mtg/bin/Res/test/helm_of_kaldra1.txt
@@ -0,0 +1,32 @@
+#NAME: Helm of Kaldra
+#DESC: verifies the three base abilities
+#DESC: of Helm of Kaldra: trample, haste,
+#DESC: first strike
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Helm of Kaldra
+hand:Grizzly Bears
+manapool:{3}{G}
+[PLAYER2]
+inplay:Lightning Elemental
+[DO]
+Grizzly Bears
+Helm of Kaldra
+Grizzly Bears
+next
+next
+Grizzly Bears
+next
+Lightning Elemental
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Helm of Kaldra,Grizzly Bears
+[PLAYER2]
+graveyard:Lightning Elemental
+life:19
+[END]
diff --git a/projects/mtg/bin/Res/test/horned_helm.txt b/projects/mtg/bin/Res/test/horned_helm.txt
new file mode 100644
index 000000000..e8326b640
--- /dev/null
+++ b/projects/mtg/bin/Res/test/horned_helm.txt
@@ -0,0 +1,29 @@
+#NAME: Horned Helm
+#DESC: "Equipped creature gets +1/+1
+#DESC: and has trample."
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Horned Helm,Scryb Sprites
+manapool:{2}
+[PLAYER2]
+inplay:Suntail Hawk
+[DO]
+Horned Helm
+Scryb Sprites
+next
+next
+Scryb Sprites
+next
+Suntail Hawk
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Horned Helm,Scryb Sprites
+[PLAYER2]
+graveyard:Suntail Hawk
+life:19
+[END]