diff --git a/arch/x86_32/kernel.s b/arch/x86_32/kernel.s
index 3f00a70..8aaec8f 100644
--- a/arch/x86_32/kernel.s
+++ b/arch/x86_32/kernel.s
@@ -32,7 +32,7 @@
 [extern ArchNextTimer]
 [extern InterruptHandler]
 [extern KThreadTerminate]
-[extern KernelMain]
+[extern KernelInitialise]
 [extern PostContextSwitch]
 [extern SetupProcessor2]
 [extern Syscall]
@@ -149,12 +149,12 @@ _start:
 %assign i i+1
 %endrep
 
-	; Setup the remaining things and call KernelMain.
+	; Setup the remaining things and call KernelInitialise
 	call	SetupProcessor1 ; Need to get SSE up before calling into C code.
 	call	PCSetupCOM1
 	call	PCDisablePIC
 	call	PCProcessMemoryMap
-	call	KernelMain
+	call	KernelInitialise
 
 	; Fall-through.
 ProcessorReady:
diff --git a/arch/x86_64/kernel.s b/arch/x86_64/kernel.s
index a2bcdb5..5edf8b0 100644
--- a/arch/x86_64/kernel.s
+++ b/arch/x86_64/kernel.s
@@ -45,7 +45,7 @@
 [extern ArchNextTimer]
 [extern InterruptHandler]
 [extern KThreadTerminate]
-[extern KernelMain]
+[extern KernelInitialise]
 [extern PostContextSwitch]
 [extern SetupProcessor2]
 [extern Syscall]
@@ -157,9 +157,9 @@ _start:
 	; First stage of processor initilisation
 	call	SetupProcessor1
 
-	; Call the KernelMain function
+	; Call the KernelInitialise function
 	and	rsp,~0xF
-	call	KernelMain
+	call	KernelInitialise
 
 ProcessorReady:
 	; Set the timer and become this CPU's idle thread.
diff --git a/drivers/acpi.cpp b/drivers/acpi.cpp
index 4a07e01..8d42bd2 100644
--- a/drivers/acpi.cpp
+++ b/drivers/acpi.cpp
@@ -324,8 +324,8 @@ CPULocalStorage *KGetCPULocal(uintptr_t index) {
 #ifdef USE_ACPICA
 #include "acpica.cpp"
 #else
-void ArchShutdown(uintptr_t action) {
-	if (action == SHUTDOWN_ACTION_RESTART) ProcessorReset();
+void ArchShutdown() {
+	if (shutdownAction == SHUTDOWN_ACTION_RESTART) ProcessorReset();
 	StartDebugOutput();
 	EsPrint("\nIt's now safe to turn off your computer.\n");
 	ProcessorDisableInterrupts();
diff --git a/drivers/acpica.cpp b/drivers/acpica.cpp
index 0a47b24..4726d05 100644
--- a/drivers/acpica.cpp
+++ b/drivers/acpica.cpp
@@ -591,8 +591,8 @@ ACPI_STATUS ACPIWalkNamespaceCallback(ACPI_HANDLE object, uint32_t depth, void *
 	return AE_OK;
 }
 
-void ArchShutdown(uintptr_t action) {
-	if (action == SHUTDOWN_ACTION_RESTART) ProcessorReset();
+void ArchShutdown() {
+	if (shutdownAction == SHUTDOWN_ACTION_RESTART) ProcessorReset();
 	AcpiEnterSleepStatePrep(5);
 	ProcessorDisableInterrupts();
 	AcpiEnterSleepState(5);
diff --git a/kernel/kernel.h b/kernel/kernel.h
index 8250bb9..7c89fbd 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -101,8 +101,8 @@ struct PhysicalMemoryRegion {
 	uint64_t pageCount;
 };
 
-void KernelInitialise();
-void KernelShutdown(uintptr_t action);
+extern "C" void KernelInitialise();
+void KernelMain(uintptr_t);
 
 uintptr_t DoSyscall(EsSyscallType index,
 		uintptr_t argument0, uintptr_t argument1, uintptr_t argument2, uintptr_t argument3,
@@ -110,6 +110,8 @@ uintptr_t DoSyscall(EsSyscallType index,
 
 uint64_t timeStampTicksPerMs;
 EsUniqueIdentifier installationID; // The identifier of this OS installation, given to us by the bootloader.
+KEvent shutdownEvent;
+uintptr_t shutdownAction;
 
 // ---------------------------------------------------------------------------------------------------------------
 // Architecture specific layer definitions.
@@ -117,7 +119,7 @@ EsUniqueIdentifier installationID; // The identifier of this OS installation, gi
 
 extern "C" {
 	void ArchInitialise();
-	void ArchShutdown(uintptr_t action);
+	void ArchShutdown();
 	void ArchNextTimer(size_t ms); // Schedule the next TIMER_INTERRUPT.
 	uint64_t ArchGetTimeMs(); // Called by the scheduler on the boot processor every context switch.
 	InterruptContext *ArchInitialiseThread(uintptr_t kernelStack, uintptr_t kernelStackSize, struct Thread *thread, 
diff --git a/kernel/main.cpp b/kernel/main.cpp
index 5ba3a5a..4474956 100644
--- a/kernel/main.cpp
+++ b/kernel/main.cpp
@@ -9,22 +9,21 @@
 #define IMPLEMENTATION
 #include "kernel.h"
 
-extern "C" void KernelMain() {										
+void KernelInitialise() {										
 	kernelProcess = scheduler.SpawnProcess(PROCESS_KERNEL);		// Spawn the kernel process.
+	MMInitialise();							// Initialise the memory manager.
+	KThreadCreate("KernelMain", KernelMain);			// Create the KernelMain thread.
 	ArchInitialise(); 						// Start processors and initialise CPULocalStorage. 
 	scheduler.started = true;					// Start the pre-emptive scheduler.
-	// Continues in KernelInitialise.
 }
 
-void KernelInitialise() {						
+void KernelMain(uintptr_t) {
 	desktopProcess = scheduler.SpawnProcess(PROCESS_DESKTOP);	// Spawn the desktop process.
 	DriversInitialise();						// Load the root device.
 	desktopProcess->Start(EsLiteral(K_DESKTOP_EXECUTABLE));		// Start the desktop process.
-}
-
-void KernelShutdown(uintptr_t action) {
+	KEventWait(&shutdownEvent, ES_WAIT_NO_TIMEOUT);			// Wait for a shutdown request.
 	scheduler.Shutdown();						// Kill user processes.
 	FSShutdown();							// Flush file cache and unmount filesystems.
 	DriversShutdown();						// Inform drivers of shutdown.
-	ArchShutdown(action);						// Power off or restart the computer. 
+	ArchShutdown();							// Power off or restart the computer. 
 }
diff --git a/kernel/scheduler.cpp b/kernel/scheduler.cpp
index 31106b4..725b620 100644
--- a/kernel/scheduler.cpp
+++ b/kernel/scheduler.cpp
@@ -771,8 +771,6 @@ Process *Scheduler::SpawnProcess(ProcessType processType) {
 	if (processType == PROCESS_KERNEL) {
 		EsCRTstrcpy(process->cExecutableName, "Kernel");
 		scheduler.allProcesses.InsertEnd(&process->allItem);
-		MMInitialise();								
-		scheduler.SpawnThread("InitKernel", (uintptr_t) KernelInitialise);
 	}
 
 	return process; 
@@ -1370,9 +1368,7 @@ void Scheduler::Yield(InterruptContext *context) {
 }
 
 void Scheduler::Shutdown() {
-	// Prevent the creation of new proceses or threads,
-	// or terminate this thread if we're already shutting down.
-	if (__sync_val_compare_and_swap(&scheduler.shutdown, false, true)) KThreadTerminate();
+	scheduler.shutdown = true;
 
 	// Close our handle to the desktop process.
 	CloseHandleToObject(desktopProcess->executableMainThread, KERNEL_OBJECT_THREAD);
diff --git a/kernel/symbols.cpp b/kernel/symbols.cpp
index af20c53..d21fc13 100644
--- a/kernel/symbols.cpp
+++ b/kernel/symbols.cpp
@@ -4,7 +4,7 @@
 extern "C" int EsStringCompareRaw(const char *s1, size_t b1, const char *s2, size_t b2);
 void EsPrint(const char *format, ...);
 
-extern "C" void KernelMain();
+extern "C" void KernelInitialise();
 extern "C" void ProcessorHalt();
 
 struct ExportedKernelFunction {
@@ -27,7 +27,7 @@ void *ResolveKernelSymbol(const char *name, size_t nameBytes) {
 		// As we get the function addresses before the kernel is linked (this file needs to be linked with the kernel),
 		// they are relative to wherever the kernel_all.o's text is placed in the executable's text section.
 
-		uintptr_t offset = (uintptr_t) ResolveKernelSymbol("KernelMain", 10) - (uintptr_t) KernelMain;
+		uintptr_t offset = (uintptr_t) ResolveKernelSymbol("KernelInitialise", 10) - (uintptr_t) KernelInitialise;
 
 		for (uintptr_t i = 0; i < sizeof(exportedKernelFunctions) / sizeof(exportedKernelFunctions[0]); i++) {
 			exportedKernelFunctions[i].address = (void *) ((uintptr_t) exportedKernelFunctions[i].address - offset);
diff --git a/kernel/syscall.cpp b/kernel/syscall.cpp
index e0acf54..8939895 100644
--- a/kernel/syscall.cpp
+++ b/kernel/syscall.cpp
@@ -1223,7 +1223,8 @@ SYSCALL_IMPLEMENT(ES_SYSCALL_PROCESS_GET_STATE) {
 
 SYSCALL_IMPLEMENT(ES_SYSCALL_SHUTDOWN) {
 	SYSCALL_PERMISSION(ES_PERMISSION_SHUTDOWN);
-	KThreadCreate("Shutdown", [] (uintptr_t action) { KernelShutdown(action); }, argument0);
+	shutdownAction = argument0;
+	KEventSet(&shutdownEvent, false, true);
 	SYSCALL_RETURN(ES_SUCCESS, false);
 }