diff --git a/ProjectPSX/Core/ProjectPSX.cs b/ProjectPSX/Core/ProjectPSX.cs
index 7a91817..fee6820 100644
--- a/ProjectPSX/Core/ProjectPSX.cs
+++ b/ProjectPSX/Core/ProjectPSX.cs
@@ -1,31 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace ProjectPSX {
     class ProjectPSX {
         private CPU cpu;
-        private BUS mmu;
+        private BUS bus;
 
+        public ProjectPSX(Window window) {
+            cpu = new CPU();
+            bus = new BUS();
 
-        public ProjectPSX() {
-            POWER_ON();
+            bus.loadBios();
+
+            bus.setWindow(window);
         }
 
         public void POWER_ON() {
-            cpu = new CPU();
-            mmu = new BUS();
-
-            mmu.loadBios();
-
             Task t = Task.Factory.StartNew(EXECUTE, TaskCreationOptions.LongRunning);
         }
 
         public void EXECUTE() {
             while (true) {
-                cpu.Run(mmu);
+                cpu.Run(bus);
+                bus.tick(2); //2 ticks per opcode
+                cpu.handleInterrupts(bus);
             }
         }