Merged in MHR-23 (pull request #14)

Draft: MHR-23

15 files changed, 124 insertions, 91 deletions

diff --git a/Kernel/Sources/AppMain.cxx b/Kernel/Sources/AppMain.cxx
index 9ca224c3..62795893 100644
--- a/Kernel/Sources/AppMain.cxx
+++ b/Kernel/Sources/AppMain.cxx
@@ -16,7 +16,7 @@
 #include <KernelKit/KernelHeap.hpp>
 #include <KernelKit/PEF.hpp>
 #include <KernelKit/PEFCodeManager.hxx>
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <KernelKit/UserHeap.hpp>
 #include <NewKit/Json.hpp>
 #include <NewKit/KernelCheck.hpp>
@@ -182,31 +182,31 @@ namespace NewOS::Detail
 	/// @brief System loader entrypoint.
 	/// @param void no parameters.
 	/// @return void no return value.
-	STATIC NewOS::Void AppSystemLoader(NewOS::Void)
+	STATIC NewOS::Void AppSystem(NewOS::Void)
 	{
-		NewOS::PEFLoader coreGraphicsShLib("/System/WindowServer");
+		NewOS::PEFLoader wndServer("/System/WindowServer");
 
-		if (!coreGraphicsShLib.IsLoaded())
+		if (!wndServer.IsLoaded())
 		{
 			NewOS::ke_stop(RUNTIME_CHECK_FAILED);
 		}
 
-		NewOS::Utils::execute_from_image(coreGraphicsShLib,
-										 NewOS::ProcessHeader::kLibKind);
+		NewOS::Utils::execute_from_image(wndServer,
+										 NewOS::ProcessHeader::kAppKind);
 
-		NewOS::PEFLoader logonService("/System/Login");
+		NewOS::PEFLoader launchServer("/System/Launcher");
 
-		if (!logonService.IsLoaded())
+		if (!launchServer.IsLoaded())
 		{
 			NewOS::ke_stop(RUNTIME_CHECK_FAILED);
 		}
 
-		NewOS::Utils::execute_from_image(logonService,
+		NewOS::Utils::execute_from_image(launchServer,
 										 NewOS::ProcessHeader::kAppKind);
 
-		NewOS::kcout << "SystemLoader: Exiting process, we're done initializing stuff...";
+		NewOS::kcout << "System: done, sleeping...";
 
-		NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Exit(0);
+		while (true) {}
 	}
 } // namespace NewOS::Detail
 
@@ -218,8 +218,8 @@ EXTERN_C NewOS::Void AppMain(NewOS::Void)
 	/// Now run kernel loop, until no process are running.
 	NewOS::Detail::FilesystemWizard wizard; // automatic.
 
-	auto cLoaderName = "SystemLoader";
-	NewOS::execute_from_image(NewOS::Detail::AppSystemLoader, cLoaderName);
+	auto cLoaderName = "System";
+	NewOS::execute_from_image(NewOS::Detail::AppSystem, cLoaderName);
 
-	while (NewOS::ProcessScheduler::Shared().Leak().Run() > 0) {}
+	while (NewOS::ProcessScheduler::The().Leak().Run() > 0) {}
 }
diff --git a/Kernel/Sources/CodeManager.cxx b/Kernel/Sources/CodeManager.cxx
index 358481f6..10de3512 100644
--- a/Kernel/Sources/CodeManager.cxx
+++ b/Kernel/Sources/CodeManager.cxx
@@ -6,7 +6,7 @@
 
 #include <NewKit/Utils.hpp>
 #include <KernelKit/CodeManager.hpp>
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 
 namespace NewOS
 {
@@ -25,6 +25,6 @@ namespace NewOS
 
 		Ref<ProcessHeader> refProc = proc;
 
-		return ProcessScheduler::Shared().Leak().Add(refProc);
+		return ProcessScheduler::The().Leak().Add(refProc);
 	}
 } // namespace NewOS
\ No newline at end of file
diff --git a/Kernel/Sources/CxxAbi.cxx b/Kernel/Sources/CxxAbi.cxx
index 9aea8db7..0b01928a 100644
--- a/Kernel/Sources/CxxAbi.cxx
+++ b/Kernel/Sources/CxxAbi.cxx
@@ -14,7 +14,7 @@ uarch_t __atexit_func_count;
 
 extern "C" void __cxa_pure_virtual()
 {
-	NewOS::kcout << "New OS: C++ placeholder method.\n";
+	NewOS::kcout << "newoskrnl: C++ placeholder method.\n";
 }
 
 extern "C" void ___chkstk_ms()
diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx
index 6f19c8ed..a60fc228 100644
--- a/Kernel/Sources/FS/NewFS.cxx
+++ b/Kernel/Sources/FS/NewFS.cxx
@@ -46,7 +46,7 @@ _Output NewFork* NewFSParser::CreateFork(_Input NewCatalog* catalog,
 		Lba lba = (theFork.Kind == kNewFSDataForkKind) ? catalog->DataFork
 													   : catalog->ResourceFork;
 
-		kcout << "Fork Lba: " << hex_number(lba) << endl;
+		kcout << "newoskrnl: fork lba: " << hex_number(lba) << endl;
 
 		if (lba <= kNewFSCatalogStartAddress)
 			return nullptr;
@@ -73,11 +73,11 @@ _Output NewFork* NewFSParser::CreateFork(_Input NewCatalog* catalog,
 
 			drv->fInput(&drv->fPacket);
 
-			kcout << "New OS: Next-Fork: " << hex_number(curFork.NextSibling) << endl;
+			kcout << "newoskrnl: Next-Fork: " << hex_number(curFork.NextSibling) << endl;
 
 			if (curFork.Flags == kNewFSFlagCreated)
 			{
-				kcout << "New OS: Fork already exists.\r";
+				kcout << "newoskrnl: Fork already exists.\r";
 
 				/// sanity check.
 				if (StringBuilder::Equals(curFork.ForkName, theFork.ForkName) &&
@@ -126,10 +126,10 @@ _Output NewFork* NewFSParser::CreateFork(_Input NewCatalog* catalog,
 		drv->fOutput(&drv->fPacket);
 
 		/// log what we have now.
-		kcout << "New OS: Wrote fork data at: " << hex_number(theFork.DataOffset)
+		kcout << "newoskrnl: Wrote fork data at: " << hex_number(theFork.DataOffset)
 			  << endl;
 
-		kcout << "New OS: Wrote fork at: " << hex_number(lba) << endl;
+		kcout << "newoskrnl: Wrote fork at: " << hex_number(lba) << endl;
 
 		return &theFork;
 	}
@@ -372,9 +372,9 @@ _Output NewCatalog* NewFSParser::CreateCatalog(_Input const char*  name,
 
 			drive->fOutput(&drive->fPacket);
 
-			kcout << "New OS: Create new catalog, status: "
+			kcout << "newoskrnl: Create new catalog, status: "
 				  << hex_number(catalogChild->Flags) << endl;
-			kcout << "New OS: Create new catalog, status: " << catalogChild->Name
+			kcout << "newoskrnl: Create new catalog, status: " << catalogChild->Name
 				  << endl;
 
 			drive->fPacket.fPacketContent = sectorBufPartBlock;
@@ -449,7 +449,7 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive)
 
 			partBlock->Version = kNewFSVersionInteger;
 
-			const auto cUntitledHD = "New OS HD\0";
+			const auto cUntitledHD = "newoskrnl HD\0";
 
 			rt_copy_memory((VoidPtr)kNewFSIdent, (VoidPtr)partBlock->Ident,
 						   kNewFSIdentLen);
@@ -475,14 +475,14 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive)
 
 			drive->fOutput(&drive->fPacket);
 
-			kcout << "Drive-Kind: " << drive->fDriveKind() << endl;
+			kcout << "newoskrnl: drive kind: " << drive->fDriveKind() << endl;
 
-			kcout << "Partition-Name: " << partBlock->PartitionName << endl;
-			kcout << "Start-Catalog: " << hex_number(partBlock->StartCatalog) << endl;
-			kcout << "Catalog-Count: " << hex_number(partBlock->CatalogCount) << endl;
-			kcout << "Free-Catalog: " << hex_number(partBlock->FreeCatalog) << endl;
-			kcout << "Free-Sectors: " << hex_number(partBlock->FreeSectors) << endl;
-			kcout << "Sector-Size: " << hex_number(partBlock->SectorSize) << endl;
+			kcout << "newoskrnl: partition name: " << partBlock->PartitionName << endl;
+			kcout << "newoskrnl: start: " << hex_number(partBlock->StartCatalog) << endl;
+			kcout << "newoskrnl: number of catalogs: " << hex_number(partBlock->CatalogCount) << endl;
+			kcout << "newoskrnl: free catalog: " << hex_number(partBlock->FreeCatalog) << endl;
+			kcout << "newoskrnl: free sectors: " << hex_number(partBlock->FreeSectors) << endl;
+			kcout << "newoskrnl: sector size: " << hex_number(partBlock->SectorSize) << endl;
 
 			/// write the root catalog.
 			this->CreateCatalog(kNewFSRoot, 0, kNewFSCatalogKindDir);
@@ -490,7 +490,7 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive)
 			return true;
 		}
 
-		kcout << "New OS: PartitionBlock already exists.\r";
+		kcout << "newoskrnl: PartitionBlock already exists.\r";
 
 		/// return success as well, do not ignore that partition.
 		return true;
@@ -531,14 +531,14 @@ bool NewFSParser::WriteCatalog(_Input _Output NewCatalog* catalog, voidPtr data,
 
 		drive->fInput(&drive->fPacket);
 
-		kcout << "Fork-Name: " << forkData->ForkName << endl;
+		kcout << "newoskrnl: forkName: " << forkData->ForkName << endl;
 
 		/// sanity check the fork.
 		if (forkData->DataOffset <= kNewFSCatalogStartAddress)
 		{
 			DbgLastError() = kErrorDiskIsCorrupted;
 
-			kcout << "New OS: Invalid fork offset.\r";
+			kcout << "newoskrnl: Invalid fork offset.\r";
 
 			delete forkData;
 			return false;
@@ -552,7 +552,8 @@ bool NewFSParser::WriteCatalog(_Input _Output NewCatalog* catalog, voidPtr data,
 			drive->fPacket.fPacketContent = data;
 			drive->fPacket.fPacketSize	  = sizeOfData;
 			drive->fPacket.fLba			  = forkData->DataOffset;
-			kcout << "Fork-Offset: " << hex_number(forkData->DataOffset) << endl;
+
+			kcout << "newoskrnl: data offset: " << hex_number(forkData->DataOffset) << endl;
 
 			drive->fOutput(&drive->fPacket);
 
@@ -563,10 +564,12 @@ bool NewFSParser::WriteCatalog(_Input _Output NewCatalog* catalog, voidPtr data,
 				 catalog == nullptr)
 		{
 			delete catalog;
+
 			drive->fPacket.fPacketContent = data;
 			drive->fPacket.fPacketSize	  = sizeOfData;
 			drive->fPacket.fLba			  = forkData->DataOffset;
-			kcout << "Fork-Offset: " << hex_number(forkData->DataOffset) << endl;
+
+			kcout << "newoskrnl: data offset: " << hex_number(forkData->DataOffset) << endl;
 
 			drive->fOutput(&drive->fPacket);
 
@@ -670,7 +673,7 @@ _NewFSSearchThroughCatalogList:
 			NewCatalog* catalogPtr = new NewCatalog();
 			rt_copy_memory(catalog, catalogPtr, sizeof(NewCatalog));
 
-			kcout << "New OS: Found catalog at: " << hex_number(startCatalogList) << endl;
+			kcout << "newoskrnl: found catalog at: " << hex_number(startCatalogList) << endl;
 
 			outLba = startCatalogList;
 			delete[] sectorBuf;
@@ -809,8 +812,8 @@ VoidPtr NewFSParser::ReadCatalog(_Input _Output NewCatalog* catalog,
 	Lba	 dataForkLba  = catalog->DataFork;
 	Size dataForkSize = catalog->DataForkSize;
 
-	kcout << "Found-Catalog: " << catalog->Name
-		  << ", Data-Fork: " << hex_number(dataForkLba) << endl;
+	kcout << "newoskrnl: catalog " << catalog->Name
+		  << ", fork: " << hex_number(dataForkLba) << endl;
 
 	Char* sectorBuf = new Char[sizeof(NewFork)];
 	auto  drive		= sMountpointInterface.GetAddressOf(this->fDriveIndex);
@@ -830,7 +833,7 @@ VoidPtr NewFSParser::ReadCatalog(_Input _Output NewCatalog* catalog,
 
 		forkData = (NewFork*)sectorBuf;
 
-		kcout << "Fork-Name: " << forkData->ForkName << endl;
+		kcout << "newoskrnl: name: " << forkData->ForkName << endl;
 
 		if (forkData->DataOffset <= kNewFSCatalogStartAddress)
 		{
@@ -930,11 +933,11 @@ namespace NewOS::Detail
 
 		if (!StringBuilder::Equals(partBlock->Ident, kNewFSIdent))
 		{
-			kcout << "New OS: New FS Partition is corrupt.\r";
+			kcout << "newoskrnl: New FS Partition is corrupt.\r";
 			return false;
 		}
 
-		kcout << "New OS: Read partition: " << partBlock->PartitionName << ", with success!\r";
+		kcout << "newoskrnl: Read partition: " << partBlock->PartitionName << ", with success!\r";
 
 		return true;
 	}
diff --git a/Kernel/Sources/IndexableProperty.cxx b/Kernel/Sources/IndexableProperty.cxx
index 16694f52..6c773b9a 100644
--- a/Kernel/Sources/IndexableProperty.cxx
+++ b/Kernel/Sources/IndexableProperty.cxx
@@ -50,7 +50,7 @@ namespace NewOS
 				indexer.AddFlag(kIndexerClaimed);
 				rt_copy_memory((VoidPtr)indexer.LeakProperty().Path, (VoidPtr)filename, filenameLen);
 
-				kcout << "New OS: FSKit: index new file: " << filename << endl;
+				kcout << "newoskrnl: FSKit: index new file: " << filename << endl;
 			}
 		}
 	} // namespace Indexer
diff --git a/Kernel/Sources/KernelCheck.cxx b/Kernel/Sources/KernelCheck.cxx
index b59417d4..6b355011 100644
--- a/Kernel/Sources/KernelCheck.cxx
+++ b/Kernel/Sources/KernelCheck.cxx
@@ -98,8 +98,8 @@ namespace NewOS
 		if (!expr)
 		{
 #ifdef __DEBUG__
-			kcout << "New Kernel: File: " << file << "\r";
-			kcout << "New Kernel: Line: " << line << "\r";
+			kcout << "newoskrnl: File: " << file << "\r";
+			kcout << "newoskrnl: Line: " << line << "\r";
 
 #endif // __DEBUG__
 
diff --git a/Kernel/Sources/KernelHeap.cxx b/Kernel/Sources/KernelHeap.cxx
index a8ca467e..93f0c164 100644
--- a/Kernel/Sources/KernelHeap.cxx
+++ b/Kernel/Sources/KernelHeap.cxx
@@ -38,7 +38,10 @@ namespace NewOS
 			SizeT fTargetPtrSize;
 			/// @brief 64-bit target pointer.
 			UIntPtr fTargetPtr;
-			UInt8	fPadding[kKernelHeapHeaderPaddingSz];
+			/// @brief Is this a page pointer?
+			Boolean fPagePtr;
+			/// @brief Padding bytes for header.
+			UInt8 fPadding[kKernelHeapHeaderPaddingSz];
 		};
 
 		typedef HeapInformationBlock* HeapInformationBlockPtr;
@@ -64,6 +67,7 @@ namespace NewOS
 		heapInfo->fMagic		 = kKernelHeapMagic;
 		heapInfo->fCRC32		 = 0; // dont fill it for now.
 		heapInfo->fTargetPtr	 = wrapper.VirtualAddress();
+		heapInfo->fPagePtr		 = 0;
 
 		++kHeapCount;
 
@@ -71,6 +75,27 @@ namespace NewOS
 										 sizeof(Detail::HeapInformationBlock));
 	}
 
+	/// @brief Makes a page heap.
+	/// @param heapPtr 
+	/// @return 
+	Int32 ke_make_ke_page(VoidPtr heapPtr)
+	{
+		if (kHeapCount < 1)
+			return -kErrorInternal;
+		if (((IntPtr)heapPtr - sizeof(Detail::HeapInformationBlock)) <= 0)
+			return -kErrorInternal;
+		if (((IntPtr)heapPtr - kBadPtr) < 0)
+			return -kErrorInternal;
+
+		Detail::HeapInformationBlockPtr virtualAddress =
+			reinterpret_cast<Detail::HeapInformationBlockPtr>(
+				(UIntPtr)heapPtr - sizeof(Detail::HeapInformationBlock));
+
+		virtualAddress->fPagePtr = 1;
+
+		return 0;
+	}
+
 	/// @brief Declare pointer as free.
 	/// @param heapPtr the pointer.
 	/// @return
diff --git a/Kernel/Sources/PEFCodeManager.cxx b/Kernel/Sources/PEFCodeManager.cxx
index 6fa7e6a1..a84730e9 100644
--- a/Kernel/Sources/PEFCodeManager.cxx
+++ b/Kernel/Sources/PEFCodeManager.cxx
@@ -8,7 +8,7 @@
 #include <KernelKit/FileManager.hpp>
 #include <KernelKit/KernelHeap.hpp>
 #include <KernelKit/PEFCodeManager.hxx>
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <NewKit/Defines.hpp>
 #include <NewKit/KernelCheck.hpp>
 #include <NewKit/OwnPtr.hpp>
@@ -195,7 +195,7 @@ namespace NewOS
 
 			proc.Kind = procKind;
 
-			return ProcessScheduler::Shared().Leak().Add(refProc);
+			return ProcessScheduler::The().Leak().Add(refProc);
 		}
 	} // namespace Utils
 
diff --git a/Kernel/Sources/PEFSharedObjectRT.cxx b/Kernel/Sources/PEFSharedObject.cxx
index 20af1b98..06825a3c 100644
--- a/Kernel/Sources/PEFSharedObjectRT.cxx
+++ b/Kernel/Sources/PEFSharedObject.cxx
@@ -10,7 +10,7 @@
 #include <KernelKit/DebugOutput.hpp>
 #include <KernelKit/PEF.hpp>
 #include <KernelKit/PEFSharedObject.hxx>
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <KernelKit/ThreadLocalStorage.hxx>
 #include <NewKit/Defines.hpp>
 
@@ -41,7 +41,7 @@ EXTERN_C SharedObjectPtr rt_library_init(void)
 
 	if (!library)
 	{
-		ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
+		ProcessScheduler::The().Leak().GetCurrent().Leak().Crash();
 
 		return nullptr;
 	}
@@ -50,17 +50,17 @@ EXTERN_C SharedObjectPtr rt_library_init(void)
 
 	if (!library->Get())
 	{
-		ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
+		ProcessScheduler::The().Leak().GetCurrent().Leak().Crash();
 
 		return nullptr;
 	}
 
 	library->Get()->fImageObject =
-		ProcessScheduler::Shared().Leak().GetCurrent().Leak().Image;
+		ProcessScheduler::The().Leak().GetCurrent().Leak().Image;
 
 	if (!library->Get()->fImageObject)
 	{
-		ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
+		ProcessScheduler::The().Leak().GetCurrent().Leak().Crash();
 
 		return nullptr;
 	}
@@ -85,7 +85,7 @@ EXTERN_C Void rt_library_free(SharedObjectPtr lib, bool* successful)
 	if (lib == nullptr)
 	{
 		*successful = false;
-		ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
+		ProcessScheduler::The().Leak().GetCurrent().Leak().Crash();
 	}
 
 	delete lib->Get();
@@ -102,6 +102,5 @@ EXTERN_C Void rt_library_free(SharedObjectPtr lib, bool* successful)
 /// @param
 EXTERN_C void __mh_purecall(void)
 {
-	ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
-	return;
+	kcout << "newoskrnl: unimplemented symbol!\r";
 }
diff --git a/Kernel/Sources/ProcessScheduler.cxx b/Kernel/Sources/ProcessScheduler.cxx
index 1e4537f1..bf088cc6 100644
--- a/Kernel/Sources/ProcessScheduler.cxx
+++ b/Kernel/Sources/ProcessScheduler.cxx
@@ -9,7 +9,7 @@
 /// @brief MicroKernel process scheduler.
 /***********************************************************************************/
 
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <KernelKit/SMPManager.hpp>
 #include <KernelKit/KernelHeap.hpp>
 #include <NewKit/String.hpp>
@@ -42,7 +42,7 @@ namespace NewOS
 
 	void ProcessHeader::Crash()
 	{
-		kcout << this->Name << ": crashed. (id = " << number(39);
+		kcout << this->Name << ": crashed. (id = " << number(kErrorProcessFault);
 		kcout << ")\r";
 
 		if (this->Ring != kRingUserKind)
@@ -163,11 +163,11 @@ namespace NewOS
 	void ProcessHeader::Exit(Int32 exit_code)
 	{
 		if (this->ProcessId !=
-			ProcessScheduler::Shared().Leak().GetCurrent().Leak().ProcessId)
+			ProcessScheduler::The().Leak().GetCurrent().Leak().ProcessId)
 			ke_stop(RUNTIME_CHECK_PROCESS);
 
 		if (this->Ring == (Int32)ProcessSelector::kRingKernel &&
-			ProcessScheduler::Shared().Leak().GetCurrent().Leak().Ring > 0)
+			ProcessScheduler::The().Leak().GetCurrent().Leak().Ring > 0)
 			ke_stop(RUNTIME_CHECK_PROCESS);
 
 		kLastExitCode = exit_code;
@@ -193,7 +193,7 @@ namespace NewOS
 		this->Image		 = nullptr;
 		this->StackFrame = nullptr;
 
-		ProcessScheduler::Shared().Leak().Remove(this->ProcessId);
+		ProcessScheduler::The().Leak().Remove(this->ProcessId);
 	}
 
 	/// @brief Add process to list.
@@ -206,7 +206,7 @@ namespace NewOS
 
 		if (!process.Leak().Image)
 		{
-			if (process.Leak().Kind != ProcessHeader::kLibKind)
+			if (process.Leak().Kind != ProcessHeader::kShLibKind)
 			{
 				return -kErrorNoEntrypoint;
 			}
@@ -223,7 +223,7 @@ namespace NewOS
 		/// Create heap according to type of process.
 		if (process.Leak().Kind == ProcessHeader::kAppKind)
 			process.Leak().HeapPtr = rt_new_heap(kUserHeapUser | kUserHeapRw);
-		else if (process.Leak().Kind == ProcessHeader::kLibKind)
+		else if (process.Leak().Kind == ProcessHeader::kShLibKind)
 			process.Leak().HeapPtr = rt_new_heap(kUserHeapUser | kUserHeapRw | kUserHeapShared);
 		else
 			process.Leak().HeapPtr = rt_new_heap(kUserHeapDriver | kUserHeapRw);
@@ -301,7 +301,7 @@ namespace NewOS
 
 	/// @brief Shared instance of the process scheduler.
 	/// @return
-	Ref<ProcessScheduler&> ProcessScheduler::Shared()
+	Ref<ProcessScheduler&> ProcessScheduler::The()
 	{
 		static ProcessScheduler ref;
 		return {ref};
@@ -319,7 +319,7 @@ namespace NewOS
 	PID& ProcessHelper::GetCurrentPID()
 	{
 		kcout << "ProcessHelper::GetCurrentPID: Leaking ProcessId...\r";
-		return ProcessScheduler::Shared().Leak().GetCurrent().Leak().ProcessId;
+		return ProcessScheduler::The().Leak().GetCurrent().Leak().ProcessId;
 	}
 
 	/// @brief Check if process can be schedulded.
@@ -355,13 +355,13 @@ namespace NewOS
 	bool ProcessHelper::StartScheduling()
 	{
 		if (ProcessHelper::CanBeScheduled(
-				ProcessScheduler::Shared().Leak().GetCurrent()))
+				ProcessScheduler::The().Leak().GetCurrent()))
 		{
-			--ProcessScheduler::Shared().Leak().GetCurrent().Leak().PTime;
+			--ProcessScheduler::The().Leak().GetCurrent().Leak().PTime;
 			return false;
 		}
 
-		auto processRef = ProcessScheduler::Shared().Leak();
+		auto processRef = ProcessScheduler::The().Leak();
 
 		if (!processRef)
 			return false; // we have nothing to schedule. simply return.
@@ -385,29 +385,29 @@ namespace NewOS
 		if (!the_stack || new_pid < 0)
 			return false;
 
-		for (SizeT index = 0UL; index < SMPManager::Shared().Leak().Count(); ++index)
+		for (SizeT index = 0UL; index < SMPManager::The().Leak().Count(); ++index)
 		{
-			if (SMPManager::Shared().Leak()[index].Leak().Kind() == kInvalidHart)
+			if (SMPManager::The().Leak()[index].Leak().Kind() == kInvalidHart)
 				continue;
 
-			if (SMPManager::Shared().Leak()[index].Leak().StackFrame() == the_stack)
+			if (SMPManager::The().Leak()[index].Leak().StackFrame() == the_stack)
 			{
-				SMPManager::Shared().Leak()[index].Leak().Busy(false);
+				SMPManager::The().Leak()[index].Leak().Busy(false);
 				continue;
 			}
 
-			if (SMPManager::Shared().Leak()[index].Leak().IsBusy())
+			if (SMPManager::The().Leak()[index].Leak().IsBusy())
 				continue;
 
-			if (SMPManager::Shared().Leak()[index].Leak().Kind() !=
+			if (SMPManager::The().Leak()[index].Leak().Kind() !=
 					ThreadKind::kHartBoot &&
-				SMPManager::Shared().Leak()[index].Leak().Kind() !=
+				SMPManager::The().Leak()[index].Leak().Kind() !=
 					ThreadKind::kHartSystemReserved)
 			{
-				SMPManager::Shared().Leak()[index].Leak().Busy(true);
+				SMPManager::The().Leak()[index].Leak().Busy(true);
 				ProcessHelper::GetCurrentPID() = new_pid;
 
-				return SMPManager::Shared().Leak()[index].Leak().Switch(the_stack);
+				return SMPManager::The().Leak()[index].Leak().Switch(the_stack);
 			}
 		}
 
diff --git a/Kernel/Sources/ProcessTeam.cxx b/Kernel/Sources/ProcessTeam.cxx
index 7e311399..068e0dbb 100644
--- a/Kernel/Sources/ProcessTeam.cxx
+++ b/Kernel/Sources/ProcessTeam.cxx
@@ -9,7 +9,7 @@
 /// @brief Process teams implementation.
 /***********************************************************************************/
 
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 
 namespace NewOS
 {
diff --git a/Kernel/Sources/SMPManager.cxx b/Kernel/Sources/SMPManager.cxx
index 90a9d440..29e0fa26 100644
--- a/Kernel/Sources/SMPManager.cxx
+++ b/Kernel/Sources/SMPManager.cxx
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 
 #include <ArchKit/ArchKit.hpp>
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <KernelKit/SMPManager.hpp>
 
 ///! BUGS: 0
@@ -95,7 +95,6 @@ namespace NewOS
 		{
 			/// Keep the arguments, switch the base pointer, stack pointer
 			/// fs and gs registers.
-
 			fStack->Rbp = stack->Rbp;
 			fStack->Rsp = stack->Rsp;
 			fStack->Fs	= stack->Fs;
@@ -103,6 +102,7 @@ namespace NewOS
 		}
 
 		rt_do_context_switch(fStack);
+		
 		return true;
 	}
 
@@ -121,7 +121,7 @@ namespace NewOS
 	SMPManager::~SMPManager() = default;
 
 	/// @brief Shared singleton function
-	Ref<SMPManager> SMPManager::Shared()
+	Ref<SMPManager> SMPManager::The()
 	{
 		static SMPManager manager;
 		return {manager};
@@ -172,6 +172,8 @@ namespace NewOS
 			rt_copy_memory(stack, fThreadList[idx].Leak().Leak().fStack,
 						   sizeof(HAL::StackFrame));
 
+			fThreadList[idx].Leak().Leak().Switch(fThreadList[idx].Leak().Leak().fStack);
+
 			fThreadList[idx].Leak().Leak().fPID = ProcessHelper::GetCurrentPID();
 
 			fThreadList[idx].Leak().Leak().Busy(false);
diff --git a/Kernel/Sources/Semaphore.cxx b/Kernel/Sources/Semaphore.cxx
index 7bd1d513..e2e135d0 100644
--- a/Kernel/Sources/Semaphore.cxx
+++ b/Kernel/Sources/Semaphore.cxx
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <KernelKit/Semaphore.hpp>
 #include <KernelKit/Timer.hpp>
 
diff --git a/Kernel/Sources/ThreadLocalStorage.cxx b/Kernel/Sources/ThreadLocalStorage.cxx
index c31ae1c2..f72bab67 100644
--- a/Kernel/Sources/ThreadLocalStorage.cxx
+++ b/Kernel/Sources/ThreadLocalStorage.cxx
@@ -7,7 +7,7 @@
  *  ========================================================
  */
 
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <KernelKit/ThreadLocalStorage.hxx>
 
 ///! BUGS: 0
@@ -33,7 +33,7 @@ Boolean tls_check_tib(ThreadInformationBlock* tib)
 	Encoder		encoder;
 	const char* tibAsBytes = encoder.AsBytes(tib);
 
-	kcout << "New OS: Checking for a valid cookie...\r";
+	kcout << "newoskrnl: Checking for a valid cookie...\r";
 
 	return tibAsBytes[0] == kCookieMag0 && tibAsBytes[1] == kCookieMag1 &&
 		   tibAsBytes[2] == kCookieMag2;
@@ -50,9 +50,9 @@ EXTERN_C Void tls_check_syscall_impl(NewOS::HAL::StackFramePtr stackPtr) noexcep
 
 	if (!tls_check_tib(tib))
 	{
-		kcout << "New OS: Verification failed, Crashing...\r";
-		ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
+		kcout << "newoskrnl: Verification failed, Crashing...\r";
+		ProcessScheduler::The().Leak().GetCurrent().Leak().Crash();
 	}
 
-	kcout << "New OS: Verification succeeded! Keeping on...\r";
+	kcout << "newoskrnl: Verification succeeded! Keeping on...\r";
 }
diff --git a/Kernel/Sources/UserHeap.cxx b/Kernel/Sources/UserHeap.cxx
index 02c4c753..64b75641 100644
--- a/Kernel/Sources/UserHeap.cxx
+++ b/Kernel/Sources/UserHeap.cxx
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/ProcessScheduler.hpp>
+#include <KernelKit/ProcessScheduler.hxx>
 #include <KernelKit/UserHeap.hpp>
 #include <NewKit/PageManager.hpp>
 
@@ -37,8 +37,9 @@ namespace NewOS
 	 */
 	class UserHeapManager final
 	{
-	public:
 		UserHeapManager()  = delete;
+		
+	public:
 		~UserHeapManager() = default;
 
 	public:
@@ -46,14 +47,17 @@ namespace NewOS
 		{
 			return s_NumPools;
 		}
+		
 		STATIC Ref<Pmm>& Leak()
 		{
 			return s_Pmm;
 		}
+		
 		STATIC Boolean& IsEnabled()
 		{
 			return s_PoolsAreEnabled;
 		}
+
 		STATIC MutableArray<Ref<PTEWrapper>>& The()
 		{
 			return s_Pool;
@@ -146,7 +150,7 @@ namespace NewOS
 		{
 			if (!poolHdr->fFree)
 			{
-				ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
+				ProcessScheduler::The().Leak().GetCurrent().Leak().Crash();
 				return;
 			}