diff --git a/CURRENTVERSION b/CURRENTVERSION
index afaf360..1cc5f65 100644
--- a/CURRENTVERSION
+++ b/CURRENTVERSION
@@ -1 +1 @@
-1.0.0
\ No newline at end of file
+1.1.0
\ No newline at end of file
diff --git a/GoICC Installation Media Creation Script.iss b/GoICC Installation Media Creation Script.iss
index 2539b16..84687a4 100644
--- a/GoICC Installation Media Creation Script.iss	
+++ b/GoICC Installation Media Creation Script.iss	
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Guns of Icarus Caster Companion"
-#define MyAppVersion "1.0.0"
+#define MyAppVersion "1.1.0"
 #define MyAppPublisher "Cole Manning, RVRX"
 #define MyAppURL "https://goicc.skyborne.net/"
 #define MyAppExeName "GoICasterCompanion.exe"
diff --git a/build.gradle b/build.gradle
index 9f5e282..077e783 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'edu.sc.seis.launch4j' version '2.5.0'
 }
 mainClassName = 'goistreamtoolredux.Main'
-project.version = '1.0.0'
+project.version = '1.1.0'
 
 repositories {
     mavenCentral()
@@ -34,7 +34,7 @@ macAppBundle {
     icon = "app-icon.png"
     appName = "GoICasterCompanion"
     volumeName = "GoICC Install"
-    dmgName = "GoICC v1.0.0"
+    dmgName = "GoICC v1.1.0"
     bundleJRE = false
 //    backgroundImage = "doc/macbackground.png"
 }
diff --git a/docs/javadoc/allclasses-frame.html b/docs/javadoc/allclasses-frame.html
index 42b027a..dff7793 100644
--- a/docs/javadoc/allclasses-frame.html
+++ b/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (GoIStreamToolRedux 1.0.0 API)</title>
+<title>All Classes (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,10 +12,9 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
 <li><a href="goistreamtoolredux/App.html" title="class in goistreamtoolredux" target="classFrame">App</a></li>
-<li><a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm" target="classFrame">CustomTimer</a></li>
+<li><a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm" target="classFrame">AppTimer</a></li>
 <li><a href="goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm" target="classFrame">FileManager</a></li>
 <li><a href="goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm" target="classFrame">InvalidDataException</a></li>
-<li><a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm" target="classFrame">LobbyTimer</a></li>
 <li><a href="goistreamtoolredux/Main.html" title="class in goistreamtoolredux" target="classFrame">Main</a></li>
 <li><a href="goistreamtoolredux/controller/MapPane.html" title="class in goistreamtoolredux.controller" target="classFrame">MapPane</a></li>
 <li><a href="goistreamtoolredux/controller/Master.html" title="class in goistreamtoolredux.controller" target="classFrame">Master</a></li>
diff --git a/docs/javadoc/allclasses-noframe.html b/docs/javadoc/allclasses-noframe.html
index cb3c7c0..637be05 100644
--- a/docs/javadoc/allclasses-noframe.html
+++ b/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (GoIStreamToolRedux 1.0.0 API)</title>
+<title>All Classes (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,10 +12,9 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
 <li><a href="goistreamtoolredux/App.html" title="class in goistreamtoolredux">App</a></li>
-<li><a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></li>
+<li><a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></li>
 <li><a href="goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm">FileManager</a></li>
 <li><a href="goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></li>
-<li><a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></li>
 <li><a href="goistreamtoolredux/Main.html" title="class in goistreamtoolredux">Main</a></li>
 <li><a href="goistreamtoolredux/controller/MapPane.html" title="class in goistreamtoolredux.controller">MapPane</a></li>
 <li><a href="goistreamtoolredux/controller/Master.html" title="class in goistreamtoolredux.controller">Master</a></li>
diff --git a/docs/javadoc/constant-values.html b/docs/javadoc/constant-values.html
index 203a88c..1394dae 100644
--- a/docs/javadoc/constant-values.html
+++ b/docs/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Constant Field Values (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Constant Field Values (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -93,7 +93,7 @@ <h2 title="goistreamtoolredux">goistreamtoolredux.*</h2>
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="goistreamtoolredux/App.html#version">version</a></code></td>
-<td class="colLast"><code>"1.0.0"</code></td>
+<td class="colLast"><code>"1.1.0"</code></td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/javadoc/deprecated-list.html b/docs/javadoc/deprecated-list.html
index aecb539..e413cec 100644
--- a/docs/javadoc/deprecated-list.html
+++ b/docs/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Deprecated List (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Deprecated List (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/App.html b/docs/javadoc/goistreamtoolredux/App.html
index d07a9bd..9cabb0b 100644
--- a/docs/javadoc/goistreamtoolredux/App.html
+++ b/docs/javadoc/goistreamtoolredux/App.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>App (GoIStreamToolRedux 1.0.0 API)</title>
+<title>App (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="App (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="App (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/Main.html b/docs/javadoc/goistreamtoolredux/Main.html
index 95ac6b1..7bc067f 100644
--- a/docs/javadoc/goistreamtoolredux/Main.html
+++ b/docs/javadoc/goistreamtoolredux/Main.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Main (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Main (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Main (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Main (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/CustomTimer.html b/docs/javadoc/goistreamtoolredux/algorithm/AppTimer.html
similarity index 71%
rename from docs/javadoc/goistreamtoolredux/algorithm/CustomTimer.html
rename to docs/javadoc/goistreamtoolredux/algorithm/AppTimer.html
index a076746..b832924 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/CustomTimer.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/AppTimer.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>CustomTimer (GoIStreamToolRedux 1.0.0 API)</title>
+<title>AppTimer (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CustomTimer (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="AppTimer (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -51,8 +51,8 @@
 <li><a href="../../goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?goistreamtoolredux/algorithm/CustomTimer.html" target="_top">Frames</a></li>
-<li><a href="CustomTimer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?goistreamtoolredux/algorithm/AppTimer.html" target="_top">Frames</a></li>
+<li><a href="AppTimer.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,7 +91,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">goistreamtoolredux.algorithm</div>
-<h2 title="Class CustomTimer" class="title">Class CustomTimer</h2>
+<h2 title="Class AppTimer" class="title">Class AppTimer</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -101,7 +101,7 @@ <h2 title="Class CustomTimer" class="title">Class CustomTimer</h2>
 <li><a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm">goistreamtoolredux.algorithm.Timers</a></li>
 <li>
 <ul class="inheritance">
-<li>goistreamtoolredux.algorithm.CustomTimer</li>
+<li>goistreamtoolredux.algorithm.AppTimer</li>
 </ul>
 </li>
 </ul>
@@ -112,8 +112,10 @@ <h2 title="Class CustomTimer" class="title">Class CustomTimer</h2>
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">CustomTimer</span>
+<pre>public class <span class="typeNameLabel">AppTimer</span>
 extends <a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm">Timers</a></pre>
+<div class="block">Singleton timer class.
+ Warning: gets confusing with all the uses of timer as a word, vs the actual JDK Timer class.</div>
 </li>
 </ul>
 </div>
@@ -134,7 +136,7 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#isTimerRunning">isTimerRunning</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#isTimerRunning">isTimerRunning</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -153,33 +155,45 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>java.util.Timer</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#getCurrentTimer--">getCurrentTimer</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#getCurrentTimer--">getCurrentTimer</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#getCurrentTimerStartLength--">getCurrentTimerStartLength</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
+<td class="colFirst"><code>static <a href="../../goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#getStartTime--">getStartTime</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#pause--">pause</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#pause--">pause</a></span>()</code>
 <div class="block">Pauses the current timer state.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#restart--">restart</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#restart--">restart</a></span>()</code>
 <div class="block">Resets the timer back to beginning value and starts it again</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#start--">start</a></span>()</code>
-<div class="block">Start the timer (initial or after a pause)</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#setTimeAtPause-long-">setTimeAtPause</a></span>(long&nbsp;timeAtPause)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#start--">start</a></span>()</code>
+<div class="block">Starts the timer (initial or after a pause), is one is not already running (i.e., <a href="../../goistreamtoolredux/algorithm/AppTimer.html#isTimerRunning"><code>isTimerRunning</code></a> is false).</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#stop--">stop</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/AppTimer.html#stop--">stop</a></span>()</code>
 <div class="block">Completely stops and cancels the timer.</div>
 </td>
 </tr>
@@ -238,13 +252,40 @@ <h4>getCurrentTimer</h4>
 <pre>public&nbsp;java.util.Timer&nbsp;getCurrentTimer()</pre>
 </li>
 </ul>
+<a name="getStartTime--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getStartTime</h4>
+<pre>public&nbsp;long&nbsp;getStartTime()</pre>
+</li>
+</ul>
+<a name="getCurrentTimerStartLength--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCurrentTimerStartLength</h4>
+<pre>public&nbsp;int&nbsp;getCurrentTimerStartLength()</pre>
+</li>
+</ul>
+<a name="setTimeAtPause-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTimeAtPause</h4>
+<pre>public&nbsp;void&nbsp;setTimeAtPause(long&nbsp;timeAtPause)</pre>
+</li>
+</ul>
 <a name="getInstance--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInstance</h4>
-<pre>public static&nbsp;<a href="../../goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a>&nbsp;getInstance()</pre>
+<pre>public static&nbsp;<a href="../../goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a>&nbsp;getInstance()</pre>
 </li>
 </ul>
 <a name="start--">
@@ -257,16 +298,24 @@ <h4>start</h4>
            throws java.io.IOException,
                   java.util.NoSuchElementException,
                   <a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></pre>
-<div class="block">Start the timer (initial or after a pause)</div>
+<div class="block">Starts the timer (initial or after a pause), is one is not already running (i.e., <a href="../../goistreamtoolredux/algorithm/AppTimer.html#isTimerRunning"><code>isTimerRunning</code></a> is false).
+ <p>
+ Sets the value of <a href="../../goistreamtoolredux/algorithm/AppTimer.html#startTime"><code>startTime</code></a> to be either:
+ <ul>
+     <li>If resuming from a pause – time at initial start, plus difference between resume and initial pause
+     <li>If initial start – Current system time.
+ </ul>
+
+ <p>Sets the value of <a href="../../goistreamtoolredux/algorithm/AppTimer.html#isTimerRunning"><code>isTimerRunning</code></a> to true before starting the</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code>java.io.IOException</code></dd>
 <dd><code>java.util.NoSuchElementException</code></dd>
 <dd><code><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></code></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#stop--"><code>stop()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#pause--"><code>pause()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#restart--"><code>restart()</code></a></dd>
+<dd><a href="../../goistreamtoolredux/algorithm/AppTimer.html#stop--"><code>stop()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#pause--"><code>pause()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#restart--"><code>restart()</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -286,9 +335,9 @@ <h4>stop</h4>
 <dd><code>java.lang.NullPointerException</code> - there is no current timer or <code>TimerTask</code> running</dd>
 <dd><code>java.io.IOException</code> - if I/O error is encountered when writing to Timer.txt</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#start--"><code>start()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#pause--"><code>pause()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#restart--"><code>restart()</code></a></dd>
+<dd><a href="../../goistreamtoolredux/algorithm/AppTimer.html#start--"><code>start()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#pause--"><code>pause()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#restart--"><code>restart()</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -304,9 +353,9 @@ <h4>pause</h4>
  Does nothing if there is no active timer</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#start--"><code>start()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#stop--"><code>stop()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#restart--"><code>restart()</code></a></dd>
+<dd><a href="../../goistreamtoolredux/algorithm/AppTimer.html#start--"><code>start()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#stop--"><code>stop()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#restart--"><code>restart()</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -325,9 +374,9 @@ <h4>restart</h4>
 <dd><code>java.io.IOException</code></dd>
 <dd><code><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></code></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/CustomTimer.html#start--"><code>start()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#stop--"><code>stop()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/CustomTimer.html#pause--"><code>pause()</code></a></dd>
+<dd><a href="../../goistreamtoolredux/algorithm/AppTimer.html#start--"><code>start()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#stop--"><code>stop()</code></a>, 
+<a href="../../goistreamtoolredux/algorithm/AppTimer.html#pause--"><code>pause()</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -362,8 +411,8 @@ <h4>restart</h4>
 <li><a href="../../goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?goistreamtoolredux/algorithm/CustomTimer.html" target="_top">Frames</a></li>
-<li><a href="CustomTimer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?goistreamtoolredux/algorithm/AppTimer.html" target="_top">Frames</a></li>
+<li><a href="AppTimer.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/FileManager.html b/docs/javadoc/goistreamtoolredux/algorithm/FileManager.html
index 0e18524..86c9e2d 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/FileManager.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/FileManager.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>FileManager (GoIStreamToolRedux 1.0.0 API)</title>
+<title>FileManager (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FileManager (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="FileManager (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -47,7 +47,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -282,67 +282,79 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i18" class="altColor">
 <td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#removeMap--">removeMap</a></span>()</code>
+<div class="block">Remove the map image and name.</div>
+</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#removeTeam-java.lang.String-">removeTeam</a></span>(java.lang.String&nbsp;teamIdentifier)</code>
+<div class="block">Remove the currently set team from given team letter/identifier.</div>
+</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#resetInputPath--">resetInputPath</a></span>()</code>
 <div class="block">Resets the inputPath to application default</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#resetOutputPath--">resetOutputPath</a></span>()</code>
 <div class="block">Resets the outputPath to application default</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#resetPreferences--">resetPreferences</a></span>()</code>
 <div class="block">Calls <code>Preferences.clear()</code> on the FileManager's preference node - effectively resetting it.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#setInputPath-java.lang.String-">setInputPath</a></span>(java.lang.String&nbsp;inputPath)</code>
 <div class="block">Sets the preferred input path</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#setMap-java.lang.String-">setMap</a></span>(java.lang.String&nbsp;mapName)</code>
 <div class="block">Sets the current map.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#setMap-java.lang.String-boolean-">setMap</a></span>(java.lang.String&nbsp;mapName,
       boolean&nbsp;isSpawn)</code>
 <div class="block">Sets the current map, with or without spawn locations</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#setOutputPath-java.lang.String-">setOutputPath</a></span>(java.lang.String&nbsp;outputPath)</code>
 <div class="block">Sets the preferred output path</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#setTeam-java.lang.String-java.lang.String-">setTeam</a></span>(java.lang.String&nbsp;newTeamName,
        java.lang.String&nbsp;teamIdentifier)</code>
 <div class="block">Sets the current team.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#setTournamentName-java.lang.String-">setTournamentName</a></span>(java.lang.String&nbsp;tournamentName)</code>
 <div class="block">Updates the <code>TournamentName.txt</code> file.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#setTourneyNumber-java.lang.String-">setTourneyNumber</a></span>(java.lang.String&nbsp;number)</code>
 <div class="block">Sets the current tournament number.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/FileManager.html#verifyContent--">verifyContent</a></span>()</code>
 <div class="block">Checks for <code>input</code> and <code>output</code> folders, creates them if necessary.</div>
@@ -888,13 +900,47 @@ <h4>resetPreferences</h4>
 <a name="refreshPreferences--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>refreshPreferences</h4>
 <pre>public static&nbsp;void&nbsp;refreshPreferences()</pre>
 <div class="block">Attempts to refresh the application's preferences.</div>
 </li>
 </ul>
+<a name="removeTeam-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeTeam</h4>
+<pre>public static&nbsp;void&nbsp;removeTeam(java.lang.String&nbsp;teamIdentifier)
+                       throws java.io.IOException</pre>
+<div class="block">Remove the currently set team from given team letter/identifier.
+ Cancels out the actions done by <a href="../../goistreamtoolredux/algorithm/FileManager.html#setTeam-java.lang.String-java.lang.String-"><code>setTeam(String, String)</code></a>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>teamIdentifier</code> - Value to identify team. Must be a valid character for filesystem</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - if files (Team.txt and TeamShort.txt) couldn't be written to</dd>
+</dl>
+</li>
+</ul>
+<a name="removeMap--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>removeMap</h4>
+<pre>public static&nbsp;void&nbsp;removeMap()
+                      throws java.io.IOException</pre>
+<div class="block">Remove the map image and name.
+ Intended to cancel out all actions taken by <a href="../../goistreamtoolredux/algorithm/FileManager.html#setMap-java.lang.String-"><code>setMap(String)</code></a>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - if <code>Map.txt</code> couldn't be written to</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -922,7 +968,7 @@ <h4>refreshPreferences</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/InvalidDataException.html b/docs/javadoc/goistreamtoolredux/algorithm/InvalidDataException.html
index 6509ddf..366de46 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/InvalidDataException.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/InvalidDataException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InvalidDataException (GoIStreamToolRedux 1.0.0 API)</title>
+<title>InvalidDataException (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InvalidDataException (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="InvalidDataException (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?goistreamtoolredux/algorithm/InvalidDataException.html" target="_top">Frames</a></li>
@@ -216,7 +216,7 @@ <h4>InvalidDataException</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?goistreamtoolredux/algorithm/InvalidDataException.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/LobbyTimer.html b/docs/javadoc/goistreamtoolredux/algorithm/LobbyTimer.html
deleted file mode 100644
index 7385c64..0000000
--- a/docs/javadoc/goistreamtoolredux/algorithm/LobbyTimer.html
+++ /dev/null
@@ -1,405 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>LobbyTimer (GoIStreamToolRedux 1.0.0 API)</title>
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LobbyTimer (GoIStreamToolRedux 1.0.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?goistreamtoolredux/algorithm/LobbyTimer.html" target="_top">Frames</a></li>
-<li><a href="LobbyTimer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">goistreamtoolredux.algorithm</div>
-<h2 title="Class LobbyTimer" class="title">Class LobbyTimer</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm">goistreamtoolredux.algorithm.Timers</a></li>
-<li>
-<ul class="inheritance">
-<li>goistreamtoolredux.algorithm.LobbyTimer</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">LobbyTimer</span>
-extends <a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm">Timers</a></pre>
-<div class="block">Singleton timer class.
- Warning: gets confusing with all the uses of timer as a word, vs the actual JDK Timer class.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#isTimerRunning">isTimerRunning</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>java.util.Timer</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#getCurrentTimer--">getCurrentTimer</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#pause--">pause</a></span>()</code>
-<div class="block">Pauses the current timer state.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#restart--">restart</a></span>()</code>
-<div class="block">Resets the timer back to beginning value and starts it again</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#start--">start</a></span>()</code>
-<div class="block">Start the timer (initial or after a pause)</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#stop--">stop</a></span>()</code>
-<div class="block">Completely stops and cancels the timer.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.goistreamtoolredux.algorithm.Timers">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;goistreamtoolredux.algorithm.<a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm">Timers</a></h3>
-<code><a href="../../goistreamtoolredux/algorithm/Timers.html#convertFromMinuteFormat-java.lang.String-">convertFromMinuteFormat</a>, <a href="../../goistreamtoolredux/algorithm/Timers.html#convertToMinuteFormat-int-">convertToMinuteFormat</a>, <a href="../../goistreamtoolredux/algorithm/Timers.html#get--">get</a>, <a href="../../goistreamtoolredux/algorithm/Timers.html#getInitialTimerLength--">getInitialTimerLength</a>, <a href="../../goistreamtoolredux/algorithm/Timers.html#set-int-">set</a>, <a href="../../goistreamtoolredux/algorithm/Timers.html#setInitialTimerLength-int-">setInitialTimerLength</a>, <a href="../../goistreamtoolredux/algorithm/Timers.html#setInitialTimerTwoLength-int-">setInitialTimerTwoLength</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="isTimerRunning">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>isTimerRunning</h4>
-<pre>protected&nbsp;boolean isTimerRunning</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getCurrentTimer--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getCurrentTimer</h4>
-<pre>public&nbsp;java.util.Timer&nbsp;getCurrentTimer()</pre>
-</li>
-</ul>
-<a name="getInstance--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getInstance</h4>
-<pre>public static&nbsp;<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a>&nbsp;getInstance()</pre>
-</li>
-</ul>
-<a name="start--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>start</h4>
-<pre>public&nbsp;void&nbsp;start()
-           throws java.io.IOException,
-                  java.util.NoSuchElementException,
-                  <a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></pre>
-<div class="block">Start the timer (initial or after a pause)</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-<dd><code>java.util.NoSuchElementException</code></dd>
-<dd><code><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></code></dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#stop--"><code>stop()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#pause--"><code>pause()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#restart--"><code>restart()</code></a></dd>
-</dl>
-</li>
-</ul>
-<a name="stop--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>stop</h4>
-<pre>public&nbsp;void&nbsp;stop()
-          throws java.lang.NullPointerException,
-                 java.io.IOException</pre>
-<div class="block">Completely stops and cancels the timer. NOT EQUIVALENT TO A PAUSE.
- Starting after this state will restart the timer.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.NullPointerException</code> - there is no current timer or <code>TimerTask</code> running</dd>
-<dd><code>java.io.IOException</code> - if I/O error is encountered when writing to Timer.txt</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#start--"><code>start()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#pause--"><code>pause()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#restart--"><code>restart()</code></a></dd>
-</dl>
-</li>
-</ul>
-<a name="pause--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>pause</h4>
-<pre>public&nbsp;void&nbsp;pause()</pre>
-<div class="block">Pauses the current timer state. Starting from this after this state will
- continue the timer from where the timer left off.
- Does nothing if there is no active timer</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#start--"><code>start()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#stop--"><code>stop()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#restart--"><code>restart()</code></a></dd>
-</dl>
-</li>
-</ul>
-<a name="restart--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>restart</h4>
-<pre>public&nbsp;void&nbsp;restart()
-             throws java.io.IOException,
-                    <a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></pre>
-<div class="block">Resets the timer back to beginning value and starts it again</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-<dd><code><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></code></dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#start--"><code>start()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#stop--"><code>stop()</code></a>, 
-<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html#pause--"><code>pause()</code></a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?goistreamtoolredux/algorithm/LobbyTimer.html" target="_top">Frames</a></li>
-<li><a href="LobbyTimer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/Team.html b/docs/javadoc/goistreamtoolredux/algorithm/Team.html
index 6abf945..623570f 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/Team.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/Team.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Team (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Team (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Team (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Team (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -47,7 +47,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -334,7 +334,7 @@ <h4>compareTo</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/Timers.html b/docs/javadoc/goistreamtoolredux/algorithm/Timers.html
index 9ea66ab..5d3ae67 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/Timers.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/Timers.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Timers (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Timers (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Timers (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Timers (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -107,7 +107,7 @@ <h2 title="Class Timers" class="title">Class Timers</h2>
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a>, <a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dd>
+<dd><a href="../../goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dd>
 </dl>
 <hr>
 <br>
@@ -163,7 +163,7 @@ <h3>Method Summary</h3>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/algorithm/Timers.html#get--">get</a></span>()</code>
-<div class="block">Gets the <b>current</b> value of the timer.</div>
+<div class="block">Gets the <b>current</b> value of <code>timer.txt</code>.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
@@ -263,10 +263,7 @@ <h4>setInitialTimerTwoLength</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInitialTimerLength</h4>
-<pre>public&nbsp;int&nbsp;getInitialTimerLength()
-                          throws java.io.IOException,
-                                 java.util.NoSuchElementException,
-                                 <a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></pre>
+<pre>public&nbsp;int&nbsp;getInitialTimerLength()</pre>
 <div class="block">Gets the total length of the timer. Not to be confused with the current length,
  this value is where the timer will go to when restarting or starting after a stop.
 
@@ -274,10 +271,6 @@ <h4>getInitialTimerLength</h4>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>timer length in seconds</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-<dd><code>java.util.NoSuchElementException</code> - TimerLength.txt contains an unexpected character.</dd>
-<dd><code><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></code></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../goistreamtoolredux/algorithm/Timers.html#setInitialTimerLength-int-"><code>setInitialTimerLength(int)</code></a></dd>
 </dl>
@@ -307,17 +300,14 @@ <h4>set</h4>
 <li class="blockList">
 <h4>get</h4>
 <pre>public&nbsp;int&nbsp;get()
-        throws java.io.IOException,
-               <a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></pre>
-<div class="block">Gets the <b>current</b> value of the timer.
- If the timer file is empty or invalid, the file will be fixed,
- and the default length (TimerLength.txt will be returned)</div>
+        throws java.io.IOException</pre>
+<div class="block">Gets the <b>current</b> value of <code>timer.txt</code>.
+ If the timer file is empty or invalid, the default timer will be retrieved</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>time left in seconds.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code>java.io.FileNotFoundException</code> - timer.txt cannot be found</dd>
-<dd><code><a href="../../goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></code> - incorrect values in TimerLength.txt</dd>
 <dd><code>java.io.IOException</code></dd>
 </dl>
 </li>
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html b/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html
index f065146..6dd0641 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux.algorithm (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux.algorithm (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -12,9 +12,8 @@ <h1 class="bar"><a href="../../goistreamtoolredux/algorithm/package-summary.html
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="CustomTimer.html" title="class in goistreamtoolredux.algorithm" target="classFrame">CustomTimer</a></li>
+<li><a href="AppTimer.html" title="class in goistreamtoolredux.algorithm" target="classFrame">AppTimer</a></li>
 <li><a href="FileManager.html" title="class in goistreamtoolredux.algorithm" target="classFrame">FileManager</a></li>
-<li><a href="LobbyTimer.html" title="class in goistreamtoolredux.algorithm" target="classFrame">LobbyTimer</a></li>
 <li><a href="Team.html" title="class in goistreamtoolredux.algorithm" target="classFrame">Team</a></li>
 <li><a href="Timers.html" title="class in goistreamtoolredux.algorithm" target="classFrame">Timers</a></li>
 </ul>
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html b/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html
index f0f9153..ff0469d 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux.algorithm (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux.algorithm (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="goistreamtoolredux.algorithm (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="goistreamtoolredux.algorithm (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -81,24 +81,20 @@ <h1 title="Package" class="title">Package&nbsp;goistreamtoolredux.algorithm</h1>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colFirst"><a href="../../goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></td>
+<td class="colLast">
+<div class="block">Singleton timer class.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm">FileManager</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></td>
-<td class="colLast">
-<div class="block">Singleton timer class.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm">Team</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm">Timers</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html b/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html
index e06de41..1671390 100644
--- a/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html
+++ b/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux.algorithm Class Hierarchy (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux.algorithm Class Hierarchy (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="goistreamtoolredux.algorithm Class Hierarchy (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="goistreamtoolredux.algorithm Class Hierarchy (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -92,8 +92,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </li>
 <li type="circle">goistreamtoolredux.algorithm.<a href="../../goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Timers</span></a>
 <ul>
-<li type="circle">goistreamtoolredux.algorithm.<a href="../../goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">CustomTimer</span></a></li>
-<li type="circle">goistreamtoolredux.algorithm.<a href="../../goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">LobbyTimer</span></a></li>
+<li type="circle">goistreamtoolredux.algorithm.<a href="../../goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">AppTimer</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/goistreamtoolredux/controller/MapPane.html b/docs/javadoc/goistreamtoolredux/controller/MapPane.html
index 1c5fd01..a4ae6dd 100644
--- a/docs/javadoc/goistreamtoolredux/controller/MapPane.html
+++ b/docs/javadoc/goistreamtoolredux/controller/MapPane.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>MapPane (GoIStreamToolRedux 1.0.0 API)</title>
+<title>MapPane (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MapPane (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="MapPane (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
+var methods = {"i0":10,"i1":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -165,6 +165,12 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/controller/MapPane.html#clear--">clear</a></span>()</code>
+<div class="block">Clears the current map (In UI and filesystem).</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/controller/MapPane.html#save--">save</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -226,12 +232,22 @@ <h3>Method Detail</h3>
 <a name="save--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>save</h4>
 <pre>public&nbsp;void&nbsp;save()</pre>
 </li>
 </ul>
+<a name="clear--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clear</h4>
+<pre>public&nbsp;void&nbsp;clear()</pre>
+<div class="block">Clears the current map (In UI and filesystem).</div>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/docs/javadoc/goistreamtoolredux/controller/Master.html b/docs/javadoc/goistreamtoolredux/controller/Master.html
index f4c1925..5be714a 100644
--- a/docs/javadoc/goistreamtoolredux/controller/Master.html
+++ b/docs/javadoc/goistreamtoolredux/controller/Master.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Master (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Master (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Master (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Master (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html b/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html
index 14ad453..6b5e829 100644
--- a/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html
+++ b/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>SettingsPane (GoIStreamToolRedux 1.0.0 API)</title>
+<title>SettingsPane (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SettingsPane (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="SettingsPane (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html b/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html
index 732d458..ffd34f9 100644
--- a/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html
+++ b/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>SplashScreenLoader (GoIStreamToolRedux 1.0.0 API)</title>
+<title>SplashScreenLoader (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SplashScreenLoader (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="SplashScreenLoader (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/controller/TeamPane.html b/docs/javadoc/goistreamtoolredux/controller/TeamPane.html
index 3538e5a..6b1401f 100644
--- a/docs/javadoc/goistreamtoolredux/controller/TeamPane.html
+++ b/docs/javadoc/goistreamtoolredux/controller/TeamPane.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>TeamPane (GoIStreamToolRedux 1.0.0 API)</title>
+<title>TeamPane (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TeamPane (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="TeamPane (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
+var methods = {"i0":10,"i1":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -165,6 +165,12 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/controller/TeamPane.html#clear--">clear</a></span>()</code>
+<div class="block">Clears the currently selected data, and empties the associated files.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../goistreamtoolredux/controller/TeamPane.html#save--">save</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -226,12 +232,22 @@ <h3>Method Detail</h3>
 <a name="save--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>save</h4>
 <pre>public&nbsp;void&nbsp;save()</pre>
 </li>
 </ul>
+<a name="clear--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clear</h4>
+<pre>public&nbsp;void&nbsp;clear()</pre>
+<div class="block">Clears the currently selected data, and empties the associated files.</div>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/docs/javadoc/goistreamtoolredux/controller/TimerPane.html b/docs/javadoc/goistreamtoolredux/controller/TimerPane.html
index 4103f14..62a0ed1 100644
--- a/docs/javadoc/goistreamtoolredux/controller/TimerPane.html
+++ b/docs/javadoc/goistreamtoolredux/controller/TimerPane.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>TimerPane (GoIStreamToolRedux 1.0.0 API)</title>
+<title>TimerPane (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TimerPane (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="TimerPane (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html b/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html
index 0a98792..c155fe5 100644
--- a/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html
+++ b/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>TournamentPane (GoIStreamToolRedux 1.0.0 API)</title>
+<title>TournamentPane (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TournamentPane (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="TournamentPane (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/controller/package-frame.html b/docs/javadoc/goistreamtoolredux/controller/package-frame.html
index bb8ffc3..0752161 100644
--- a/docs/javadoc/goistreamtoolredux/controller/package-frame.html
+++ b/docs/javadoc/goistreamtoolredux/controller/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux.controller (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux.controller (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/docs/javadoc/goistreamtoolredux/controller/package-summary.html b/docs/javadoc/goistreamtoolredux/controller/package-summary.html
index 795a68c..a5ec681 100644
--- a/docs/javadoc/goistreamtoolredux/controller/package-summary.html
+++ b/docs/javadoc/goistreamtoolredux/controller/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux.controller (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux.controller (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="goistreamtoolredux.controller (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="goistreamtoolredux.controller (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/controller/package-tree.html b/docs/javadoc/goistreamtoolredux/controller/package-tree.html
index a785085..dc4ed59 100644
--- a/docs/javadoc/goistreamtoolredux/controller/package-tree.html
+++ b/docs/javadoc/goistreamtoolredux/controller/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux.controller Class Hierarchy (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux.controller Class Hierarchy (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="goistreamtoolredux.controller Class Hierarchy (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="goistreamtoolredux.controller Class Hierarchy (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/package-frame.html b/docs/javadoc/goistreamtoolredux/package-frame.html
index baca5cb..40fed0e 100644
--- a/docs/javadoc/goistreamtoolredux/package-frame.html
+++ b/docs/javadoc/goistreamtoolredux/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/javadoc/goistreamtoolredux/package-summary.html b/docs/javadoc/goistreamtoolredux/package-summary.html
index 99afe5c..4718201 100644
--- a/docs/javadoc/goistreamtoolredux/package-summary.html
+++ b/docs/javadoc/goistreamtoolredux/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="goistreamtoolredux (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="goistreamtoolredux (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/goistreamtoolredux/package-tree.html b/docs/javadoc/goistreamtoolredux/package-tree.html
index cf33123..5308296 100644
--- a/docs/javadoc/goistreamtoolredux/package-tree.html
+++ b/docs/javadoc/goistreamtoolredux/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>goistreamtoolredux Class Hierarchy (GoIStreamToolRedux 1.0.0 API)</title>
+<title>goistreamtoolredux Class Hierarchy (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="goistreamtoolredux Class Hierarchy (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="goistreamtoolredux Class Hierarchy (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/help-doc.html b/docs/javadoc/help-doc.html
index 672a0f1..edd2462 100644
--- a/docs/javadoc/help-doc.html
+++ b/docs/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (GoIStreamToolRedux 1.0.0 API)</title>
+<title>API Help (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="API Help (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/index-all.html b/docs/javadoc/index-all.html
index 76553f5..f5bb929 100644
--- a/docs/javadoc/index-all.html
+++ b/docs/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Index (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Index (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -67,7 +67,7 @@
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a name="I:A">
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a name="I:A">
 <!--   -->
 </a>
 <h2 class="title">A</h2>
@@ -90,6 +90,10 @@ <h2 class="title">A</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/App.html#App--">App()</a></span> - Constructor for class goistreamtoolredux.<a href="goistreamtoolredux/App.html" title="class in goistreamtoolredux">App</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">AppTimer</span></a> - Class in <a href="goistreamtoolredux/algorithm/package-summary.html">goistreamtoolredux.algorithm</a></dt>
+<dd>
+<div class="block">Singleton timer class.</div>
+</dd>
 </dl>
 <a name="I:C">
 <!--   -->
@@ -100,6 +104,14 @@ <h2 class="title">C</h2>
 <dd>
 <div class="block">checks GitHub for any new releases after current version.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/controller/MapPane.html#clear--">clear()</a></span> - Method in class goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/MapPane.html" title="class in goistreamtoolredux.controller">MapPane</a></dt>
+<dd>
+<div class="block">Clears the current map (In UI and filesystem).</div>
+</dd>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/controller/TeamPane.html#clear--">clear()</a></span> - Method in class goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/TeamPane.html" title="class in goistreamtoolredux.controller">TeamPane</a></dt>
+<dd>
+<div class="block">Clears the currently selected data, and empties the associated files.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/Team.html#compareTo-goistreamtoolredux.algorithm.Team-">compareTo(Team)</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm">Team</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/FileManager.html#compareVersions-java.lang.String-java.lang.String-">compareVersions(String, String)</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm">FileManager</a></dt>
@@ -120,8 +132,6 @@ <h2 class="title">C</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/controller/SplashScreenLoader.html#createScene--">createScene()</a></span> - Method in class goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/SplashScreenLoader.html" title="class in goistreamtoolredux.controller">SplashScreenLoader</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">CustomTimer</span></a> - Class in <a href="goistreamtoolredux/algorithm/package-summary.html">goistreamtoolredux.algorithm</a></dt>
-<dd>&nbsp;</dd>
 </dl>
 <a name="I:F">
 <!--   -->
@@ -144,7 +154,7 @@ <h2 class="title">G</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/Timers.html#get--">get()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm">Timers</a></dt>
 <dd>
-<div class="block">Gets the <b>current</b> value of the timer.</div>
+<div class="block">Gets the <b>current</b> value of <code>timer.txt</code>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/Team.html#getAbbreviatedName--">getAbbreviatedName()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm">Team</a></dt>
 <dd>&nbsp;</dd>
@@ -156,9 +166,9 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Loads all teams in from the <code>input/teams.txt</code> file</div>
 </dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/CustomTimer.html#getCurrentTimer--">getCurrentTimer()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#getCurrentTimer--">getCurrentTimer()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/LobbyTimer.html#getCurrentTimer--">getCurrentTimer()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#getCurrentTimerStartLength--">getCurrentTimerStartLength()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/FileManager.html#getDefaultInputPath--">getDefaultInputPath()</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm">FileManager</a></dt>
 <dd>
@@ -176,9 +186,7 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Gets the currently set application input folder path.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/CustomTimer.html#getInstance--">getInstance()</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/LobbyTimer.html#getInstance--">getInstance()</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#getInstance--">getInstance()</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/App.html#getMasterController--">getMasterController()</a></span> - Static method in class goistreamtoolredux.<a href="goistreamtoolredux/App.html" title="class in goistreamtoolredux">App</a></dt>
 <dd>&nbsp;</dd>
@@ -194,6 +202,8 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Parses `teams.txt` to get a team's longName from its shortName.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#getStartTime--">getStartTime()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/Team.html#getTeamFromDisk-java.lang.String-">getTeamFromDisk(String)</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/Team.html" title="class in goistreamtoolredux.algorithm">Team</a></dt>
 <dd>
 <div class="block">Loads a team from the <code>output/Team$.txt</code> file</div>
@@ -242,9 +252,7 @@ <h2 class="title">I</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/InvalidDataException.html#InvalidDataException-java.lang.String-">InvalidDataException(String)</a></span> - Constructor for exception goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/InvalidDataException.html" title="class in goistreamtoolredux.algorithm">InvalidDataException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/CustomTimer.html#isTimerRunning">isTimerRunning</a></span> - Variable in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/LobbyTimer.html#isTimerRunning">isTimerRunning</a></span> - Variable in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#isTimerRunning">isTimerRunning</a></span> - Variable in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <a name="I:K">
@@ -258,16 +266,6 @@ <h2 class="title">K</h2>
  the currently active controller for the right side (main) content.</div>
 </dd>
 </dl>
-<a name="I:L">
-<!--   -->
-</a>
-<h2 class="title">L</h2>
-<dl>
-<dt><a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">LobbyTimer</span></a> - Class in <a href="goistreamtoolredux/algorithm/package-summary.html">goistreamtoolredux.algorithm</a></dt>
-<dd>
-<div class="block">Singleton timer class.</div>
-</dd>
-</dl>
 <a name="I:M">
 <!--   -->
 </a>
@@ -315,11 +313,7 @@ <h2 class="title">O</h2>
 </a>
 <h2 class="title">P</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/CustomTimer.html#pause--">pause()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></dt>
-<dd>
-<div class="block">Pauses the current timer state.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/LobbyTimer.html#pause--">pause()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#pause--">pause()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>
 <div class="block">Pauses the current timer state.</div>
 </dd>
@@ -335,6 +329,14 @@ <h2 class="title">R</h2>
 <dd>
 <div class="block">Attempts to refresh the application's preferences.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/FileManager.html#removeMap--">removeMap()</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm">FileManager</a></dt>
+<dd>
+<div class="block">Remove the map image and name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/FileManager.html#removeTeam-java.lang.String-">removeTeam(String)</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm">FileManager</a></dt>
+<dd>
+<div class="block">Remove the currently set team from given team letter/identifier.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/FileManager.html#resetInputPath--">resetInputPath()</a></span> - Static method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/FileManager.html" title="class in goistreamtoolredux.algorithm">FileManager</a></dt>
 <dd>
 <div class="block">Resets the inputPath to application default</div>
@@ -351,11 +353,7 @@ <h2 class="title">R</h2>
 <dd>
 <div class="block">Prompts the user if they would like to reset preferences.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/CustomTimer.html#restart--">restart()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></dt>
-<dd>
-<div class="block">Resets the timer back to beginning value and starts it again</div>
-</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/LobbyTimer.html#restart--">restart()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#restart--">restart()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>
 <div class="block">Resets the timer back to beginning value and starts it again</div>
 </dd>
@@ -409,6 +407,8 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Sets the current application theme</div>
 </dd>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#setTimeAtPause-long-">setTimeAtPause(long)</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="goistreamtoolredux/controller/SettingsPane.html" title="class in goistreamtoolredux.controller"><span class="typeNameLink">SettingsPane</span></a> - Class in <a href="goistreamtoolredux/controller/package-summary.html">goistreamtoolredux.controller</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/controller/SettingsPane.html#SettingsPane--">SettingsPane()</a></span> - Constructor for class goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/SettingsPane.html" title="class in goistreamtoolredux.controller">SettingsPane</a></dt>
@@ -427,23 +427,15 @@ <h2 class="title">S</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/controller/SplashScreenLoader.html#SplashScreenLoader--">SplashScreenLoader()</a></span> - Constructor for class goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/SplashScreenLoader.html" title="class in goistreamtoolredux.controller">SplashScreenLoader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/CustomTimer.html#start--">start()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></dt>
-<dd>
-<div class="block">Start the timer (initial or after a pause)</div>
-</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/LobbyTimer.html#start--">start()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#start--">start()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>
-<div class="block">Start the timer (initial or after a pause)</div>
+<div class="block">Starts the timer (initial or after a pause), is one is not already running (i.e., <a href="goistreamtoolredux/algorithm/AppTimer.html#isTimerRunning"><code>AppTimer.isTimerRunning</code></a> is false).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/App.html#start-javafx.stage.Stage-">start(Stage)</a></span> - Method in class goistreamtoolredux.<a href="goistreamtoolredux/App.html" title="class in goistreamtoolredux">App</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/controller/SplashScreenLoader.html#start-javafx.stage.Stage-">start(Stage)</a></span> - Method in class goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/SplashScreenLoader.html" title="class in goistreamtoolredux.controller">SplashScreenLoader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/CustomTimer.html#stop--">stop()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm">CustomTimer</a></dt>
-<dd>
-<div class="block">Completely stops and cancels the timer.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/LobbyTimer.html#stop--">stop()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm">LobbyTimer</a></dt>
+<dt><span class="memberNameLink"><a href="goistreamtoolredux/algorithm/AppTimer.html#stop--">stop()</a></span> - Method in class goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm">AppTimer</a></dt>
 <dd>
 <div class="block">Completely stops and cancels the timer.</div>
 </dd>
@@ -494,7 +486,7 @@ <h2 class="title">V</h2>
 <dt><span class="memberNameLink"><a href="goistreamtoolredux/App.html#version">version</a></span> - Static variable in class goistreamtoolredux.<a href="goistreamtoolredux/App.html" title="class in goistreamtoolredux">App</a></dt>
 <dd>&nbsp;</dd>
 </dl>
-<a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;</div>
+<a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/docs/javadoc/index.html b/docs/javadoc/index.html
index cd77a38..d51ad3e 100644
--- a/docs/javadoc/index.html
+++ b/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>GoIStreamToolRedux 1.0.0 API</title>
+<title>GoIStreamToolRedux 1.1.0 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/docs/javadoc/overview-frame.html b/docs/javadoc/overview-frame.html
index 65c192d..aee55ea 100644
--- a/docs/javadoc/overview-frame.html
+++ b/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Overview List (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/javadoc/overview-summary.html b/docs/javadoc/overview-summary.html
index 5cfc570..34b698d 100644
--- a/docs/javadoc/overview-summary.html
+++ b/docs/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Overview (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Overview (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">GoIStreamToolRedux 1.0.0 API</h1>
+<h1 class="title">GoIStreamToolRedux 1.1.0 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
diff --git a/docs/javadoc/overview-tree.html b/docs/javadoc/overview-tree.html
index aa7fe96..ff59f8f 100644
--- a/docs/javadoc/overview-tree.html
+++ b/docs/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Class Hierarchy (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Class Hierarchy (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
@@ -110,8 +110,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/TimerPane.html" title="class in goistreamtoolredux.controller"><span class="typeNameLink">TimerPane</span></a></li>
 <li type="circle">goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/Timers.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">Timers</span></a>
 <ul>
-<li type="circle">goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/CustomTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">CustomTimer</span></a></li>
-<li type="circle">goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/LobbyTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">LobbyTimer</span></a></li>
+<li type="circle">goistreamtoolredux.algorithm.<a href="goistreamtoolredux/algorithm/AppTimer.html" title="class in goistreamtoolredux.algorithm"><span class="typeNameLink">AppTimer</span></a></li>
 </ul>
 </li>
 <li type="circle">goistreamtoolredux.controller.<a href="goistreamtoolredux/controller/TournamentPane.html" title="class in goistreamtoolredux.controller"><span class="typeNameLink">TournamentPane</span></a></li>
diff --git a/docs/javadoc/package-list b/docs/javadoc/package-list
index e69de29..8fc3246 100644
--- a/docs/javadoc/package-list
+++ b/docs/javadoc/package-list
@@ -0,0 +1,3 @@
+goistreamtoolredux
+goistreamtoolredux.algorithm
+goistreamtoolredux.controller
diff --git a/docs/javadoc/serialized-form.html b/docs/javadoc/serialized-form.html
index b59c7b3..eaf8ded 100644
--- a/docs/javadoc/serialized-form.html
+++ b/docs/javadoc/serialized-form.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Serialized Form (GoIStreamToolRedux 1.0.0 API)</title>
+<title>Serialized Form (GoIStreamToolRedux 1.1.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (GoIStreamToolRedux 1.0.0 API)";
+            parent.document.title="Serialized Form (GoIStreamToolRedux 1.1.0 API)";
         }
     }
     catch(err) {
diff --git a/src/main/java/goistreamtoolredux/App.java b/src/main/java/goistreamtoolredux/App.java
index 0a892ad..e96bb7e 100644
--- a/src/main/java/goistreamtoolredux/App.java
+++ b/src/main/java/goistreamtoolredux/App.java
@@ -1,7 +1,7 @@
 package goistreamtoolredux;
 
+import goistreamtoolredux.algorithm.AppTimer;
 import goistreamtoolredux.algorithm.FileManager;
-import goistreamtoolredux.algorithm.LobbyTimer;
 import goistreamtoolredux.controller.Master;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -26,8 +26,8 @@
 
 public class App extends Application {
 
-    //current application version. User for update checking
-    public static final String version = "1.0.0";
+    //current application version. Used for update checking
+    public static final String version = "1.1.0";
 
     /**The JavaFX application's primary stage. All Scenes are built upon this stage*/
     private static Stage primaryStage;
@@ -68,8 +68,10 @@ public void start(Stage primaryStage) throws IOException {
         primaryStage.getIcons().addAll(icon32, icon64, icon256);
         System.out.println("Icons Added");
 
+        //primary stage settings
         primaryStage.setScene(new Scene(root, 700, 400)); // 600 (page) + 100 (sidebar) by 400
         primaryStage.setOpacity(0);
+        primaryStage.setResizable(false);
         primaryStage.show();
 
         //manual application delay for setup (allow user to disable), and preloader calls
@@ -99,8 +101,18 @@ public void handle(WorkerStateEvent event) {
     public void stop() {
         System.out.println("Shutting Down");
         //cancel the current TimerTask so the app doesn't hang on quit
-        if (LobbyTimer.getInstance().getCurrentTimer() != null) {
-            LobbyTimer.getInstance().getCurrentTimer().cancel();
+        if (AppTimer.getInstance().getCurrentTimer() != null) {
+            AppTimer.getInstance().getCurrentTimer().cancel();
+        }
+
+        //reset the timer file to better align with application UI behaviour on start
+        AppTimer timerInstance = AppTimer.getInstance();
+        try {
+            timerInstance.set(timerInstance.getInitialTimerLength());
+        } catch (IOException e) {
+            //app is closing, there is not much that can be done here but just let the app close...
+            System.err.println("Failed to update timer file on system exit.");
+            e.printStackTrace();
         }
     }
 
@@ -132,7 +144,7 @@ public static void showExceptionDialog(Exception exception, String headerText, S
         expContent.add(label, 0, 0);
         expContent.add(textArea, 0, 1);
 
-// Set expandable Exception into the dialog pane.
+        // Set expandable Exception into the dialog pane.
         alert.getDialogPane().setExpandableContent(expContent);
 
         System.out.println("posting");
diff --git a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java
new file mode 100644
index 0000000..7f14e1b
--- /dev/null
+++ b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java
@@ -0,0 +1,227 @@
+package goistreamtoolredux.algorithm;
+
+import goistreamtoolredux.App;
+import goistreamtoolredux.controller.TimerPane;
+
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.NoSuchElementException;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.prefs.Preferences;
+
+/**
+ * Singleton timer class.
+ * Warning: gets confusing with all the uses of timer as a word, vs the actual JDK Timer class.
+ */
+public class AppTimer extends Timers {
+
+    private static AppTimer singleton = new AppTimer();
+    private Timer currentTimer;
+    protected boolean isTimerRunning = false;
+    private long startTime;
+    private int currentTimerStartLength;
+    private long timeAtPause = -1; //Positive value indicates the time at paused, -1 indicates timer is not resuming from pause
+
+    public Timer getCurrentTimer() {
+        return currentTimer;
+    }
+    public long getStartTime() {
+        return startTime;
+    }
+    public int getCurrentTimerStartLength() {
+        return currentTimerStartLength;
+    }
+    public void setTimeAtPause(long timeAtPause) {
+        this.timeAtPause = timeAtPause;
+    }
+
+    private AppTimer() {}
+
+    /* Static 'instance' method */
+    public static AppTimer getInstance() {
+        return singleton;
+    }
+
+
+    /**
+     * Starts the timer (initial or after a pause), is one is not already running (i.e., {@link #isTimerRunning} is false).
+     * <p>
+     * Sets the value of {@link #startTime} to be either:
+     * <ul>
+     *     <li>If resuming from a pause – time at initial start, plus difference between resume and initial pause
+     *     <li>If initial start – Current system time.
+     * </ul>
+     *
+     * <p>Sets the value of {@link #isTimerRunning} to true before starting the
+     *
+     * @throws IOException
+     * @throws NoSuchElementException
+     *
+     * @see #stop()
+     * @see #pause()
+     * @see #restart()
+     */
+    public void start() throws IOException, NoSuchElementException, InvalidDataException {
+        if (!isTimerRunning) { //prevent starting when there is already a timer. no doubling up!
+            if (get() <= 0) { //if timer is currently at 0, restart
+                restart();
+            } else { //otherwise, resume from last position by starting goistreamtoolredux.algorithm.CountdownTimer task
+                isTimerRunning = true;
+
+                //set start time/date
+                if (timeAtPause < 0) { //new timer, looking to be created
+                    startTime = System.currentTimeMillis();
+
+                    //set length this timer will use
+                    currentTimerStartLength = getInitialTimerLength();
+                } else { //paused timer, looking to resume
+                    //if timer was paused, use a time calculated off of the saved state.
+                    //New start time will be old start time plus the time elapsed between resume and pause,
+                    //  thereby pushing forward the start time by however long the timer was paused for.
+                    //T_s = T_s + (T_resume - T_pause)
+                    startTime = startTime + (System.currentTimeMillis() - timeAtPause);
+
+                    //no need to update currentTimerStartLength, as we want to stick with the one that was used before
+                    // pause, so as to not update the length partway through the timer (not good).
+                }
+
+
+
+                //set up and start TimerTask
+                currentTimer = new Timer();
+                TimerTask task = new CountdownTimer();
+                currentTimer.schedule(task,0, 1000);
+            }
+        } else System.err.println("Timer already running!");
+    }
+
+    /**
+     * Completely stops and cancels the timer. NOT EQUIVALENT TO A PAUSE.
+     * Starting after this state will restart the timer.
+     *
+     * @throws NullPointerException there is no current timer or {@link TimerTask} running
+     * @throws IOException if I/O error is encountered when writing to Timer.txt
+     * @see #start()
+     * @see #pause()
+     * @see #restart()
+     */
+    public void stop() throws NullPointerException, IOException {
+        //stop the current TimerTask
+        if (currentTimer != null) {
+            currentTimer.cancel();
+            isTimerRunning = false;
+        }
+        //set Timer.txt to nothing [will cause start() to restart timer if called next]
+        set(0);
+        //remove saved state
+        timeAtPause = -1;
+    }
+
+    /**
+     * Pauses the current timer state. Starting from this after this state will
+     * continue the timer from where the timer left off.
+     * Does nothing if there is no active timer
+     *
+     * @see #start()
+     * @see #stop()
+     * @see #restart()
+     */
+    public void pause() {
+        //cancel TimerTask to stop countdown. Keeps value, so start() can resume from it
+        if (currentTimer != null) {
+            currentTimer.cancel();
+            isTimerRunning = false;
+            //save state
+            timeAtPause = System.currentTimeMillis();
+        }
+    }
+
+    /**
+     * Resets the timer back to beginning value and starts it again
+     * @see #start()
+     * @see #stop()
+     * @see #pause()
+     */
+    public void restart() throws IOException, InvalidDataException {
+        //stop timer
+        stop();
+
+        //write initial timer length to Timer.txt
+        try {
+            set(getInitialTimerLength());
+        } catch (NoSuchElementException exception) {
+            App.showExceptionDialog(exception, "Error starting/restarting timer.", "Please delete your 'Timer.txt' and restart the application. Submit a bug report if the problem persists.");
+            return;
+        }
+
+        //start
+        start();
+    }
+
+}
+
+/**
+ * Begins countdown from current value in the <code>Timer.txt</code> file.
+ * When timer reaches zero, sets the <code>Timer.txt</code> file to value of {@link Preferences} key <code>"timer_end_text"</code>.
+ *
+ * <p>Counts down by comparing value of {@link AppTimer#getStartTime()} with {@link System#currentTimeMillis()}, and converting to int via {@link Math#toIntExact(long)}
+ *
+ * @implNote This class is a {@link TimerTask} to be scheduled with {@link Timer#schedule(TimerTask, long, long)}.
+ */
+class CountdownTimer extends TimerTask {
+
+    public void run() {
+
+        AppTimer timer = AppTimer.getInstance();
+
+        try {
+            int currentFileTime = timer.get();
+            if (currentFileTime <= 0) { //timer has reached 0
+                System.out.println("Timer Finished!\n>");
+                AppTimer.getInstance().isTimerRunning = false;
+                timer.getCurrentTimer().cancel();
+
+                //set timer text to be the preferred text upon ending
+                Writer fileWriter = new FileWriter(FileManager.outputPath + "Timer.txt");
+                fileWriter.write(Preferences.userRoot().node("/goistreamtoolredux/algorithm").get("timer_end_text","0:00"));
+                fileWriter.close();
+
+                //remove saved state
+                AppTimer.getInstance().setTimeAtPause(-1);
+            } else { //timer still has more to count
+
+                //get new time for timer
+                long elapsedSinceStartMilli = System.currentTimeMillis() - timer.getStartTime();
+                // timerLength - timeSinceStart
+                long foo = timer.getCurrentTimerStartLength() - (elapsedSinceStartMilli/1000);
+
+                timer.set(Math.toIntExact(foo)); //todo catch ArithmeticException
+                TimerPane timerPaneController = (TimerPane) App.getMasterController().getTimerPaneController();
+                timerPaneController.setLobbyTimerText(String.valueOf(foo));
+            }
+        } catch (FileNotFoundException exception) {
+            System.err.println("Error encountered in timer task (FileNotFoundException). Reason: '" + exception.getMessage() + "'\nCancelling Timer...");
+            exception.printStackTrace();
+            AppTimer.getInstance().isTimerRunning = false;
+            AppTimer.getInstance().setTimeAtPause(-1);
+            timer.getCurrentTimer().cancel();
+        } catch (IOException exception) {
+            System.err.println("Error encountered in timer task (IOException). Reason: '" + exception.getMessage() + "'\nCancelling Timer...");
+            exception.printStackTrace();
+            AppTimer.getInstance().isTimerRunning = false;
+            AppTimer.getInstance().setTimeAtPause(-1);
+            timer.getCurrentTimer().cancel();
+        } catch (IllegalArgumentException exception) {
+            //possibly due to timer being set for negative seconds
+            // timer should be shut off
+            System.err.println("Error encountered in timer task (IllegalArgumentException). Reason: '" + exception.getMessage() + "'\nCancelling Timer...");
+            exception.printStackTrace();
+            AppTimer.getInstance().isTimerRunning = false;
+            AppTimer.getInstance().setTimeAtPause(-1);
+            timer.getCurrentTimer().cancel();
+        }
+    }
+}
diff --git a/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java b/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java
deleted file mode 100644
index b4e0249..0000000
--- a/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package goistreamtoolredux.algorithm;
-
-import goistreamtoolredux.App;
-import goistreamtoolredux.controller.TimerPane;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.NoSuchElementException;
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class CustomTimer extends Timers {
-
-    private static CustomTimer singleton = new CustomTimer();
-    private Timer currentTimer;
-    protected boolean isTimerRunning = false;
-
-    public Timer getCurrentTimer() {
-        return currentTimer;
-    }
-
-    private CustomTimer() {}
-
-    /* Static 'instance' method */
-    public static CustomTimer getInstance() {
-        return singleton;
-    }
-
-    //File paths
-//    String timerLength = FileManager.inputPath + "TimerLength.txt";
-//    String timerTXT = FileManager.outputPath + "Timer.txt";
-
-
-    /*--- Methods ---*/
-
-    /**
-     * Start the timer (initial or after a pause)
-     * @throws IOException
-     * @throws NoSuchElementException
-     * @see #stop()
-     * @see #pause()
-     * @see #restart()
-     */
-    public void start() throws IOException, NoSuchElementException, InvalidDataException {
-        if (!isTimerRunning) { //prevent starting when there is already a timer. no doubling up!
-            if (get() <= 0) { //if timer is currently at 0, restart
-                restart();
-            } else { //otherwise, resume from last position by starting goistreamtoolredux.algorithm.CountdownTimer task
-                isTimerRunning = true;
-                currentTimer = new Timer();
-                TimerTask task = new CountdownTimerCustom();
-                currentTimer.schedule(task,0, 1000);
-            }
-        } else System.err.println("Timer already running!");
-    }
-
-    /**
-     * Completely stops and cancels the timer. NOT EQUIVALENT TO A PAUSE.
-     * Starting after this state will restart the timer.
-     *
-     * @throws NullPointerException there is no current timer or {@link TimerTask} running
-     * @throws IOException if I/O error is encountered when writing to Timer.txt
-     * @see #start()
-     * @see #pause()
-     * @see #restart()
-     */
-    public void stop() throws NullPointerException, IOException {
-        //stop the current TimerTask
-        if (currentTimer != null) {
-            currentTimer.cancel();
-            isTimerRunning = false;
-        }
-        //set Timer.txt to nothing [will cause start() to restart timer if called next]
-        set(0);
-    }
-
-    /**
-     * Pauses the current timer state. Starting from this after this state will
-     * continue the timer from where the timer left off.
-     * Does nothing if there is no active timer
-     *
-     * @see #start()
-     * @see #stop()
-     * @see #restart()
-     */
-    public void pause() {
-        //cancel TimerTask to stop countdown. Keeps value, so start() can resume from it
-        if (currentTimer != null) {
-            currentTimer.cancel();
-            isTimerRunning = false;
-        }
-    }
-
-    /**
-     * Resets the timer back to beginning value and starts it again
-     * @see #start()
-     * @see #stop()
-     * @see #pause()
-     */
-    public void restart() throws IOException, InvalidDataException {
-        //stop timer
-        if (currentTimer != null) {
-            currentTimer.cancel();
-            isTimerRunning = false;
-        }
-
-        //write initial timer length to Timer.txt
-        set(getInitialTimerLength());
-
-        //start
-        start();
-    }
-}
-
-/**
- * Begins countdown from current value in the <code>Timer.txt</code> file. {@link TimerTask} to be scheduled in {@link Timer#schedule(TimerTask, long, long)} for the countdown timer system.
- * @implNote Be careful with scheduling this function too fast/often, it doesn't implement any
- * file locks and is not atomic as of the current version.
- * @implNote Does not use system clock (or at least efficiently. Timer will start to lag behind if more system resources are used or application is active with other tasks
- */
-class CountdownTimerCustom extends TimerTask {
-
-    public void run() {
-
-        /*todo, implement lock*/
-
-        LobbyTimer timer = LobbyTimer.getInstance();
-
-        try {
-            int currentTime = timer.get();
-            if (currentTime <= 0) {
-                System.out.println("Timer Finished!\n>");
-                LobbyTimer.getInstance().isTimerRunning = false;
-                timer.getCurrentTimer().cancel();
-            } else {
-                timer.set(currentTime - 1);
-                TimerPane timerPaneController = (TimerPane) App.getMasterController().getTimerPaneController();
-                timerPaneController.setLobbyTimerText(String.valueOf(currentTime - 1));
-            }
-        } catch (FileNotFoundException exception) {
-            exception.printStackTrace();
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        } catch (InvalidDataException exception) {
-            exception.printStackTrace();
-        }
-    }
-}
-
diff --git a/src/main/java/goistreamtoolredux/algorithm/FileManager.java b/src/main/java/goistreamtoolredux/algorithm/FileManager.java
index 2144baf..f50df55 100644
--- a/src/main/java/goistreamtoolredux/algorithm/FileManager.java
+++ b/src/main/java/goistreamtoolredux/algorithm/FileManager.java
@@ -239,7 +239,7 @@ private static void CLIParse(String input) {
                 break;
 
             case "timer set":
-                LobbyTimer timer = LobbyTimer.getInstance();
+                AppTimer timer = AppTimer.getInstance();
                 try {
                     System.out.println("How many seconds would you like to set the timer for");
                     int setTime = scanner.nextInt();
@@ -259,7 +259,7 @@ private static void CLIParse(String input) {
 
             case "timer start":
                 try {
-                    LobbyTimer.getInstance().start();
+                    AppTimer.getInstance().start();
                 } catch (IOException exception) {
                     exception.printStackTrace();
                 } catch (NoSuchElementException exception) {
@@ -271,7 +271,7 @@ private static void CLIParse(String input) {
 
             case "timer stop":
                 try {
-                    LobbyTimer.getInstance().stop();
+                    AppTimer.getInstance().stop();
                     System.out.println("Stopped!");
                 } catch (IOException exception) {
                     exception.printStackTrace();
@@ -279,12 +279,12 @@ private static void CLIParse(String input) {
                 break;
 
             case "timer pause":
-                LobbyTimer.getInstance().pause();
+                AppTimer.getInstance().pause();
                 break;
 
             case "timer restart": case "timer reset":
                 try {
-                    LobbyTimer.getInstance().restart();
+                    AppTimer.getInstance().restart();
                 } catch (IOException | InvalidDataException exception) {
                     exception.printStackTrace();
                 }
@@ -948,4 +948,56 @@ public static void refreshPreferences() {
         inputPath = getInputPath();
         outputPath = getOutputPath();
     }
+
+    /**
+     * Remove the currently set team from given team letter/identifier.
+     * Cancels out the actions done by {@link #setTeam(String, String)}.
+     *
+     * @throws IOException if files (Team.txt and TeamShort.txt) couldn't be written to
+     * @param teamIdentifier Value to identify team. Must be a valid character for filesystem
+     */
+    public static void removeTeam(String teamIdentifier) throws IOException {
+        /*--- Update TXTs ---*/
+
+        //get file names
+        String teamTXT = "Team" + teamIdentifier + ".txt";
+        String teamShortTXT = "TeamShort" + teamIdentifier + ".txt";
+
+        //update output file "TeamShortX.txt"
+        Writer fileWriter2 = new FileWriter(outputPath + teamShortTXT); //TeamShortX.txt
+        fileWriter2.write(""); //write shortName to file
+        fileWriter2.close();
+        System.out.println(teamShortTXT + " updated.");
+
+        //update output file "TeamX.txt"
+        Writer fileWriter = new FileWriter(outputPath + teamTXT); //TeamX.txt
+        fileWriter.write("");
+        fileWriter.close();
+        System.out.println(teamTXT + " updated.");
+
+
+        /*--- Remove Image ---*/
+        File outputTeamLogo = new File(outputPath + "Team" + teamIdentifier + ".png");
+        if (outputTeamLogo.exists()) {
+            outputTeamLogo.delete();
+        }
+    }
+
+    /**
+     * Remove the map image and name.
+     * Intended to cancel out all actions taken by {@link #setMap(String)}.
+     *
+     * @throws IOException if <code>Map.txt</code> couldn't be written to
+     */
+    public static void removeMap() throws IOException {
+        //remove Map.png
+        File outputTeamLogo = new File(outputPath + "Map.png");
+        if (outputTeamLogo.exists()) {
+            outputTeamLogo.delete();
+        }
+        //remove text contents
+        Writer fileWriter = new FileWriter(outputPath + "Map.txt"); //TeamX.txt
+        fileWriter.write("");
+        fileWriter.close();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java b/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java
deleted file mode 100644
index e26e2e7..0000000
--- a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package goistreamtoolredux.algorithm;
-
-import goistreamtoolredux.App;
-import goistreamtoolredux.controller.TimerPane;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.NoSuchElementException;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * Singleton timer class.
- * Warning: gets confusing with all the uses of timer as a word, vs the actual JDK Timer class.
- */
-public class LobbyTimer extends Timers {
-
-    private static LobbyTimer singleton = new LobbyTimer();
-    private Timer currentTimer;
-    protected boolean isTimerRunning = false;
-
-    public Timer getCurrentTimer() {
-        return currentTimer;
-    }
-
-    private LobbyTimer() {}
-
-    /* Static 'instance' method */
-    public static LobbyTimer getInstance() {
-        return singleton;
-    }
-
-
-    /**
-     * Start the timer (initial or after a pause)
-     * @throws IOException
-     * @throws NoSuchElementException
-     * @see #stop()
-     * @see #pause()
-     * @see #restart()
-     */
-    public void start() throws IOException, NoSuchElementException, InvalidDataException {
-        if (!isTimerRunning) { //prevent starting when there is already a timer. no doubling up!
-            if (get() <= 0) { //if timer is currently at 0, restart
-                restart();
-            } else { //otherwise, resume from last position by starting goistreamtoolredux.algorithm.CountdownTimer task
-                isTimerRunning = true;
-                currentTimer = new Timer();
-                TimerTask task = new CountdownTimer();
-                currentTimer.schedule(task,0, 1000);
-            }
-        } else System.err.println("Timer already running!");
-    }
-
-    /**
-     * Completely stops and cancels the timer. NOT EQUIVALENT TO A PAUSE.
-     * Starting after this state will restart the timer.
-     *
-     * @throws NullPointerException there is no current timer or {@link TimerTask} running
-     * @throws IOException if I/O error is encountered when writing to Timer.txt
-     * @see #start()
-     * @see #pause()
-     * @see #restart()
-     */
-    public void stop() throws NullPointerException, IOException {
-        //stop the current TimerTask
-        if (currentTimer != null) {
-            currentTimer.cancel();
-            isTimerRunning = false;
-        }
-        //set Timer.txt to nothing [will cause start() to restart timer if called next]
-        set(0);
-    }
-
-    /**
-     * Pauses the current timer state. Starting from this after this state will
-     * continue the timer from where the timer left off.
-     * Does nothing if there is no active timer
-     *
-     * @see #start()
-     * @see #stop()
-     * @see #restart()
-     */
-    public void pause() {
-        //cancel TimerTask to stop countdown. Keeps value, so start() can resume from it
-        if (currentTimer != null) {
-            currentTimer.cancel();
-            isTimerRunning = false;
-        }
-    }
-
-    /**
-     * Resets the timer back to beginning value and starts it again
-     * @see #start()
-     * @see #stop()
-     * @see #pause()
-     */
-    public void restart() throws IOException, InvalidDataException {
-        //stop timer
-        if (currentTimer != null) {
-            currentTimer.cancel();
-            isTimerRunning = false;
-        }
-
-        //write initial timer length to Timer.txt
-        try {
-            set(getInitialTimerLength());
-        } catch (NoSuchElementException exception) {
-            App.showExceptionDialog(exception, "Error starting/restarting timer.", "Please go to the settings page and specify a lobby timer length, and save it (Cmd+S), before attempting to start the timer.");
-            return;
-        }
-
-        //start
-        start();
-    }
-
-}
-
-/**
- * Begins countdown from current value in the <code>Timer.txt</code> file. {@link TimerTask} to be scheduled in {@link Timer#schedule(TimerTask, long, long)} for the countdown timer system.
- * @implNote Be careful with scheduling this function too fast/often, it doesn't implement any
- * file locks and is not atomic as of the current version.
- * @implNote Does not use system clock (or at least efficiently. Timer will start to lag behind if more system resources are used or application is active with other tasks
- */
-class CountdownTimer extends TimerTask {
-
-    public void run() {
-
-        /*todo, implement lock*/
-
-        LobbyTimer timer = LobbyTimer.getInstance();
-
-        try {
-            int currentTime = timer.get();
-            if (currentTime <= 0) {
-                System.out.println("Timer Finished!\n>");
-                LobbyTimer.getInstance().isTimerRunning = false;
-                timer.getCurrentTimer().cancel();
-            } else {
-                timer.set(currentTime - 1);
-                TimerPane timerPaneController = (TimerPane) App.getMasterController().getTimerPaneController();
-                timerPaneController.setLobbyTimerText(String.valueOf(currentTime - 1));
-            }
-        } catch (FileNotFoundException exception) {
-            exception.printStackTrace();
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        } catch (InvalidDataException exception) {
-            exception.printStackTrace();
-        }
-    }
-}
diff --git a/src/main/java/goistreamtoolredux/algorithm/Timers.java b/src/main/java/goistreamtoolredux/algorithm/Timers.java
index 98003b7..8d50edc 100644
--- a/src/main/java/goistreamtoolredux/algorithm/Timers.java
+++ b/src/main/java/goistreamtoolredux/algorithm/Timers.java
@@ -7,8 +7,6 @@
 
 public class Timers {
 
-//    private Timer currentTimer;
-//    protected boolean isTimerRunning = false;
 
     private static Preferences prefs = Preferences.userRoot().node("/goistreamtoolredux/algorithm");
     private static final String TIMER_ONE_LENGTH = "timer_one_length";
@@ -28,11 +26,6 @@ public class Timers {
      * @see #getInitialTimerLength()
      */
     public void setInitialTimerLength(int seconds) throws IOException, IllegalArgumentException {
-//        if (seconds <= 0) throw new IllegalArgumentException("Cannot set initial timer value to 0");
-//        //open TimerLength file and set a new value
-//        Writer fileWriter = new FileWriter(timerLength);
-//        fileWriter.write(String.valueOf(seconds));
-//        fileWriter.close();
         prefs.putInt(TIMER_TWO_LENGTH, seconds);
     }
 
@@ -48,11 +41,9 @@ public void setInitialTimerTwoLength(int seconds) {
      * Gotten from the preferences API, defaults to 240 if no preference set yet.
      *
      * @return timer length in seconds
-     * @throws IOException
-     * @throws NoSuchElementException TimerLength.txt contains an unexpected character.
      * @see #setInitialTimerLength(int)
      */
-    public int getInitialTimerLength() throws IOException, NoSuchElementException, InvalidDataException {
+    public int getInitialTimerLength() {
         if (prefs.getBoolean(IS_TIMER_ONE, true)) {
             //if timer one is selected, or must be defaulted to
             return prefs.getInt(TIMER_ONE_LENGTH, 240);
@@ -79,34 +70,32 @@ public void set(int seconds) throws IOException {
     }
 
     /**
-     * Gets the <b>current</b> value of the timer.
-     * If the timer file is empty or invalid, the file will be fixed,
-     * and the default length (TimerLength.txt will be returned)
+     * Gets the <b>current</b> value of <code>timer.txt</code>.
+     * If the timer file is empty or invalid, the default timer will be retrieved
+     *
      * @return time left in seconds.
      * @throws FileNotFoundException timer.txt cannot be found
-     * @throws InvalidDataException incorrect values in TimerLength.txt
      */
-    public int get() throws IOException, InvalidDataException {
+    public int get() throws IOException {
         //open Timer.txt and scan first integer
         File timerSettings = new File(timerTXT);
         Scanner scanner = new Scanner(timerSettings);
         try {
             return convertFromMinuteFormat(scanner.nextLine());
-        } catch (NoSuchElementException e) {
-            //timer file is empty or invalid.
-            //write value of "TimerLength.txt" to "Timer.txt", and return such
-            Writer fileWriter = new FileWriter(timerTXT);
-            try {
-                fileWriter.write(convertToMinuteFormat(getInitialTimerLength()));
-            } catch (NoSuchElementException | InvalidDataException exception) {
-                //getInitial error, so write new value to getInitial
-                Writer fileWriterInitial = new FileWriter(FileManager.inputPath + "TimerLength.txt");
-                fileWriterInitial.write(240);
-                fileWriterInitial.close();
-            }
-            fileWriter.close();
+        } catch (NumberFormatException | NoSuchElementException exception) {
+            /*
+            NumberFormatException:
+             occurs when timer.txt does not contain int - this can be because of user input
+             but more commonly due to user setting their own end text in the file.
+             in this case, we just return the preferred length.
+            NoSuchElementException:
+             timer file is empty (no line found)
+             return preferred timer start value
+             */
+
+            return getInitialTimerLength();
+
         }
-        return 240;
     }
 
     /**
diff --git a/src/main/java/goistreamtoolredux/controller/MapPane.java b/src/main/java/goistreamtoolredux/controller/MapPane.java
index f6723ec..32609bf 100644
--- a/src/main/java/goistreamtoolredux/controller/MapPane.java
+++ b/src/main/java/goistreamtoolredux/controller/MapPane.java
@@ -9,6 +9,8 @@
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
@@ -20,6 +22,7 @@
 import java.net.URL;
 import java.util.Collections;
 import java.util.LinkedList;
+import java.util.Optional;
 import java.util.ResourceBundle;
 
 public class MapPane {
@@ -61,6 +64,8 @@ void selectMap(ActionEvent event) {
                 mapFile = new File(FileManager.inputPath + "map_images" + File.separator + selectedMap + ".png");
             }
             mapImage.setImage(new Image(mapFile.toURI().toString()));
+        } else {
+            mapImage.setImage(null);
         }
     }
 
@@ -105,6 +110,34 @@ public void save() {
                 JFXSnackbar bar = new JFXSnackbar(anchorPane);
                 bar.enqueue(new JFXSnackbar.SnackbarEvent(new JFXSnackbarLayout("Error Setting Map...",null,null),new Duration(1000)));
             }
+        } else { //No map was selected
+            //Delete Map file
+            try {
+                FileManager.removeMap();
+            } catch (IOException exception) {
+                exception.printStackTrace();
+                //todo handle
+            }
+        }
+    }
+
+    /**
+     * Clears the current map (In UI and filesystem).
+     */
+    public void clear() {
+
+        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+        alert.setTitle("Confirmation Dialog");
+        alert.setHeaderText("Map files will be cleared");
+        alert.setContentText("This action does not need saving, and will be executed immediately. Are you ok with this?");
+
+        Optional<ButtonType> result = alert.showAndWait();
+        if (result.get() == ButtonType.OK){
+            //Clear UI
+            mapComboBox.getSelectionModel().clearSelection();
+
+            //Clear Map File and Map Text
+            save();
         }
     }
 }
diff --git a/src/main/java/goistreamtoolredux/controller/Master.java b/src/main/java/goistreamtoolredux/controller/Master.java
index 0ae9c25..c3f6ffc 100644
--- a/src/main/java/goistreamtoolredux/controller/Master.java
+++ b/src/main/java/goistreamtoolredux/controller/Master.java
@@ -102,6 +102,17 @@ public void keyListener(KeyEvent keyEvent) {
                     break;
             }
         }
+        else if ((keyEvent.isMetaDown() && keyEvent.getText().equalsIgnoreCase("w")) || (keyEvent.isControlDown() && keyEvent.getText().equalsIgnoreCase("w"))) {
+            switch (currentPage) {
+                case "/goistreamtoolredux/fxml/TeamPane.fxml":
+                    //save team content
+                    teamPaneController.clear();
+                    break;
+                case "/goistreamtoolredux/fxml/MapPane.fxml":
+                    mapPaneController.clear();
+                    break;
+            }
+        }
     }
 
     @FXML
diff --git a/src/main/java/goistreamtoolredux/controller/TeamPane.java b/src/main/java/goistreamtoolredux/controller/TeamPane.java
index 028793e..29128b6 100644
--- a/src/main/java/goistreamtoolredux/controller/TeamPane.java
+++ b/src/main/java/goistreamtoolredux/controller/TeamPane.java
@@ -10,6 +10,8 @@
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
@@ -23,6 +25,7 @@
 import java.net.URL;
 import java.util.Collections;
 import java.util.LinkedList;
+import java.util.Optional;
 import java.util.ResourceBundle;
 
 public class TeamPane {
@@ -113,72 +116,116 @@ private void setTeamIfNotNull(Team aTeam, String letter) {
                 exception.printStackTrace();
                 //todo, handle
             }
-        } else System.out.println("null team");
+        } else {
+            //remove content
+            try {
+                FileManager.removeTeam(letter);
+            } catch (IOException exception) {
+                //todo, handle
+                exception.printStackTrace();
+            }
+        }
 
     }
 
     @FXML
     void selectTeamA(ActionEvent event) {
         selectedATeam = teamAComboBox.getSelectionModel().getSelectedItem();
-        //update UI image
-        if (selectedATeam.getTeamLogo() == null) { //if there isn't an image
-            //delete image
+
+        if (selectedATeam == null) { //comboBox selection has been cleared
+            //remove image and text from UI
             teamAImage.setImage(null);
+            teamALabel.setText(null);
+
         } else {
-            //update image
-            teamAImage.setImage(new Image(selectedATeam.getTeamLogo().toUri().toString()));
+            //update UI image
+            if (selectedATeam.getTeamLogo() == null) { //if there isn't an image
+                //delete image
+                teamAImage.setImage(null);
+            } else {
+                //update image
+                teamAImage.setImage(new Image(selectedATeam.getTeamLogo().toUri().toString()));
+            }
+
+            //update label
+            teamALabel.setText(selectedATeam.getAbbreviatedName());
         }
 
-        //update label
-        teamALabel.setText(selectedATeam.getAbbreviatedName());
     }
 
     @FXML
     void selectTeamB(ActionEvent event) {
         selectedBTeam = teamBComboBox.getSelectionModel().getSelectedItem();
-        //update UI image
-        if (selectedBTeam.getTeamLogo() == null) { //if there isn't an image
-            //delete image
+
+        if (selectedBTeam == null) { //comboBox selection has been cleared
+            //remove image and text from UI
             teamBImage.setImage(null);
+            teamBLabel.setText(null);
+
         } else {
-            //update image
-            teamBImage.setImage(new Image(selectedBTeam.getTeamLogo().toUri().toString()));
-        }
+            //update UI image
+            if (selectedBTeam.getTeamLogo() == null) { //if there isn't an image
+                //delete image
+                teamBImage.setImage(null);
+            } else {
+                //update image
+                teamBImage.setImage(new Image(selectedBTeam.getTeamLogo().toUri().toString()));
+            }
 
-        //update label
-        teamBLabel.setText(selectedBTeam.getAbbreviatedName());
+            //update label
+            teamBLabel.setText(selectedBTeam.getAbbreviatedName());
+        }
     }
 
     @FXML
     void selectTeamC(ActionEvent event) {
         selectedCTeam = teamCComboBox.getSelectionModel().getSelectedItem();
-        //update UI image
-        if (selectedCTeam.getTeamLogo() == null) { //if there isn't an image
-            //delete image
+
+        if (selectedCTeam == null) { //comboBox selection has been cleared
+            //remove image and text from UI
             teamCImage.setImage(null);
+            teamCLabel.setText(null);
+
         } else {
-            //update image
-            teamCImage.setImage(new Image(selectedCTeam.getTeamLogo().toUri().toString()));
+
+            //update UI image
+            if (selectedCTeam.getTeamLogo() == null) { //if there isn't an image
+                //delete image
+                teamCImage.setImage(null);
+            } else {
+                //update image
+                teamCImage.setImage(new Image(selectedCTeam.getTeamLogo().toUri().toString()));
+            }
+
+            //update label
+            teamCLabel.setText(selectedCTeam.getAbbreviatedName());
         }
 
-        //update label
-        teamCLabel.setText(selectedCTeam.getAbbreviatedName());
     }
 
     @FXML
     void selectTeamD(ActionEvent event) {
         selectedDTeam = teamDComboBox.getSelectionModel().getSelectedItem();
-        //update UI image
-        if (selectedDTeam.getTeamLogo() == null) { //if there isn't an image
-            //delete image
+
+        if (selectedDTeam == null) { //comboBox selection has been cleared
+            //remove image and text from UI
             teamDImage.setImage(null);
+            teamDLabel.setText(null);
+
         } else {
-            //update image
-            teamDImage.setImage(new Image(selectedDTeam.getTeamLogo().toUri().toString()));
-        }
 
-        //update label
-        teamDLabel.setText(selectedDTeam.getAbbreviatedName());
+            //update UI image
+            if (selectedDTeam.getTeamLogo() == null) { //if there isn't an image
+                //delete image
+                teamDImage.setImage(null);
+            } else {
+                //update image
+                teamDImage.setImage(new Image(selectedDTeam.getTeamLogo().toUri().toString()));
+            }
+
+            //update label
+            teamDLabel.setText(selectedDTeam.getAbbreviatedName());
+        }
     }
 
     @FXML
@@ -326,4 +373,30 @@ public Team fromString(String string) {
             }
         });
     }
+
+    /**
+     * Clears the currently selected data, and empties the associated files.
+     */
+    public void clear() {
+        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+        alert.setTitle("Confirmation Dialog");
+        alert.setHeaderText("Team files will be cleared");
+        alert.setContentText("This action does not need saving, and will be executed immediately. Are you ok with this?");
+
+        Optional<ButtonType> result = alert.showAndWait();
+        if (result.get() == ButtonType.OK){
+            // ... user chose OK
+
+            //clear UI
+            teamAComboBox.getSelectionModel().clearSelection(); //change is heard by FXML!
+            teamBComboBox.getSelectionModel().clearSelection();
+            teamCComboBox.getSelectionModel().clearSelection();
+            teamDComboBox.getSelectionModel().clearSelection();
+
+            //clear files
+            save();
+        } else {
+            // ... user chose CANCEL or closed the dialog
+        }
+    }
 }
diff --git a/src/main/java/goistreamtoolredux/controller/TimerPane.java b/src/main/java/goistreamtoolredux/controller/TimerPane.java
index 38ec322..e235793 100644
--- a/src/main/java/goistreamtoolredux/controller/TimerPane.java
+++ b/src/main/java/goistreamtoolredux/controller/TimerPane.java
@@ -1,14 +1,11 @@
 package goistreamtoolredux.controller;
 
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXSnackbar;
-import com.jfoenix.controls.JFXSnackbarLayout;
-import com.jfoenix.controls.JFXToggleButton;
+import com.jfoenix.controls.*;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
 import goistreamtoolredux.App;
+import goistreamtoolredux.algorithm.AppTimer;
 import goistreamtoolredux.algorithm.FileManager;
 import goistreamtoolredux.algorithm.InvalidDataException;
-import goistreamtoolredux.algorithm.LobbyTimer;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -56,6 +53,9 @@ public class TimerPane {
     @FXML // fx:id="timerToggler"
     private JFXToggleButton timerToggler; // Value injected by FXMLLoader
 
+    @FXML // fx:id="timerEndTextField"
+    private JFXTextField timerEndTextField; // Value injected by FXMLLoader
+
     @FXML // fx:id="timerOneSpinner"
     private Spinner<Integer> timerOneSpinner; // Value injected by FXMLLoader
 
@@ -70,20 +70,19 @@ public class TimerPane {
     private static final String TIMER_ONE_LENGTH = "timer_one_length";
     private static final String TIMER_TWO_LENGTH = "timer_two_length";
     private static final String IS_TIMER_ONE = "is_timer_one";
-
-
+    private static final String TIMER_END_TEXT = "timer_end_text";
 
 
 
     @FXML
     void lobbyPauseClicked(MouseEvent event) {
-        LobbyTimer.getInstance().pause();
+        AppTimer.getInstance().pause();
     }
 
     @FXML
     void lobbyPlayClicked(MouseEvent event) {
         try {
-            LobbyTimer.getInstance().start();
+            AppTimer.getInstance().start();
         } catch (IOException exception) {
             exception.printStackTrace();
             //todo handle
@@ -96,7 +95,7 @@ void lobbyPlayClicked(MouseEvent event) {
     @FXML
     void lobbyRestartClicked(MouseEvent event) {
         try {
-            LobbyTimer.getInstance().restart();
+            AppTimer.getInstance().restart();
         } catch (IOException exception) {
             exception.printStackTrace();
             //todo handle
@@ -110,7 +109,7 @@ void lobbyRestartClicked(MouseEvent event) {
     @FXML
     void lobbyStopClicked(MouseEvent event) {
         try {
-            LobbyTimer.getInstance().stop();
+            AppTimer.getInstance().stop();
             lobbyTimerText.setText("0");
         } catch (IOException exception) {
             exception.printStackTrace();
@@ -137,7 +136,7 @@ void initialize() {
 
         //get initial lobby timer length
         try {
-            lobbyTimerText.setText(String.valueOf(LobbyTimer.getInstance().get()));
+            lobbyTimerText.setText(String.valueOf(AppTimer.getInstance().get()));
         } catch (FileNotFoundException exception) {
             //if file is not found - then there is no current timer, so the default '00:00' is what we want
             // so no changes need to be made
@@ -150,9 +149,6 @@ void initialize() {
                 e.printStackTrace();
                 //todo, handle failed file creation
             }
-        } catch (InvalidDataException invalidDataException) {
-            invalidDataException.printStackTrace();
-            //todo handle
         } catch (IOException exception) {
             exception.printStackTrace();
             //todo handle
@@ -167,6 +163,9 @@ void initialize() {
         //init timer 2 spinner
         initTimerSpinner(timerTwoSpinner, prefs.getInt(TIMER_TWO_LENGTH, 240));
 
+        //init value for end text TextField
+        timerEndTextField.setText(prefs.get(TIMER_END_TEXT, "0:00"));
+
     }
 
     static void initTimerSpinner(Spinner<Integer> timerSpinner, int initialLength) {
@@ -218,7 +217,7 @@ public void save(ActionEvent actionEvent) {
         anchorPane.requestFocus(); //pulls focus away from spinners - allowing them to update their values
         JFXSnackbar bar = new JFXSnackbar(anchorPane);
         try {
-            LobbyTimer.getInstance().setInitialTimerLength(timerOneSpinner.getValue());
+            AppTimer.getInstance().setInitialTimerLength(timerOneSpinner.getValue());
             prefs.putInt(TIMER_ONE_LENGTH, timerOneSpinner.getValue());
             prefs.putInt(TIMER_TWO_LENGTH, timerTwoSpinner.getValue());
             bar.enqueue(new JFXSnackbar.SnackbarEvent(new JFXSnackbarLayout("Saving Timers"),new Duration(1000)));
@@ -226,6 +225,10 @@ public void save(ActionEvent actionEvent) {
             //todo
             exception.printStackTrace();
         }
+
+        //update timer end text
+        prefs.put(TIMER_END_TEXT, timerEndTextField.getText());
+        System.out.println("updating end preference: " + prefs.get(TIMER_END_TEXT, "NOT THERE?"));
     }
 
 }
diff --git a/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml b/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml
index f0080fb..2632965 100644
--- a/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml
+++ b/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.jfoenix.controls.JFXButton?>
 <?import com.jfoenix.controls.JFXCheckBox?>
 <?import com.jfoenix.controls.JFXComboBox?>
 <?import javafx.geometry.*?>
@@ -44,5 +45,26 @@
             </VBox>
          </children>
       </HBox>
+      <BorderPane layoutX="491.0" layoutY="307.0" prefHeight="70.0" prefWidth="115.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+         <bottom>
+            <GridPane BorderPane.alignment="BOTTOM_RIGHT">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <JFXButton fx:id="saveButton" onAction="#save" text="Save" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+               </children>
+               <BorderPane.margin>
+                  <Insets bottom="5.0" right="5.0" />
+               </BorderPane.margin>
+            </GridPane>
+         </bottom>
+      </BorderPane>
    </children>
 </AnchorPane>
diff --git a/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml b/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml
index f987d9f..ddd437e 100644
--- a/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml
+++ b/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXTextField?>
 <?import com.jfoenix.controls.JFXToggleButton?>
 <?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
 <?import javafx.geometry.Insets?>
@@ -36,6 +37,11 @@
                   <JFXToggleButton id="timerSwitchToggler" fx:id="timerToggler" onAction="#timerTogglerAction" text="Timer Two" />
                </children>
             </HBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <JFXTextField fx:id="timerEndTextField" promptText="Timer End Text" />
+               </children>
+            </HBox>
             <HBox alignment="CENTER" prefHeight="134.0" prefWidth="600.0">
                <children>
                   <VBox alignment="CENTER" prefHeight="200.0" prefWidth="300.0">
@@ -62,7 +68,7 @@
             </HBox>
          </children>
       </VBox>
-      <BorderPane layoutX="481.0" layoutY="297.0" prefHeight="70.0" prefWidth="115.0">
+      <BorderPane layoutX="481.0" layoutY="297.0" prefHeight="70.0" prefWidth="115.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
          <bottom>
             <GridPane BorderPane.alignment="BOTTOM_RIGHT">
                <columnConstraints>

Modifier and Type	Method and Description
`java.util.Timer`	`getCurrentTimer()`
`static LobbyTimer`	`getInstance()`
`void`	`pause()` - Pauses the current timer state. -
`void`	`restart()` - Resets the timer back to beginning value and starts it again -
`void`	`start()` - Start the timer (initial or after a pause) -
`void`	`stop()` - Completely stops and cancels the timer. -