diff --git a/wadsrc/static/mapinfo/GoidaGame.txt b/wadsrc/static/mapinfo/GoidaGame.txt
index 4ec60255cbd..3879242bc5b 100644
--- a/wadsrc/static/mapinfo/GoidaGame.txt
+++ b/wadsrc/static/mapinfo/GoidaGame.txt
@@ -1,2 +1,543 @@
-// MAPINFO for Goida
+// MAPINFO for Goida [PLACEHOLDER] // TODO: Remove this PlaceHolder
 include "mapinfo/doomcommon.txt"
+
+clearepisodes
+episode map01
+{
+	name = "$TXT_D2E1"
+	key = "h"
+}
+
+episode level01
+{
+	name = "$TXT_D2E2"
+	key = "n"
+	optional
+}
+
+defaultmap
+{
+	sucktime = 1
+}
+
+map MAP01 lookup "HUSTR_1"
+{
+	titlepatch = "CWILV00"
+	next = "MAP02"
+	secretnext = "MAP02"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 30
+	music = "$MUSIC_RUNNIN"
+}
+
+map MAP02 lookup "HUSTR_2"
+{
+	titlepatch = "CWILV01"
+	next = "MAP03"
+	secretnext = "MAP03"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 90
+	music = "$MUSIC_STALKS"
+}
+
+map MAP03 lookup "HUSTR_3"
+{
+	titlepatch = "CWILV02"
+	next = "MAP04"
+	secretnext = "MAP04"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 120
+	music = "$MUSIC_COUNTD"
+}
+
+map MAP04 lookup "HUSTR_4"
+{
+	titlepatch = "CWILV03"
+	next = "MAP05"
+	secretnext = "MAP05"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 120
+	music = "$MUSIC_BETWEE"
+}
+
+map MAP05 lookup "HUSTR_5"
+{
+	titlepatch = "CWILV04"
+	next = "MAP06"
+	secretnext = "MAP06"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 90
+	music = "$MUSIC_DOOM"
+}
+
+map MAP06 lookup "HUSTR_6"
+{
+	titlepatch = "CWILV05"
+	next = "MAP07"
+	secretnext = "MAP07"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THE_DA"
+	needclustertext
+}
+
+map MAP07 lookup "HUSTR_7"
+{
+	titlepatch = "CWILV06"
+	next = "MAP08"
+	secretnext = "MAP08"
+	sky1 = "SKY1"
+	cluster = 6
+	par = 120
+	map07special
+	music = "$MUSIC_SHAWN"
+}
+
+map MAP08 lookup "HUSTR_8"
+{
+	titlepatch = "CWILV07"
+	next = "MAP09"
+	secretnext = "MAP09"
+	sky1 = "SKY1"
+	cluster = 6
+	par = 120
+	music = "$MUSIC_DDTBLU"
+}
+
+map MAP09 lookup "HUSTR_9"
+{
+	titlepatch = "CWILV08"
+	next = "MAP10"
+	secretnext = "MAP10"
+	sky1 = "SKY1"
+	cluster = 6
+	par = 270
+	music = "$MUSIC_IN_CIT"
+}
+
+map MAP10 lookup "HUSTR_10"
+{
+	titlepatch = "CWILV09"
+	next = "MAP11"
+	secretnext = "MAP11"
+	sky1 = "SKY1"
+	cluster = 6
+	par = 90
+	music = "$MUSIC_DEAD"
+}
+
+map MAP11 lookup "HUSTR_11"
+{
+	titlepatch = "CWILV10"
+	next = "MAP12"
+	secretnext = "MAP12"
+	sky1 = "SKY1"
+	cluster = 6
+	par = 210
+	music = "$MUSIC_STLKS2"
+	needclustertext
+}
+
+map MAP12 lookup "HUSTR_12"
+{
+	titlepatch = "CWILV11"
+	next = "MAP13"
+	secretnext = "MAP13"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 150
+	music = "$MUSIC_THEDA2"
+}
+
+map MAP13 lookup "HUSTR_13"
+{
+	titlepatch = "CWILV12"
+	next = "MAP14"
+	secretnext = "MAP14"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 150
+	music = "$MUSIC_DOOM2"
+}
+
+map MAP14 lookup "HUSTR_14"
+{
+	titlepatch = "CWILV13"
+	next = "MAP15"
+	secretnext = "MAP15"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 150
+	music = "$MUSIC_DDTBL2"
+}
+
+map MAP15 lookup "HUSTR_15"
+{
+	titlepatch = "CWILV14"
+	next = "MAP16"
+	secretnext = "MAP31"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 210
+	music = "$MUSIC_RUNNI2"
+	needclustertext
+}
+
+map MAP16 lookup "HUSTR_16"
+{
+	titlepatch = "CWILV15"
+	next = "MAP17"
+	secretnext = "MAP17"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 150
+	music = "$MUSIC_DEAD2"
+}
+
+map MAP17 lookup "HUSTR_17"
+{
+	titlepatch = "CWILV16"
+	next = "MAP18"
+	secretnext = "MAP18"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 420
+	music = "$MUSIC_STLKS3"
+}
+
+map MAP18 lookup "HUSTR_18"
+{
+	titlepatch = "CWILV17"
+	next = "MAP19"
+	secretnext = "MAP19"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 150
+	music = "$MUSIC_ROMERO"
+}
+
+map MAP19 lookup "HUSTR_19"
+{
+	titlepatch = "CWILV18"
+	next = "MAP20"
+	secretnext = "MAP20"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 210
+	music = "$MUSIC_SHAWN2"
+}
+
+map MAP20 lookup "HUSTR_20"
+{
+	titlepatch = "CWILV19"
+	next = "MAP21"
+	secretnext = "MAP21"
+	sky1 = "SKY2"
+	cluster = 7
+	par = 150
+	music = "$MUSIC_MESSAG"
+	needclustertext
+}
+
+map MAP21 lookup "HUSTR_21"
+{
+	titlepatch = "CWILV20"
+	next = "MAP22"
+	secretnext = "MAP22"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 240
+	music = "$MUSIC_COUNT2"
+}
+
+map MAP22 lookup "HUSTR_22"
+{
+	titlepatch = "CWILV21"
+	next = "MAP23"
+	secretnext = "MAP23"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 150
+	music = "$MUSIC_DDTBL3"
+}
+
+map MAP23 lookup "HUSTR_23"
+{
+	titlepatch = "CWILV22"
+	next = "MAP24"
+	secretnext = "MAP24"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 180
+	music = "$MUSIC_AMPIE"
+}
+
+map MAP24 lookup "HUSTR_24"
+{
+	titlepatch = "CWILV23"
+	next = "MAP25"
+	secretnext = "MAP25"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 150
+	music = "$MUSIC_THEDA3"
+}
+
+map MAP25 lookup "HUSTR_25"
+{
+	titlepatch = "CWILV24"
+	next = "MAP26"
+	secretnext = "MAP26"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 150
+	music = "$MUSIC_ADRIAN"
+}
+
+map MAP26 lookup "HUSTR_26"
+{
+	titlepatch = "CWILV25"
+	next = "MAP27"
+	secretnext = "MAP27"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 300
+	music = "$MUSIC_MESSG2"
+}
+
+map MAP27 lookup "HUSTR_27"
+{
+	titlepatch = "CWILV26"
+	next = "MAP28"
+	secretnext = "MAP28"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 330
+	music = "$MUSIC_ROMER2"
+}
+
+map MAP28 lookup "HUSTR_28"
+{
+	titlepatch = "CWILV27"
+	next = "MAP29"
+	secretnext = "MAP29"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 420
+	music = "$MUSIC_TENSE"
+}
+
+map MAP29 lookup "HUSTR_29"
+{
+	titlepatch = "CWILV28"
+	next = "MAP30"
+	secretnext = "MAP30"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 300
+	music = "$MUSIC_SHAWN3"
+}
+
+map MAP30 lookup "HUSTR_30"
+{
+	titlepatch = "CWILV29"
+	next = "EndGameC"
+	secretnext = "EndGameC"
+	sky1 = "SKY3"
+	cluster = 8
+	par = 180
+	allowmonstertelefrags
+	music = "$MUSIC_OPENIN"
+	needclustertext
+}
+
+map MAP31 lookup "HUSTR_31"
+{
+	titlepatch = "CWILV30"
+	next = "MAP16"
+	secretnext = "MAP32"
+	sky1 = "SKY3"
+	cluster = 9
+	par = 120
+	music = "$MUSIC_EVIL"
+	needclustertext
+}
+
+map MAP32 lookup "HUSTR_32"
+{
+	titlepatch = "CWILV31"
+	next = "MAP16"
+	secretnext = "MAP16"
+	sky1 = "SKY3"
+	cluster = 10
+	par = 30
+	music = "$MUSIC_ULTIMA"
+}
+
+// DOOM II first cluster (up thru level 6)
+
+cluster 5
+{
+	flat = "$BGFLAT06"
+	exittext = lookup, "C1TEXT"
+
+}
+
+// DOOM II second cluster (up thru level 11)
+
+cluster 6
+{
+	flat = "$BGFLAT11"
+	exittext = lookup, "C2TEXT"
+
+}
+
+// DOOM II third cluster (up thru level 20)
+
+cluster 7
+{
+	flat = "$BGFLAT20"
+	exittext = lookup, "C3TEXT"
+}
+
+// DOOM II fourth cluster (up thru level 30)
+
+cluster 8
+{
+	flat = "$BGFLAT30"
+	exittext = lookup, "C4TEXT"
+}
+
+// DOOM II fifth cluster (level 31)
+
+cluster 9
+{
+	flat = "$BGFLAT15"
+	entertext = lookup, "C5TEXT"
+}
+
+// DOOM II sixth cluster (level 32)
+
+cluster 10
+{
+	flat = "$BGFLAT31"
+	entertext = lookup, "C6TEXT"
+}
+
+// No Rest for the Living
+
+map LEVEL01 lookup "NHUSTR_1"
+{
+	titlepatch = "NWILV00"
+	next = "LEVEL02"
+	secretnext = "LEVEL09"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 75
+	music = "$MUSIC_MESSAG"
+}
+
+map LEVEL02 lookup "NHUSTR_2"
+{
+	titlepatch = "NWILV01"
+	next = "LEVEL03"
+	secretnext = "LEVEL09"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 105
+	music = "$MUSIC_DDTBLU"
+}
+
+map LEVEL03 lookup "NHUSTR_3"
+{
+	titlepatch = "NWILV02"
+	next = "LEVEL04"
+	secretnext = "LEVEL09"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 120
+	music = "$MUSIC_DOOM"
+}
+
+map LEVEL04 lookup "NHUSTR_4"
+{
+	titlepatch = "NWILV03"
+	next = "LEVEL05"
+	secretnext = "LEVEL09"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 105
+	music = "$MUSIC_SHAWN"
+}
+
+map LEVEL05 lookup "NHUSTR_5"
+{
+	titlepatch = "NWILV04"
+	next = "LEVEL06"
+	secretnext = "LEVEL09"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 210
+	music = "$MUSIC_IN_CIT"
+}
+
+map LEVEL06 lookup "NHUSTR_6"
+{
+	titlepatch = "NWILV05"
+	next = "LEVEL07"
+	secretnext = "LEVEL09"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 105
+	sucktime = 1
+	music = "$MUSIC_THE_DA"
+}
+
+map LEVEL07 lookup "NHUSTR_7"
+{
+	titlepatch = "NWILV06"
+	next = "LEVEL08"
+	secretnext = "LEVEL09"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 165
+	map07special
+	music = "$MUSIC_IN_CIT"
+}
+
+map LEVEL08 lookup "NHUSTR_8"
+{
+	titlepatch = "NWILV07"
+	next = "EndGameC"
+	secretnext = "EndGameC"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 105
+	music = "$MUSIC_SHAWN"
+	needclustertext
+}
+
+map LEVEL09 lookup "NHUSTR_9"
+{
+	titlepatch = "NWILV08"
+	next = "LEVEL05"
+	secretnext = "LEVEL05"
+	sky1 = "SKY1"
+	cluster = 11
+	par = 135
+	music = "$MUSIC_DDTBLU"
+}
+
+cluster 11
+{
+	flat = "SLIME16"
+	exittext = lookup, "NERVETEXT"
+}
+