diff --git a/source/Cosmos/Cosmos.Kernel/CPU.cs b/source/Cosmos/Cosmos.Kernel/CPU.cs
index 58a0ce622..d091f05b7 100644
--- a/source/Cosmos/Cosmos.Kernel/CPU.cs
+++ b/source/Cosmos/Cosmos.Kernel/CPU.cs
@@ -34,7 +34,6 @@ namespace Cosmos.Kernel {
 			Console.Write("Creating IDT...");
 			Hardware.CPU.CreateIDT();
 			Console.WriteLine("Done");
-			TestATA();
 		}
 
 		public static uint TickCount {
@@ -51,7 +50,7 @@ namespace Cosmos.Kernel {
 				;
 		}
 
-		static unsafe void TestATA() {
+		public static unsafe void TestATA() {
 			Hardware.Storage.ATA.Initialize(Sleep);
 			Hardware.Storage.ATA xDrive = new Cosmos.Hardware.Storage.ATA(0, 0);
 			byte* xBuffer = (byte*)Heap.MemAlloc(512);
diff --git a/source/Cosmos/Cosmos.Kernel/Stages.cs b/source/Cosmos/Cosmos.Kernel/Stages.cs
index 47fa542db..2a0494384 100644
--- a/source/Cosmos/Cosmos.Kernel/Stages.cs
+++ b/source/Cosmos/Cosmos.Kernel/Stages.cs
@@ -9,8 +9,8 @@ namespace Cosmos.Kernel {
                 public static void Initialize() {
                         CPU.Init ();
 
-                        //queue = new Cosmos.Kernel.Staging.DefaultStageQueue ();
-                        //queue.Run ();
+                        queue = new Cosmos.Kernel.Staging.DefaultStageQueue ();
+                        queue.Run ();
                 }
 
                 public static void Teardown() {
diff --git a/source/Cosmos/Cosmos.Kernel/Staging/Stages/TestStage.cs b/source/Cosmos/Cosmos.Kernel/Staging/Stages/TestStage.cs
index 7e42bf725..2ecc27f24 100644
--- a/source/Cosmos/Cosmos.Kernel/Staging/Stages/TestStage.cs
+++ b/source/Cosmos/Cosmos.Kernel/Staging/Stages/TestStage.cs
@@ -12,7 +12,8 @@ namespace Cosmos.Kernel.Staging.Stages {
                         }
                 }
 
-                public void Initialize() {
+				public void Initialize() {
+					CPU.TestATA ();
 
                 }
 
diff --git a/source/Cosmos/Cosmos.Shell.Console/Program.cs b/source/Cosmos/Cosmos.Shell.Console/Program.cs
index 72c7ede64..bcc11d9dd 100644
--- a/source/Cosmos/Cosmos.Shell.Console/Program.cs
+++ b/source/Cosmos/Cosmos.Shell.Console/Program.cs
@@ -5,12 +5,12 @@ using System.Text;
 namespace Cosmos.Shell.Console {
 	class Program {
 		static void Main() {
-			Kernel.CPU.Init ();
+			Kernel.Stages.Initialize ();
 
 			System.Console.WriteLine ("Cosmos creation complete");
 			Kernel.Interrupts.DoTest ();
 
-			//Kernel.Stages.Teardown ();
+			Kernel.Stages.Teardown ();
 		}
 	}
 }