diff --git a/src/net/apocalypselabs/symat/MainGUI.java b/src/net/apocalypselabs/symat/MainGUI.java
index 4a8b25f..a599fb1 100644
--- a/src/net/apocalypselabs/symat/MainGUI.java
+++ b/src/net/apocalypselabs/symat/MainGUI.java
@@ -38,7 +38,6 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import javax.swing.ImageIcon;
 import javax.swing.JInternalFrame;
-import javax.swing.KeyStroke;
 
 /**
  *
@@ -51,6 +50,7 @@ public class MainGUI extends javax.swing.JFrame {
     public static final String VERSION_NAME = "0.8";
     public static String argfile = "";
     public static boolean skipPython = false; // Skip python init on start?
+    public static boolean skipEditor = false; // Skip editor init on start?
 
     /**
      * Creates new form MainGUI
@@ -525,7 +525,12 @@ public class MainGUI extends javax.swing.JFrame {
         for (String arg : args) {
             if (arg.equals("skippython")) {
                 skipPython = true;
-            } else {
+            } else if (arg.equals("skipeditor")) {
+                skipEditor = true;
+            } else if (arg.equals("quickstart")) {
+                skipPython = true;
+                skipEditor = true;
+            }else {
                 argfile = args[0];
             }
         }
diff --git a/src/net/apocalypselabs/symat/SplashScreen.java b/src/net/apocalypselabs/symat/SplashScreen.java
index 794e1c7..dfe317c 100644
--- a/src/net/apocalypselabs/symat/SplashScreen.java
+++ b/src/net/apocalypselabs/symat/SplashScreen.java
@@ -117,11 +117,13 @@ public class SplashScreen extends javax.swing.JFrame {
                     // Ignore
                 }
             }
-            
-            setProgress(50, "Preparing editor...");
-            // Get editor going too
-            CodeEditor edit = new CodeEditor();
-            
+
+            if (!MainGUI.skipEditor) {
+                System.out.println("Preparing editor, to skip run with argument 'skipeditor'");
+                setProgress(50, "Preparing editor...");
+                // Get editor going too
+                CodeEditor edit = new CodeEditor();
+            }
             setProgress(70, "Loading main interface...");
             new MainGUI().setVisible(true);
             setProgress(100, "Done!");
@@ -130,6 +132,7 @@ public class SplashScreen extends javax.swing.JFrame {
 
         /**
          * Set the progress bar.
+         *
          * @param progress how full to make it (0 <= progress <= 100)
          * @param label The String to put on the label.
          */
@@ -148,7 +151,7 @@ public class SplashScreen extends javax.swing.JFrame {
 
         /**
          * Animate the dots on the progress bar label.
-         * 
+         *
          * This way people know it's not "frozen", so they don't "let it go".
          */
         private class DotThread extends Thread {
@@ -169,7 +172,7 @@ public class SplashScreen extends javax.swing.JFrame {
                             } else if (val.endsWith(".  ")) {
                                 progBar.setString(val.replace(".  ", ".. "));
                             } else if (!val.endsWith(" ")) {
-                                progBar.setString(val+".  ");
+                                progBar.setString(val + ".  ");
                             }
                         }
                     });
@@ -177,7 +180,7 @@ public class SplashScreen extends javax.swing.JFrame {
                     try {
                         Thread.sleep(500);
                     } catch (InterruptedException ex) {
-                        
+
                     }
                 }
             }
@@ -191,4 +194,4 @@ public class SplashScreen extends javax.swing.JFrame {
     private javax.swing.JLabel jLabel5;
     private javax.swing.JProgressBar progBar;
     // End of variables declaration//GEN-END:variables
-}
\ No newline at end of file
+}