diff --git a/.gitignore b/.gitignore
index b3910c0..a365fd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,7 @@ DS_Store
 /.cache
 /compile_commands.json
 
+# Logs
+*.log
+/log
+
diff --git a/kernel/include/bootloader.h b/kernel/include/bootloader.h
index 40cff73..b83bffa 100644
--- a/kernel/include/bootloader.h
+++ b/kernel/include/bootloader.h
@@ -5,14 +5,15 @@
 #include <limine.h>
 
 struct bootloader {
-	size_t hhdm_offset;
-	size_t kernel_virt_base;
-	size_t kernel_phys_base;
+	offset_t hhdm_offset;
+	uintptr_t kernel_virt_base;
+	intptr_t kernel_phys_base;
 	size_t mm_total_memory;
-	uint64_t mm_entry_count;
+	size_t mm_entry_count;
 	LIMINE_PTR(struct limine_memmap_entry**) mm_entries;
-	uint64_t fb_entry_count;
+	size_t fb_entry_count;
 	LIMINE_PTR(struct limine_framebuffer**) fb_entries;
+	LIMINE_PTR(struct limine_file*) executable;
 };
 
 extern struct bootloader bootloader;
diff --git a/kernel/include/limine.h b/kernel/include/limine.h
index 0a3d4dc..c8e2e32 100644
--- a/kernel/include/limine.h
+++ b/kernel/include/limine.h
@@ -1,6 +1,6 @@
-/* BSD Zero Clause License */
+/* SPDX-License-Identifier: 0BSD */
 
-/* Copyright (C) 2022-2025 Mintsuki and contributors.
+/* Copyright (C) 2022-2026 Mintsuki and contributors.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
@@ -17,12 +17,12 @@
 #ifndef LIMINE_H
 #define LIMINE_H 1
 
+#include <kernel.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <kernel.h>
-
 /* Misc */
 
 #ifdef LIMINE_NO_POINTERS
@@ -31,42 +31,16 @@ extern "C" {
 #  define LIMINE_PTR(TYPE) TYPE
 #endif
 
-#ifndef LIMINE_API_REVISION
-#  define LIMINE_API_REVISION 0
-#endif
+#define LIMINE_REQUESTS_START_MARKER { 0xf6b8f4b39de7d1ae, 0xfab91a6940fcb9cf, \
+                                       0x785c6ed015d3e316, 0x181e920a7852b9d9 }
+#define LIMINE_REQUESTS_END_MARKER { 0xadc0e0531bb10d03, 0x9572709f31764c62 }
 
-#if LIMINE_API_REVISION > 3
-#  error "limine.h API revision unsupported"
-#endif
+#define LIMINE_BASE_REVISION(N) { 0xf9562b2d5c95a6c8, 0x6a7b384944536bdc, (N) }
 
-#ifdef __GNUC__
-#  define LIMINE_DEPRECATED __attribute__((__deprecated__))
-#  define LIMINE_DEPRECATED_IGNORE_START \
-    _Pragma("GCC diagnostic push") \
-    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#  define LIMINE_DEPRECATED_IGNORE_END \
-    _Pragma("GCC diagnostic pop")
-#else
-#  define LIMINE_DEPRECATED
-#  define LIMINE_DEPRECATED_IGNORE_START
-#  define LIMINE_DEPRECATED_IGNORE_END
-#endif
+#define LIMINE_BASE_REVISION_SUPPORTED(VAR) ((VAR)[2] == 0)
 
-#define LIMINE_REQUESTS_START_MARKER \
-    uint64_t limine_requests_start_marker[4] = { 0xf6b8f4b39de7d1ae, 0xfab91a6940fcb9cf, \
-                                                 0x785c6ed015d3e316, 0x181e920a7852b9d9 };
-#define LIMINE_REQUESTS_END_MARKER \
-    uint64_t limine_requests_end_marker[2] = { 0xadc0e0531bb10d03, 0x9572709f31764c62 };
-
-#define LIMINE_REQUESTS_DELIMITER LIMINE_REQUESTS_END_MARKER
-
-#define LIMINE_BASE_REVISION(N) \
-    uint64_t limine_base_revision[3] = { 0xf9562b2d5c95a6c8, 0x6a7b384944536bdc, (N) };
-
-#define LIMINE_BASE_REVISION_SUPPORTED (limine_base_revision[2] == 0)
-
-#define LIMINE_LOADED_BASE_REV_VALID (limine_base_revision[1] != 0x6a7b384944536bdc)
-#define LIMINE_LOADED_BASE_REVISION (limine_base_revision[1])
+#define LIMINE_LOADED_BASE_REVISION_VALID(VAR) ((VAR)[1] != 0x6a7b384944536bdc)
+#define LIMINE_LOADED_BASE_REVISION(VAR) ((VAR)[1])
 
 #define LIMINE_COMMON_MAGIC 0xc7b1dd30df4c8b88, 0x0a82e883a194f07b
 
@@ -86,11 +60,7 @@ struct limine_file {
     LIMINE_PTR(void *) address;
     uint64_t size;
     LIMINE_PTR(char *) path;
-#if LIMINE_API_REVISION >= 3
     LIMINE_PTR(char *) string;
-#else
-    LIMINE_PTR(char *) cmdline;
-#endif
     uint32_t media_type;
     uint32_t unused;
     uint32_t tftp_ip;
@@ -104,7 +74,7 @@ struct limine_file {
 
 /* Boot info */
 
-#define LIMINE_BOOTLOADER_INFO_REQUEST { LIMINE_COMMON_MAGIC, 0xf55038d8e2a1202f, 0x279426fcf5f59740 }
+#define LIMINE_BOOTLOADER_INFO_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xf55038d8e2a1202f, 0x279426fcf5f59740 }
 
 struct limine_bootloader_info_response {
     uint64_t revision;
@@ -120,7 +90,7 @@ struct limine_bootloader_info_request {
 
 /* Executable command line */
 
-#define LIMINE_EXECUTABLE_CMDLINE_REQUEST { LIMINE_COMMON_MAGIC, 0x4b161536e598651e, 0xb390ad4a2f1f303a }
+#define LIMINE_EXECUTABLE_CMDLINE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x4b161536e598651e, 0xb390ad4a2f1f303a }
 
 struct limine_executable_cmdline_response {
     uint64_t revision;
@@ -135,11 +105,11 @@ struct limine_executable_cmdline_request {
 
 /* Firmware type */
 
-#define LIMINE_FIRMWARE_TYPE_REQUEST { LIMINE_COMMON_MAGIC, 0x8c2f75d90bef28a8, 0x7045a4688eac00c3 }
+#define LIMINE_FIRMWARE_TYPE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x8c2f75d90bef28a8, 0x7045a4688eac00c3 }
 
 #define LIMINE_FIRMWARE_TYPE_X86BIOS 0
-#define LIMINE_FIRMWARE_TYPE_UEFI32 1
-#define LIMINE_FIRMWARE_TYPE_UEFI64 2
+#define LIMINE_FIRMWARE_TYPE_EFI32 1
+#define LIMINE_FIRMWARE_TYPE_EFI64 2
 #define LIMINE_FIRMWARE_TYPE_SBI 3
 
 struct limine_firmware_type_response {
@@ -155,7 +125,7 @@ struct limine_firmware_type_request {
 
 /* Stack size */
 
-#define LIMINE_STACK_SIZE_REQUEST { LIMINE_COMMON_MAGIC, 0x224ef0460a8e8926, 0xe1cb0fc25f46ea3d }
+#define LIMINE_STACK_SIZE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x224ef0460a8e8926, 0xe1cb0fc25f46ea3d }
 
 struct limine_stack_size_response {
     uint64_t revision;
@@ -170,7 +140,7 @@ struct limine_stack_size_request {
 
 /* HHDM */
 
-#define LIMINE_HHDM_REQUEST { LIMINE_COMMON_MAGIC, 0x48dcf1cb8ad2b852, 0x63984e959a98244b }
+#define LIMINE_HHDM_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x48dcf1cb8ad2b852, 0x63984e959a98244b }
 
 struct limine_hhdm_response {
     uint64_t revision;
@@ -185,7 +155,7 @@ struct limine_hhdm_request {
 
 /* Framebuffer */
 
-#define LIMINE_FRAMEBUFFER_REQUEST { LIMINE_COMMON_MAGIC, 0x9d5827dcd881dd75, 0xa3148604f6fab11b }
+#define LIMINE_FRAMEBUFFER_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x9d5827dcd881dd75, 0xa3148604f6fab11b }
 
 #define LIMINE_FRAMEBUFFER_RGB 1
 
@@ -236,93 +206,29 @@ struct limine_framebuffer_request {
     LIMINE_PTR(struct limine_framebuffer_response *) response;
 };
 
-/* Terminal */
-
-#define LIMINE_TERMINAL_REQUEST { LIMINE_COMMON_MAGIC, 0xc8ac59310c2b0844, 0xa68d0c7265d38878 }
-
-#define LIMINE_TERMINAL_CB_DEC 10
-#define LIMINE_TERMINAL_CB_BELL 20
-#define LIMINE_TERMINAL_CB_PRIVATE_ID 30
-#define LIMINE_TERMINAL_CB_STATUS_REPORT 40
-#define LIMINE_TERMINAL_CB_POS_REPORT 50
-#define LIMINE_TERMINAL_CB_KBD_LEDS 60
-#define LIMINE_TERMINAL_CB_MODE 70
-#define LIMINE_TERMINAL_CB_LINUX 80
-
-#define LIMINE_TERMINAL_CTX_SIZE ((uint64_t)(-1))
-#define LIMINE_TERMINAL_CTX_SAVE ((uint64_t)(-2))
-#define LIMINE_TERMINAL_CTX_RESTORE ((uint64_t)(-3))
-#define LIMINE_TERMINAL_FULL_REFRESH ((uint64_t)(-4))
-
-/* Response revision 1 */
-#define LIMINE_TERMINAL_OOB_OUTPUT_GET ((uint64_t)(-10))
-#define LIMINE_TERMINAL_OOB_OUTPUT_SET ((uint64_t)(-11))
-
-#define LIMINE_TERMINAL_OOB_OUTPUT_OCRNL (1 << 0)
-#define LIMINE_TERMINAL_OOB_OUTPUT_OFDEL (1 << 1)
-#define LIMINE_TERMINAL_OOB_OUTPUT_OFILL (1 << 2)
-#define LIMINE_TERMINAL_OOB_OUTPUT_OLCUC (1 << 3)
-#define LIMINE_TERMINAL_OOB_OUTPUT_ONLCR (1 << 4)
-#define LIMINE_TERMINAL_OOB_OUTPUT_ONLRET (1 << 5)
-#define LIMINE_TERMINAL_OOB_OUTPUT_ONOCR (1 << 6)
-#define LIMINE_TERMINAL_OOB_OUTPUT_OPOST (1 << 7)
-
-LIMINE_DEPRECATED_IGNORE_START
-
-struct LIMINE_DEPRECATED limine_terminal;
-
-typedef void (*limine_terminal_write)(struct limine_terminal *, const char *, uint64_t);
-typedef void (*limine_terminal_callback)(struct limine_terminal *, uint64_t, uint64_t, uint64_t, uint64_t);
-
-struct LIMINE_DEPRECATED limine_terminal {
-    uint64_t columns;
-    uint64_t rows;
-    LIMINE_PTR(struct limine_framebuffer *) framebuffer;
-};
-
-struct LIMINE_DEPRECATED limine_terminal_response {
-    uint64_t revision;
-    uint64_t terminal_count;
-    LIMINE_PTR(struct limine_terminal **) terminals;
-    LIMINE_PTR(limine_terminal_write) write;
-};
-
-struct LIMINE_DEPRECATED limine_terminal_request {
-    uint64_t id[4];
-    uint64_t revision;
-    LIMINE_PTR(struct limine_terminal_response *) response;
-    LIMINE_PTR(limine_terminal_callback) callback;
-};
-
-LIMINE_DEPRECATED_IGNORE_END
-
 /* Paging mode */
 
-#define LIMINE_PAGING_MODE_REQUEST { LIMINE_COMMON_MAGIC, 0x95c1a0edab0944cb, 0xa4e5cb3842f7488a }
+#define LIMINE_PAGING_MODE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x95c1a0edab0944cb, 0xa4e5cb3842f7488a }
 
-#if defined (__x86_64__) || defined (__i386__)
 #define LIMINE_PAGING_MODE_X86_64_4LVL 0
 #define LIMINE_PAGING_MODE_X86_64_5LVL 1
-#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_X86_64_4LVL
-#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_X86_64_4LVL
-#elif defined (__aarch64__)
+#define LIMINE_PAGING_MODE_X86_64_MIN LIMINE_PAGING_MODE_X86_64_4LVL
+#define LIMINE_PAGING_MODE_X86_64_DEFAULT LIMINE_PAGING_MODE_X86_64_4LVL
+
 #define LIMINE_PAGING_MODE_AARCH64_4LVL 0
 #define LIMINE_PAGING_MODE_AARCH64_5LVL 1
-#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_AARCH64_4LVL
-#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_AARCH64_4LVL
-#elif defined (__riscv) && (__riscv_xlen == 64)
+#define LIMINE_PAGING_MODE_AARCH64_MIN LIMINE_PAGING_MODE_AARCH64_4LVL
+#define LIMINE_PAGING_MODE_AARCH64_DEFAULT LIMINE_PAGING_MODE_AARCH64_4LVL
+
 #define LIMINE_PAGING_MODE_RISCV_SV39 0
 #define LIMINE_PAGING_MODE_RISCV_SV48 1
 #define LIMINE_PAGING_MODE_RISCV_SV57 2
-#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_RISCV_SV39
-#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_RISCV_SV48
-#elif defined (__loongarch__) && (__loongarch_grlen == 64)
-#define LIMINE_PAGING_MODE_LOONGARCH64_4LVL 0
-#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_LOONGARCH64_4LVL
-#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_LOONGARCH64_4LVL
-#else
-#error Unknown architecture
-#endif
+#define LIMINE_PAGING_MODE_RISCV_MIN LIMINE_PAGING_MODE_RISCV_SV39
+#define LIMINE_PAGING_MODE_RISCV_DEFAULT LIMINE_PAGING_MODE_RISCV_SV48
+
+#define LIMINE_PAGING_MODE_LOONGARCH_4LVL 0
+#define LIMINE_PAGING_MODE_LOONGARCH_MIN LIMINE_PAGING_MODE_LOONGARCH_4LVL
+#define LIMINE_PAGING_MODE_LOONGARCH_DEFAULT LIMINE_PAGING_MODE_LOONGARCH_4LVL
 
 struct limine_paging_mode_response {
     uint64_t revision;
@@ -338,47 +244,19 @@ struct limine_paging_mode_request {
     uint64_t min_mode;
 };
 
-/* 5-level paging */
-
-#define LIMINE_5_LEVEL_PAGING_REQUEST { LIMINE_COMMON_MAGIC, 0x94469551da9b3192, 0xebe5e86db7382888 }
-
-LIMINE_DEPRECATED_IGNORE_START
-
-struct LIMINE_DEPRECATED limine_5_level_paging_response {
-    uint64_t revision;
-};
-
-struct LIMINE_DEPRECATED limine_5_level_paging_request {
-    uint64_t id[4];
-    uint64_t revision;
-    LIMINE_PTR(struct limine_5_level_paging_response *) response;
-};
-
-LIMINE_DEPRECATED_IGNORE_END
-
 /* MP */
 
-#if LIMINE_API_REVISION >= 1
-#  define LIMINE_MP_REQUEST { LIMINE_COMMON_MAGIC, 0x95a67b819a1b857e, 0xa0b61b723b6a73e0 }
-#  define LIMINE_MP(TEXT) limine_mp_##TEXT
-#else
-#  define LIMINE_SMP_REQUEST { LIMINE_COMMON_MAGIC, 0x95a67b819a1b857e, 0xa0b61b723b6a73e0 }
-#  define LIMINE_MP(TEXT) limine_smp_##TEXT
-#endif
+#define LIMINE_MP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x95a67b819a1b857e, 0xa0b61b723b6a73e0 }
 
-struct LIMINE_MP(info);
+struct limine_mp_info;
 
-typedef void (*limine_goto_address)(struct LIMINE_MP(info) *);
+typedef void (*limine_goto_address)(struct limine_mp_info *);
 
 #if defined (__x86_64__) || defined (__i386__)
 
-#if LIMINE_API_REVISION >= 1
-#  define LIMINE_MP_X2APIC (1 << 0)
-#else
-#  define LIMINE_SMP_X2APIC (1 << 0)
-#endif
+#define LIMINE_MP_RESPONSE_X86_64_X2APIC (1 << 0)
 
-struct LIMINE_MP(info) {
+struct limine_mp_info {
     uint32_t processor_id;
     uint32_t lapic_id;
     uint64_t reserved;
@@ -386,17 +264,17 @@ struct LIMINE_MP(info) {
     uint64_t extra_argument;
 };
 
-struct LIMINE_MP(response) {
+struct limine_mp_response {
     uint64_t revision;
     uint32_t flags;
     uint32_t bsp_lapic_id;
     uint64_t cpu_count;
-    LIMINE_PTR(struct LIMINE_MP(info) **) cpus;
+    LIMINE_PTR(struct limine_mp_info **) cpus;
 };
 
 #elif defined (__aarch64__)
 
-struct LIMINE_MP(info) {
+struct limine_mp_info {
     uint32_t processor_id;
     uint32_t reserved1;
     uint64_t mpidr;
@@ -405,17 +283,17 @@ struct LIMINE_MP(info) {
     uint64_t extra_argument;
 };
 
-struct LIMINE_MP(response) {
+struct limine_mp_response {
     uint64_t revision;
     uint64_t flags;
     uint64_t bsp_mpidr;
     uint64_t cpu_count;
-    LIMINE_PTR(struct LIMINE_MP(info) **) cpus;
+    LIMINE_PTR(struct limine_mp_info **) cpus;
 };
 
 #elif defined (__riscv) && (__riscv_xlen == 64)
 
-struct LIMINE_MP(info) {
+struct limine_mp_info {
     uint64_t processor_id;
     uint64_t hartid;
     uint64_t reserved;
@@ -423,39 +301,48 @@ struct LIMINE_MP(info) {
     uint64_t extra_argument;
 };
 
-struct LIMINE_MP(response) {
+struct limine_mp_response {
     uint64_t revision;
     uint64_t flags;
     uint64_t bsp_hartid;
     uint64_t cpu_count;
-    LIMINE_PTR(struct LIMINE_MP(info) **) cpus;
+    LIMINE_PTR(struct limine_mp_info **) cpus;
 };
 
 #elif defined (__loongarch__) && (__loongarch_grlen == 64)
 
-struct LIMINE_MP(info) {
+struct limine_mp_info {
+    uint64_t processor_id;
+    uint64_t phys_id;
     uint64_t reserved;
+    LIMINE_PTR(limine_goto_address) goto_address;
+    uint64_t extra_argument;
 };
 
-struct LIMINE_MP(response) {
+struct limine_mp_response {
+    uint64_t revision;
+    uint64_t flags;
+    uint64_t bsp_phys_id;
     uint64_t cpu_count;
-    LIMINE_PTR(struct LIMINE_MP(info) **) cpus;
+    LIMINE_PTR(struct limine_mp_info **) cpus;
 };
 
 #else
 #error Unknown architecture
 #endif
 
-struct LIMINE_MP(request) {
+#define LIMINE_MP_REQUEST_X86_64_X2APIC (1 << 0)
+
+struct limine_mp_request {
     uint64_t id[4];
     uint64_t revision;
-    LIMINE_PTR(struct LIMINE_MP(response) *) response;
+    LIMINE_PTR(struct limine_mp_response *) response;
     uint64_t flags;
 };
 
 /* Memory map */
 
-#define LIMINE_MEMMAP_REQUEST { LIMINE_COMMON_MAGIC, 0x67cf3d9d378a806f, 0xe304acdfc50c3c62 }
+#define LIMINE_MEMMAP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x67cf3d9d378a806f, 0xe304acdfc50c3c62 }
 
 #define LIMINE_MEMMAP_USABLE                 0
 #define LIMINE_MEMMAP_RESERVED               1
@@ -463,13 +350,9 @@ struct LIMINE_MP(request) {
 #define LIMINE_MEMMAP_ACPI_NVS               3
 #define LIMINE_MEMMAP_BAD_MEMORY             4
 #define LIMINE_MEMMAP_BOOTLOADER_RECLAIMABLE 5
-#if LIMINE_API_REVISION >= 2
-#  define LIMINE_MEMMAP_EXECUTABLE_AND_MODULES 6
-#else
-#  define LIMINE_MEMMAP_KERNEL_AND_MODULES 6
-#endif
+#define LIMINE_MEMMAP_EXECUTABLE_AND_MODULES 6
 #define LIMINE_MEMMAP_FRAMEBUFFER            7
-#define LIMINE_MEMMAP_ACPI_TABLES            8
+#define LIMINE_MEMMAP_RESERVED_MAPPED        8
 
 struct limine_memmap_entry {
     uint64_t base;
@@ -491,7 +374,7 @@ struct limine_memmap_request {
 
 /* Entry point */
 
-#define LIMINE_ENTRY_POINT_REQUEST { LIMINE_COMMON_MAGIC, 0x13d86c035a1cd3e1, 0x2b0caa89d8f3026a }
+#define LIMINE_ENTRY_POINT_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x13d86c035a1cd3e1, 0x2b0caa89d8f3026a }
 
 typedef void (*limine_entry_point)(void);
 
@@ -508,53 +391,29 @@ struct limine_entry_point_request {
 
 /* Executable File */
 
-#if LIMINE_API_REVISION >= 2
-#  define LIMINE_EXECUTABLE_FILE_REQUEST { LIMINE_COMMON_MAGIC, 0xad97e90e83f1ed67, 0x31eb5d1c5ff23b69 }
-#else
-#  define LIMINE_KERNEL_FILE_REQUEST { LIMINE_COMMON_MAGIC, 0xad97e90e83f1ed67, 0x31eb5d1c5ff23b69 }
-#endif
+#define LIMINE_EXECUTABLE_FILE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xad97e90e83f1ed67, 0x31eb5d1c5ff23b69 }
 
-#if LIMINE_API_REVISION >= 2
 struct limine_executable_file_response {
-#else
-struct limine_kernel_file_response {
-#endif
     uint64_t revision;
-#if LIMINE_API_REVISION >= 2
     LIMINE_PTR(struct limine_file *) executable_file;
-#else
-    LIMINE_PTR(struct limine_file *) kernel_file;
-#endif
 };
 
-#if LIMINE_API_REVISION >= 2
 struct limine_executable_file_request {
-#else
-struct limine_kernel_file_request {
-#endif
     uint64_t id[4];
     uint64_t revision;
-#if LIMINE_API_REVISION >= 2
     LIMINE_PTR(struct limine_executable_file_response *) response;
-#else
-    LIMINE_PTR(struct limine_kernel_file_response *) response;
-#endif
 };
 
 /* Module */
 
-#define LIMINE_MODULE_REQUEST { LIMINE_COMMON_MAGIC, 0x3e7e279702be32af, 0xca1c4f3bd1280cee }
+#define LIMINE_MODULE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x3e7e279702be32af, 0xca1c4f3bd1280cee }
 
 #define LIMINE_INTERNAL_MODULE_REQUIRED (1 << 0)
 #define LIMINE_INTERNAL_MODULE_COMPRESSED (1 << 1)
 
 struct limine_internal_module {
     LIMINE_PTR(const char *) path;
-#if LIMINE_API_REVISION >= 3
     LIMINE_PTR(const char *) string;
-#else
-    LIMINE_PTR(const char *) cmdline;
-#endif
     uint64_t flags;
 };
 
@@ -576,15 +435,11 @@ struct limine_module_request {
 
 /* RSDP */
 
-#define LIMINE_RSDP_REQUEST { LIMINE_COMMON_MAGIC, 0xc5e77b6b397e7b43, 0x27637845accdcf3c }
+#define LIMINE_RSDP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xc5e77b6b397e7b43, 0x27637845accdcf3c }
 
 struct limine_rsdp_response {
     uint64_t revision;
-#if LIMINE_API_REVISION >= 1
-    uint64_t address;
-#else
     LIMINE_PTR(void *) address;
-#endif
 };
 
 struct limine_rsdp_request {
@@ -595,17 +450,12 @@ struct limine_rsdp_request {
 
 /* SMBIOS */
 
-#define LIMINE_SMBIOS_REQUEST { LIMINE_COMMON_MAGIC, 0x9e9046f11e095391, 0xaa4a520fefbde5ee }
+#define LIMINE_SMBIOS_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x9e9046f11e095391, 0xaa4a520fefbde5ee }
 
 struct limine_smbios_response {
     uint64_t revision;
-#if LIMINE_API_REVISION >= 1
-    uint64_t entry_32;
-    uint64_t entry_64;
-#else
     LIMINE_PTR(void *) entry_32;
     LIMINE_PTR(void *) entry_64;
-#endif
 };
 
 struct limine_smbios_request {
@@ -616,15 +466,11 @@ struct limine_smbios_request {
 
 /* EFI system table */
 
-#define LIMINE_EFI_SYSTEM_TABLE_REQUEST { LIMINE_COMMON_MAGIC, 0x5ceba5163eaaf6d6, 0x0a6981610cf65fcc }
+#define LIMINE_EFI_SYSTEM_TABLE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x5ceba5163eaaf6d6, 0x0a6981610cf65fcc }
 
 struct limine_efi_system_table_response {
     uint64_t revision;
-#if LIMINE_API_REVISION >= 1
-    uint64_t address;
-#else
     LIMINE_PTR(void *) address;
-#endif
 };
 
 struct limine_efi_system_table_request {
@@ -635,7 +481,7 @@ struct limine_efi_system_table_request {
 
 /* EFI memory map */
 
-#define LIMINE_EFI_MEMMAP_REQUEST { LIMINE_COMMON_MAGIC, 0x7df62a431d6872d5, 0xa4fcdfb3e57306c8 }
+#define LIMINE_EFI_MEMMAP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x7df62a431d6872d5, 0xa4fcdfb3e57306c8 }
 
 struct limine_efi_memmap_response {
     uint64_t revision;
@@ -653,74 +499,38 @@ struct limine_efi_memmap_request {
 
 /* Date at boot */
 
-#if LIMINE_API_REVISION >= 3
-#  define LIMINE_DATE_AT_BOOT_REQUEST { LIMINE_COMMON_MAGIC, 0x502746e184c088aa, 0xfbc5ec83e6327893 }
-#else
-#  define LIMINE_BOOT_TIME_REQUEST { LIMINE_COMMON_MAGIC, 0x502746e184c088aa, 0xfbc5ec83e6327893 }
-#endif
+#define LIMINE_DATE_AT_BOOT_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x502746e184c088aa, 0xfbc5ec83e6327893 }
 
-#if LIMINE_API_REVISION >= 3
 struct limine_date_at_boot_response {
-#else
-struct limine_boot_time_response {
-#endif
     uint64_t revision;
-#if LIMINE_API_REVISION >= 3
     int64_t timestamp;
-#else
-    int64_t boot_time;
-#endif
 };
 
-#if LIMINE_API_REVISION >= 3
 struct limine_date_at_boot_request {
-#else
-struct limine_boot_time_request {
-#endif
     uint64_t id[4];
     uint64_t revision;
-#if LIMINE_API_REVISION >= 3
     LIMINE_PTR(struct limine_date_at_boot_response *) response;
-#else
-    LIMINE_PTR(struct limine_boot_time_response *) response;
-#endif
 };
 
 /* Executable address */
 
-#if LIMINE_API_REVISION >= 2
-#  define LIMINE_EXECUTABLE_ADDRESS_REQUEST { LIMINE_COMMON_MAGIC, 0x71ba76863cc55f63, 0xb2644a48c516a487 }
-#else
-#  define LIMINE_KERNEL_ADDRESS_REQUEST { LIMINE_COMMON_MAGIC, 0x71ba76863cc55f63, 0xb2644a48c516a487 }
-#endif
+#define LIMINE_EXECUTABLE_ADDRESS_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x71ba76863cc55f63, 0xb2644a48c516a487 }
 
-#if LIMINE_API_REVISION >= 2
 struct limine_executable_address_response {
-#else
-struct limine_kernel_address_response {
-#endif
     uint64_t revision;
     uint64_t physical_base;
     uint64_t virtual_base;
 };
 
-#if LIMINE_API_REVISION >= 2
 struct limine_executable_address_request {
-#else
-struct limine_kernel_address_request {
-#endif
     uint64_t id[4];
     uint64_t revision;
-#if LIMINE_API_REVISION >= 2
     LIMINE_PTR(struct limine_executable_address_response *) response;
-#else
-    LIMINE_PTR(struct limine_kernel_address_response *) response;
-#endif
 };
 
 /* Device Tree Blob */
 
-#define LIMINE_DTB_REQUEST { LIMINE_COMMON_MAGIC, 0xb40ddb48fb54bac7, 0x545081493f81ffb7 }
+#define LIMINE_DTB_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xb40ddb48fb54bac7, 0x545081493f81ffb7 }
 
 struct limine_dtb_response {
     uint64_t revision;
@@ -735,7 +545,7 @@ struct limine_dtb_request {
 
 /* RISC-V Boot Hart ID */
 
-#define LIMINE_RISCV_BSP_HARTID_REQUEST { LIMINE_COMMON_MAGIC, 0x1369359f025525f9, 0x2ff2a56178391bb6 }
+#define LIMINE_RISCV_BSP_HARTID_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x1369359f025525f9, 0x2ff2a56178391bb6 }
 
 struct limine_riscv_bsp_hartid_response {
     uint64_t revision;
@@ -750,7 +560,7 @@ struct limine_riscv_bsp_hartid_request {
 
 /* Bootloader Performance */
 
-#define LIMINE_BOOTLOADER_PERFORMANCE_REQUEST { LIMINE_COMMON_MAGIC, 0x6b50ad9bf36d13ad, 0xdc4c7e88fc759e17 }
+#define LIMINE_BOOTLOADER_PERFORMANCE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x6b50ad9bf36d13ad, 0xdc4c7e88fc759e17 }
 
 struct limine_bootloader_performance_response {
     uint64_t revision;
@@ -765,6 +575,18 @@ struct limine_bootloader_performance_request {
     LIMINE_PTR(struct limine_bootloader_performance_response *) response;
 };
 
+#define LIMINE_KEEP_IOMMU_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x8ebaabe51f490179, 0x2aa86a59ffb4ab0f }
+
+struct limine_keep_iommu_response {
+    uint64_t revision;
+};
+
+struct limine_keep_iommu_request {
+    uint64_t id[4];
+    uint64_t revision;
+    LIMINE_PTR(struct limine_keep_iommu_response *) response;
+};
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/kernel/src/bootloader.c b/kernel/src/bootloader.c
index 7da5ff3..631d345 100644
--- a/kernel/src/bootloader.c
+++ b/kernel/src/bootloader.c
@@ -5,41 +5,49 @@
 /*
  * This defines our expected Limine version
  */
-static volatile LIMINE_BASE_REVISION(4);
+static volatile uint64_t lim_base_revision[] = LIMINE_BASE_REVISION(4);
 
 struct bootloader bootloader = { 0 };
 
 static struct limine_paging_mode_request lim_paging_req =
-	{ .id = LIMINE_PAGING_MODE_REQUEST, .revision = 4,
+	{ .id = LIMINE_PAGING_MODE_REQUEST_ID, .revision = 4,
 	  .mode = LIMINE_PAGING_MODE_X86_64_4LVL, };
 
-static struct limine_kernel_address_request lim_kaddr_req =
-	{ .id = LIMINE_KERNEL_ADDRESS_REQUEST, .revision = 4 };
+static struct limine_executable_address_request lim_kaddr_req =
+	{ .id = LIMINE_EXECUTABLE_ADDRESS_REQUEST_ID, .revision = 4 };
 
 static struct limine_hhdm_request lim_hhdm_req = 
-	{ .id = LIMINE_HHDM_REQUEST, .revision = 4 };
+	{ .id = LIMINE_HHDM_REQUEST_ID, .revision = 4 };
 
 static struct limine_memmap_request lim_memmap_req =
-	{ .id = LIMINE_MEMMAP_REQUEST, .revision = 4 };
+	{ .id = LIMINE_MEMMAP_REQUEST_ID, .revision = 4 };
 
 static struct limine_framebuffer_request lim_fbuf_req =
-	{ .id = LIMINE_FRAMEBUFFER_REQUEST, .revision = 0 };
+	{ .id = LIMINE_FRAMEBUFFER_REQUEST_ID, .revision = 4 };
+
+static struct limine_executable_file_request lim_exe_req =
+	{ .id = LIMINE_EXECUTABLE_FILE_REQUEST_ID, .revision = 4 };
 
 int boot_init(void) {
-	if (LIMINE_BASE_REVISION_SUPPORTED == false) panic("Unsupported Limine base revision.");
+	if (LIMINE_BASE_REVISION_SUPPORTED(lim_base_revision) == false) panic("Unsupported Limine base revision.");
 
 	struct limine_paging_mode_response* lim_paging_res = lim_paging_req.response;
-	struct limine_kernel_address_response* lim_kaddr_res = lim_kaddr_req.response;
+	struct limine_executable_address_response* lim_kaddr_res = lim_kaddr_req.response;
 	struct limine_hhdm_response* lim_hhdm_res = lim_hhdm_req.response;
 	struct limine_memmap_response* lim_memmap_res = lim_memmap_req.response;
 	struct limine_framebuffer_response* lim_fbuf_res = lim_fbuf_req.response;
+	struct limine_executable_file_response* lim_exe_res = lim_exe_req.response;
 
-	if (lim_paging_res->mode != LIMINE_PAGING_MODE_X86_64_4LVL) return 1;
+	if (lim_paging_res->mode != LIMINE_PAGING_MODE_X86_64_4LVL) {
+		debugf("[boot] Expected 4 level paging.\n");
+		return 1;
+	}
 	bootloader.hhdm_offset = lim_hhdm_res->offset;
 	bootloader.kernel_phys_base = lim_kaddr_res->physical_base;
 	bootloader.kernel_virt_base = lim_kaddr_res->virtual_base;
 	bootloader.mm_entries = lim_memmap_res->entries;
 	bootloader.mm_entry_count = lim_memmap_res->entry_count;
+	bootloader.executable = lim_exe_res->executable_file;
 
 	bootloader.mm_total_memory = 0;
 	for (size_t i = 0; i < bootloader.mm_entry_count; i++) {
diff --git a/kernel/src/kernel.c b/kernel/src/kernel.c
index b759d5f..89d850d 100644
--- a/kernel/src/kernel.c
+++ b/kernel/src/kernel.c
@@ -34,7 +34,10 @@ void _start(void) {
 
 	// Memory management
 	if (pmm_init() != 0) panic("Failed to initalize Physical Memory Manager.");
-	if (pag_init() != 0) panic("Failed to initalize Paging.");
+	void* paddr = pmm_alloc();
+	pmm_free(paddr);
+
+	//if (pag_init() != 0) panic("Failed to initalize Paging.");
 	//if (kmalloc_init() != 0) panic("Failed to initialize kernel heap.");
 
 	// Tasking