diff --git a/.gitattributes b/.gitattributes
index 195e4161cf9..be5a7383c5e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1895,6 +1895,7 @@ forge-gui/res/cardsfolder/a/arctic_wolves.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/a/arcum_dagsson.txt -text
 forge-gui/res/cardsfolder/a/arcums_sleigh.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/a/arcums_weathervane.txt -text
+forge-gui/res/cardsfolder/a/arcums_whistle.txt -text
 forge-gui/res/cardsfolder/a/ardent_militia.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/a/ardent_plea.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/a/ardent_recruit.txt svneol=native#text/plain
diff --git a/forge-gui/res/cardsfolder/a/arcums_whistle.txt b/forge-gui/res/cardsfolder/a/arcums_whistle.txt
new file mode 100644
index 00000000000..e0b1378c992
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/arcums_whistle.txt
@@ -0,0 +1,10 @@
+Name:Arcum's Whistle
+ManaCost:3
+Types:Artifact
+A:AB$ Pump | Cost$ 3 T | ValidTgts$ Creature.nonWall+ActivePlayerCtrl+notFirstTurnControlled | TgtPrompt$ Select target non-Wall creature the active player has controlled continuously since the beginning of the turn. | IsCurse$ True | KW$ HIDDEN CARDNAME attacks each turn if able. | UnlessCost$ X | UnlessPayer$ TargetedController | References$ X | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DestroyPacifist | SpellDescription$ Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That player may pay {X}, where X is that creature's converted mana cost. If he or she doesn't, the creature attacks this turn if able, and at the beginning of the next end step, destroy it if it didn't attack. Activate this ability only before attackers are declared.
+SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroy | RememberObjects$ ParentTarget | TriggerDescription$ At the beginning of the end step, destroy that creature if it didn't attack this turn.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered | ConditionDefined$ DelayTriggerRemembered | ConditionPresent$ Creature.notAttackedThisTurn | ConditionCompare$ GE1
+SVar:X:Targeted$CardManaCost
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/arcums_whistle.jpg
+Oracle:{3}, {T}: Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That player may pay {X}, where X is that creature's converted mana cost. If he or she doesn't, the creature attacks this turn if able, and at the beginning of the next end step, destroy it if it didn't attack. Activate this ability only before attackers are declared.
diff --git a/forge-gui/res/cardsfolder/n/nettling_imp.txt b/forge-gui/res/cardsfolder/n/nettling_imp.txt
index 91eb9269250..b5250d3ac05 100644
--- a/forge-gui/res/cardsfolder/n/nettling_imp.txt
+++ b/forge-gui/res/cardsfolder/n/nettling_imp.txt
@@ -2,11 +2,9 @@ Name:Nettling Imp
 ManaCost:2 B
 Types:Creature Imp
 PT:1/1
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.nonWall+ActivePlayerCtrl+notFirstTurnControlled | TgtPrompt$ Select target non-Wall creature the active player has controlled continuously since the beginning of the turn. | ActivationPhases$ Upkeep->BeginCombat | OpponentTurn$ True | KW$ HIDDEN CARDNAME attacks each turn if able. | RememberTargets$ True | SubAbility$ DestroyPacifist | SpellDescription$ Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only before attackers are declared.
-SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigDestroy | IsPresent$ Creature.IsRemembered+notAttackedThisTurn | TriggerDescription$ At the beginning of the end step, destroy that creature if it didn't attack this turn. | SubAbility$ RemoveTrigger
-SVar:RemoveTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ DBCleanup| IsPresent$ Creature.IsRemembered+notAttackedThisTurn | PresentCompare$ EQ0 | Static$ True
-SVar:TrigDestroy:DB$ Destroy | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearTriggered$ True
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature.nonWall+ActivePlayerCtrl+notFirstTurnControlled | TgtPrompt$ Select target non-Wall creature the active player has controlled continuously since the beginning of the turn. | ActivationPhases$ Upkeep->BeginCombat | OpponentTurn$ True | KW$ HIDDEN CARDNAME attacks each turn if able. | SubAbility$ DestroyPacifist | SpellDescription$ Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only before attackers are declared.
+SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | RememberObjects$ ParentTarget | Execute$ TrigDestroy | TriggerDescription$ At the beginning of the end step, destroy that creature if it didn't attack this turn.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered | ConditionDefined$ DelayTriggerRemembered | ConditionPresent$ Creature.notAttackedThisTurn | ConditionCompare$ GE1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettling_imp.jpg
 Oracle:{T}: Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only during an opponent's turn, before attackers are declared.
diff --git a/forge-gui/res/cardsfolder/n/norritt.txt b/forge-gui/res/cardsfolder/n/norritt.txt
index 10b39c3c48d..b9eace1a3e0 100644
--- a/forge-gui/res/cardsfolder/n/norritt.txt
+++ b/forge-gui/res/cardsfolder/n/norritt.txt
@@ -3,10 +3,9 @@ ManaCost:3 B
 Types:Creature Imp
 PT:1/1
 A:AB$ Untap | Cost$ T | ValidTgts$ Creature.Blue | TgtPrompt$ Select target blue creature | SpellDescription$ Untap target blue creature.
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.nonWall+ActivePlayerCtrl+notFirstTurnControlled | TgtPrompt$ Select target non-Wall creature the active player has controlled continuously since the beginning of the turn. | ActivationPhases$ Upkeep->BeginCombat | KW$ HIDDEN CARDNAME attacks each turn if able. | RememberTargets$ True | SubAbility$ DestroyPacifist | SpellDescription$ Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only before attackers are declared.
-SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigDestroy | IsPresent$ Creature.IsRemembered+notAttackedThisTurn | TriggerDescription$ At the beginning of the end step, destroy that creature if it didn't attack this turn.
-SVar:TrigDestroy:DB$Destroy | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature.nonWall+ActivePlayerCtrl+notFirstTurnControlled | TgtPrompt$ Select target non-Wall creature the active player has controlled continuously since the beginning of the turn. | ActivationPhases$ Upkeep->BeginCombat | KW$ HIDDEN CARDNAME attacks each turn if able. | SubAbility$ DestroyPacifist | SpellDescription$ Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only before attackers are declared.
+SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroy | RememberObjects$ ParentTarget | TriggerDescription$ At the beginning of the end step, destroy that creature if it didn't attack this turn.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered | ConditionDefined$ DelayTriggerRemembered | ConditionPresent$ Creature.notAttackedThisTurn | ConditionCompare$ GE1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/norritt.jpg
 Oracle:{T}: Untap target blue creature.\n{T}: Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only before attackers are declared.