diff --git a/forge-gui/res/cardsfolder/i/infinite_hourglass.txt b/forge-gui/res/cardsfolder/i/infinite_hourglass.txt
index 35f12c0b512..33c2264e429 100644
--- a/forge-gui/res/cardsfolder/i/infinite_hourglass.txt
+++ b/forge-gui/res/cardsfolder/i/infinite_hourglass.txt
@@ -5,7 +5,8 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Creature | AddPower$ X | Description$ All creatures get +1/+0 for each time counter on CARDNAME.
 SVar:X:Count$CardCounters.TIME
-A:AB$ RemoveCounter | Cost$ 3 | CounterType$ TIME | CounterNum$ 1 | ActivationPhases$ Upkeep | AnyPlayer$ True | SpellDescription$ Remove a time counter from CARDNAME. Any player may activate this ability but only during any upkeep step.
+#TODO: Improve the AI for this
+A:AB$ RemoveCounter | Cost$ 3 | CounterType$ TIME | CounterNum$ 1 | ActivationPhases$ Upkeep | AnyPlayer$ True | AILogic$ Never | SpellDescription$ Remove a time counter from CARDNAME. Any player may activate this ability but only during any upkeep step.
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/infinite_hourglass.jpg
 Oracle:At the beginning of your upkeep, put a time counter on Infinite Hourglass.\nAll creatures get +1/+0 for each time counter on Infinite Hourglass.\n{3}: Remove a time counter from Infinite Hourglass. Any player may activate this ability but only during any upkeep step.
diff --git a/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt b/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt
index 3cb6233625c..3d3657d373b 100644
--- a/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt
+++ b/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt
@@ -2,8 +2,7 @@ Name:Magus of the Coffers
 ManaCost:4 B
 Types:Creature Human Wizard
 PT:4/4
-A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} for each Swamp you control.
+A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B} for each Swamp you control.
 SVar:X:Count$Valid Swamp.YouCtrl
-AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_coffers.jpg
 Oracle:{2}, {T}: Add {B} for each Swamp you control.
diff --git a/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt b/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt
index d1427b86bf2..a44175f7fea 100644
--- a/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt
+++ b/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt
@@ -1,8 +1,7 @@
 Name:Songs of the Damned
 ManaCost:B
 Types:Instant
-A:SP$ Mana | Cost$ B | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} for each creature card in your graveyard.
+A:SP$ Mana | Cost$ B | Produced$ B | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B} for each creature card in your graveyard.
 SVar:X:Count$TypeInYourYard.Creature
-AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/songs_of_the_damned.jpg
 Oracle:Add {B} for each creature card in your graveyard.
diff --git a/forge-gui/res/cardsfolder/w/withering_wisps.txt b/forge-gui/res/cardsfolder/w/withering_wisps.txt
index 0f138c59a50..90a0b47b2b1 100644
--- a/forge-gui/res/cardsfolder/w/withering_wisps.txt
+++ b/forge-gui/res/cardsfolder/w/withering_wisps.txt
@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Enchantment
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self
-A:AB$ DamageAll | Cost$ B | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Player | ValidDescription$ each creature and each player. | ActivationLimit$ X | References$ X | SpellDescription$ CARDNAME deals 1 damage to each creature and each player. Activate this ability no more times each turn than the number of snow Swamps you control.
+A:AB$ DamageAll | Cost$ B | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Player | ValidDescription$ each creature and each player. | ActivationLimit$ X | References$ X | AILogic$ DmgAllCreaturesAndPlayers | SpellDescription$ CARDNAME deals 1 damage to each creature and each player. Activate this ability no more times each turn than the number of snow Swamps you control.
 SVar:X:Count$Valid Swamp.Snow+YouCtrl
 SVar:NeedsToPlay:Creature
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/Mirri the Cursed.dck b/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/Mirri the Cursed.dck
new file mode 100644
index 00000000000..4ba2847e0d7
--- /dev/null
+++ b/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/Mirri the Cursed.dck	
@@ -0,0 +1,29 @@
+[metadata]
+Name=Mirri the Cursed
+[Commander]
+1 Mirri the Cursed|PLC
+[Main]
+1 Abyssal Specter|ICE
+1 Bridge from Below|FUT
+1 Dark Ritual|ICE
+1 Deepcavern Imp|FUT
+1 Enslave|PLC
+1 Frenzy Sliver|FUT
+1 Herald of Leshrac|CSP
+1 Hivestone|TSP
+1 Lim-Dul the Necromancer|TSP
+1 Magus of the Coffers|PLC
+1 Necropotence|ICE
+1 Nether Traitor|TSP
+1 Paradise Plume|TSP
+1 Phobian Phantasm|CSP
+1 Shimian Specter|FUT
+1 Spitting Sliver|PLC
+1 Stromgald Crusader|CSP
+1 Stronghold Overseer|TSP
+1 Sudden Death|TSP
+16 Swamp|TSP
+1 Temporal Extortion|PLC
+1 Tombstalker|FUT
+1 Vampiric Sliver|TSP
+1 Veilstone Amulet|FUT
diff --git a/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/Teneb, the Harvester.dck b/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/Teneb, the Harvester.dck
new file mode 100644
index 00000000000..87f1358589d
--- /dev/null
+++ b/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/Teneb, the Harvester.dck	
@@ -0,0 +1,39 @@
+[metadata]
+Name=Teneb, the Harvester
+[Commander]
+1 Teneb, the Harvester|PLC
+[Main]
+1 Aspect of Mongoose|TSP
+1 Bridge from Below|FUT
+1 Brushland|ICE
+1 Buried Alive|ODY
+1 Cabal Ritual|TOR
+1 Caves of Koilos|APC
+1 Dance of the Dead|ICE
+1 Dark Ritual|USG
+1 Dread Return|TSP
+1 Dryad Arbor|FUT
+1 Earsplitting Rats|JUD
+1 Entomb|ODY
+1 Forest|TSP
+1 Hymn of Rebirth|ICE
+1 Hypnotic Specter|4ED
+1 Hypnox|TOR
+1 Living Death|COM
+1 Living End|TSP
+1 Llanowar Wastes|APC
+1 Lotus Bloom|TSP
+1 Lotus Vale|WTH
+1 Panglacial Wurm|CSP
+1 Phantasmagorian|PLC
+1 Plains|TSP
+1 Pox|ICE
+1 Reya Dawnbringer|INV
+1 Silver Seraph|JUD
+1 Smallpox|TSP
+1 Spirit of the Night|MIR
+1 Stronghold Rats|FUT
+6 Swamp|TSP
+1 Thran Quarry|USG
+1 Undiscovered Paradise|VIS
+1 Yawgmoth's Will|USG
diff --git a/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/_events.txt b/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/_events.txt
index 66c69ba92d0..21f1e200673 100644
--- a/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/_events.txt	
+++ b/forge-gui/res/conquest/planes/Time_Vault/Chronicle of Ages/_events.txt	
@@ -1,5 +1,5 @@
-Name:EVENT1|Deck:Random.dck|Variant:None|Avatar:None|Desc:
-Name:EVENT2|Deck:Random.dck|Variant:None|Avatar:None|Desc:
+Name:Mirri the Cursed|Deck:Mirri the Cursed.dck|Variant:Commander|Avatar:Mirri the Cursed|Desc:
+Name:Teneb, the Harvester|Deck:Teneb, the Harvester.dck|Variant:Commander|Avatar:Teneb, the Harvester|Desc:
 Name:EVENT3|Deck:Random.dck|Variant:None|Avatar:None|Desc:
 Name:EVENT4|Deck:Random.dck|Variant:None|Avatar:None|Desc:
 Name:EVENT5|Deck:Random.dck|Variant:None|Avatar:None|Desc:
diff --git a/forge-gui/res/conquest/planes/Time_Vault/sets.txt b/forge-gui/res/conquest/planes/Time_Vault/sets.txt
index 9f80ee8f007..b5e136bebac 100644
--- a/forge-gui/res/conquest/planes/Time_Vault/sets.txt
+++ b/forge-gui/res/conquest/planes/Time_Vault/sets.txt
@@ -18,4 +18,5 @@ LGN
 SCG
 TSP
 PLC
-FUT
\ No newline at end of file
+FUT
+COM
diff --git a/forge-gui/res/conquest/planes/planes.txt b/forge-gui/res/conquest/planes/planes.txt
index fd14c390922..2a2d1ab4b5c 100644
--- a/forge-gui/res/conquest/planes/planes.txt
+++ b/forge-gui/res/conquest/planes/planes.txt
@@ -14,6 +14,6 @@ Name:Regatha|RegionSize:6|Unreachable:True|Desc:
 Name:Shandalar|RegionSize:9|Unreachable:True|Desc:
 Name:Tarkir|RegionSize:9|Desc:A plane dominated by five powerful clans... or five powerful dragon lords.\nConsists of 45 events. Contains cards from KTK, FRF, DTK, CMD, CNS/CN2, some C17.
 Name:Theros|RegionSize:9|Desc:Mortals tremble before an awe-inspiring pantheon of gods.\nConsists of 45 events. Contains cards from THS, BNG, JOU, HOP, PCA, and more.
-Name:Time_Vault|RegionSize:9|Unreachable:True|Desc:A mysterious and legendary Time Vault, allowing one to travel back in time and revisit the ages long past and experience the history of Dominaria.\nConsists of 18 events. Contains cards from ICE, ALL, CSP, MIR, VIS, WTH, USG, ULG, UDS, INV, PLS, APC, ODY, TOR, JUD, ONS, LGN, SCG, TSP, PLC, and FUT.\n\nThe portal to this plane is unstable and will close soon, so hasten your step, planeswalker, while you have the chance...
+Name:Time_Vault|RegionSize:9|Unreachable:True|Desc:A mysterious and legendary Time Vault, allowing one to travel back in time and revisit the ages long past and experience the history of Dominaria.\nConsists of 18 events. Contains cards from ICE, ALL, CSP, MIR, VIS, WTH, USG, ULG, UDS, INV, PLS, APC, ODY, TOR, JUD, ONS, LGN, SCG, TSP, PLC, FUT, and COM.\n\nThe portal to this plane is unstable and will close soon, so hasten your step, planeswalker, while you have the chance...
 Name:Ulgrotha|RegionSize:6|Unreachable:True|Desc:
 Name:Zendikar|RegionSize:9|Desc:This land of primal mana was lethal even before its Eldrazi prisoners escaped.\nConsists of 60 events. Contains cards from ZEN, WWK, ROE, BFZ, OGW, and C16.