diff --git a/i-mic-fps.rb b/i-mic-fps.rb
index 82bea31..28fb07f 100644
--- a/i-mic-fps.rb
+++ b/i-mic-fps.rb
@@ -31,6 +31,7 @@ include GLU
 
 def require_all(directory)
   files = Dir["#{directory}/**/*.rb"].sort!
+  file_order = []
 
   loop do
     failed = []
@@ -39,6 +40,7 @@ def require_all(directory)
     files.each do |file|
       begin
         require_relative file
+        file_order << file
       rescue NameError => e
         failed << file
         first_name_error ||= e
@@ -52,6 +54,8 @@ def require_all(directory)
     end
     break if failed.empty?
   end
+
+  # pp file_order.map { |f| f.gsub(".rb", "")}
 end
 
 require_all "lib"
@@ -87,5 +91,17 @@ elsif ARGV.join.include?("--profile")
     puts "ruby-prof not installed!"
   end
 else
-  IMICFPS::Window.new.show
+  native = ARGV.join.include?("--native")
+  fps_target = ARGV.first.to_i != 0 ? ARGV.first.to_i : 60
+  window_width = native ? Gosu.screen_width : 1280
+  window_height = native ? Gosu.screen_height : 720
+  window_fullscreen = native ? true : false
+
+  IMICFPS::Window.new(
+    width: window_width,
+    height: window_height,
+    fullscreen: window_fullscreen,
+    resizable: !window_fullscreen,
+    update_interval: 1000.0 / fps_target
+  ).show
 end
diff --git a/lib/window.rb b/lib/window.rb
index 81ef196..9f34309 100644
--- a/lib/window.rb
+++ b/lib/window.rb
@@ -5,14 +5,7 @@ class IMICFPS
     attr_accessor :number_of_vertices, :needs_cursor
     attr_reader :renderer, :scene, :config, :director, :console, :delta_time
 
-    def initialize(window_width = 1280, window_height = 720, fullscreen = false)
-      fps_target = ARGV.first.to_i != 0 ? ARGV.first.to_i : 60
-      if ARGV.join.include?("--native")
-        super(width: Gosu.screen_width, height: Gosu.screen_height, fullscreen: true, resizable: true, update_interval: 1000.0 / fps_target)
-      else
-        super(width: window_width, height: window_height, fullscreen: fullscreen, resizable: true, update_interval: 1000.0 / fps_target)
-      end
-      $window = self
+    def setup
       I18n.load_path << Dir["#{GAME_ROOT_PATH}/locales/*.yml"]
       I18n.default_locale = :en
       language = Gosu.language.split("_").first.to_sym
@@ -43,7 +36,7 @@ class IMICFPS
         @config.save!
       end
 
-      push_state(Boot)
+      push_state(CyberarmEngine::IntroState, forward: Boot)
 
       @delta_time = Gosu.milliseconds
     end