diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
index 7c2efcc..a9f9120 100644
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -137,13 +137,13 @@ pub fn boot() -> Result<(), Box<dyn core::error::Error>> {
     interrupts::enable_pic();
     debugln!("[Success]");
 
-    debug!("    Disabling PICs... ");
-    interrupts::disable_pic();
-    debugln!("[Success]");
+    // debug!("    Disabling PICs... ");
+    // interrupts::disable_pic();
+    // debugln!("[Success]");
 
-    debug!("    Initialising APIC... ");
-    enable_apic();
-    debugln!("[Success]");
+    // debug!("    Initialising APIC... ");
+    // enable_apic();
+    // debugln!("[Success]");
 
     debug!("    Enabling Interrupts... ");
     x86_64::instructions::interrupts::enable();
@@ -151,3 +151,10 @@ pub fn boot() -> Result<(), Box<dyn core::error::Error>> {
 
     Ok(())
 }
+
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo<'_>) -> ! {
+    debugln!("{:?}", _info);
+
+    hcf()
+}