diff --git a/projects/mtg/bin/Res/ai/baka/deck157.txt b/projects/mtg/bin/Res/ai/baka/deck157.txt
new file mode 100644
index 000000000..ffea330b0
--- /dev/null
+++ b/projects/mtg/bin/Res/ai/baka/deck157.txt
@@ -0,0 +1,26 @@
+#NAME:Counter Attack
+#DESC:Deck Concept by Vitty85
+#DESC:Designed for Wagic by Bob
+#HINT:castpriority(creature,*)
+#HINT:combo hold(Time of Need|myhand)^cast(Time of Need|myhand) targeting(Shalai and Hallar|mylibrary)^restriction{type(Shalai and Hallar|mybattlefield)~lessthan~1}^totalmananeeded({1}{G})
+#HINT:combo hold(Basri's Solidarity|myhand)^until(Shalai and Hallar|mybattlefield)^cast(Basri's Solidarity|myhand)^totalmananeeded({1}{W})
+#HINT:alwaysattackwith(Kalonian Hydra)
+Basri's Solidarity (*) * 4
+Birds of Paradise (M12) (*) * 3
+Cathars' Crusade (*) * 2
+Clifftop Retreat (*) * 3
+Essence Warden (*) * 3
+Graypelt Refuge (*) * 4
+Heliod, Sun-Crowned (*) * 3
+Jetmir's Garden (*) * 4
+Kazandu Refuge (*) * 2
+Prosperous Innkeeper (*) * 2
+Razorverge Thicket (*) * 4
+Archangel of Thune (*) * 3
+Rootbound Crag (*) * 2
+Kalonian Hydra (*) * 4
+Shalai and Hallar (*) * 4
+Soul Warden (*) * 3
+Sunpetal Grove (*) * 2
+Time of Need (*) * 4
+Windswept Heath (*) * 4
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/ai/baka/deck158.txt b/projects/mtg/bin/Res/ai/baka/deck158.txt
new file mode 100644
index 000000000..5fdba52ab
--- /dev/null
+++ b/projects/mtg/bin/Res/ai/baka/deck158.txt
@@ -0,0 +1,27 @@
+#NAME:Orcs of Mordor
+#DESC:Designed for Wagic by Bob
+Assault on Osgiliath (*) * 2
+Dunland Crebain (*) * 2
+Easterling Vanguard (*) * 2
+Feed the Swarm (*) * 2
+Foray of Orcs (*) * 4
+Gothmog, Morgul Lieutenant  (*) * 1
+Grishnakh, Brash Instigator (*) * 1
+March from the Black Gate  (*) * 2
+Mauhur, Uruk-hai Captain (*) * 2
+Mordor Muster (*) * 2
+Mountain (LTR) (*) * 4
+Mountain (SNC) (*) * 4
+Mountain (ONE) (*) * 4
+Orcish Bowmasters (*) * 4
+Olog-hai Crusher (*) * 2
+Sauron, the Lidless Eye (*) * 1
+Snarling Warg (*) * 2
+Swamp (LTR) (*) * 4
+Swamp (SNC) (*) * 4
+Swamp (ONE) (*) * 4
+Swamp (NEO) (*) * 2
+Swarming of Moria (*) * 3
+Ugluk of the White Hand (*) * 1
+Witch-king, Bringer of Ruin (*) * 1
+
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 8a56ef895..1ea63e7d5 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -1,7 +1,7 @@
 grade=borderline
 #Bordeline Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
-#I sorted this programmatically - Thanks to Vitty85 28-07-2023
+#I sorted this programmatically - Thanks to Vitty85 04-08-2023
 [card]
 name=+2 Mace
 auto={3}:equip
@@ -8575,8 +8575,9 @@ toughness=4
 [/card]
 [card]
 name=Bishop of Wings
-auto=life:4 controller
-auto=@movedTo(creature[angel]|graveyard) from(mybattlefield):_SPIRITTOKEN_
+auto=name(Gain 4 life) life:4 controller
+auto=@movedTo(angel|mybattlefield):name(Gain 4 life) life:4 controller
+auto=@movedTo(angel|graveyard) from(mybattlefield):name(Create spirit) _SPIRITTOKEN_
 text=Whenever an Angel enters the battlefield under your control, you gain 4 life. -- Whenever an Angel you control dies, create a 1/1 white Spirit creature token with flying.
 mana={W}{W}
 type=Creature
@@ -84693,9 +84694,28 @@ toughness=4
 [/card]
 [card]
 name=Selvala, Heart of the Wilds
-auto=@movedto(other creature|myBattlefield) may (draw:[power=power:highest:creature:myBattlefield]|mybattlefield)
-auto=@movedto(other creature|opponentBattlefield) may (draw:[power=power:highest:creature:opponentBattlefield]|opponentbattlefield)
-auto={G}{T}: name(add mana) thisforeach(variable{pwr:highest:creature:mybattlefield}>0) ability$! choice add{G} _ choice add{R} _ choice add{U} _ choice add{B} _ choice add{W} !$ controller
+auto=@movedto(other creature[power=0]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=0]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=1]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=1]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=2]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=2]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=3]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=3]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=4]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=4]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=5]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=5]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=6]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=6]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=7]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=7]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=8]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=8]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=9]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=9]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=10]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=0]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=11]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=1]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=12]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=2]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=13]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=3]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=14]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=4]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=15]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=5]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=16]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=6]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=17]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=7]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=18]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=8]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power=19]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=9]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto=@movedto(other creature[power>=20]|battlefield):name(Draw a card) all(trigger[to]) name(Draw a card) transforms((,newability[if type(other creature[power>=20]|battlefield)~morethan~0 then donothing else ability$!name(Draw a card) choice name(Draw a card) draw:1 controller _ choice name(Don't draw) donothing!$ controller])) oneshot
+auto={G}{T}:name(Add x mana) name(Add x mana) transforms((,newability[thisforeach(variable{pwr:highest:creature:mybattlefield}>0) ability$!name(Add mana) choice add{G} _ choice add{R} _ choice add{U} _ choice add{B} _ choice add{W} !$ controller])) oneshot
 text=Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power. -- {G}, {T}: Add X mana in any combination of colors, where X is the greatest power among creatures you control.
 mana={1}{G}{G}
 type=Legendary Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index b2f6704db..b684804a4 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1,6 +1,6 @@
 #Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
-#I sorted this programmatically so the other comments are removed except for AUTO_DEFINE - Vitty85 28-07-2023
+#I sorted this programmatically so the other comments are removed except for AUTO_DEFINE - Vitty85 04-08-2023
 [card]
 name=Abandon Reason
 target=<upto:2>creature
@@ -26094,8 +26094,8 @@ toughness=1
 [card]
 name=Darksteel Pendant
 abilities=indestructible
-aicode=activate may bottomoflibrary all(*[zpos=1]|mylibrary)
-auto={1}{t}:name(Look) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend
+aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
+auto={1}{T}:name(Scry 1) _SCRY1_
 text=Darksteel Pendant is indestructible. ("Destroy" effects and lethal damage don't destroy it.) -- {1}, {T}: Look at the top card of your library. You may put that card on the bottom of your library.
 mana={2}
 type=Artifact
@@ -60519,11 +60519,7 @@ type=Instant
 [/card]
 [card]
 name=Joiner Adept
-auto=lord(land|myBattlefield) {T}:add{G}
-auto=lord(land|myBattlefield) {T}:add{R}
-auto=lord(land|myBattlefield) {T}:add{U}
-auto=lord(land|myBattlefield) {T}:add{B}
-auto=lord(land|myBattlefield) {T}:add{W}
+auto=lord(land|myBattlefield) transforms((,newability[{T}:add{G}],newability[{T}:add{R}],newability[{T}:add{U}],newability[{T}:add{B}],newability[{T}:add{W}]))
 text=Lands you control have "{T}: Add one mana of any color to your mana pool."
 mana={1}{G}
 type=Creature
@@ -82706,9 +82702,9 @@ type=Enchantment
 [/card]
 [card]
 name=Opt
-aicode=activate may bottomoflibrary all(*[zpos=1]|mylibrary)
-auto=name(Look) reveal:1 optionone name(Put back on top and draw) target(*|reveal) moveto(mylibrary) and!(draw:1)! optiononeend optiontwo name(put on bottom and draw) target(<1>*|reveal) bottomoflibrary and!(draw:1)! optiontwoend revealend
-text=Look at the top card of your library. You may put that card on the bottom of your library. -- Draw a card.
+aicode=activate transforms((,newability[draw:1 controller])) oneshot
+auto=name(Scry 1 and draw) scry:1 scrycore delayed draw:1 controller scrycoreend scryend
+text=Scry 1. -- Draw a card.
 mana={U}
 type=Instant
 [/card]
@@ -109006,11 +109002,11 @@ toughness=0
 [/card]
 [card]
 name=Soldevi Excavations
+aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
+auto={1}{T}:name(Scry 1) _SCRY1_ 
 auto=if type(island[-tapped]|mybattlefield)~morethan~0 then sacrifice notatarget(island[-tapped]|mybattlefield) oneshot else sacrifice
-auto={t}:add{1}{u}
-aicode=activate may bottomoflibrary all(*[zpos=1]|mylibrary)
-auto={1}{t}:name(Look) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend
-text=If Soldevi Excavations would enter the battlefield, sacrifice an untapped Island instead. If you do, put Soldevi Excavations onto the battlefield. If you don't, put it into its owner's graveyard. -- {T}: Add {1}{U} to your mana pool. -- {1}, {T}: Look at the top card of your library. You may put that card on the bottom of your library.
+auto={T}:add{1}{U}
+text=If Soldevi Excavations would enter the battlefield, sacrifice an untapped Island instead. If you do, put Soldevi Excavations onto the battlefield. If you don't, put it into its owner's graveyard. -- {T}: Add {1}{U} to your mana pool. -- {1}, {T}: Scry 1.
 type=Land
 [/card]
 [card]