diff --git a/forge-gui/res/cardsfolder/c/crumble_to_dust.txt b/forge-gui/res/cardsfolder/c/crumble_to_dust.txt
index 0a08f9c367f..94fb7c1b4a2 100644
--- a/forge-gui/res/cardsfolder/c/crumble_to_dust.txt
+++ b/forge-gui/res/cardsfolder/c/crumble_to_dust.txt
@@ -2,8 +2,12 @@ Name:Crumble to Dust
 ManaCost:3 R
 Types:Sorcery
 K:Devoid
-A:SP$ ChangeZone | Cost$ 3 R | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Exile target nonbasic land. Search its controller's graveyard, hand, and library for any number of cards with the same name as that land and exile them. Then that player shuffles his or library.
-SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Remembered.sameName | Origin$ Graveyard,Hand,Library | Defined$ TargetedController | Destination$ Exile | Search$ True | Shuffle$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crumble_to_dust.jpg
+A:SP$ ChangeZone | Cost$ 3 R | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land | RememberChanged$ True | SubAbility$ ExileYard | SpellDescription$ Exile target nonbasic land. Search its controller's graveyard, hand, and library for any number of cards with the same name as that land and exile them. Then that player shuffles his or library.
+SVar:ExileYard:DB$ ChangeZone | ChangeType$ Remembered.sameName | Origin$ Graveyard | DefinedPlayer$ TargetedController | Chooser$ You | Destination$ Exile | ChangeNum$ NumInYard | References$ NumInYard | Hidden$ True | SubAbility$ ExileHand | StackDescription$ None
+SVar:ExileHand:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedController | ChangeType$ Remembered.sameName | ChangeNum$ NumInHand | References$ NumInHand | Chooser$ You | SubAbility$ ExileLib | StackDescription$ None
+SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPlayer$ TargetedController | ChangeType$ Remembered.sameName | ChangeNum$ NumInLib | References$ NumInLib | Chooser$ You | Shuffle$ True | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NumInLib:TargetedController$CardsInLibrary
+SVar:NumInHand:TargetedController$CardsInHand
+SVar:NumInYard:TargetedController$CardsInGraveyard
 Oracle:Exile target nonbasic land. Search its controller's graveyard, hand, and library for any number of cards with the same name as that land and exile them. Then that player shuffles his or library.
diff --git a/forge-gui/res/cardsfolder/d/dwarven_recruiter.txt b/forge-gui/res/cardsfolder/d/dwarven_recruiter.txt
index 3567f8d241b..50088beaa1e 100644
--- a/forge-gui/res/cardsfolder/d/dwarven_recruiter.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_recruiter.txt
@@ -6,5 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigChangeZone:DB$ ChangeZone | ChangeNum$ X | ChangeType$ Dwarf | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | References$ X
 SVar:X:Count$InYourLibrary.Dwarf
 AI:RemoveDeck:All
+DeckNeeds:Type$Dwarf
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_recruiter.jpg
 Oracle:When Dwarven Recruiter enters the battlefield, search your library for any number of Dwarf cards and reveal those cards. Shuffle your library, then put them on top of it in any order.
diff --git a/forge-gui/res/cardsfolder/i/invasive_surgery.txt b/forge-gui/res/cardsfolder/i/invasive_surgery.txt
index 819ca8c4b2e..b680509c8ce 100644
--- a/forge-gui/res/cardsfolder/i/invasive_surgery.txt
+++ b/forge-gui/res/cardsfolder/i/invasive_surgery.txt
@@ -1,10 +1,14 @@
 Name:Invasive Surgery
 ManaCost:U
 Types:Instant
-A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Sorcery | RememberCountered$ True | ForgetOtherTargets$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Counter target sorcery spell. Delirium — If there are four or more card types amongst cards in your graveyard, search the graveyard, hand, and library of that spell's controller for cards with the same name as that spell, exile those cards, then that player shuffles their library.
-SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Remembered.sameName | Condition$ Delirium | Origin$ Graveyard,Hand,Library | Defined$ TargetedController | Destination$ Exile | Search$ True | Shuffle$ True | SubAbility$ DBCleanup
+A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Sorcery | RememberCountered$ True | SubAbility$ ExileYard | SpellDescription$ Counter target sorcery spell. Delirium — If there are four or more card types amongst cards in your graveyard, search the graveyard, hand, and library of that spell's controller for cards with the same name as that spell, exile those cards, then that player shuffles their library.
+SVar:ExileYard:DB$ ChangeZone | Condition$ Delirium | Origin$ Graveyard | Destination$ Exile | DefinedPlayer$ TargetedController | ChangeType$ Remembered.sameName | ChangeNum$ NumInYard | References$ NumInYard | Chooser$ You | Hidden$ True | SubAbility$ ExileHand | StackDescription$ None
+SVar:ExileHand:DB$ ChangeZone | Condition$ Delirium | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedController | ChangeType$ Remembered.sameName | ChangeNum$ NumInHand | References$ NumInHand | Chooser$ You | SubAbility$ ExileLib | StackDescription$ None
+SVar:ExileLib:DB$ ChangeZone | Condition$ Delirium | Origin$ Library | Destination$ Exile | DefinedPlayer$ TargetedController | ChangeType$ Remembered.sameName | ChangeNum$ NumInLib | References$ NumInLib | Chooser$ You | Shuffle$ True | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NumInLib:TargetedController$CardsInLibrary
+SVar:NumInHand:TargetedController$CardsInHand
+SVar:NumInYard:TargetedController$CardsInGraveyard
 DeckHints:Ability$Graveyard & Ability$Discard
 DeckHas:Ability$Delirium
-SVar:Picture:http://www.wizards.com/global/images/magic/general/invasive_surgery.jpg
 Oracle:Counter target sorcery spell.\nDelirium — If there are four or more card types among cards in your graveyard, search the graveyard, hand, and library of that spell's controller for any number of cards with the same name as that spell, exile those cards, then that player shuffles their library.
diff --git a/forge-gui/res/cardsfolder/l/lost_legacy.txt b/forge-gui/res/cardsfolder/l/lost_legacy.txt
index 0a3485f444a..fecb15d0378 100644
--- a/forge-gui/res/cardsfolder/l/lost_legacy.txt
+++ b/forge-gui/res/cardsfolder/l/lost_legacy.txt
@@ -1,12 +1,15 @@
 Name:Lost Legacy
 ManaCost:1 B B
 Types:Sorcery
-A:SP$ NameCard | Cost$ 1 B B | Defined$ You | ValidCards$ Card.nonLand+nonArtifact | ValidDesc$ nonartifact, nonland | SubAbility$ ExileHand | SpellDescription$ Choose a nonartifact, nonland card name. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. That player shuffles their library, then draws a card for each card exiled from hand this way. | SpellDescription$ StackDescription
-SVar:ExileHand:DB$ ChangeZoneAll | Origin$ Hand | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card.NamedCard | RememberChanged$ True | SubAbility$ Exile
-SVar:Exile:DB$ ChangeZoneAll | Origin$ Graveyard,Hand,Library | Destination$ Exile | Defined$ TargetedPlayer | ChangeType$ Card.NamedCard | Search$ True | Shuffle$ True | SubAbility$ Draw
-SVar:Draw:DB$ Draw | Defined$ TargetedPlayer | NumCards$ X | References$ X | SubAbility$ DBCleanup
+A:SP$ NameCard | Cost$ 1 B B | Defined$ You | ValidCards$ Card.nonLand+nonArtifact | ValidDesc$ nonartifact, nonland | SubAbility$ ExileHand | SpellDescription$ Choose a nonartifact, nonland card name. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. That player shuffles their library, then draws a card for each card exiled from hand this way. | StackDescription$ SpellDescription
+SVar:ExileHand:DB$ ChangeZone | ValidTgts$ Player | TgtPrompt$ Select target player | RememberTargets$ True | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInHand | References$ NumInHand | Chooser$ You | SubAbility$ ExileLib | RememberChanged$ True | StackDescription$ None
+SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInLib | References$ NumInLib | Chooser$ You | Shuffle$ True | SubAbility$ ExileYard | StackDescription$ None
+SVar:ExileYard:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInYard | References$ NumInYard | Chooser$ You | Hidden$ True | SubAbility$ Draw | StackDescription$ None
+SVar:Draw:DB$ Draw | Defined$ TargetedPlayer | NumCards$ X | References$ X | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize
+SVar:NumInHand:TargetedPlayer$CardsInHand
+SVar:NumInLib:TargetedPlayer$CardsInLibrary
+SVar:NumInYard:TargetedPlayer$CardsInGraveyard
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lost_legacy.jpg
 Oracle:Choose a nonartifact, nonland card name. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. That player shuffles their library, then draws a card for each card exiled from hand this way.
diff --git a/forge-gui/res/cardsfolder/p/pick_the_brain.txt b/forge-gui/res/cardsfolder/p/pick_the_brain.txt
index 30ec6e9f158..e3fdc792eb3 100644
--- a/forge-gui/res/cardsfolder/p/pick_the_brain.txt
+++ b/forge-gui/res/cardsfolder/p/pick_the_brain.txt
@@ -1,10 +1,14 @@
 Name:Pick the Brain
 ManaCost:2 B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 B | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand | ChangeNum$ 1 | IsCurse$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Target opponent reveals their hand. You choose a nonland card from it and exile that card. Delirium — If there are four or more card types among cards in your graveyard, search that player's graveyard, hand, and library for any number of cards with the same name as the exiled card, exile those cards, then that player shuffles their library.
-SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Remembered.sameName | Condition$ Delirium | Origin$ Graveyard,Hand,Library | Defined$ Targeted | Destination$ Exile | Search$ True | Shuffle$ True | SubAbility$ DBCleanup
+A:SP$ ChangeZone | Cost$ 2 B | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand | ChangeNum$ 1 | IsCurse$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ ExileYard | SpellDescription$ Target opponent reveals their hand. You choose a nonland card from it and exile that card. Delirium — If there are four or more card types among cards in your graveyard, search that player's graveyard, hand, and library for any number of cards with the same name as the exiled card, exile those cards, then that player shuffles their library.
+SVar:ExileYard:DB$ ChangeZone | Condition$ Delirium | Origin$ Graveyard | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Remembered.sameName | ChangeNum$ NumInYard | References$ NumInYard | Chooser$ You | Hidden$ True | SubAbility$ ExileHand | StackDescription$ None
+SVar:ExileHand:DB$ ChangeZone | Condition$ Delirium | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Remembered.sameName | ChangeNum$ NumInHand | References$ NumInHand | Chooser$ You | SubAbility$ ExileLib | StackDescription$ None
+SVar:ExileLib:DB$ ChangeZone | Condition$ Delirium | Origin$ Library | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Remembered.sameName | ChangeNum$ NumInLib | References$ NumInLib | Chooser$ You | Shuffle$ True | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NumInHand:TargetedPlayer$CardsInHand
+SVar:NumInLib:TargetedPlayer$CardsInLibrary
+SVar:NumInYard:TargetedPlayer$CardsInGraveyard
 DeckHints:Ability$Graveyard & Ability$Discard
 DeckHas:Ability$Delirium
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pick_the_brain.jpg
 Oracle:Target opponent reveals their hand. You choose a nonland card from it and exile that card.\nDelirium — If there are four or more card types among cards in your graveyard, search that player's graveyard, hand, and library for any number of cards with the same name as the exiled card, exile those cards, then that player shuffles their library.
diff --git a/forge-gui/res/cardsfolder/r/reap_intellect.txt b/forge-gui/res/cardsfolder/r/reap_intellect.txt
index d9c616c8600..ef0b89a219c 100644
--- a/forge-gui/res/cardsfolder/r/reap_intellect.txt
+++ b/forge-gui/res/cardsfolder/r/reap_intellect.txt
@@ -1,9 +1,14 @@
 Name:Reap Intellect
 ManaCost:X 2 U B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X 2 U B | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand | ChangeNum$ X | References$ X | IsCurse$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ DBExile | SpellDescription$ Target opponent reveals their hand. You choose X non-land cards from among them. Search that player's library, hand and graveyard for cards with the same name as those cards and exile them. Then, that player shuffles their library.
-SVar:DBExile:DB$ ChangeZoneAll | Origin$ Hand,Library,Graveyard | Destination$ Exile | Defined$ Targeted | Search$ True | ChangeType$ Card.sharesNameWith Remembered | Shuffle$ True | SubAbility$ DBCleanup
+A:SP$ ChangeZone | Cost$ X 2 U B | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand | ChangeNum$ X | References$ X | IsCurse$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ DBRepeat | SpellDescription$ Target opponent reveals their hand. You choose X non-land cards from among them. Search that player's library, hand and graveyard for cards with the same name as those cards and exile them. Then, that player shuffles their library.
+SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.IsRemembered | Zone$ Exile | RepeatSubAbility$ ExileYard | SubAbility$ DBCleanup
+SVar:ExileYard:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.sharesNameWith Imprinted | ChangeNum$ NumInYard | References$ NumInYard | Chooser$ You | Hidden$ True | SubAbility$ ExileHand | StackDescription$ None
+SVar:ExileHand:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.sharesNameWith Imprinted | ChangeNum$ NumInHand | References$ NumInHand | Chooser$ You | SubAbility$ ExileLib | StackDescription$ None
+SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.sharesNameWith Imprinted | ChangeNum$ NumInLib | References$ NumInLib | Chooser$ You | Shuffle$ True | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NumInHand:TargetedPlayer$CardsInHand
+SVar:NumInLib:TargetedPlayer$CardsInLibrary
+SVar:NumInYard:TargetedPlayer$CardsInGraveyard
 SVar:X:Count$xPaid
-SVar:Picture:http://www.wizards.com/global/images/magic/general/reap_intellect.jpg
 Oracle:Target opponent reveals their hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles their library.