diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 1cb2e944bb0..6b2d355d765 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -21,7 +21,7 @@ var/global/list/surgery_steps = list()				//list of all surgery steps  |BS12
 var/global/list/side_effects = list()				//list of all medical sideeffects types by thier names |BS12
 var/global/list/mechas_list = list()				//list of all mechs. Used by hostile mobs target tracking.
 var/global/list/joblist = list()					//list of all jobstypes, minus borg and AI
-
+var/global/list/flag_list = list()					//list of flags during Nations gamemode
 //Languages/species/whitelist.
 var/global/list/all_species[0]
 var/global/list/all_languages[0]
diff --git a/code/game/gamemodes/nations/nationdatums.dm b/code/game/gamemodes/nations/nationdatums.dm
index 0f9b8d366a1..1f9b54b2a74 100644
--- a/code/game/gamemodes/nations/nationdatums.dm
+++ b/code/game/gamemodes/nations/nationdatums.dm
@@ -1,8 +1,6 @@
 /datum/nations
 	var/name
 	var/flagpath
-	var/obj/effect/landmark/nations/landmark
-
 
 
 /datum/nations/atmosia
@@ -27,4 +25,68 @@
 
 /datum/nations/scientopia
 	name = "Scientopia"
-	flagpath = /obj/item/flag/nation/rnd
\ No newline at end of file
+	flagpath = /obj/item/flag/nation/rnd
+
+
+
+
+
+
+
+
+
+//Nations/Department flags --Nations Gamemode Specific
+/obj/item/flag/nation
+	density = 1
+	anchored = 1
+	var/turf/startloc = null
+
+/obj/item/flag/nation/New()
+	..()
+	flag_list += src
+
+/obj/item/flag/nation/fire_act()
+	return
+
+/obj/item/flag/nation/Ignite()
+	return
+
+/obj/item/flag/nation/light()
+	return
+
+
+
+/obj/item/flag/nation/attackby(var/obj/item/weapon/W, var/mob/user)
+
+
+
+
+/obj/item/flag/nation/cargo
+	name = "Cargonia flag"
+	desc = "The flag of the independant, sovereign nation of Cargonia."
+	icon_state = "cargoflag"
+
+/obj/item/flag/nation/med
+	name = "Medistan flag"
+	desc = "The flag of the independant, sovereign nation of Medistan."
+	icon_state = "medflag"
+
+/obj/item/flag/nation/sec
+	name = "Brigston flag"
+	desc = "The flag of the independant, sovereign nation of Brigston."
+	icon_state = "secflag"
+
+/obj/item/flag/nation/rnd
+	name = "Scientopia flag"
+	desc = "The flag of the independant, sovereign nation of Scientopia."
+	icon_state = "rndflag"
+
+/obj/item/flag/nation/atmos
+	name = "Atmosia flag"
+	desc = "The flag of the independant, sovereign nation of Atmosia."
+	icon_state = "atmosflag"
+
+/obj/item/flag/nation/command
+	name = "Command flag"
+	desc = "The flag of the independant, sovereign nation of Command."
+	icon_state = "ntflag"
\ No newline at end of file
diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm
index cd51fad8e7c..dc01ef6b61e 100644
--- a/code/game/gamemodes/nations/nations.dm
+++ b/code/game/gamemodes/nations/nations.dm
@@ -8,21 +8,17 @@ datum/game_mode/nations
 
 	var/list/cargonians = list("Quartermaster","Cargo Technician","Shaft Miner")
 
-	var/global/list/atmosia = list()
-	var/global/list/brigston = list()
-	var/global/list/cargonia = list()
-	var/global/list/command = list()
-	var/global/list/medistan = list()
-	var/global/list/scientopia = list()
+
 
 
 /datum/game_mode/nations/post_setup()
 	spawn (rand(waittime_l, waittime_h))
 		remove_flags()
 		spawn(50)
-			spawn_flags()
 			send_intercept()
 			split_teams()
+			spawn_flags()
+			populate_vars()
 
 /datum/game_mode/nations/send_intercept()
 	command_alert("Due to recent and COMPLETELY UNFOUNDED allegations of massive fraud and insider trading \
@@ -98,33 +94,33 @@ datum/game_mode/nations
 				message_admins("[H.name] with [H.mind.assigned_role] could not find any nation to assign!")
 				continue
 
-/datum/game_mode/nations/proc/populate_datums()
+/datum/game_mode/nations/proc/populate_vars()
 	for(var/obj/effect/landmark/nations/N in landmarks_list)
 		switch(N.name)
 			if("Atmosia")
-				var/datum/nations/atmosia/A
-				A.landmark = N
-				continue
+				for(var/obj/item/flag/nation/atmos/A in flag_list)
+					A.startloc = get_turf(N)
+					continue
 			if("Brigston")
-				var/datum/nations/brigston/B
-				B.landmark = N
-				continue
+				for(var/obj/item/flag/nation/sec/B in flag_list)
+					B.startloc = get_turf(N)
+					continue
 			if("Cargonia")
-				var/datum/nations/cargonia/C
-				C.landmark = N
-				continue
+				for(var/obj/item/flag/nation/cargo/C in flag_list)
+					C.startloc = get_turf(N)
+					continue
 			if("Command")
-				var/datum/nations/command/D
-				D.landmark = N
-				continue
+				for(var/obj/item/flag/nation/command/D in flag_list)
+					D.startloc = get_turf(N)
+					continue
 			if("Medistan")
-				var/datum/nations/medistan/M
-				M.landmark = N
-				continue
+				for(var/obj/item/flag/nation/med/M in flag_list)
+					M.startloc = get_turf(N)
+					continue
 			if("Scientopia")
-				var/datum/nations/scientopia/S
-				S.landmark = N
-				continue
+				for(var/obj/item/flag/nation/rnd/S in flag_list)
+					S.startloc = get_turf(N)
+					continue
 
 /mob/proc/respawn_self()
 	set category = "OOC"
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index 20804d9285d..c779a03aac2 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -156,47 +156,34 @@
 	desc = "A flag proudly proclaiming the superior heritage of Unathi."
 	icon_state = "unathiflag"
 
-//Nations/Department flags
-/obj/item/flag/nation
-	density = 1
-	anchored = 1
+//Nation Flags (Able to spawn outside Nations gamemode)
 
-/obj/item/flag/nation/fire_act()
-	return
-
-/obj/item/flag/nation/Ignite()
-	return
-
-/obj/item/flag/nation/light()
-	return
-
-
-/obj/item/flag/nation/cargo
+/obj/item/flag/cargo
 	name = "Cargonia flag"
 	desc = "The flag of the independant, sovereign nation of Cargonia."
 	icon_state = "cargoflag"
 
-/obj/item/flag/nation/med
+/obj/item/flag/med
 	name = "Medistan flag"
 	desc = "The flag of the independant, sovereign nation of Medistan."
 	icon_state = "medflag"
 
-/obj/item/flag/nation/sec
+/obj/item/flag/sec
 	name = "Brigston flag"
 	desc = "The flag of the independant, sovereign nation of Brigston."
 	icon_state = "secflag"
 
-/obj/item/flag/nation/rnd
+/obj/item/flag/rnd
 	name = "Scientopia flag"
 	desc = "The flag of the independant, sovereign nation of Scientopia."
 	icon_state = "rndflag"
 
-/obj/item/flag/nation/atmos
+/obj/item/flag/atmos
 	name = "Atmosia flag"
 	desc = "The flag of the independant, sovereign nation of Atmosia."
 	icon_state = "atmosflag"
 
-/obj/item/flag/nation/command
+/obj/item/flag/command
 	name = "Command flag"
 	desc = "The flag of the independant, sovereign nation of Command."
 	icon_state = "ntflag"