diff --git a/.gitattributes b/.gitattributes
index 4492f9214df..ec8af1243ab 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3064,6 +3064,7 @@ res/cardsfolder/e/energy_field.txt svneol=native#text/plain
 res/cardsfolder/e/energy_flux.txt svneol=native#text/plain
 res/cardsfolder/e/energy_storm.txt svneol=native#text/plain
 res/cardsfolder/e/energy_tap.txt svneol=native#text/plain
+res/cardsfolder/e/energy_vortex.txt -text
 res/cardsfolder/e/enervate.txt svneol=native#text/plain
 res/cardsfolder/e/enfeeblement.txt svneol=native#text/plain
 res/cardsfolder/e/engineered_explosives.txt -text
@@ -3259,6 +3260,7 @@ res/cardsfolder/f/fabricate.txt svneol=native#text/plain
 res/cardsfolder/f/face_of_fear.txt svneol=native#text/plain
 res/cardsfolder/f/faceless_butcher.txt svneol=native#text/plain
 res/cardsfolder/f/faceless_devourer.txt svneol=native#text/plain
+res/cardsfolder/f/faces_of_the_past.txt -text
 res/cardsfolder/f/facevaulter.txt svneol=native#text/plain
 res/cardsfolder/f/fact_or_fiction.txt svneol=native#text/plain
 res/cardsfolder/f/fade_from_memory.txt svneol=native#text/plain
diff --git a/res/cardsfolder/e/energy_vortex.txt b/res/cardsfolder/e/energy_vortex.txt
new file mode 100644
index 00000000000..6333d8edbcf
--- /dev/null
+++ b/res/cardsfolder/e/energy_vortex.txt
@@ -0,0 +1,19 @@
+Name:Energy Vortex
+ManaCost:3 U U
+Types:Enchantment
+Text:no text
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseP | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose an opponent.
+SVar:ChooseP:AB$ ChoosePlayer | Cost$ 0 | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemove | TriggerDescription$ At the beginning of your upkeep, remove all energy counters from CARDNAME.
+SVar:TrigRemove:AB$ RemoveCounter | Cost$ 0 | CounterType$ ENERGY | CounterNum$ All
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.Chosen | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of the chosen player's upkeep, CARDNAME deals 3 damage to that player unless he or she pays {1} for each energy counter on CARDNAME.
+SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ ChosenPlayer | NumDmg$ 3 | UnlessCost$ Y | UnlessPayer$ ChosenPlayer | References$ Y
+A:AB$ PutCounter | Cost$ X | CounterType$ ENERGY | CounterNum$ X | References$ X | PlayerTurn$ True | ActivationPhases$ Upkeep | SpellDescription$ Put X energy counters on CARDNAME. Activate this ability only during your upkeep.
+SVar:X:Count$xPaid
+SVar:Y:Count$CardCounters.ENERGY
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/energy_vortex.jpg
+SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/64.jpg
+Oracle:As Energy Vortex enters the battlefield, choose an opponent.\nAt the beginning of your upkeep, remove all energy counters from Energy Vortex.\nAt the beginning of the chosen player's upkeep, Energy Vortex deals 3 damage to that player unless he or she pays {1} for each energy counter on Energy Vortex.\n{X}: Put X energy counters on Energy Vortex. Activate this ability only during your upkeep.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/f/faces_of_the_past.txt b/res/cardsfolder/f/faces_of_the_past.txt
new file mode 100644
index 00000000000..d102fec1225
--- /dev/null
+++ b/res/cardsfolder/f/faces_of_the_past.txt
@@ -0,0 +1,12 @@
+Name:Faces of the Past
+ManaCost:2 U
+Types:Enchantment
+Text:no text
+T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigTaporUntapAll | TriggerDescription$ Whenever a creature dies, tap all untapped creatures that share a creature type with it or untap all tapped creatures that share a creature type with it.
+SVar:TrigTaporUntapAll:AB$ TaporUntapAll | Cost$ 0 | ValidCards$ TriggeredCard.sharesCreatureTypeWith | ValidMessage$ creatures that share a creature type with the triggered creature
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/faces_of_the_past.jpg
+SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/35.jpg
+Oracle:Whenever a creature dies, tap all untapped creatures that share a creature type with it or untap all tapped creatures that share a creature type with it.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/t/the_rack.txt b/res/cardsfolder/t/the_rack.txt
index be9da8a9b2e..b5a069a0ec4 100644
--- a/res/cardsfolder/t/the_rack.txt
+++ b/res/cardsfolder/t/the_rack.txt
@@ -3,9 +3,9 @@ ManaCost:1
 Types:Artifact
 Text:no text
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseP | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose an opponent.
-SVar:ChooseP:AB$ ChoosePlayer | Cost$ 0 | Defined$ You | Choices$ Opponent | AILogic$ Curse
+SVar:ChooseP:AB$ ChoosePlayer | Cost$ 0 | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | AILogic$ Curse
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.Chosen | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of the chosen player's upkeep, CARDNAME deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
-SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ X | References$ X
+SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ ChosenPlayer | NumDmg$ X | References$ X
 SVar:X:Count$InChosenHand/NMinus.3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/the_rack.jpg