diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7373164..bb2e2c6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,643 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Made every appropriate Text and Logic class">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/gui/BankGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/BankGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/gui/GameEndGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/GameEndGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/gui/TaipanShopGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/TaipanShopGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/gui/TravelGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/TravelGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/logic/FileSaving.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/FileSaving.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/logic/GameEndLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/GameEndLogic.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/logic/TaipanShopLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/TaipanShopLogic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/gui/RandomEventGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/RandomEventGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/logic/RandomEventLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/RandomEventLogic.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/text/BankText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/BankText.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/text/GameEndText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/GameEndText.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/text/StartText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/StartText.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/text/TravelText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/TravelText.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/text/WarehouseText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/WarehouseText.java" afterDir="false" />
     </list>
+    <ignored path="$PROJECT_DIR$/out/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DefaultGradleProjectSettings">
+    <option name="testRunner" value="GRADLE" />
+    <option name="delegatedBuild" value="true" />
+  </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/text/GameEndText.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/logic/GameEndLogic.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="14" selection-start-line="14" selection-end-line="14" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="3" column="77" selection-start-line="3" selection-start-column="77" selection-end-line="3" selection-end-column="77" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="uml://JAVA/">
-          <provider selected="true" editor-type-id="UmlEditorProvider">
-            <state>
-              <ID>JAVA</ID>
-              <OriginalElement />
-              <nodes>
-                <node x="0.0" y="153.0">images</node>
-                <node x="152.0" y="227.0">tests</node>
-                <node x="0.0" y="227.0">saves</node>
-                <node x="118.0" y="79.0">gui</node>
-                <node x="0.0" y="79.0">text</node>
-                <node x="55.0" y="0.0">logic</node>
-              </nodes>
-              <notes />
-              <edges>
-                <edge source="gui" target="logic">
-                  <point x="0.0" y="-14.5" />
-                  <point x="166.0" y="54.0" />
-                  <point x="133.75" y="54.0" />
-                  <point x="26.25" y="14.5" />
-                </edge>
-                <edge source="text" target="logic">
-                  <point x="0.0" y="-14.5" />
-                  <point x="49.0" y="54.0" />
-                  <point x="81.25" y="54.0" />
-                  <point x="-26.25" y="14.5" />
-                </edge>
-              </edges>
-              <settings layout="Hierarchic Group" zoom="1.0" x="-199.5" y="58.0" />
-              <SelectedNodes />
-              <Categories>
-                <Category>Fields</Category>
-                <Category>Constructors</Category>
-                <Category>Methods</Category>
-                <Category>Properties</Category>
-                <Category>Inner Classes</Category>
-              </Categories>
-              <SCOPE>Project Files</SCOPE>
-              <VISIBILITY>private</VISIBILITY>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="uml://JAVA/logic.TravelLogic">
-          <provider selected="true" editor-type-id="UmlEditorProvider">
-            <state>
-              <ID>JAVA</ID>
-              <OriginalElement>logic.TravelLogic</OriginalElement>
-              <nodes>
-                <node x="681.4999999999999" y="528.0">logic.WarehouseLogic</node>
-                <node x="546.4999999999999" y="528.0">logic.BankLogic</node>
-                <node x="2335.386257890782" y="815.0">gui.WarehouseGUI</node>
-                <node x="1660.2580345340673" y="528.0">logic.GameEndLogic</node>
-                <node x="10.5" y="528.0">text.BankText</node>
-                <node x="865.0616964872731" y="815.0">text.TravelText</node>
-                <node x="1286.5616964872731" y="617.0">logic.ShipWarfareLogic</node>
-                <node x="1933.5869819024883" y="716.0">gui.RandomEventGUI</node>
-                <node x="838.4999999999999" y="528.0">logic.TravelLogic</node>
-                <node x="1759.4870648638364" y="716.0">gui.ShipWarfareGUI</node>
-                <node x="2737.0404135338345" y="1113.0">javafx.application.Application</node>
-                <node x="1855.5343503235408" y="528.0">text.MainText</node>
-                <node x="1995.4653822055136" y="815.0">gui.TravelGUI</node>
-                <node x="272.5" y="528.0">logic.MainLogic</node>
-                <node x="2582.9915210486765" y="815.0">logic.FileSaving</node>
-                <node x="348.4463118718886" y="1024.0">text.TaipanShopText</node>
-                <node x="1497.4630047134608" y="79.0">logic.Player</node>
-                <node x="2170.8336263118345" y="528.0">text.StartText</node>
-                <node x="1062.538736288453" y="528.0">text.RandomEventText</node>
-                <node x="127.5" y="528.0">text.LoanSharkText</node>
-                <node x="1449.6143280662207" y="528.0">text.GameEndText</node>
-                <node x="1949.6336263118346" y="1024.0">gui.TaipanShopGUI</node>
-                <node x="397.5" y="528.0">text.WarehouseText</node>
-                <node x="1027.4486407834174" y="815.0">logic.TaipanShopLogic</node>
-                <node x="1710.1080345340674" y="617.0">gui.GameEndGUI</node>
-                <node x="2408.886257890782" y="528.0">logic.RandomEventLogic</node>
-                <node x="1227.538736288453" y="528.0">tests.PlayerTest</node>
-                <node x="2606.0404135338345" y="1113.0">gui.StartGUI</node>
-                <node x="720.4723249939435" y="716.0">text.ShipWarfareText</node>
-                <node x="2093.024032282383" y="0.0">java.io.Serializable</node>
-                <node x="2125.705983709273" y="815.0">gui.BankGUI</node>
-                <node x="2628.9915210486765" y="1212.0">gui.MainGUI</node>
-                <node x="1496.3150520779268" y="815.0">gui.LoanSharkGUI</node>
-                <node x="2286.886257890782" y="528.0">logic.StartLogic</node>
-              </nodes>
-              <notes />
-              <edges>
-                <edge source="text.TaipanShopText" target="text.BankText">
-                  <point x="-51.15384615384619" y="-14.5" />
-                  <point x="363.7924657180424" y="994.0" />
-                  <point x="61.40309422471273" y="994.0" />
-                  <point x="61.40309422471273" y="597.0" />
-                  <point x="82.5" y="597.0" />
-                  <point x="24.0" y="14.5" />
-                </edge>
-                <edge source="text.TaipanShopText" target="text.TravelText">
-                  <point x="20.461538461538566" y="-14.5" />
-                  <point x="435.4078503334272" y="964.0" />
-                  <point x="890.5616964872731" y="964.0" />
-                  <point x="-25.5" y="14.5" />
-                </edge>
-                <edge source="javafx.application.Application" target="javafx.application.Application">
-                  <point x="-36.33333333333326" y="14.5" />
-                  <point x="2755.207080200501" y="1162.0" />
-                  <point x="2717.0404135338345" y="1162.0" />
-                  <point x="2717.0404135338345" y="1127.5" />
-                  <point x="-54.5" y="-0.0" />
-                </edge>
-                <edge source="gui.ShipWarfareGUI" target="gui.TaipanShopGUI">
-                  <point x="-49.125" y="14.5" />
-                  <point x="1775.8620648638364" y="795.0" />
-                  <point x="1799.5142809686947" y="795.0" />
-                  <point x="1799.5142809686947" y="904.0" />
-                  <point x="1995.1336263118346" y="904.0" />
-                  <point x="-19.5" y="-14.5" />
-                </edge>
-                <edge source="text.TravelText" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="916.0616964872731" y="775.0" />
-                  <point x="957.9999999999999" y="775.0" />
-                  <point x="957.9999999999999" y="328.0" />
-                  <point x="1517.9893205029346" y="328.0" />
-                  <point x="-19.473684210526244" y="14.5" />
-                </edge>
-                <edge source="gui.MainGUI" target="logic.Player">
-                  <point x="-37.59999999999991" y="-14.5" />
-                  <point x="2638.3915210486766" y="1192.0" />
-                  <point x="0.0" y="1192.0" />
-                  <point x="0.0" y="138.0" />
-                  <point x="1497.9893205029346" y="138.0" />
-                  <point x="-39.473684210526244" y="14.5" />
-                </edge>
-                <edge source="logic.ShipWarfareLogic" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="1357.0616964872731" y="597.0" />
-                  <point x="1351.038736288453" y="597.0" />
-                  <point x="1351.038736288453" y="458.0" />
-                  <point x="1531.6735310292504" y="458.0" />
-                  <point x="-5.789473684210407" y="14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="logic.Player">
-                  <point x="-54.16666666666663" y="-14.5" />
-                  <point x="1960.4669596451681" y="984.0" />
-                  <point x="1438.0616964872731" y="984.0" />
-                  <point x="1438.0616964872731" y="478.0" />
-                  <point x="1533.778794187145" y="478.0" />
-                  <point x="-3.6842105263158373" y="14.5" />
-                </edge>
-                <edge source="text.WarehouseText" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="462.0" y="248.0" />
-                  <point x="1509.5682678713556" y="248.0" />
-                  <point x="-27.894736842105203" y="14.5" />
-                </edge>
-                <edge source="gui.RandomEventGUI" target="gui.TaipanShopGUI">
-                  <point x="-17.625" y="14.5" />
-                  <point x="1986.4619819024883" y="795.0" />
-                  <point x="1984.3336263118345" y="795.0" />
-                  <point x="1984.3336263118345" y="874.0" />
-                  <point x="2008.1336263118346" y="874.0" />
-                  <point x="-6.5" y="-14.5" />
-                </edge>
-                <edge source="text.ShipWarfareText" target="logic.Player">
-                  <point x="-53.59999999999991" y="-14.5" />
-                  <point x="733.8723249939436" y="696.0" />
-                  <point x="659.9999999999999" y="696.0" />
-                  <point x="659.9999999999999" y="278.0" />
-                  <point x="1512.7261626081977" y="278.0" />
-                  <point x="-24.736842105263122" y="14.5" />
-                </edge>
-                <edge source="gui.TravelGUI" target="gui.TaipanShopGUI">
-                  <point x="39.59999999999991" y="14.5" />
-                  <point x="2084.5653822055137" y="894.0" />
-                  <point x="2029.8002929785011" y="894.0" />
-                  <point x="15.166666666666629" y="-14.5" />
-                </edge>
-                <edge source="gui.StartGUI" target="logic.Player">
-                  <point x="-13.0" y="-14.5" />
-                  <point x="2638.5404135338345" y="1073.0" />
-                  <point x="2572.4915210486765" y="1073.0" />
-                  <point x="2572.4915210486765" y="168.0" />
-                  <point x="1572.7261626081977" y="168.0" />
-                  <point x="35.26315789473688" y="14.5" />
-                </edge>
-                <edge source="text.TaipanShopText" target="text.LoanSharkText">
-                  <point x="-20.461538461538566" y="-14.5" />
-                  <point x="394.48477341035004" y="964.0" />
-                  <point x="185.65309422471273" y="964.0" />
-                  <point x="185.65309422471273" y="597.0" />
-                  <point x="221.25" y="597.0" />
-                  <point x="31.25" y="14.5" />
-                </edge>
-                <edge source="gui.MainGUI" target="gui.StartGUI">
-                  <point x="0.0" y="-14.5" />
-                  <point x="2675.9915210486765" y="1192.0" />
-                  <point x="2674.2904135338345" y="1192.0" />
-                  <point x="22.75" y="14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="gui.LoanSharkGUI">
-                  <point x="-49.83333333333326" y="-14.5" />
-                  <point x="1964.8002929785014" y="974.0" />
-                  <point x="1511.5650520779268" y="974.0" />
-                  <point x="-45.75" y="14.5" />
-                </edge>
-                <edge source="gui.BankGUI" target="gui.TaipanShopGUI">
-                  <point x="11.625" y="14.5" />
-                  <point x="2183.830983709273" y="924.0" />
-                  <point x="2042.8002929785011" y="924.0" />
-                  <point x="28.16666666666663" y="-14.5" />
-                </edge>
-                <edge source="logic.TravelLogic" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="892.9999999999999" y="318.0" />
-                  <point x="1516.936688923987" y="318.0" />
-                  <point x="-20.526315789473756" y="14.5" />
-                </edge>
-                <edge source="logic.MainLogic" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="324.5" y="218.0" />
-                  <point x="1506.4103731345135" y="218.0" />
-                  <point x="-31.052631578947285" y="14.5" />
-                </edge>
-                <edge source="logic.WarehouseLogic" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="749.4999999999999" y="298.0" />
-                  <point x="1514.8314257660925" y="298.0" />
-                  <point x="-22.631578947368325" y="14.5" />
-                </edge>
-                <edge source="gui.RandomEventGUI" target="logic.Player">
-                  <point x="47.0" y="-14.5" />
-                  <point x="2051.0869819024883" y="696.0" />
-                  <point x="2037.9505012531326" y="696.0" />
-                  <point x="2037.9505012531326" y="328.0" />
-                  <point x="1555.8840573450398" y="328.0" />
-                  <point x="18.42105263157896" y="14.5" />
-                </edge>
-                <edge source="gui.GameEndGUI" target="logic.Player">
-                  <point x="23.600000000000023" y="-14.5" />
-                  <point x="1792.7080345340673" y="587.0" />
-                  <point x="1832.9817187445938" y="587.0" />
-                  <point x="1832.9817187445938" y="428.0" />
-                  <point x="1545.357741555566" y="428.0" />
-                  <point x="7.894736842105203" y="14.5" />
-                </edge>
-                <edge source="gui.TravelGUI" target="gui.RandomEventGUI">
-                  <point x="-14.142857142857167" y="-14.5" />
-                  <point x="2030.8225250626565" y="795.0" />
-                  <point x="2021.7119819024883" y="795.0" />
-                  <point x="17.625" y="14.5" />
-                </edge>
-                <edge source="logic.FileSaving" target="java.io.Serializable">
-                  <point x="33.66666666666674" y="-14.5" />
-                  <point x="2667.158187715343" y="795.0" />
-                  <point x="2716.5046789434136" y="795.0" />
-                  <point x="2716.5046789434136" y="54.0" />
-                  <point x="2172.524032282383" y="54.0" />
-                  <point x="26.5" y="14.5" />
-                </edge>
-                <edge source="gui.StartGUI" target="gui.TaipanShopGUI">
-                  <point x="-39.0" y="-14.5" />
-                  <point x="2612.5404135338345" y="1093.0" />
-                  <point x="1982.1336263118346" y="1093.0" />
-                  <point x="-32.5" y="14.5" />
-                </edge>
-                <edge source="gui.BankGUI" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="2172.205983709273" y="795.0" />
-                  <point x="2160.3336263118345" y="795.0" />
-                  <point x="2160.3336263118345" y="278.0" />
-                  <point x="1561.1472152397766" y="278.0" />
-                  <point x="23.684210526315837" y="14.5" />
-                </edge>
-                <edge source="gui.LoanSharkGUI" target="gui.TaipanShopGUI">
-                  <point x="15.25" y="14.5" />
-                  <point x="1572.5650520779268" y="954.0" />
-                  <point x="1973.4669596451681" y="954.0" />
-                  <point x="-41.16666666666663" y="-14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="gui.BankGUI">
-                  <point x="23.83333333333337" y="-14.5" />
-                  <point x="2038.4669596451681" y="914.0" />
-                  <point x="2160.580983709273" y="914.0" />
-                  <point x="-11.625" y="14.5" />
-                </edge>
-                <edge source="text.GameEndText" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="1510.1143280662207" y="508.0" />
-                  <point x="1536.936688923987" y="508.0" />
-                  <point x="-0.526315789473756" y="14.5" />
-                </edge>
-                <edge source="text.TaipanShopText" target="logic.Player">
-                  <point x="-40.923076923076906" y="-14.5" />
-                  <point x="374.0232349488117" y="984.0" />
-                  <point x="117.0" y="984.0" />
-                  <point x="117.0" y="178.0" />
-                  <point x="1502.199846818724" y="178.0" />
-                  <point x="-35.26315789473688" y="14.5" />
-                </edge>
-                <edge source="gui.ShipWarfareGUI" target="gui.GameEndGUI">
-                  <point x="-18.714285714285666" y="-14.5" />
-                  <point x="1806.2727791495508" y="666.0" />
-                  <point x="1783.8580345340674" y="666.0" />
-                  <point x="14.75" y="14.5" />
-                </edge>
-                <edge source="logic.FileSaving" target="logic.Player">
-                  <point x="-33.66666666666674" y="-14.5" />
-                  <point x="2599.82485438201" y="795.0" />
-                  <point x="2610.859675705537" y="795.0" />
-                  <point x="2610.859675705537" y="158.0" />
-                  <point x="1573.7787941871452" y="158.0" />
-                  <point x="36.31578947368439" y="14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="gui.GameEndGUI">
-                  <point x="-23.83333333333337" y="-14.5" />
-                  <point x="1990.8002929785011" y="914.0" />
-                  <point x="1745.8580345340674" y="914.0" />
-                  <point x="1745.8580345340674" y="696.0" />
-                  <point x="1754.3580345340674" y="696.0" />
-                  <point x="-14.75" y="14.5" />
-                </edge>
-                <edge source="logic.StartLogic" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="2337.386257890782" y="218.0" />
-                  <point x="1567.4630047134608" y="218.0" />
-                  <point x="30.0" y="14.5" />
-                </edge>
-                <edge source="gui.WarehouseGUI" target="gui.TaipanShopGUI">
-                  <point x="15.75" y="14.5" />
-                  <point x="2414.136257890782" y="964.0" />
-                  <point x="2060.1336263118346" y="964.0" />
-                  <point x="45.5" y="-14.5" />
-                </edge>
-                <edge source="logic.TaipanShopLogic" target="logic.Player">
-                  <point x="46.66666666666674" y="-14.5" />
-                  <point x="1144.115307450084" y="795.0" />
-                  <point x="1217.038736288453" y="795.0" />
-                  <point x="1217.038736288453" y="418.0" />
-                  <point x="1527.4630047134608" y="418.0" />
-                  <point x="-10.0" y="14.5" />
-                </edge>
-                <edge source="gui.MainGUI" target="javafx.application.Application">
-                  <point x="37.599999999999994" y="-14.5" />
-                  <point x="2713.5915210486764" y="1192.0" />
-                  <point x="2827.873746867168" y="1192.0" />
-                  <point x="36.33333333333337" y="14.5" />
-                </edge>
-                <edge source="text.ShipWarfareText" target="logic.ShipWarfareLogic">
-                  <point x="53.59999999999991" y="-14.5" />
-                  <point x="841.0723249939434" y="696.0" />
-                  <point x="1339.4366964872731" y="696.0" />
-                  <point x="-17.625" y="14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="logic.FileSaving">
-                  <point x="62.83333333333337" y="-14.5" />
-                  <point x="2077.466959645168" y="1004.0" />
-                  <point x="2620.8665210486765" y="1004.0" />
-                  <point x="-12.625" y="14.5" />
-                </edge>
-                <edge source="tests.PlayerTest" target="logic.Player">
-                  <point x="-25.5" y="-14.5" />
-                  <point x="1253.038736288453" y="428.0" />
-                  <point x="1528.515636292408" y="428.0" />
-                  <point x="-8.947368421052715" y="14.5" />
-                </edge>
-                <edge source="text.MainText" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="1904.0343503235408" y="388.0" />
-                  <point x="1549.5682678713556" y="388.0" />
-                  <point x="12.105263157894797" y="14.5" />
-                </edge>
-                <edge source="gui.LoanSharkGUI" target="logic.Player">
-                  <point x="-40.66666666666663" y="-14.5" />
-                  <point x="1516.6483854112603" y="795.0" />
-                  <point x="1439.1143280662207" y="795.0" />
-                  <point x="1439.1143280662207" y="488.0" />
-                  <point x="1534.8314257660925" y="488.0" />
-                  <point x="-2.6315789473683253" y="14.5" />
-                </edge>
-                <edge source="gui.ShipWarfareGUI" target="logic.ShipWarfareLogic">
-                  <point x="-37.42857142857139" y="-14.5" />
-                  <point x="1787.558493435265" y="676.0" />
-                  <point x="1409.9366964872731" y="676.0" />
-                  <point x="52.875" y="14.5" />
-                </edge>
-                <edge source="logic.GameEndLogic" target="logic.Player">
-                  <point x="32.0" y="-14.5" />
-                  <point x="1756.2580345340673" y="448.0" />
-                  <point x="1543.2524783976714" y="448.0" />
-                  <point x="5.789473684210634" y="14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="gui.TravelGUI">
-                  <point x="-2.1666666666667425" y="-14.5" />
-                  <point x="2012.466959645168" y="864.0" />
-                  <point x="2005.3653822055135" y="864.0" />
-                  <point x="-39.599999999999994" y="14.5" />
-                </edge>
-                <edge source="gui.StartGUI" target="logic.FileSaving">
-                  <point x="0.0" y="-14.5" />
-                  <point x="2651.5404135338345" y="1093.0" />
-                  <point x="2653.2415210486765" y="1093.0" />
-                  <point x="2653.2415210486765" y="1004.0" />
-                  <point x="2646.1165210486765" y="1004.0" />
-                  <point x="12.625" y="14.5" />
-                </edge>
-                <edge source="text.TaipanShopText" target="logic.TaipanShopLogic">
-                  <point x="61.38461538461547" y="-14.5" />
-                  <point x="476.3309272565041" y="1004.0" />
-                  <point x="1079.9486407834174" y="1004.0" />
-                  <point x="-17.5" y="14.5" />
-                </edge>
-                <edge source="logic.RandomEventLogic" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="2484.386257890782" y="198.0" />
-                  <point x="1569.5682678713556" y="198.0" />
-                  <point x="32.1052631578948" y="14.5" />
-                </edge>
-                <edge source="text.TaipanShopText" target="text.WarehouseText">
-                  <point x="0.0" y="-14.5" />
-                  <point x="414.9463118718886" y="944.0" />
-                  <point x="446.4223249939437" y="944.0" />
-                  <point x="446.4223249939437" y="597.0" />
-                  <point x="429.75" y="597.0" />
-                  <point x="-32.25" y="14.5" />
-                </edge>
-                <edge source="text.TravelText" target="text.ShipWarfareText">
-                  <point x="-20.40000000000009" y="-14.5" />
-                  <point x="895.661696487273" y="785.0" />
-                  <point x="820.9723249939435" y="785.0" />
-                  <point x="33.5" y="14.5" />
-                </edge>
-                <edge source="text.BankText" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="58.5" y="158.0" />
-                  <point x="1500.0945836608291" y="158.0" />
-                  <point x="-37.368421052631675" y="14.5" />
-                </edge>
-                <edge source="logic.BankLogic" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="597.9999999999999" y="268.0" />
-                  <point x="1511.6735310292502" y="268.0" />
-                  <point x="-25.789473684210634" y="14.5" />
-                </edge>
-                <edge source="text.StartText" target="logic.Player">
-                  <point x="-31.333333333333485" y="-14.5" />
-                  <point x="2186.500292978501" y="268.0" />
-                  <point x="1562.199846818724" y="268.0" />
-                  <point x="24.736842105263122" y="14.5" />
-                </edge>
-                <edge source="gui.WarehouseGUI" target="logic.Player">
-                  <point x="42.0" y="-14.5" />
-                  <point x="2440.386257890782" y="795.0" />
-                  <point x="2570.386257890782" y="795.0" />
-                  <point x="2570.386257890782" y="188.0" />
-                  <point x="1570.6208994503029" y="188.0" />
-                  <point x="33.15789473684208" y="14.5" />
-                </edge>
-                <edge source="gui.TravelGUI" target="gui.ShipWarfareGUI">
-                  <point x="-28.285714285714278" y="-14.5" />
-                  <point x="2016.6796679197994" y="775.0" />
-                  <point x="1874.1120648638364" y="775.0" />
-                  <point x="49.125" y="14.5" />
-                </edge>
-                <edge source="gui.ShipWarfareGUI" target="logic.Player">
-                  <point x="18.71428571428578" y="-14.5" />
-                  <point x="1843.7013505781222" y="696.0" />
-                  <point x="1845.0343503235408" y="696.0" />
-                  <point x="1845.0343503235408" y="408.0" />
-                  <point x="1547.4630047134608" y="408.0" />
-                  <point x="10.0" y="14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="gui.WarehouseGUI">
-                  <point x="41.16666666666663" y="-14.5" />
-                  <point x="2055.800292978501" y="954.0" />
-                  <point x="2382.636257890782" y="954.0" />
-                  <point x="-15.75" y="14.5" />
-                </edge>
-                <edge source="gui.TravelGUI" target="logic.Player">
-                  <point x="42.428571428571445" y="-14.5" />
-                  <point x="2087.393953634085" y="795.0" />
-                  <point x="2133.9981661130146" y="795.0" />
-                  <point x="2133.9981661130146" y="298.0" />
-                  <point x="1559.0419520818818" y="298.0" />
-                  <point x="21.57894736842104" y="14.5" />
-                </edge>
-                <edge source="logic.Player" target="java.io.Serializable">
-                  <point x="0.0" y="-14.5" />
-                  <point x="1537.4630047134608" y="54.0" />
-                  <point x="2119.524032282383" y="54.0" />
-                  <point x="-26.5" y="14.5" />
-                </edge>
-                <edge source="gui.GameEndGUI" target="logic.GameEndLogic">
-                  <point x="-23.600000000000023" y="-14.5" />
-                  <point x="1745.5080345340673" y="597.0" />
-                  <point x="1756.2580345340673" y="597.0" />
-                  <point x="32.0" y="14.5" />
-                </edge>
-                <edge source="gui.TaipanShopGUI" target="logic.TaipanShopLogic">
-                  <point x="-62.83333333333326" y="-14.5" />
-                  <point x="1951.8002929785014" y="1004.0" />
-                  <point x="1114.9486407834174" y="1004.0" />
-                  <point x="17.5" y="14.5" />
-                </edge>
-                <edge source="text.RandomEventText" target="logic.Player">
-                  <point x="0.0" y="-14.5" />
-                  <point x="1134.538736288453" y="398.0" />
-                  <point x="1525.357741555566" y="398.0" />
-                  <point x="-12.105263157894797" y="14.5" />
-                </edge>
-                <edge source="text.LoanSharkText" target="logic.Player">
-                  <point x="-41.66666666666674" y="-14.5" />
-                  <point x="148.33333333333326" y="188.0" />
-                  <point x="1503.2524783976714" y="188.0" />
-                  <point x="-34.210526315789366" y="14.5" />
-                </edge>
-              </edges>
-              <settings layout="Hierarchic Group" zoom="0.4564676616915422" x="1491.6076294277932" y="776.8233925662544" />
-              <SelectedNodes />
-              <Categories />
-              <SCOPE>All</SCOPE>
-              <VISIBILITY>private</VISIBILITY>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="75" column="39" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="41" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/gui/GameEndGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="607">
-              <caret line="95" column="29" selection-start-line="95" selection-start-column="29" selection-end-line="95" selection-end-column="29" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#GameEndGUI#0;class#GameEndGUI#0" />
-                <element signature="docComment;method#initializeGameEndGUI#0;class#GameEndGUI#0" />
-                <element signature="docComment;method#start#0;class#GameEndGUI#0" />
-                <element signature="method#start#0;class#GameEndGUI#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/text/TravelText.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="692">
-              <caret line="139" column="5" selection-start-line="139" selection-start-column="5" selection-end-line="139" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/text/StartText.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3740">
-              <caret line="220" column="17" selection-start-line="220" selection-start-column="17" selection-end-line="220" selection-end-column="17" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5782396">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="340">
+                  <caret line="20" selection-start-line="20" selection-end-line="20" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="187">
+                  <caret line="11" column="34" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/gui/BankGUI.java">
+              <provider selected="true" editor-type-id="text-editor" />
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="135">
+                  <caret line="133" selection-start-line="133" selection-end-line="136" selection-end-column="33" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/logic/TravelLogic.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="68">
+                  <caret line="4" selection-end-line="4" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/logic/BankLogic.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="34">
+                  <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/logic/RandomEventLogic.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="357">
+                  <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -666,6 +122,8 @@
       <find>where</find>
       <find>getName</find>
       <find>;</find>
+      <find>Goods</find>
+      <find>Y</find>
     </findStrings>
     <replaceStrings>
       <replace>player</replace>
@@ -694,9 +152,7 @@
         <option value="$PROJECT_DIR$/src/TaipanShopText.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareText.java" />
         <option value="$PROJECT_DIR$/src/tests/PlayerTest.java" />
-        <option value="$PROJECT_DIR$/src/gui/WarehouseGUI.java" />
         <option value="$PROJECT_DIR$/src/gui/LoanSharkGUI.java" />
-        <option value="$PROJECT_DIR$/src/gui/RandomEventGUI.java" />
         <option value="$PROJECT_DIR$/src/gui/StartGUI.java" />
         <option value="$PROJECT_DIR$/src/gui/ShipWarfareGUI.java" />
         <option value="$PROJECT_DIR$/src/text/loanSharkText.java" />
@@ -705,33 +161,35 @@
         <option value="$PROJECT_DIR$/src/text/LoanSharkText.java" />
         <option value="$PROJECT_DIR$/src/logic/BankLogic.java" />
         <option value="$PROJECT_DIR$/src/logic/MainLogic.java" />
-        <option value="$PROJECT_DIR$/src/logic/RandomEventLogic.java" />
         <option value="$PROJECT_DIR$/src/logic/StartLogic.java" />
         <option value="$PROJECT_DIR$/src/logic/TravelLogic.java" />
-        <option value="$PROJECT_DIR$/src/logic/WarehouseLogic.java" />
         <option value="$PROJECT_DIR$/src/text/MainText.java" />
         <option value="$PROJECT_DIR$/src/text/RandomEventText.java" />
         <option value="$PROJECT_DIR$/src/text/ShipWarfareText.java" />
         <option value="$PROJECT_DIR$/src/gui/BankGUI.java" />
-        <option value="$PROJECT_DIR$/src/logic/TaipanShopLogic.java" />
         <option value="$PROJECT_DIR$/src/logic/FileSaving.java" />
         <option value="$PROJECT_DIR$/src/text/TravelText.java" />
-        <option value="$PROJECT_DIR$/src/text/WarehouseText.java" />
         <option value="$PROJECT_DIR$/src/text/StartText.java" />
         <option value="$PROJECT_DIR$/src/text/BankText.java" />
         <option value="$PROJECT_DIR$/src/text/GameEndText.java" />
         <option value="$PROJECT_DIR$/src/logic/GameEndLogic.java" />
         <option value="$PROJECT_DIR$/src/gui/GameEndGUI.java" />
         <option value="$PROJECT_DIR$/src/gui/TaipanShopGUI.java" />
+        <option value="$PROJECT_DIR$/src/logic/TaipanShopLogic.java" />
         <option value="$PROJECT_DIR$/src/gui/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/WarehouseGUI.java" />
+        <option value="$PROJECT_DIR$/src/logic/WarehouseLogic.java" />
+        <option value="$PROJECT_DIR$/src/text/WarehouseText.java" />
+        <option value="$PROJECT_DIR$/src/logic/RandomEventLogic.java" />
+        <option value="$PROJECT_DIR$/src/gui/RandomEventGUI.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="106" />
-    <option name="y" value="-19" />
-    <option name="width" value="1189" />
-    <option name="height" value="652" />
+    <option name="x" value="1672" />
+    <option name="y" value="264" />
+    <option name="width" value="1376" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -740,51 +198,34 @@
     </navigator>
     <panes>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="gui" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="images" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="logic" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="saves" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="text" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -792,10 +233,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554676381347" />
     <property name="extract.method.default.visibility" value="public" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/src/junit-4.12.jar!/" />
@@ -843,9 +286,15 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaipanShop" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="TaipanShop" />
+    <configuration name="WarehouseText" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="text.WarehouseText" />
       <module name="TaipanClone" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="text.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -858,19 +307,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.TaipanShop" />
       <item itemvalue="Application.main" />
       <item itemvalue="Application.ShipWarfareGUI" />
       <item itemvalue="Application.MainGUI" />
       <item itemvalue="Application.ShipWarfareText" />
+      <item itemvalue="Application.WarehouseText" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.MainGUI" />
+        <item itemvalue="Application.WarehouseText" />
         <item itemvalue="Application.ShipWarfareText" />
         <item itemvalue="Application.ShipWarfareGUI" />
         <item itemvalue="Application.main" />
-        <item itemvalue="Application.TaipanShop" />
       </list>
     </recent_temporary>
   </component>
@@ -922,6 +371,7 @@
       <workItem from="1553661269531" duration="1969000" />
       <workItem from="1553965313291" duration="2578000" />
       <workItem from="1554580719911" duration="4636000" />
+      <workItem from="1554933069926" duration="10764000" />
     </task>
     <task id="LOCAL-00001" summary="Fixed duplication between Shop and Travel">
       <created>1554662120663</created>
@@ -965,12 +415,12 @@
       <option name="project" value="LOCAL" />
       <updated>1554670728348</updated>
     </task>
-    <task id="LOCAL-00007" summary="Added some stuff for the Travel Class">
-      <created>1550575512841</created>
+    <task id="LOCAL-00007" summary="Created logic class for Warehouse">
+      <created>1554940686318</created>
       <option name="number" value="00007" />
       <option name="presentableId" value="LOCAL-00007" />
       <option name="project" value="LOCAL" />
-      <updated>1550575512841</updated>
+      <updated>1554940686318</updated>
     </task>
     <task id="LOCAL-00008" summary="Added disasters as well as removing a bug from the flee method in Haris's code">
       <created>1550623749854</created>
@@ -1266,11 +716,11 @@
       <option name="project" value="LOCAL" />
       <updated>1553494120570</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="19241000" />
+    <option name="totallyTimeSpent" value="30005000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1282,10 +732,44 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
+    <frame x="1672" y="264" width="1376" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.15647922" />
+      <window_info content_ui="combo" x="151" y="114" width="256" height="893" id="Project" order="0" weight="0.15647922" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Inspection Results" order="0" weight="0.32922733" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32922733" />
+      <window_info anchor="bottom" x="22" y="418" width="1636" height="174" id="Run" order="2" sideWeight="0.49874055" weight="0.17133258" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39977604" />
+      <window_info anchor="bottom" id="Duplicates" order="4" weight="0.50391936" />
+      <window_info anchor="bottom" id="Message" order="5" />
+      <window_info anchor="bottom" id="TODO" order="6" type="SLIDING" weight="0.33034715" />
+      <window_info anchor="bottom" id="Cvs" order="7" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49938875" weight="0.32922733" />
+      <window_info anchor="bottom" id="Database Changes" order="11" />
+      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
+      <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" type="SLIDING" weight="0.18141097" />
+      <window_info anchor="bottom" id="Duplicate detector" order="15" type="SLIDING" weight="0.08958567" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Maven" order="6" />
+      <window_info anchor="right" id="Capture Analysis" order="7" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+    </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" x="151" y="114" width="256" height="893" id="Project" order="0" visible="true" weight="0.15647922" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -1304,7 +788,7 @@
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49938875" weight="0.32922733" />
       <window_info anchor="bottom" id="Database Changes" order="11" />
-      <window_info anchor="bottom" id="Terminal" order="12" type="SLIDING" weight="0.32922733" />
+      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
       <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
       <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" type="SLIDING" weight="0.18141097" />
       <window_info anchor="bottom" id="Duplicate detector" order="15" type="SLIDING" weight="0.08958567" />
@@ -1317,7 +801,10 @@
       <window_info anchor="right" id="Maven" order="6" />
       <window_info anchor="right" id="Capture Analysis" order="7" />
       <window_info anchor="right" id="Palette&#9;" order="8" />
-    </layout>
+    </layout-to-restore>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
@@ -1363,7 +850,6 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
-    <MESSAGE value="Completed SHipWarfareGUI" />
     <MESSAGE value="Completed ShipWarfareGUI" />
     <MESSAGE value="Probably should upload" />
     <MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
@@ -1388,823 +874,165 @@
     <MESSAGE value="Fixed the severe lack of TaipanShopText" />
     <MESSAGE value="Moved everything into logic classes" />
     <MESSAGE value="Made every appropriate Text and Logic class" />
-    <option name="LAST_COMMIT_MESSAGE" value="Made every appropriate Text and Logic class" />
+    <MESSAGE value="Created logic class for Warehouse" />
+    <option name="LAST_COMMIT_MESSAGE" value="Created logic class for Warehouse" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/styleguide.css">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/WarehouseGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="18" column="37" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/LoanSharkGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="22" column="38" lean-forward="true" selection-start-line="22" selection-start-column="38" selection-end-line="22" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/StartGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3808">
-          <caret line="224" column="26" selection-start-line="224" selection-start-column="26" selection-end-line="224" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/ShipWarfareGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/MainGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="26" column="47" selection-start-line="26" selection-start-column="47" selection-end-line="26" selection-end-column="47" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/MainGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="20" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/RandomEventGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/Warehouse.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/MainLogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/LoanSharkText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/MainText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/RandomEventText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="5" lean-forward="true" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/BankGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="577">
-          <caret line="163" selection-start-line="163" selection-end-line="163" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#initializeBank#0;class#BankGUI#0" />
-            <element signature="e#3009#3010#0" expanded="true" />
-            <element signature="e#3078#3079#0" expanded="true" />
-            <element signature="e#3464#3465#0" expanded="true" />
-            <element signature="e#3533#3534#0" expanded="true" />
-            <element signature="method#deposits#0;class#BankGUI#0" />
-            <element signature="method#withdraw#0;class#BankGUI#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/BankLogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="1" selection-start-line="2" selection-end-line="3" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/LoanSharkGUI.java" />
+    <entry file="file://$PROJECT_DIR$/src/gui/StartGUI.java" />
+    <entry file="file://$PROJECT_DIR$/src/gui/ShipWarfareGUI.java" />
+    <entry file="file://$PROJECT_DIR$/src/logic/MainGUI.java" />
+    <entry file="file://$PROJECT_DIR$/src/logic/RandomEventGUI.java" />
+    <entry file="file://$PROJECT_DIR$/src/logic/Warehouse.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/LoanSharkText.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/MainText.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/RandomEventText.java" />
+    <entry file="file://$PROJECT_DIR$/src/tests/PlayerTest.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/ShipWarfareText.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/StartText.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/BankText.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/GameEndText.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/TaipanShopText.java" />
+    <entry file="file://$PROJECT_DIR$/src/gui/GameEndGUI.java" />
+    <entry file="file://$PROJECT_DIR$/src/text/TravelText.java" />
+    <entry file="uml://JAVA/" />
+    <entry file="uml://JAVA/logic.TravelLogic" />
     <entry file="file://$PROJECT_DIR$/src/logic/FileSaving.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/RandomEventLogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="44" selection-start-line="2" selection-start-column="44" selection-end-line="2" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/ShipWarfareLogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-          <folding>
-            <element signature="e#1218#1219#0" expanded="true" />
-            <element signature="e#1251#1252#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-345">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/StartLogic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
-          <caret line="2" column="38" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+          <folding>
+            <element signature="e#777#778#0" expanded="true" />
+            <element signature="e#803#804#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/TravelLogic.java">
+    <entry file="file://$PROJECT_DIR$/src/logic/ShipWarfareLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-872">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/MainLogic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
-          <caret line="2" column="39" selection-start-line="2" selection-start-column="39" selection-end-line="2" selection-end-column="39" />
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/tests/PlayerTest.java">
+    <entry file="file://$PROJECT_DIR$/src/logic/Player.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="25" column="29" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/ShipWarfareText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/WarehouseLogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/TaipanShopLogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="97" column="6" selection-start-line="97" selection-start-column="6" selection-end-line="97" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/StartText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/BankText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="77" column="4" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#BankText#0;class#BankText#0" />
-            <element signature="docComment;method#bank#0;class#BankText#0" />
-            <element signature="method#bank#0;class#BankText#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/GameEndText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/TaipanShopText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="36" selection-start-line="36" selection-end-line="38" selection-end-column="38" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3740">
-          <caret line="220" column="17" selection-start-line="220" selection-start-column="17" selection-end-line="220" selection-end-column="17" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/GameEndGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="607">
-          <caret line="95" column="29" selection-start-line="95" selection-start-column="29" selection-end-line="95" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#GameEndGUI#0;class#GameEndGUI#0" />
-            <element signature="docComment;method#initializeGameEndGUI#0;class#GameEndGUI#0" />
-            <element signature="docComment;method#start#0;class#GameEndGUI#0" />
-            <element signature="method#start#0;class#GameEndGUI#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/TravelText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="692">
-          <caret line="139" column="5" selection-start-line="139" selection-start-column="5" selection-end-line="139" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="75" column="39" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="41" />
+        <state relative-caret-position="-748">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/GameEndLogic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/MainGUI.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="77" selection-start-line="3" selection-start-column="77" selection-end-line="3" selection-end-column="77" />
+        <state relative-caret-position="340">
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="uml://JAVA/">
-      <provider selected="true" editor-type-id="UmlEditorProvider">
-        <state>
-          <ID>JAVA</ID>
-          <OriginalElement />
-          <nodes>
-            <node x="0.0" y="153.0">images</node>
-            <node x="152.0" y="227.0">tests</node>
-            <node x="0.0" y="227.0">saves</node>
-            <node x="118.0" y="79.0">gui</node>
-            <node x="0.0" y="79.0">text</node>
-            <node x="55.0" y="0.0">logic</node>
-          </nodes>
-          <notes />
-          <edges>
-            <edge source="gui" target="logic">
-              <point x="0.0" y="-14.5" />
-              <point x="166.0" y="54.0" />
-              <point x="133.75" y="54.0" />
-              <point x="26.25" y="14.5" />
-            </edge>
-            <edge source="text" target="logic">
-              <point x="0.0" y="-14.5" />
-              <point x="49.0" y="54.0" />
-              <point x="81.25" y="54.0" />
-              <point x="-26.25" y="14.5" />
-            </edge>
-          </edges>
-          <settings layout="Hierarchic Group" zoom="1.0" x="-199.5" y="58.0" />
-          <SelectedNodes />
-          <Categories>
-            <Category>Fields</Category>
-            <Category>Constructors</Category>
-            <Category>Methods</Category>
-            <Category>Properties</Category>
-            <Category>Inner Classes</Category>
-          </Categories>
-          <SCOPE>Project Files</SCOPE>
-          <VISIBILITY>private</VISIBILITY>
+    <entry file="file://$PROJECT_DIR$/src/logic/TravelLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
-    <entry file="uml://JAVA/logic.TravelLogic">
-      <provider selected="true" editor-type-id="UmlEditorProvider">
-        <state>
-          <ID>JAVA</ID>
-          <OriginalElement>logic.TravelLogic</OriginalElement>
-          <nodes>
-            <node x="681.4999999999999" y="528.0">logic.WarehouseLogic</node>
-            <node x="546.4999999999999" y="528.0">logic.BankLogic</node>
-            <node x="2335.386257890782" y="815.0">gui.WarehouseGUI</node>
-            <node x="1660.2580345340673" y="528.0">logic.GameEndLogic</node>
-            <node x="10.5" y="528.0">text.BankText</node>
-            <node x="865.0616964872731" y="815.0">text.TravelText</node>
-            <node x="1286.5616964872731" y="617.0">logic.ShipWarfareLogic</node>
-            <node x="1933.5869819024883" y="716.0">gui.RandomEventGUI</node>
-            <node x="838.4999999999999" y="528.0">logic.TravelLogic</node>
-            <node x="1759.4870648638364" y="716.0">gui.ShipWarfareGUI</node>
-            <node x="2737.0404135338345" y="1113.0">javafx.application.Application</node>
-            <node x="1855.5343503235408" y="528.0">text.MainText</node>
-            <node x="1995.4653822055136" y="815.0">gui.TravelGUI</node>
-            <node x="272.5" y="528.0">logic.MainLogic</node>
-            <node x="2582.9915210486765" y="815.0">logic.FileSaving</node>
-            <node x="348.4463118718886" y="1024.0">text.TaipanShopText</node>
-            <node x="1497.4630047134608" y="79.0">logic.Player</node>
-            <node x="2170.8336263118345" y="528.0">text.StartText</node>
-            <node x="1062.538736288453" y="528.0">text.RandomEventText</node>
-            <node x="127.5" y="528.0">text.LoanSharkText</node>
-            <node x="1449.6143280662207" y="528.0">text.GameEndText</node>
-            <node x="1949.6336263118346" y="1024.0">gui.TaipanShopGUI</node>
-            <node x="397.5" y="528.0">text.WarehouseText</node>
-            <node x="1027.4486407834174" y="815.0">logic.TaipanShopLogic</node>
-            <node x="1710.1080345340674" y="617.0">gui.GameEndGUI</node>
-            <node x="2408.886257890782" y="528.0">logic.RandomEventLogic</node>
-            <node x="1227.538736288453" y="528.0">tests.PlayerTest</node>
-            <node x="2606.0404135338345" y="1113.0">gui.StartGUI</node>
-            <node x="720.4723249939435" y="716.0">text.ShipWarfareText</node>
-            <node x="2093.024032282383" y="0.0">java.io.Serializable</node>
-            <node x="2125.705983709273" y="815.0">gui.BankGUI</node>
-            <node x="2628.9915210486765" y="1212.0">gui.MainGUI</node>
-            <node x="1496.3150520779268" y="815.0">gui.LoanSharkGUI</node>
-            <node x="2286.886257890782" y="528.0">logic.StartLogic</node>
-          </nodes>
-          <notes />
-          <edges>
-            <edge source="text.TaipanShopText" target="text.BankText">
-              <point x="-51.15384615384619" y="-14.5" />
-              <point x="363.7924657180424" y="994.0" />
-              <point x="61.40309422471273" y="994.0" />
-              <point x="61.40309422471273" y="597.0" />
-              <point x="82.5" y="597.0" />
-              <point x="24.0" y="14.5" />
-            </edge>
-            <edge source="text.TaipanShopText" target="text.TravelText">
-              <point x="20.461538461538566" y="-14.5" />
-              <point x="435.4078503334272" y="964.0" />
-              <point x="890.5616964872731" y="964.0" />
-              <point x="-25.5" y="14.5" />
-            </edge>
-            <edge source="javafx.application.Application" target="javafx.application.Application">
-              <point x="-36.33333333333326" y="14.5" />
-              <point x="2755.207080200501" y="1162.0" />
-              <point x="2717.0404135338345" y="1162.0" />
-              <point x="2717.0404135338345" y="1127.5" />
-              <point x="-54.5" y="-0.0" />
-            </edge>
-            <edge source="gui.ShipWarfareGUI" target="gui.TaipanShopGUI">
-              <point x="-49.125" y="14.5" />
-              <point x="1775.8620648638364" y="795.0" />
-              <point x="1799.5142809686947" y="795.0" />
-              <point x="1799.5142809686947" y="904.0" />
-              <point x="1995.1336263118346" y="904.0" />
-              <point x="-19.5" y="-14.5" />
-            </edge>
-            <edge source="text.TravelText" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="916.0616964872731" y="775.0" />
-              <point x="957.9999999999999" y="775.0" />
-              <point x="957.9999999999999" y="328.0" />
-              <point x="1517.9893205029346" y="328.0" />
-              <point x="-19.473684210526244" y="14.5" />
-            </edge>
-            <edge source="gui.MainGUI" target="logic.Player">
-              <point x="-37.59999999999991" y="-14.5" />
-              <point x="2638.3915210486766" y="1192.0" />
-              <point x="0.0" y="1192.0" />
-              <point x="0.0" y="138.0" />
-              <point x="1497.9893205029346" y="138.0" />
-              <point x="-39.473684210526244" y="14.5" />
-            </edge>
-            <edge source="logic.ShipWarfareLogic" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="1357.0616964872731" y="597.0" />
-              <point x="1351.038736288453" y="597.0" />
-              <point x="1351.038736288453" y="458.0" />
-              <point x="1531.6735310292504" y="458.0" />
-              <point x="-5.789473684210407" y="14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="logic.Player">
-              <point x="-54.16666666666663" y="-14.5" />
-              <point x="1960.4669596451681" y="984.0" />
-              <point x="1438.0616964872731" y="984.0" />
-              <point x="1438.0616964872731" y="478.0" />
-              <point x="1533.778794187145" y="478.0" />
-              <point x="-3.6842105263158373" y="14.5" />
-            </edge>
-            <edge source="text.WarehouseText" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="462.0" y="248.0" />
-              <point x="1509.5682678713556" y="248.0" />
-              <point x="-27.894736842105203" y="14.5" />
-            </edge>
-            <edge source="gui.RandomEventGUI" target="gui.TaipanShopGUI">
-              <point x="-17.625" y="14.5" />
-              <point x="1986.4619819024883" y="795.0" />
-              <point x="1984.3336263118345" y="795.0" />
-              <point x="1984.3336263118345" y="874.0" />
-              <point x="2008.1336263118346" y="874.0" />
-              <point x="-6.5" y="-14.5" />
-            </edge>
-            <edge source="text.ShipWarfareText" target="logic.Player">
-              <point x="-53.59999999999991" y="-14.5" />
-              <point x="733.8723249939436" y="696.0" />
-              <point x="659.9999999999999" y="696.0" />
-              <point x="659.9999999999999" y="278.0" />
-              <point x="1512.7261626081977" y="278.0" />
-              <point x="-24.736842105263122" y="14.5" />
-            </edge>
-            <edge source="gui.TravelGUI" target="gui.TaipanShopGUI">
-              <point x="39.59999999999991" y="14.5" />
-              <point x="2084.5653822055137" y="894.0" />
-              <point x="2029.8002929785011" y="894.0" />
-              <point x="15.166666666666629" y="-14.5" />
-            </edge>
-            <edge source="gui.StartGUI" target="logic.Player">
-              <point x="-13.0" y="-14.5" />
-              <point x="2638.5404135338345" y="1073.0" />
-              <point x="2572.4915210486765" y="1073.0" />
-              <point x="2572.4915210486765" y="168.0" />
-              <point x="1572.7261626081977" y="168.0" />
-              <point x="35.26315789473688" y="14.5" />
-            </edge>
-            <edge source="text.TaipanShopText" target="text.LoanSharkText">
-              <point x="-20.461538461538566" y="-14.5" />
-              <point x="394.48477341035004" y="964.0" />
-              <point x="185.65309422471273" y="964.0" />
-              <point x="185.65309422471273" y="597.0" />
-              <point x="221.25" y="597.0" />
-              <point x="31.25" y="14.5" />
-            </edge>
-            <edge source="gui.MainGUI" target="gui.StartGUI">
-              <point x="0.0" y="-14.5" />
-              <point x="2675.9915210486765" y="1192.0" />
-              <point x="2674.2904135338345" y="1192.0" />
-              <point x="22.75" y="14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="gui.LoanSharkGUI">
-              <point x="-49.83333333333326" y="-14.5" />
-              <point x="1964.8002929785014" y="974.0" />
-              <point x="1511.5650520779268" y="974.0" />
-              <point x="-45.75" y="14.5" />
-            </edge>
-            <edge source="gui.BankGUI" target="gui.TaipanShopGUI">
-              <point x="11.625" y="14.5" />
-              <point x="2183.830983709273" y="924.0" />
-              <point x="2042.8002929785011" y="924.0" />
-              <point x="28.16666666666663" y="-14.5" />
-            </edge>
-            <edge source="logic.TravelLogic" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="892.9999999999999" y="318.0" />
-              <point x="1516.936688923987" y="318.0" />
-              <point x="-20.526315789473756" y="14.5" />
-            </edge>
-            <edge source="logic.MainLogic" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="324.5" y="218.0" />
-              <point x="1506.4103731345135" y="218.0" />
-              <point x="-31.052631578947285" y="14.5" />
-            </edge>
-            <edge source="logic.WarehouseLogic" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="749.4999999999999" y="298.0" />
-              <point x="1514.8314257660925" y="298.0" />
-              <point x="-22.631578947368325" y="14.5" />
-            </edge>
-            <edge source="gui.RandomEventGUI" target="logic.Player">
-              <point x="47.0" y="-14.5" />
-              <point x="2051.0869819024883" y="696.0" />
-              <point x="2037.9505012531326" y="696.0" />
-              <point x="2037.9505012531326" y="328.0" />
-              <point x="1555.8840573450398" y="328.0" />
-              <point x="18.42105263157896" y="14.5" />
-            </edge>
-            <edge source="gui.GameEndGUI" target="logic.Player">
-              <point x="23.600000000000023" y="-14.5" />
-              <point x="1792.7080345340673" y="587.0" />
-              <point x="1832.9817187445938" y="587.0" />
-              <point x="1832.9817187445938" y="428.0" />
-              <point x="1545.357741555566" y="428.0" />
-              <point x="7.894736842105203" y="14.5" />
-            </edge>
-            <edge source="gui.TravelGUI" target="gui.RandomEventGUI">
-              <point x="-14.142857142857167" y="-14.5" />
-              <point x="2030.8225250626565" y="795.0" />
-              <point x="2021.7119819024883" y="795.0" />
-              <point x="17.625" y="14.5" />
-            </edge>
-            <edge source="logic.FileSaving" target="java.io.Serializable">
-              <point x="33.66666666666674" y="-14.5" />
-              <point x="2667.158187715343" y="795.0" />
-              <point x="2716.5046789434136" y="795.0" />
-              <point x="2716.5046789434136" y="54.0" />
-              <point x="2172.524032282383" y="54.0" />
-              <point x="26.5" y="14.5" />
-            </edge>
-            <edge source="gui.StartGUI" target="gui.TaipanShopGUI">
-              <point x="-39.0" y="-14.5" />
-              <point x="2612.5404135338345" y="1093.0" />
-              <point x="1982.1336263118346" y="1093.0" />
-              <point x="-32.5" y="14.5" />
-            </edge>
-            <edge source="gui.BankGUI" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="2172.205983709273" y="795.0" />
-              <point x="2160.3336263118345" y="795.0" />
-              <point x="2160.3336263118345" y="278.0" />
-              <point x="1561.1472152397766" y="278.0" />
-              <point x="23.684210526315837" y="14.5" />
-            </edge>
-            <edge source="gui.LoanSharkGUI" target="gui.TaipanShopGUI">
-              <point x="15.25" y="14.5" />
-              <point x="1572.5650520779268" y="954.0" />
-              <point x="1973.4669596451681" y="954.0" />
-              <point x="-41.16666666666663" y="-14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="gui.BankGUI">
-              <point x="23.83333333333337" y="-14.5" />
-              <point x="2038.4669596451681" y="914.0" />
-              <point x="2160.580983709273" y="914.0" />
-              <point x="-11.625" y="14.5" />
-            </edge>
-            <edge source="text.GameEndText" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="1510.1143280662207" y="508.0" />
-              <point x="1536.936688923987" y="508.0" />
-              <point x="-0.526315789473756" y="14.5" />
-            </edge>
-            <edge source="text.TaipanShopText" target="logic.Player">
-              <point x="-40.923076923076906" y="-14.5" />
-              <point x="374.0232349488117" y="984.0" />
-              <point x="117.0" y="984.0" />
-              <point x="117.0" y="178.0" />
-              <point x="1502.199846818724" y="178.0" />
-              <point x="-35.26315789473688" y="14.5" />
-            </edge>
-            <edge source="gui.ShipWarfareGUI" target="gui.GameEndGUI">
-              <point x="-18.714285714285666" y="-14.5" />
-              <point x="1806.2727791495508" y="666.0" />
-              <point x="1783.8580345340674" y="666.0" />
-              <point x="14.75" y="14.5" />
-            </edge>
-            <edge source="logic.FileSaving" target="logic.Player">
-              <point x="-33.66666666666674" y="-14.5" />
-              <point x="2599.82485438201" y="795.0" />
-              <point x="2610.859675705537" y="795.0" />
-              <point x="2610.859675705537" y="158.0" />
-              <point x="1573.7787941871452" y="158.0" />
-              <point x="36.31578947368439" y="14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="gui.GameEndGUI">
-              <point x="-23.83333333333337" y="-14.5" />
-              <point x="1990.8002929785011" y="914.0" />
-              <point x="1745.8580345340674" y="914.0" />
-              <point x="1745.8580345340674" y="696.0" />
-              <point x="1754.3580345340674" y="696.0" />
-              <point x="-14.75" y="14.5" />
-            </edge>
-            <edge source="logic.StartLogic" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="2337.386257890782" y="218.0" />
-              <point x="1567.4630047134608" y="218.0" />
-              <point x="30.0" y="14.5" />
-            </edge>
-            <edge source="gui.WarehouseGUI" target="gui.TaipanShopGUI">
-              <point x="15.75" y="14.5" />
-              <point x="2414.136257890782" y="964.0" />
-              <point x="2060.1336263118346" y="964.0" />
-              <point x="45.5" y="-14.5" />
-            </edge>
-            <edge source="logic.TaipanShopLogic" target="logic.Player">
-              <point x="46.66666666666674" y="-14.5" />
-              <point x="1144.115307450084" y="795.0" />
-              <point x="1217.038736288453" y="795.0" />
-              <point x="1217.038736288453" y="418.0" />
-              <point x="1527.4630047134608" y="418.0" />
-              <point x="-10.0" y="14.5" />
-            </edge>
-            <edge source="gui.MainGUI" target="javafx.application.Application">
-              <point x="37.599999999999994" y="-14.5" />
-              <point x="2713.5915210486764" y="1192.0" />
-              <point x="2827.873746867168" y="1192.0" />
-              <point x="36.33333333333337" y="14.5" />
-            </edge>
-            <edge source="text.ShipWarfareText" target="logic.ShipWarfareLogic">
-              <point x="53.59999999999991" y="-14.5" />
-              <point x="841.0723249939434" y="696.0" />
-              <point x="1339.4366964872731" y="696.0" />
-              <point x="-17.625" y="14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="logic.FileSaving">
-              <point x="62.83333333333337" y="-14.5" />
-              <point x="2077.466959645168" y="1004.0" />
-              <point x="2620.8665210486765" y="1004.0" />
-              <point x="-12.625" y="14.5" />
-            </edge>
-            <edge source="tests.PlayerTest" target="logic.Player">
-              <point x="-25.5" y="-14.5" />
-              <point x="1253.038736288453" y="428.0" />
-              <point x="1528.515636292408" y="428.0" />
-              <point x="-8.947368421052715" y="14.5" />
-            </edge>
-            <edge source="text.MainText" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="1904.0343503235408" y="388.0" />
-              <point x="1549.5682678713556" y="388.0" />
-              <point x="12.105263157894797" y="14.5" />
-            </edge>
-            <edge source="gui.LoanSharkGUI" target="logic.Player">
-              <point x="-40.66666666666663" y="-14.5" />
-              <point x="1516.6483854112603" y="795.0" />
-              <point x="1439.1143280662207" y="795.0" />
-              <point x="1439.1143280662207" y="488.0" />
-              <point x="1534.8314257660925" y="488.0" />
-              <point x="-2.6315789473683253" y="14.5" />
-            </edge>
-            <edge source="gui.ShipWarfareGUI" target="logic.ShipWarfareLogic">
-              <point x="-37.42857142857139" y="-14.5" />
-              <point x="1787.558493435265" y="676.0" />
-              <point x="1409.9366964872731" y="676.0" />
-              <point x="52.875" y="14.5" />
-            </edge>
-            <edge source="logic.GameEndLogic" target="logic.Player">
-              <point x="32.0" y="-14.5" />
-              <point x="1756.2580345340673" y="448.0" />
-              <point x="1543.2524783976714" y="448.0" />
-              <point x="5.789473684210634" y="14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="gui.TravelGUI">
-              <point x="-2.1666666666667425" y="-14.5" />
-              <point x="2012.466959645168" y="864.0" />
-              <point x="2005.3653822055135" y="864.0" />
-              <point x="-39.599999999999994" y="14.5" />
-            </edge>
-            <edge source="gui.StartGUI" target="logic.FileSaving">
-              <point x="0.0" y="-14.5" />
-              <point x="2651.5404135338345" y="1093.0" />
-              <point x="2653.2415210486765" y="1093.0" />
-              <point x="2653.2415210486765" y="1004.0" />
-              <point x="2646.1165210486765" y="1004.0" />
-              <point x="12.625" y="14.5" />
-            </edge>
-            <edge source="text.TaipanShopText" target="logic.TaipanShopLogic">
-              <point x="61.38461538461547" y="-14.5" />
-              <point x="476.3309272565041" y="1004.0" />
-              <point x="1079.9486407834174" y="1004.0" />
-              <point x="-17.5" y="14.5" />
-            </edge>
-            <edge source="logic.RandomEventLogic" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="2484.386257890782" y="198.0" />
-              <point x="1569.5682678713556" y="198.0" />
-              <point x="32.1052631578948" y="14.5" />
-            </edge>
-            <edge source="text.TaipanShopText" target="text.WarehouseText">
-              <point x="0.0" y="-14.5" />
-              <point x="414.9463118718886" y="944.0" />
-              <point x="446.4223249939437" y="944.0" />
-              <point x="446.4223249939437" y="597.0" />
-              <point x="429.75" y="597.0" />
-              <point x="-32.25" y="14.5" />
-            </edge>
-            <edge source="text.TravelText" target="text.ShipWarfareText">
-              <point x="-20.40000000000009" y="-14.5" />
-              <point x="895.661696487273" y="785.0" />
-              <point x="820.9723249939435" y="785.0" />
-              <point x="33.5" y="14.5" />
-            </edge>
-            <edge source="text.BankText" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="58.5" y="158.0" />
-              <point x="1500.0945836608291" y="158.0" />
-              <point x="-37.368421052631675" y="14.5" />
-            </edge>
-            <edge source="logic.BankLogic" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="597.9999999999999" y="268.0" />
-              <point x="1511.6735310292502" y="268.0" />
-              <point x="-25.789473684210634" y="14.5" />
-            </edge>
-            <edge source="text.StartText" target="logic.Player">
-              <point x="-31.333333333333485" y="-14.5" />
-              <point x="2186.500292978501" y="268.0" />
-              <point x="1562.199846818724" y="268.0" />
-              <point x="24.736842105263122" y="14.5" />
-            </edge>
-            <edge source="gui.WarehouseGUI" target="logic.Player">
-              <point x="42.0" y="-14.5" />
-              <point x="2440.386257890782" y="795.0" />
-              <point x="2570.386257890782" y="795.0" />
-              <point x="2570.386257890782" y="188.0" />
-              <point x="1570.6208994503029" y="188.0" />
-              <point x="33.15789473684208" y="14.5" />
-            </edge>
-            <edge source="gui.TravelGUI" target="gui.ShipWarfareGUI">
-              <point x="-28.285714285714278" y="-14.5" />
-              <point x="2016.6796679197994" y="775.0" />
-              <point x="1874.1120648638364" y="775.0" />
-              <point x="49.125" y="14.5" />
-            </edge>
-            <edge source="gui.ShipWarfareGUI" target="logic.Player">
-              <point x="18.71428571428578" y="-14.5" />
-              <point x="1843.7013505781222" y="696.0" />
-              <point x="1845.0343503235408" y="696.0" />
-              <point x="1845.0343503235408" y="408.0" />
-              <point x="1547.4630047134608" y="408.0" />
-              <point x="10.0" y="14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="gui.WarehouseGUI">
-              <point x="41.16666666666663" y="-14.5" />
-              <point x="2055.800292978501" y="954.0" />
-              <point x="2382.636257890782" y="954.0" />
-              <point x="-15.75" y="14.5" />
-            </edge>
-            <edge source="gui.TravelGUI" target="logic.Player">
-              <point x="42.428571428571445" y="-14.5" />
-              <point x="2087.393953634085" y="795.0" />
-              <point x="2133.9981661130146" y="795.0" />
-              <point x="2133.9981661130146" y="298.0" />
-              <point x="1559.0419520818818" y="298.0" />
-              <point x="21.57894736842104" y="14.5" />
-            </edge>
-            <edge source="logic.Player" target="java.io.Serializable">
-              <point x="0.0" y="-14.5" />
-              <point x="1537.4630047134608" y="54.0" />
-              <point x="2119.524032282383" y="54.0" />
-              <point x="-26.5" y="14.5" />
-            </edge>
-            <edge source="gui.GameEndGUI" target="logic.GameEndLogic">
-              <point x="-23.600000000000023" y="-14.5" />
-              <point x="1745.5080345340673" y="597.0" />
-              <point x="1756.2580345340673" y="597.0" />
-              <point x="32.0" y="14.5" />
-            </edge>
-            <edge source="gui.TaipanShopGUI" target="logic.TaipanShopLogic">
-              <point x="-62.83333333333326" y="-14.5" />
-              <point x="1951.8002929785014" y="1004.0" />
-              <point x="1114.9486407834174" y="1004.0" />
-              <point x="17.5" y="14.5" />
-            </edge>
-            <edge source="text.RandomEventText" target="logic.Player">
-              <point x="0.0" y="-14.5" />
-              <point x="1134.538736288453" y="398.0" />
-              <point x="1525.357741555566" y="398.0" />
-              <point x="-12.105263157894797" y="14.5" />
-            </edge>
-            <edge source="text.LoanSharkText" target="logic.Player">
-              <point x="-41.66666666666674" y="-14.5" />
-              <point x="148.33333333333326" y="188.0" />
-              <point x="1503.2524783976714" y="188.0" />
-              <point x="-34.210526315789366" y="14.5" />
-            </edge>
-          </edges>
-          <settings layout="Hierarchic Group" zoom="0.4564676616915422" x="1491.6076294277932" y="776.8233925662544" />
-          <SelectedNodes />
-          <Categories />
-          <SCOPE>All</SCOPE>
-          <VISIBILITY>private</VISIBILITY>
+    <entry file="file://$PROJECT_DIR$/src/logic/BankLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/BankGUI.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/TaipanShopLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="17" column="31" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="34" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/WarehouseGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="49">
+          <caret line="239" column="50" lean-forward="true" selection-start-line="239" selection-start-column="50" selection-end-line="239" selection-end-column="50" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#settingBorderFormat#0;class#WarehouseGUI#0" />
+            <element signature="method#updateLabels#0;class#WarehouseGUI#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1158">
+          <caret line="5" column="25" lean-forward="true" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
+          <folding>
+            <element signature="method#showWarehouse#0;class#WarehouseText#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/WarehouseLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="133" selection-start-line="133" selection-end-line="136" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/RandomEventLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
         </state>
       </provider>
     </entry>
diff --git a/src/gui/LoanSharkGUI.java b/src/gui/LoanSharkGUI.java
index 542fb8f..47c1066 100644
--- a/src/gui/LoanSharkGUI.java
+++ b/src/gui/LoanSharkGUI.java
@@ -169,13 +169,6 @@ public class LoanSharkGUI extends Player {
         //primaryStage.show();
         return primaryStage;
     }
-
-
-    public void start(Stage primaryStage) {
-        LoanSharkGUI loan = new LoanSharkGUI(getPlayer());
-        loan.initializeLoanShark(primaryStage);
-        primaryStage.show();
-    }
 }
 
 
diff --git a/src/gui/RandomEventGUI.java b/src/gui/RandomEventGUI.java
index 2fae948..e080a3b 100644
--- a/src/gui/RandomEventGUI.java
+++ b/src/gui/RandomEventGUI.java
@@ -8,8 +8,7 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import logic.Player;
-
-import java.util.Random;
+import logic.RandomEventLogic;
 
 /**
  * 2019-03-19
@@ -132,33 +131,20 @@ public class RandomEventGUI extends Player {
         * 2: Paying Liu Yuen
         * 3: Repairing the Ship
         */
-        Random rand = new Random();
-        int randGenNum = rand.nextInt(3) + 1;
-        while(true){
-            //Buy Guns
-            if (randGenNum == 1) {
-                itemPrice = (int) ((getPlayer().getMoney() * 0.1) + 10);
-                sellingItemLabel.setText("A vender is selling a gun for $" + itemPrice + " for a gun?");
-                break;
-            }
-            //Liu Yuen
-            if (randGenNum == 2) {
-                itemPrice = (int) ((getPlayer().getMoney() * 0.1) + 10);
-                sellingItemLabel.setText("Liu Yuen asks $" + itemPrice + " in donation to the temple of Tin Hau, the Sea Goddess");
-                setAttackingShips(true);
-                break;
-            }
-            //Ship Repair
-            if (randGenNum == 3 && getHP() < 100) {
-                itemPrice = (int) ((100 - getPlayer().getHP()) * 10 + 10);
-                sellingItemLabel.setText("Mc Henry from the Hong Kong shipyard has arrived,\n would be willing to repair your ship for $" + itemPrice);
-                break;
-            }
-            else {
-                randGenNum = 2;
-            }
+        RandomEventLogic randomEventLogic = new RandomEventLogic(getPlayer());
+        int[] randEvent = randomEventLogic.randEvent();
+        eventNumber = randEvent[0];
+        itemPrice = randEvent[1];
+
+        if(eventNumber == 1){
+            sellingItemLabel.setText("A vender is selling a gun for $" + itemPrice + " for a gun?");
+        }
+        if(eventNumber == 2){
+            sellingItemLabel.setText("Liu Yuen asks $" + itemPrice + " in donation to the temple of Tin Hau, the Sea Goddess");
+        }
+        if(eventNumber == 3){
+            sellingItemLabel.setText("Mc Henry from the Hong Kong shipyard has arrived,\n would be willing to repair your ship for $" + itemPrice);
         }
-        eventNumber = randGenNum;
 
         if((eventNumber == 1 && getCargoSpace() < 10)){
             TaipanShopGUI taipanShopGUI = new TaipanShopGUI(getPlayer());
@@ -229,4 +215,6 @@ public class RandomEventGUI extends Player {
         stage.setScene(root);
         return stage;
     }
+
+
 }
\ No newline at end of file
diff --git a/src/gui/TravelGUI.java b/src/gui/TravelGUI.java
index 567b96e..1298dc2 100644
--- a/src/gui/TravelGUI.java
+++ b/src/gui/TravelGUI.java
@@ -18,7 +18,6 @@ import logic.Player;
 import java.util.Random;
 
 public class TravelGUI extends Player {
-    private TaipanShopGUI shop;
     private Label firm = new Label();
     private Label wItemsText = new Label();
     private Label wItemSpaceText = new Label();
diff --git a/src/gui/WarehouseGUI.java b/src/gui/WarehouseGUI.java
index 7b576c5..a5c5585 100644
--- a/src/gui/WarehouseGUI.java
+++ b/src/gui/WarehouseGUI.java
@@ -1,6 +1,7 @@
 package gui;
 
 import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
@@ -9,10 +10,11 @@ import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import logic.Player;
+import logic.WarehouseLogic;
 
 /**
  * 2019-03-19
- * Authors:Siddhant, Vikram, Harkamal, Haris, Nathan
+ * Authors:Siddhant and Harkamal
  * WarehouseGUI allows the user to store goods in a warehouse in order to have more hold on the ship
  */
 
@@ -90,13 +92,7 @@ public class WarehouseGUI extends Player {
         textField = new TextField();
 
         //Creating the box for the warehouse GUI
-        borderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER);
-        hBox.setAlignment(javafx.geometry.Pos.CENTER);
-        hBox.setPrefHeight(100.0);
-        hBox.setPrefWidth(200.0);
-        hBox.setSpacing(10.0);
-
-        vBox.setAlignment(javafx.geometry.Pos.CENTER_LEFT);
+        settingBorderFormat(hBox, vBox);
         vBox.setPrefHeight(200.0);
         vBox.setPrefWidth(100.0);
 
@@ -137,20 +133,14 @@ public class WarehouseGUI extends Player {
 
 
         //Takes you to the HK warehouse
-        borderPane.setAlignment(title, javafx.geometry.Pos.CENTER);
+        borderPane.setAlignment(title, Pos.CENTER);
         title.setText("Hong Kong Warehouse");
         title.setFont(new Font(24.0));
         title.setPadding(new Insets(10.0, 0.0, 0.0, 0.0));
         borderPane.setTop(title);
 
         // Making the BOX again
-        borderPane.setAlignment(hBox0, javafx.geometry.Pos.CENTER);
-        hBox0.setAlignment(javafx.geometry.Pos.CENTER);
-        hBox0.setPrefHeight(100.0);
-        hBox0.setPrefWidth(200.0);
-        hBox0.setSpacing(10.0);
-
-        vBox0.setAlignment(javafx.geometry.Pos.CENTER_LEFT);
+        settingBorderFormat(hBox0, vBox0);
         vBox0.setSpacing(10.0);
 
         playerLabel.setText("Player:");
@@ -171,10 +161,10 @@ public class WarehouseGUI extends Player {
 
         playerOpium.setText("Opium:");
 
-        vBox1.setAlignment(javafx.geometry.Pos.CENTER_LEFT);
+        vBox1.setAlignment(Pos.CENTER_LEFT);
         vBox1.setSpacing(10.0);
 
-        houseLabel.setAlignment(javafx.geometry.Pos.TOP_CENTER);
+        houseLabel.setAlignment(Pos.TOP_CENTER);
         houseLabel.setText("Warehouse:");
         houseLabel.setFont(new Font(18.0));
 
@@ -231,85 +221,46 @@ public class WarehouseGUI extends Player {
             taipanShopGUI.initializeShop(stage);
             stage.show();
         });
+
         //Runs when the withdraw button is selected. and removes the amount of the selected good
         withdrawButton.setOnAction(event -> {
-            try {
-                int withdraw = Integer.parseInt(textField.getText());
-
-                if(withdraw <= 0){
-                    title.setText("Please enter a valid value");
-                }
-                //Transfers general amount
-                else if(Goods.getSelectedToggle() == generalRadio && withdraw <= getwGeneral()){
-                    setGeneralHeld(getPlayer().getGeneralHeld()+withdraw);
-                    setwGeneral(getPlayer().getwGeneral()-withdraw);
-                }
-                //Transfers Arms amount
-                else if(Goods.getSelectedToggle() == armsRadio && withdraw <= getwArms()){
-                    setArmsHeld(getPlayer().getArmsHeld()+withdraw);
-                    setwArms(getPlayer().getwArms()-withdraw);
-                }
-                //Transfers Silk Amount
-                else if(Goods.getSelectedToggle() == silkRadio && withdraw <= getwSilk()){
-                    setSilkHeld(getPlayer().getSilkHeld()+withdraw);
-                    setwSilk(getPlayer().getwSilk()-withdraw);
-                }
-                //Transfers Opium amount
-                else if(Goods.getSelectedToggle() == opiumRadio && withdraw <= getwOpium()) {
-                    setOpiumHeld(getPlayer().getOpiumHeld() + withdraw);
-                    setwOpium(getPlayer().getwOpium() - withdraw);
-                }
-                // Ensures a valid value is entered
-                else{
-                    title.setText("Please enter a valid value");
-                }
-                updateLabels();
+            WarehouseLogic warehouseLogic = new WarehouseLogic(getPlayer());
+            if(Goods.getSelectedToggle() == generalRadio){
+                title.setText(warehouseLogic.withdraw(textField.getText(),1));
             }
-            catch (Exception e) {
-                title.setText("Please enter a valid value");
+            else if(Goods.getSelectedToggle() == armsRadio){
+                title.setText(warehouseLogic.withdraw(textField.getText(),2));
             }
+            else if(Goods.getSelectedToggle() == silkRadio){
+                title.setText(warehouseLogic.withdraw(textField.getText(),3));
+            }
+            else if(Goods.getSelectedToggle() == opiumRadio){
+                title.setText(warehouseLogic.withdraw(textField.getText(),4));
+            }
+            setPlayer(warehouseLogic.getPlayer());
+            updateLabels();
         });
+
         //Button to add a user entered amount to the warehouse
         depositButton.setOnAction(event -> {
-            try {
-                int deposit = Integer.parseInt(textField.getText());
-
-                if(deposit <= 0){
-                    title.setText("Please enter a valid value");
-                }
-                //Transfers general amount
-                else if(Goods.getSelectedToggle() == generalRadio && deposit <= getGeneralHeld()){
-                    setGeneralHeld(getPlayer().getGeneralHeld()-deposit);
-                    setwGeneral(getPlayer().getwGeneral()+deposit);
-                }
-                //Transfers Arms  amount
-                else if(Goods.getSelectedToggle() == armsRadio && deposit <= getArmsHeld()){
-                    setArmsHeld(getPlayer().getArmsHeld()-deposit);
-                    setwArms(getPlayer().getwArms()+deposit);
-                }
-                //Transfers Silk amount
-                else if(Goods.getSelectedToggle() == silkRadio && deposit <= getSilkHeld()){
-                    setSilkHeld(getPlayer().getSilkHeld()-deposit);
-                    setwSilk(getPlayer().getwSilk()+deposit);
-                }
-                //Transfers Opium amount
-                else if(Goods.getSelectedToggle() == opiumRadio && deposit <= getOpiumHeld()){
-                    setOpiumHeld(getPlayer().getOpiumHeld()-deposit);
-                    setwOpium(getPlayer().getwOpium()+deposit);
-                }
-                //Checks if the correct value is entered
-                else{
-                    title.setText("Please enter a valid value");
-                }
-                updateLabels();
+            WarehouseLogic warehouseLogic = new WarehouseLogic(getPlayer());
+            if(Goods.getSelectedToggle() == generalRadio){
+                title.setText(warehouseLogic.deposit(textField.getText(),1));
             }
-            catch (Exception e) {
-                title.setText("Please enter a valid value");
+            else if(Goods.getSelectedToggle() == armsRadio){
+                title.setText(warehouseLogic.deposit(textField.getText(),2));
             }
+            else if(Goods.getSelectedToggle() == silkRadio){
+                title.setText(warehouseLogic.deposit(textField.getText(),3));
+            }
+            else if(Goods.getSelectedToggle() == opiumRadio){
+                title.setText(warehouseLogic.deposit(textField.getText(),4));
+            }
+            setPlayer(warehouseLogic.getPlayer());
+            updateLabels();
         });
 
-
-        //Create the sceene and box of the desired size
+        //Create the scene and box of the desired size
         Scene root = new Scene(borderPane, 600, 480);
         root.getStylesheets().add("styleguide.css");
 
@@ -319,6 +270,15 @@ public class WarehouseGUI extends Player {
         return stage;
     }
 
+    public void settingBorderFormat(HBox hBox, VBox vBox) {
+        borderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER);
+        hBox.setAlignment(javafx.geometry.Pos.CENTER);
+        hBox.setPrefHeight(100.0);
+        hBox.setPrefWidth(200.0);
+        hBox.setSpacing(10.0);
+        vBox.setAlignment(javafx.geometry.Pos.CENTER_LEFT);
+    }
+
     /**
      * As soon as the transfer is made the table of the amount of goods is updated using this method
      */
diff --git a/src/logic/MainLogic.java b/src/logic/MainLogic.java
deleted file mode 100644
index cc625e3..0000000
--- a/src/logic/MainLogic.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package logic;
-
-public class MainLogic extends Player{
-}
diff --git a/src/logic/RandomEventLogic.java b/src/logic/RandomEventLogic.java
index 51e3776..e6e743a 100644
--- a/src/logic/RandomEventLogic.java
+++ b/src/logic/RandomEventLogic.java
@@ -1,4 +1,45 @@
 package logic;
 
+import java.util.Random;
+
 public class RandomEventLogic extends Player{
+
+    /**
+     * constructor; only runs when a Player object is provided. The constructor is fully encapsulated.
+     *
+     * @param player is a Player object that will be copied and the player instance variable is set to the copy.
+     */
+    public RandomEventLogic(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public int[] randEvent() {
+        Random rand = new Random();
+        int itemPrice;
+        int randGenNum = rand.nextInt(3) + 1;
+        while(true){
+            //Buy Guns
+            if (randGenNum == 1) {
+                itemPrice = (int) ((getPlayer().getMoney() * 0.1) + 10);
+                break;
+            }
+            //Liu Yuen
+            if (randGenNum == 2) {
+                itemPrice = (int) ((getPlayer().getMoney() * 0.1) + 10);
+                setAttackingShips(true);
+                break;
+            }
+            //Ship Repair
+            if (randGenNum == 3 && getHP() < 100) {
+                itemPrice = (int) ((100 - getPlayer().getHP()) * 10 + 10);
+                break;
+            }
+            else {
+                randGenNum = 2;
+            }
+        }
+        return new int[]{randGenNum,itemPrice};
+    }
+
 }
diff --git a/src/logic/TaipanShopLogic.java b/src/logic/TaipanShopLogic.java
index 6bf7d90..2dcf213 100644
--- a/src/logic/TaipanShopLogic.java
+++ b/src/logic/TaipanShopLogic.java
@@ -1,6 +1,7 @@
-package logic; /**
+package logic;
+
+/**
  * TaipanShopLogic deals with the computations necessary for the shop such as randomizing prices.
- *
  * Author: Vikram Bawa
  */
 import java.util.Random;
diff --git a/src/logic/WarehouseLogic.java b/src/logic/WarehouseLogic.java
index 36ae6fd..25c882c 100644
--- a/src/logic/WarehouseLogic.java
+++ b/src/logic/WarehouseLogic.java
@@ -1,4 +1,94 @@
 package logic;
 
 public class WarehouseLogic extends Player {
+
+    /**
+     * constructor; only runs when a Player object is provided. The constructor is fully encapsulated.
+     *
+     * @param player is a Player object that will be copied and the player instance variable is set to the copy.
+     */
+    public WarehouseLogic(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public String deposit(String str, int goodsNum) {
+        try {
+            int deposit = Integer.parseInt(str);
+            if(deposit <= 0){
+                return "Please enter a valid value";
+            }
+            //Transfers General amount
+            else if(goodsNum == 1 && deposit <= getGeneralHeld()){
+                setGeneralHeld(getPlayer().getGeneralHeld()-deposit);
+                setwGeneral(getPlayer().getwGeneral()+deposit);
+                return "Successful deposit";
+            }
+            //Transfers Arms amount
+            else if(goodsNum == 2 && deposit <= getArmsHeld()){
+                setArmsHeld(getPlayer().getArmsHeld()-deposit);
+                setwArms(getPlayer().getwArms()+deposit);
+                return "Successful deposit";
+            }
+            //Transfers Silk amount
+            else if(goodsNum == 3 && deposit <= getSilkHeld()){
+                setSilkHeld(getPlayer().getSilkHeld()-deposit);
+                setwSilk(getPlayer().getwSilk()+deposit);
+                return "Successful deposit";
+            }
+            //Transfers Opium amount
+            else if(goodsNum == 4 && deposit <= getOpiumHeld()){
+                setOpiumHeld(getPlayer().getOpiumHeld()-deposit);
+                setwOpium(getPlayer().getwOpium()+deposit);
+                return "Successful deposit";
+            }
+            //Checks if the correct value is entered
+            else{
+                return "Please enter a valid value";
+            }
+        }
+        catch (Exception e) {
+            return "Please enter a valid value";
+        }
+    }
+
+    public String withdraw(String str, int goodsNum) {
+        try {
+            int withdraw = Integer.parseInt(str);
+            if(withdraw <= 0){
+                return "Please enter a valid value";
+            }
+            //Transfers general amount
+            else if(goodsNum == 1 && withdraw <= getwGeneral()){
+                setGeneralHeld(getPlayer().getGeneralHeld()+withdraw);
+                setwGeneral(getPlayer().getwGeneral()-withdraw);
+                return "Successful withdraw";
+            }
+            //Transfers Arms amount
+            else if(goodsNum == 2 && withdraw <= getwArms()){
+                setArmsHeld(getPlayer().getArmsHeld()+withdraw);
+                setwArms(getPlayer().getwArms()-withdraw);
+                return "Successful withdraw";
+            }
+            //Transfers Silk Amount
+            else if(goodsNum == 3 && withdraw <= getwSilk()){
+                setSilkHeld(getPlayer().getSilkHeld()+withdraw);
+                setwSilk(getPlayer().getwSilk()-withdraw);
+                return "Successful withdraw";
+            }
+            //Transfers Opium amount
+            else if(goodsNum == 4 && withdraw <= getwOpium()) {
+                setOpiumHeld(getPlayer().getOpiumHeld() + withdraw);
+                setwOpium(getPlayer().getwOpium() - withdraw);
+                return "Successful withdraw";
+            }
+            // Ensures a valid value is entered
+            else{
+                return "Please enter a valid value";
+            }
+        }
+        catch (Exception e) {
+            return "Please enter a valid value";
+        }
+    }
 }
diff --git a/src/saves/playerSave.txt b/src/saves/playerSave.txt
index 6191cc5..f1e8ef0 100644
Binary files a/src/saves/playerSave.txt and b/src/saves/playerSave.txt differ
diff --git a/src/text/WarehouseText.java b/src/text/WarehouseText.java
index a33a300..4f57fd9 100644
--- a/src/text/WarehouseText.java
+++ b/src/text/WarehouseText.java
@@ -1,6 +1,7 @@
 package text;
 
 import logic.Player;
+import logic.WarehouseLogic;
 
 import java.util.Scanner;
 
@@ -20,80 +21,29 @@ public class WarehouseText extends Player {
      *
      */
     public void addAmount() {
-        boolean askGood = false;
-        String amount;
-        int finalAmount = 0;
-        System.out.println("Please enter the amount of the good you would like to ADD.");
         Scanner keyboard = new Scanner(System.in);
-        amount = keyboard.nextLine();//Asks the user for the amount of the good they would like to add
+
+        System.out.println("Please enter the amount of the good you would like to deposit.");
+        String amount = keyboard.nextLine();
+        //Asks the user for the amount of the good they would like to add
          /*The try function ensures that the program does not crash
          due to any errors while giving the program an incorrect input*/
-        try {
-            //The if statement checks that you have enough resources to make the transfer
-            if (Integer.parseInt(amount) <= getOpiumHeld() || Integer.parseInt(amount) <= getSilkHeld() || Integer.parseInt(amount) <= getGeneralHeld() || Integer.parseInt(amount) <= getArmsHeld()) {
-                finalAmount = Integer.parseInt(amount);
-                askGood = true;
-            }
-            //Else statement lets the user know that they do not hav enough goods to make the requested transfer
-            else {
-                System.out.println("Nice try but you don't have any items of that quantity!");
-                askGood = false;
-            }
-            //Ensures that goods are only transferred if they have the specified amount
-            //The user is prompted to enter which good they want to transfer
-            if (askGood == true) {
-                String good;
-                System.out.println("Please enter a good to transfer O, S, G, A :");
-                good = keyboard.nextLine();
-                int held = 0;
-                //The following set of loops check to see which good the user has selected and makes the transfer
-                if (Integer.parseInt(amount) > 0) {
-                    if (good.equalsIgnoreCase("O")) {
-                        if (getOpiumHeld() >= Integer.parseInt(amount)) {
-                            setwOpium(getwOpium() + finalAmount);
-                            held = getOpiumHeld();
-                            setOpiumHeld(held - finalAmount);
-                            System.out.println(getOpiumHeld());
-                        } else {
-                            System.out.println("You don't even have that much opium!");
-                        }
-                    } else if (good.equalsIgnoreCase("S")) {
-                        if (getSilkHeld() >= Integer.parseInt(amount)) {
-                            setwSilk(getwSilk() + finalAmount);
-                            held = getSilkHeld();
-                            setSilkHeld(held - finalAmount);
-                        } else {
-                            System.out.println("You don't even have that much silk!");
-
-                        }
-                    } else if (good.equalsIgnoreCase("G")) {
-                        if (getGeneralHeld() >= Integer.parseInt(amount)) {
-                            setwGeneral(getwGeneral() + finalAmount);
-                            held = getGeneralHeld();
-                            setGeneralHeld(held - finalAmount);
-                        } else {
-                            System.out.println("You don't even have that much general cargo!");
-
-                        }
-                    } else if (good.equalsIgnoreCase("A")) {
-                        if (getArmsHeld() >= Integer.parseInt(amount)) {
-                            setwArms(getwArms() + finalAmount);
-                            held = getArmsHeld();
-                            setArmsHeld(held - finalAmount);
-                        } else {
-                            System.out.println("You don't even have that much Arms!");
-                        }
-                    }
-                }
-                //Ensures no negative amounts are entered
-                else {
-                    System.out.println("Sorry this transfer cannot be made");
-                }
-            }
-            //If the program errors out this is the message displayed and the method is re-run, so that the game does not end.
-        } catch (Exception e) {
-            System.out.println("Wait, that's not a valid input please try again");
+        System.out.println("Please enter a good to transfer O, S, A, G :");
+        String good = keyboard.nextLine();
+        WarehouseLogic warehouseLogic = new WarehouseLogic(getPlayer());
+        if(good.equalsIgnoreCase("g")){
+            System.out.println(warehouseLogic.deposit(amount,1));
         }
+        else if(good.equalsIgnoreCase("a")){
+            System.out.println(warehouseLogic.deposit(amount,2));
+        }
+        else if(good.equalsIgnoreCase("s")){
+            System.out.println(warehouseLogic.deposit(amount,3));
+        }
+        else if(good.equalsIgnoreCase("o")){
+            System.out.println(warehouseLogic.deposit(amount,4));
+        }
+        setPlayer(warehouseLogic.getPlayer());
     }
 
     /**
@@ -106,82 +56,28 @@ public class WarehouseText extends Player {
      */
 
     public void removeAmount() {
-        String amount;
-        boolean askGood = false;
-        int finalAmount = 0;
-        System.out.println("Please enter the amount of the good you would like to REMOVE");
         Scanner keyboard = new Scanner(System.in);
-        //Prompts the user for the amount they would like to remove
-        amount = keyboard.nextLine();
-        //The if statement checks that you have enough resources to make the transfer
-        try {
-            //The if statement checks that you have enough resources to make the transfer
-            if (Integer.parseInt(amount) <= getwOpium() || Integer.parseInt(amount) <= getwSilk() || Integer.parseInt(amount) <= getwGeneral() || Integer.parseInt(amount) <= getwArms()) {
-                finalAmount = Integer.parseInt(amount);
-                askGood = true;
-            }
-            //Else statement lets the user know that they do not hav enough goods to make the requested transfer
-            else {
-                System.out.println("Nice try but you don't have any items of that quantity in the warehouse!");
-                askGood = false;
-            }
-
-            //Ensures that goods are only transferred if they have the specified amount
-            //The user is prompted to enter which good they want to transfer
-
-            if (askGood == true) {
-                String good;
-                System.out.println("Please enter a good to transfer O, S, G, A :");
-                good = keyboard.nextLine();
-                int held = 0;
-                //The following set of loops check to see which good the user has selected and makes the transfer and amount > 0
-                if (Integer.parseInt(amount) > 0) {
-                    if (good.equalsIgnoreCase("O")) {
-                        if (getwOpium() >= Integer.parseInt(amount)) {
-                            setwOpium(getwOpium() - Integer.parseInt(amount));
-                            held = getOpiumHeld();
-                            setOpiumHeld(held + finalAmount);
-                        } else {
-                            System.out.println("You don't have that much opium stored in the warehouse!");
-                        }
-                    } else if (good.equalsIgnoreCase("S")) {
-                        if (getwSilk() >= Integer.parseInt(amount)) {
-                            setwSilk(getwSilk() - Integer.parseInt(amount));
-                            held = getSilkHeld();
-                            setSilkHeld(held + finalAmount);
-                        } else {
-                            System.out.println("You don't have that much silk stored in the warehouse!");
-                        }
-                    } else if (good.equalsIgnoreCase("G")) {
-                        if (getwGeneral() >= Integer.parseInt(amount)) {
-                            setwGeneral(getwGeneral() - Integer.parseInt(amount));
-                            held = getGeneralHeld();
-                            setGeneralHeld(held + finalAmount);
-                        } else {
-                            System.out.println("You don't have that much general cargo stored in the warehouse!");
-
-                        }
-                    } else if (good.equalsIgnoreCase("A")) {
-                        if (getwArms() >= Integer.parseInt(amount)) {
-                            setwArms(getwArms() - Integer.parseInt(amount));
-                            held = getArmsHeld();
-                            setArmsHeld(held + finalAmount);
-                        } else {
-                            System.out.println("You don't have that much arms stored in the warehouse!");
-
-                        }
-                    }
-                }
-                //Ensures the value entered is positive
-                else {
-                    System.out.println("Sorry this transfer cannot be made");
-                }
-            }
+        System.out.println("Please enter the amount of the good you would like to withdraw.");
+        String amount = keyboard.nextLine();
+        //Asks the user for the amount of the good they would like to withdraw
+         /*The try function ensures that the program does not crash
+         due to any errors while giving the program an incorrect input*/
+        System.out.println("Please enter a good to withdraw (O)pium, (S)ilk, (A)rms, (G)eneral:");
+        String good = keyboard.nextLine();
+        WarehouseLogic warehouseLogic = new WarehouseLogic(getPlayer());
+        if(good.equalsIgnoreCase("g")){
+            System.out.println(warehouseLogic.withdraw(amount,1));
         }
-        //If the program errors out this is the message displayed and the method is re-run, so that the game does not end.
-        catch (Exception e){
-            System.out.println("Wait, that's not a valid input please try again");
+        else if(good.equalsIgnoreCase("a")){
+            System.out.println(warehouseLogic.withdraw(amount,2));
         }
+        else if(good.equalsIgnoreCase("s")){
+            System.out.println(warehouseLogic.withdraw(amount,3));
+        }
+        else if(good.equalsIgnoreCase("o")){
+            System.out.println(warehouseLogic.withdraw(amount,4));
+        }
+        setPlayer(warehouseLogic.getPlayer());
     }
 
     /**
@@ -206,26 +102,23 @@ public class WarehouseText extends Player {
         boolean keepGoing = true;
         while (keepGoing) {
             this.showWarehouse();
-            String input = " ";
-            System.out.println("Would you like to add(A) or remove(R) resources? ");
+            System.out.println("Would you like to (D)eposit or (W)ithdraw resources? ");
             Scanner keyboard = new Scanner(System.in);
-            input = keyboard.next();
-            if (input.equalsIgnoreCase("R")) {
+            String input = keyboard.next();
+            if (input.equalsIgnoreCase("D")) {
                 this.removeAmount();
                 this.showWarehouse();
-            } else if (input.equalsIgnoreCase("A")) {
+            } else if (input.equalsIgnoreCase("W")) {
                 this.addAmount();
                 this.showWarehouse();
-
             }
             else{
                 System.out.println("Don't waste the warehouse's time, try again later with a valid input");
             }
 
-            String check;
             //Check to see if the player wants to continue in the warehouse or they are done
             System.out.println("Would you like to do any other business? Y / N?");
-            check = keyboard.nextLine();
+            String check = keyboard.nextLine();
             check = keyboard.nextLine();
 
             if (check.equalsIgnoreCase("Y")) {