diff --git a/Asuro.iso b/Asuro.iso
index ca47452d..05548f2b 100644
Binary files a/Asuro.iso and b/Asuro.iso differ
diff --git a/bin/kernel.bin b/bin/kernel.bin
index 287b6f29..fabe44bf 100755
Binary files a/bin/kernel.bin and b/bin/kernel.bin differ
diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin
index 287b6f29..fabe44bf 100755
Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ
diff --git a/lib/isr33.ppu b/lib/isr33.ppu
index 13b0cdc4..7a9b7e47 100644
Binary files a/lib/isr33.ppu and b/lib/isr33.ppu differ
diff --git a/lib/kernel.ppu b/lib/kernel.ppu
index a31213c0..4419a11f 100644
Binary files a/lib/kernel.ppu and b/lib/kernel.ppu differ
diff --git a/lib/keyboard.ppu b/lib/keyboard.ppu
index db68b8c9..8378cb0d 100644
Binary files a/lib/keyboard.ppu and b/lib/keyboard.ppu differ
diff --git a/lib/libpconsole.a b/lib/libpconsole.a
index b2457402..1128a6b4 100644
Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ
diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a
index f3ef05f1..95709fca 100644
Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ
diff --git a/lib/libpsystem.a b/lib/libpsystem.a
index 79fe5ca3..f36f6b9d 100644
Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ
diff --git a/lib/mouse.ppu b/lib/mouse.ppu
index ac72fbbf..7b1ab0fe 100644
Binary files a/lib/mouse.ppu and b/lib/mouse.ppu differ
diff --git a/lib/scheduler.ppu b/lib/scheduler.ppu
index 1da47fe8..3a29c463 100644
Binary files a/lib/scheduler.ppu and b/lib/scheduler.ppu differ
diff --git a/src/isr/isr33.pas b/src/isr/isr33.pas
index b678ef74..c0b62994 100644
--- a/src/isr/isr33.pas
+++ b/src/isr/isr33.pas
@@ -32,6 +32,8 @@ var
     b : dword;
 
 begin
+    //writechar('!'); // Bug traces all the way back to here - when the keyboard randomly doesn't work, this inturrupt isn't even called...
+                      // This needs further investigation... Is there something that can go wrong when setting up the PIC?
     b:= inb($60); 
     //console.writehexln(b);
     for i:=0 to MAX_HOOKS-1 do begin
diff --git a/src/kernel.pas b/src/kernel.pas
index d5bf8944..be263656 100644
--- a/src/kernel.pas
+++ b/src/kernel.pas
@@ -110,6 +110,7 @@ begin
      console.writestringln('DRIVERS: INIT BEGIN.');
      pci.init();
      keyboard.init(keyboard_layout);
+     keyboard.hook(@temphook);
      mouse.init();
      console.writestringln('DRIVERS: INIT END.');
 
@@ -130,7 +131,6 @@ begin
      console.setdefaultattribute(console.combinecolors(White, Black));
      console.writestringln('');
      console.writestringln('Press any key to boot in to Asuro Terminal...');
-     keyboard.hook(@temphook);
      util.halt_and_dont_catch_fire;
 end;