diff --git a/aurorastation.dme b/aurorastation.dme
index 336ee3d4b2d..93707c2bac9 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -252,6 +252,7 @@
 #include "code\controllers\subsystems\processing\modifiers.dm"
 #include "code\controllers\subsystems\processing\nanoui.dm"
 #include "code\controllers\subsystems\processing\ntsl2.dm"
+#include "code\controllers\subsystems\processing\overmap.dm"
 #include "code\controllers\subsystems\processing\processing.dm"
 #include "code\controllers\subsystems\processing\projectiles.dm"
 #include "code\controllers\subsystems\processing\psi.dm"
diff --git a/code/__defines/subsystem-priority.dm b/code/__defines/subsystem-priority.dm
index 77c32409c16..350c7ce35d9 100644
--- a/code/__defines/subsystem-priority.dm
+++ b/code/__defines/subsystem-priority.dm
@@ -41,6 +41,7 @@
 //#define SS_PRIORITY_DEFAULT  50	// This is defined somewhere else.
 #define SS_PRIORITY_TIMER      20	// Timed event scheduling. This is important.
 #define SS_PRIORITY_PROFILE    15
+#define SS_PRIORITY_OVERMAP    12   // Handles overmap processing. Keeps things smooth during highpop, ideally.
 #define SS_PRIORITY_SMOOTHING  10	// Smooth turf generation.
 #define SS_PRIORITY_ORBIT       5	// Orbit datum updates.
 #define SS_PRIORITY_ICON_UPDATE 5	// Queued icon updates. Mostly used by APCs and tables.
diff --git a/code/controllers/subsystems/processing/overmap.dm b/code/controllers/subsystems/processing/overmap.dm
new file mode 100644
index 00000000000..3005f5c126a
--- /dev/null
+++ b/code/controllers/subsystems/processing/overmap.dm
@@ -0,0 +1,11 @@
+var/datum/controller/subsystem/processing/overmap/SSovermap
+
+/datum/controller/subsystem/processing/overmap
+	name = "Overmap"
+	stat_tag = "OVRM"
+	priority = SS_PRIORITY_OVERMAP
+	flags = SS_TICKER|SS_NO_INIT
+	wait = 7
+
+/datum/controller/subsystem/processing/overmap/New()
+	NEW_SS_GLOBAL(SSovermap)
diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm
index eef02bc8703..a4483848f87 100644
--- a/code/modules/overmap/sectors.dm
+++ b/code/modules/overmap/sectors.dm
@@ -63,7 +63,7 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
 
 	LAZYADD(SSshuttle.sectors_to_initialize, src) //Queued for further init. Will populate the waypoint lists; waypoints not spawned yet will be added in as they spawn.
 	SSshuttle.clear_init_queue()
-	START_PROCESSING(SSprocessing, src)
+	START_PROCESSING(SSovermap, src)
 
 /obj/effect/overmap/visitable/process()
 	if(get_dist(src, targeting) > 7)
@@ -85,7 +85,7 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
 	targeting = null
 	levi_safeguard = null
 	gravity_generator = null
-	STOP_PROCESSING(SSprocessing, src)
+	STOP_PROCESSING(SSovermap, src)
 	. = ..()
 
 //This is called later in the init order by SSshuttle to populate sector objects. Importantly for subtypes, shuttles will be created by then.
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index e32d2284fc3..2513be6f1a8 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -155,7 +155,7 @@
 /obj/machinery/computer/ship/helm/proc/get_eta()
 	var/ETA = connected.ETA()
 	if(ETA && connected.get_speed())
-		return "[round(ETA/10)] seconds"
+		return "[round(ETA/7)] seconds"
 	else
 		return "N/A"
 
diff --git a/html/changelogs/mattatlas-dejavu.yml b/html/changelogs/mattatlas-dejavu.yml
new file mode 100644
index 00000000000..929cd68f456
--- /dev/null
+++ b/html/changelogs/mattatlas-dejavu.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - experiment: "Overmap processing is now on a priority subsystem. This means that ships will now be REALLY fast, and should keep being fast even when the server is lagging."