diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index db626bd2..04333826 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cdb932d9-7e58-4d94-93a9-e7b232ef17da" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Core/CalcVar/CalcVarBase.java" afterPath="$PROJECT_DIR$/src/Core/CalcVar/CalcVarBase.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Core/CalcVar/CalcVarComboBox.java" afterPath="$PROJECT_DIR$/src/Core/CalcVar/CalcVarComboBox.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Core/CalcVar/CalcVarNumerical.java" afterPath="$PROJECT_DIR$/src/Core/CalcVar/CalcVarNumerical.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Core/Calculator.java" afterPath="$PROJECT_DIR$/src/Core/Calculator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainWindow/MainWindowController.java" afterPath="$PROJECT_DIR$/src/MainWindow/MainWindowController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Utility/MetricPrefixes/MetricPrefixes.java" afterPath="$PROJECT_DIR$/src/Utility/MetricPrefixes/MetricPrefixes.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Utility/Rounding.java" afterPath="$PROJECT_DIR$/src/Utility/Rounding.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Utility/StandardResistanceFinder.java" afterPath="$PROJECT_DIR$/src/Utility/StandardResistanceFinder.java" />
     </list>
     <ignored path="JavaFxApplication.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -78,8 +70,8 @@
       <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="101">
-              <caret line="144" column="0" selection-start-line="144" selection-start-column="0" selection-end-line="144" selection-end-column="0" />
+            <state relative-caret-position="362">
+              <caret line="119" column="13" selection-start-line="119" selection-start-column="13" selection-end-line="119" selection-end-column="13" />
               <folding />
             </state>
           </provider>
@@ -1058,12 +1050,18 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/Main.java</url>
-          <line>164</line>
+          <line>165</line>
           <properties />
           <option name="timeStamp" value="67" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/Main.java</url>
+          <line>135</line>
+          <properties />
+          <option name="timeStamp" value="70" />
+        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="68" />
+      <option name="time" value="71" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="JUnit">
@@ -1530,8 +1528,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="101">
-          <caret line="144" column="0" selection-start-line="144" selection-start-column="0" selection-end-line="144" selection-end-column="0" />
+        <state relative-caret-position="362">
+          <caret line="119" column="13" selection-start-line="119" selection-start-column="13" selection-end-line="119" selection-end-column="13" />
           <folding />
         </state>
       </provider>
diff --git a/src/Main.java b/src/Main.java
index 2c250c27..56915ef1 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -112,14 +112,16 @@ public void start(Stage primaryStage) throws Exception{
 
         primaryStage.setMaximized(true);
 
+        //====== SAVING/LOADING APP STATE =====//
+
         // Install event handler for when the app is closed
         primaryStage.setOnCloseRequest((windowEvent) -> {
-                this.saveCalculatorState();
+                //this.saveCalculatorState();
             }
         );
 
         // Load saved calculator state (if any)
-        loadCalculatorState();
+        //loadCalculatorState();
 
         // Show the NinjaCalc app
         primaryStage.show();
@@ -131,19 +133,18 @@ private void saveCalculatorState() {
 
         try {
             // Write to disk with FileOutputStream
-            FileOutputStream f_out = new
+            FileOutputStream fileOS = new
                     FileOutputStream(appStateFileName);
 
             // Write object with ObjectOutputStream
-            ObjectOutputStream obj_out = new
-                    ObjectOutputStream(f_out);
+            ObjectOutputStream objOS = new
+                    ObjectOutputStream(fileOS);
 
             // Write object out to disk
-            obj_out.writeObject(controller.getOpenCalculators());
-
-            obj_out.close();
+            objOS.writeObject(controller.getOpenCalculators());
 
-            f_out.close();
+            objOS.close();
+            fileOS.close();
         } catch (FileNotFoundException e) {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("FileNotFoundException");