diff --git a/src/main.c b/src/main.c
index 8d2783f..84f5a79 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,9 @@
-#include "vga.h"
-#include "log.h"
-#include "io.h"
 #include "descriptor_tables.h"
+#include "io.h"
+#include "log.h"
 #include "timer.h"
+#include "vga.h"
+#include "paging.h"
 
 int kmain(void *mboot)
 {
@@ -17,12 +18,23 @@
 	vga_write("Setup complete!\n");
 	vga_set_color(WHITE, BLACK);
 
+	init_timer(20);
+
+	initialize_paging();
 	asm volatile("sti");
 
-	init_timer(50);
 
-	while (1)
-	{}
-	
+#ifdef TEST_PAGE_FAULT
+	kprintf("Causing page fault:\n");
+
+	volatile uint *ptr = (uint *) 0xa0000000;
+	volatile uint cause_page_fault = *ptr;
+
+	kprintf("Should have caused page fault: %d...\n", cause_page_fault);
+#endif
+
+	while (true)
+		asm volatile("hlt");
+
 	return 0xCAFEBABE;
 }