diff --git a/projects/mtg/bin/Res/sets/ALL/todo.dat b/projects/mtg/bin/Res/sets/ALL/todo.dat
index 864660b7f..8b64c6aa3 100644
--- a/projects/mtg/bin/Res/sets/ALL/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALL/todo.dat
@@ -354,7 +354,7 @@ id=3073
 name=Feast or Famine
 mana={3}{B}
 type=Instant
-text=Choose one  EPut a 2/2 black Zombie creature token onto the battlefield; or destroy target nonblack, nonartifact creature and it can't be regenerated.
+text=Choose one - Put a 2/2 black Zombie creature token onto the battlefield; or destroy target nonblack, nonartifact creature and it can't be regenerated.
 auto=may token(Zombie,Creature Zombie,2/2,black)
 auto=may bury target(creature[-black;-artifact])
 #Not sure this would work need to retest this one
diff --git a/projects/mtg/bin/Res/sets/ONS/_cards.dat b/projects/mtg/bin/Res/sets/ONS/_cards.dat
index 3775386c8..a89ce11e6 100644
--- a/projects/mtg/bin/Res/sets/ONS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ONS/_cards.dat
@@ -681,6 +681,17 @@ auto=cantattack
 auto=cantblock
 [/card]
 [card]
+id=39433
+name=Piety Charm
+mana={W}
+type=Instant
+text=Choose one: Destroy target Aura attached to a creature; or target Soldier creature gets +2/+2 until end of turn; or creatures you control gain vigilance until end of turn.
+auto=may destroy target(aura)
+auto=may target(creature) 2/2
+auto=may lord(creature|myBattlefield) vigilance ueot
+rarity=C
+[/card]
+[card]
 text={W}
 id=40121
 name=Plains
diff --git a/projects/mtg/bin/Res/sets/ONS/todo.dat b/projects/mtg/bin/Res/sets/ONS/todo.dat
index 9b9f8fac1..a644dc528 100644
--- a/projects/mtg/bin/Res/sets/ONS/todo.dat
+++ b/projects/mtg/bin/Res/sets/ONS/todo.dat
@@ -1523,14 +1523,7 @@ type=Sorcery
 text=Choose a creature type. If you control more creatures of that type than any other player, you gain control of all creatures of that type. (This effect doesn't end at end of turn.)
 rarity=R
 [/card]
-[card]
-id=39433
-name=Piety Charm
-mana={W}
-type=Instant
-text=Choose one: Destroy target Aura attached to a creature; or target Soldier creature gets +2/+2 until end of turn; or creatures you control gain vigilance until end of turn.
-rarity=C
-[/card]
+
 [card]
 text=Pinpoint Avalanche deals 4 damage to target creature. The damage can't be prevented.
 ###THIS CARD VERSION WON'T PREVENT THE CARD FROM BEING REGENERATED!!! 0.9.1
diff --git a/projects/mtg/bin/Res/sets/ZEN/_cards.dat b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
index de83a4e5d..57adc1794 100644
--- a/projects/mtg/bin/Res/sets/ZEN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
@@ -1,4 +1,15 @@
 [card]
+id=178135
+name=Adventuring Gear
+mana={1}
+type=Artifact
+subtype=Equipment
+text=Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+auto={1}:equip
+auto=@movedTo(land|myBattlefield):2/2
+rarity=C
+[/card]
+[card]
 text=Kicker {3} (You may pay an additional {3} as you cast this spell.)   AEther Figment is unblockable. If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it.
 id=170993
 name=AEther Figment
@@ -1216,6 +1227,18 @@ mana={2}{R}
 type=Instant
 [/card]
 [card]
+id=178134
+name=Spidersilk Net
+mana={0}
+type=Artifact
+subtype=Equipment
+text=Equipped creature gets +0/+2 and has reach. (It can block creatures with flying.) Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+auto={2}:equip
+auto=reach
+auto=0/2
+rarity=C
+[/card]
+[card]
 text=Spire Barrage deals damage to target creature or player equal to the number of Mountains you control.
 target=creature,player
 auto=foreach(mountain|myBattlefield) damage:1
@@ -1399,6 +1422,17 @@ target=trap|mylibrary
 auto=moveTo(myhand)
 [/card]
 [card]
+id=193396
+name=Trusty Machete
+mana={1}
+type=Artifact
+subtype=Equipment
+text=Equipped creature gets +2/+1. Equip {2}
+auto={2}:equip
+auto=2/1
+rarity=U
+[/card]
+[card]
 text=Haste   Whenever Tuktuk Grunts or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Tuktuk Grunts.
 id=192229
 name=Tuktuk Grunts
diff --git a/projects/mtg/bin/Res/sets/ZEN/todo.dat b/projects/mtg/bin/Res/sets/ZEN/todo.dat
index 67b2d00d2..8c8efa847 100644
--- a/projects/mtg/bin/Res/sets/ZEN/todo.dat
+++ b/projects/mtg/bin/Res/sets/ZEN/todo.dat
@@ -7,6 +7,8 @@ subtype=Kor Soldier
 power=2
 toughness=2
 text=Other Kor creatures you control get +2/+2 for each Equipment attached to Armament Master.
+auto=foreach(this[equipment]) lord(other Kor|myBattlefield) 2/2
+##not codeable, the above its a concept
 rarity=R
 [/card]
 [card]
@@ -1055,15 +1057,7 @@ toughness=1
 text=Deathtouch (Creatures dealt damage by this creature are destroyed. You can divide this creature's combat damage among any of the creatures blocking or blocked by it.) Landfall - Whenever a land enters the battlefield under your control, you may have target creature block Turntimber Basilisk this turn if able.
 rarity=U
 [/card]
-[card]
-id=178135
-name=Adventuring Gear
-mana={1}
-type=Artifact
-subtype=Equipment
-text=Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-rarity=C
-[/card]
+
 [card]
 id=193397
 name=Blade of the Bloodchief
@@ -1071,6 +1065,10 @@ mana={1}
 type=Artifact
 subtype=Equipment
 text=Whenever a creature is put into a graveyard from the battlefield, put a +1/+1 counter on equipped creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead. Equip {1}
+auto={1}:equip
+auto=@movedTo(creature|graveyard) from(battlefield):counter(1/1)
+auto=@movedTo(creature|graveyard) from(battlefield):aslongas(mytgt[vampire]) counter(1/1)
+##until mytgt is "upgraded" this will not work yet....
 rarity=R
 [/card]
 [card]
@@ -1138,15 +1136,7 @@ type=Artifact
 text=When Khalni Gem enters the battlefield, return two lands you control to their owner's hand. {T}: Add two mana of any one color to your mana pool.
 rarity=U
 [/card]
-[card]
-id=178134
-name=Spidersilk Net
-mana={0}
-type=Artifact
-subtype=Equipment
-text=Equipped creature gets +0/+2 and has reach. (It can block creatures with flying.) Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
-rarity=C
-[/card]
+
 [card]
 id=190410
 name=Trailblazer's Boots
@@ -1156,15 +1146,7 @@ subtype=Equipment
 text=Equipped creature has nonbasic landwalk. (It's unblockable as long as defending player controls a nonbasic land.) Equip {2}
 rarity=U
 [/card]
-[card]
-id=193396
-name=Trusty Machete
-mana={1}
-type=Artifact
-subtype=Equipment
-text=Equipped creature gets +2/+1. Equip {2}
-rarity=U
-[/card]
+
 [card]
 id=190414
 name=Emeria, the Sky Ruin
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index c6142dd35..7517f6e12 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -6,6 +6,8 @@ generic/deathtouch.txt
 generic/doesnotuntap.txt
 generic/doesnotuntap2.txt
 generic/double_strike.txt
+generic/equip_landfall_buff.txt
+generic/equip_reach.txt
 generic/fear.txt
 generic/fear_i147.txt
 generic/first_and_double_strike1_i187.txt
diff --git a/projects/mtg/bin/Res/test/generic/equip_landfall_buff.txt b/projects/mtg/bin/Res/test/generic/equip_landfall_buff.txt
new file mode 100644
index 000000000..318199e72
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/equip_landfall_buff.txt
@@ -0,0 +1,32 @@
+#Test:equipment
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Adventuring Gear,195161
+manapool:{2}
+inplay:Runeclaw Bear
+[PLAYER2]
+[DO]
+Adventuring Gear
+Adventuring Gear
+Runeclaw Bear
+195161
+next
+#begin
+next
+#attackers
+Runeclaw Bear
+next
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+life:20
+inplay:Runeclaw Bear,Adventuring Gear,195161
+[PLAYER2]
+life:16
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/generic/equip_reach.txt b/projects/mtg/bin/Res/test/generic/equip_reach.txt
new file mode 100644
index 000000000..39a8aeb4c
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/equip_reach.txt
@@ -0,0 +1,41 @@
+#Test:equipment
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Spidersilk Net
+manapool:{2}
+inplay:Runeclaw Bear
+[PLAYER2]
+inplay:Welkin Tern
+[DO]
+Spidersilk Net
+Spidersilk Net
+Runeclaw Bear
+eot
+next
+#upkeeep
+next
+#draw
+next
+#firstmain
+next
+#begin
+next
+#attackers
+Welkin Tern
+next
+#blocker
+Runeclaw Bear
+next
+#damage
+next
+#end
+[ASSERT]
+COMBATEND
+[PLAYER1]
+life:20
+inplay:Runeclaw Bear,Spidersilk Net
+[PLAYER2]
+graveyard:Welkin Tern
+life:20
+[END]
\ No newline at end of file