diff --git a/.gitattributes b/.gitattributes
index ee2e1bb24e5..4d175caa639 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16942,6 +16942,8 @@ forge-gui/res/cardsfolder/u/utter_end.txt -text
 forge-gui/res/cardsfolder/u/utvara_hellkite.txt -text
 forge-gui/res/cardsfolder/u/utvara_scalper.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/u/uyo_silent_prophet.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/upcoming/bontus_last_reckoning.txt -text
+forge-gui/res/cardsfolder/upcoming/samut_the_tested.txt -text
 forge-gui/res/cardsfolder/v/vacuumelt.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/v/vaevictis_asmadi.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/v/vagrant_plowbeasts.txt svneol=native#text/plain
@@ -18847,6 +18849,7 @@ forge-gui/res/editions/Commander[!!-~]2013.txt -text svneol=unset#application/oc
 forge-gui/res/editions/Commander[!!-~]2014.txt -text
 forge-gui/res/editions/Commander[!!-~]2015.txt -text
 forge-gui/res/editions/Commander[!!-~]2016.txt -text
+forge-gui/res/editions/Commander[!!-~]2017.txt -text
 forge-gui/res/editions/Commander[!!-~]Anthology.txt -text
 forge-gui/res/editions/Commander's[!!-~]Arsenal.txt -text
 forge-gui/res/editions/Commander.txt -text
@@ -18900,6 +18903,7 @@ forge-gui/res/editions/Future[!!-~]Sight.txt -text
 forge-gui/res/editions/Gatecrash.txt -text
 forge-gui/res/editions/Guildpact.txt -text
 forge-gui/res/editions/Homelands.txt -text
+forge-gui/res/editions/Hour[!!-~]of[!!-~]Devastation.txt -text
 forge-gui/res/editions/Ice[!!-~]Age.txt -text
 forge-gui/res/editions/Innistrad.txt -text
 forge-gui/res/editions/Invasion.txt -text
diff --git a/forge-gui/res/cardsfolder/upcoming/bontus_last_reckoning.txt b/forge-gui/res/cardsfolder/upcoming/bontus_last_reckoning.txt
new file mode 100644
index 00000000000..fb1845110fd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bontus_last_reckoning.txt
@@ -0,0 +1,7 @@
+Name:Bontu's Last Reckoning
+ManaCost:1 B B
+Types:Sorcery
+A:SP$ DestroyAll | Cost$ 2 W W | ValidCards$ Creature | SubAbility$ DBNoUntap | SpellDescription$ Destroy all creatures. Lands you control don't untap during your next untap step.
+SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Land.YouCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/bontus_last_reckoning.jpg
+Oracle:Destroy all creatures. Lands you control don't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/upcoming/samut_the_tested.txt b/forge-gui/res/cardsfolder/upcoming/samut_the_tested.txt
new file mode 100644
index 00000000000..d04d0dae6e9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/samut_the_tested.txt
@@ -0,0 +1,9 @@
+Name:Samut, the Tested
+ManaCost:2 R G
+Types:Planeswalker Samut
+Loyalty:4
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | Planeswalker$ True | KW$ Double Strike | SpellDescription$ Up to one target creature gains double strike until end of turn.
+A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to distribute damage to | NumDmg$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | Planeswalker$ True | SpellDescription$ CARDNAME deals 2 damage divided as you choose among one or two target creatures and/or players.
+A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature,Planeswalker | ChangeNum$ 2 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Search your library for up to two creature and/or planeswalker cards, put them onto the battlefield, then shuffle your library.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/samut_the_tested.jpg
+Oracle:[+1] Up to one target creature gains double strike until end of turn.\n[-2] Samut, the Tested deals 2 damage divided as you choose among one or two target creatures and/or players.\n[-7] Search your library for up to two creature and/or planeswalker cards, put them onto the battlefield, then shuffle your library.
\ No newline at end of file
diff --git a/forge-gui/res/editions/Commander 2017.txt b/forge-gui/res/editions/Commander 2017.txt
new file mode 100644
index 00000000000..f23124aed9c
--- /dev/null
+++ b/forge-gui/res/editions/Commander 2017.txt	
@@ -0,0 +1,9 @@
+[metadata]
+Code=C17
+Date=2017-08-25
+Name=Commander 2017
+Code2=C17
+MciCode=c17
+Type=Other
+
+[cards]
diff --git a/forge-gui/res/editions/Hour of Devastation.txt b/forge-gui/res/editions/Hour of Devastation.txt
new file mode 100644
index 00000000000..e5787c33f26
--- /dev/null
+++ b/forge-gui/res/editions/Hour of Devastation.txt	
@@ -0,0 +1,12 @@
+[metadata]
+Code=HOU
+Date=2017-07-14
+Name=Hour of Devastation
+Code2=HOU
+Type=Expansion
+MciCode=hou
+Booster=10 Common:!fromSheet("HOU Planeswalker Decks and Toolkit"), 3 Uncommon:!fromSheet("HOU Planeswalker Decks and Toolkit"), 1 RareMythic:!fromSheet("HOU Planeswalker Decks and Toolkit"), 1 BasicLand AKH
+AdditionalSheetForFoils=fromSheet("MPS Hour of Devastation Invocations")
+AdditionalSetUnlockedInQuest=MPS_AKH
+
+[cards]
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 9b0be11d1ee..08a676487f7 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -290,6 +290,7 @@ Nissa
 Nixilis
 Ral
 Saheeli
+Samut
 Sarkhan
 Sorin
 Tamiyo