diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b0a86ec..1f31af0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java" line="35" mnemonic="2" />
+    <bookmark url="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java" line="33" mnemonic="2" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AuthService.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterController.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/SessionService.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTDialog.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Commons/src/models/TTAccount.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/App.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeManager.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java" afterPath="$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -24,11 +40,11 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="Home.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Home.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="462">
-              <caret line="60" column="18" lean-forward="false" selection-start-line="60" selection-start-column="18" selection-end-line="60" selection-end-column="18" />
+            <state relative-caret-position="-420">
+              <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -36,23 +52,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="HomeManager.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeManager.java">
+      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="483">
-              <caret line="23" column="22" lean-forward="false" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ITTAuth.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
+            <state relative-caret-position="334">
+              <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -63,8 +67,8 @@
       <file leaf-file-name="TTAuth.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="415">
-              <caret line="34" column="46" lean-forward="false" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" />
+            <state relative-caret-position="252">
+              <caret line="60" column="13" lean-forward="true" selection-start-line="60" selection-start-column="13" selection-end-line="60" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -72,11 +76,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TTServer.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/TTServer.java">
+      <file leaf-file-name="ITTAuth.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="496">
-              <caret line="29" column="32" lean-forward="false" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+            <state relative-caret-position="189">
+              <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -84,11 +88,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java">
+      <file leaf-file-name="Register.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="42">
-              <caret line="2" column="48" lean-forward="false" selection-start-line="2" selection-start-column="48" selection-end-line="2" selection-end-column="48" />
+            <state relative-caret-position="504">
+              <caret line="66" column="32" lean-forward="true" selection-start-line="66" selection-start-column="32" selection-end-line="66" selection-end-column="32" />
               <folding />
             </state>
           </provider>
@@ -97,8 +101,8 @@
       <file leaf-file-name="TTLogger.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Commons/src/utilities/TTLogger.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="181">
-              <caret line="30" column="32" lean-forward="false" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
+            <state relative-caret-position="30">
+              <caret line="32" column="30" lean-forward="true" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -106,22 +110,26 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="log" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/log">
+      <file leaf-file-name="TTDialog.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTDialog.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="-432">
+              <caret line="87" column="48" lean-forward="true" selection-start-line="87" selection-start-column="48" selection-end-line="87" selection-end-column="48" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+      <file leaf-file-name="RegisterController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" column="4" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="4" />
-              <folding />
+            <state relative-caret-position="378">
+              <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -130,7 +138,7 @@
         <entry file="file://$PROJECT_DIR$/Commons/src/models/TTResponse.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="147">
-              <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+              <caret line="7" column="48" lean-forward="true" selection-start-line="7" selection-start-column="48" selection-end-line="7" selection-end-column="48" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -138,6 +146,16 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="Menu.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-147">
+              <caret line="53" column="21" lean-forward="true" selection-start-line="53" selection-start-column="21" selection-end-line="53" selection-end-column="21" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -175,35 +193,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTGameBox.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLetter.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/LettersPlaceholders.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Auth.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/Auth.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/ITTAuth.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeService.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Config.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/TTServer.java" />
@@ -214,18 +208,42 @@
         <option value="$PROJECT_DIR$/utilities/TTLogger.java" />
         <option value="$PROJECT_DIR$/models/TTResponse.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/TTServer.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
         <option value="$PROJECT_DIR$/Client/Client.iml" />
         <option value="$PROJECT_DIR$/Server/Server.iml" />
         <option value="$PROJECT_DIR$/Commons/Commons.iml" />
         <option value="$PROJECT_DIR$/Commons/src/models/TTResponse.java" />
-        <option value="$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeManager.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java" />
-        <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java" />
         <option value="$PROJECT_DIR$/Commons/src/utilities/TTLogger.java" />
         <option value="$PROJECT_DIR$/log" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/TTDialog.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Dialog.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/Dialog.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeManager.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuManager.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AccountService.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/App.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
+        <option value="$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java" />
+        <option value="$PROJECT_DIR$/Commons/src/models/TTAccount.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AuthService.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/SessionService.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterController.java" />
+        <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTDialog.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
       </list>
     </option>
   </component>
@@ -236,10 +254,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1938" />
-    <option name="height" value="1048" />
+    <option name="x" value="-1709" />
+    <option name="y" value="-107" />
+    <option name="width" value="1718" />
+    <option name="height" value="928" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -258,6 +276,8 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -478,6 +498,32 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="TextTwist" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="TextTwist" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Client" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="client" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ui" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="TextTwist" />
@@ -504,10 +550,34 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="TextTwist" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="TextTwist" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Client" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="client" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="constants" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -553,13 +623,13 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.Main (1)">
-    <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Compound.RunAll">
+    <configuration default="false" name="Server" type="Application" factoryName="Application" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" value="com.texttwist.server.Main" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
+      <option name="VM_PARAMETERS" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -569,7 +639,7 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="false" name="Main (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+    <configuration default="false" name="Client" type="Application" factoryName="Application" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="com.texttwist.client.*" />
@@ -577,9 +647,9 @@
         </pattern>
       </extension>
       <option name="MAIN_CLASS_NAME" value="com.texttwist.client.Main" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
+      <option name="VM_PARAMETERS" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -957,21 +1027,21 @@
       <method />
     </configuration>
     <configuration default="false" name="RunAll" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
-      <toRun type="Application" name="Main" />
-      <toRun type="Application" name="Main (1)" />
+      <toRun type="Application" name="Client" />
+      <toRun type="Application" name="Server" />
       <method />
     </configuration>
     <list size="3">
       <item index="0" class="java.lang.String" itemvalue="Compound.RunAll" />
-      <item index="1" class="java.lang.String" itemvalue="Application.Main" />
-      <item index="2" class="java.lang.String" itemvalue="Application.Main (1)" />
+      <item index="1" class="java.lang.String" itemvalue="Application.Server" />
+      <item index="2" class="java.lang.String" itemvalue="Application.Client" />
     </list>
     <recent_temporary>
       <list size="4">
-        <item index="0" class="java.lang.String" itemvalue="Application.Main (1)" />
-        <item index="1" class="java.lang.String" itemvalue="Application.Main" />
-        <item index="2" class="java.lang.String" itemvalue="Application.Main" />
-        <item index="3" class="java.lang.String" itemvalue="Application.Main" />
+        <item index="0" class="java.lang.String" itemvalue="Application.Server" />
+        <item index="1" class="java.lang.String" itemvalue="Application.Client" />
+        <item index="2" class="java.lang.String" itemvalue="Application.Server" />
+        <item index="3" class="java.lang.String" itemvalue="Application.Server" />
       </list>
     </recent_temporary>
   </component>
@@ -990,15 +1060,17 @@
       <workItem from="1497387626373" duration="13500000" />
       <workItem from="1497426956018" duration="15512000" />
       <workItem from="1497543392984" duration="8897000" />
-      <workItem from="1497552318772" duration="3034000" />
+      <workItem from="1497552318772" duration="3068000" />
+      <workItem from="1497562855680" duration="194000" />
+      <workItem from="1497704337642" duration="11601000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="91000000" />
+    <option name="totallyTimeSpent" value="102829000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
+    <frame x="-1709" y="-107" width="1718" height="928" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1008,10 +1080,10 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14159292" sideWeight="0.5047059" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14160264" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14159292" sideWeight="0.49529412" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1023,7 +1095,7 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.49764705" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1041,7 +1113,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="7" />
+      <option name="time" value="10" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1050,37 +1122,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/awt/Container.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="1092" column="0" lean-forward="false" selection-start-line="1092" selection-start-column="0" selection-end-line="1092" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/awt/Window.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="802" column="25" lean-forward="true" selection-start-line="802" selection-start-column="25" selection-end-line="802" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/com/texttwist/client/ui/TTImage.java" />
-    <entry file="file://$PROJECT_DIR$/out/production/Client/com/texttwist/client/Main.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/resources/images.properties" />
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/javax/imageio/ImageIO.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="1291" column="51" lean-forward="false" selection-start-line="1291" selection-start-column="51" selection-end-line="1291" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/resources/images/logo.png">
       <provider selected="true" editor-type-id="images">
         <state />
@@ -1101,13 +1142,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="15" column="23" lean-forward="true" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -1129,36 +1163,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="82" column="53" lean-forward="true" selection-start-line="82" selection-start-column="53" selection-end-line="82" selection-end-column="53" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="73" column="21" lean-forward="true" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="21" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#542#543#0" expanded="false" />
-            <element signature="e#569#570#0" expanded="false" />
-            <element signature="e#768#776#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
@@ -1166,54 +1170,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTGameBox.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="24" column="55" lean-forward="true" selection-start-line="24" selection-start-column="55" selection-end-line="24" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="861">
-          <caret line="47" column="34" lean-forward="false" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="34" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="35" column="14" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLetter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
@@ -1222,109 +1178,18 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/LettersPlaceholders.java" />
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="32" column="27" lean-forward="false" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="22" column="10" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="588">
-          <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="60" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="18" lean-forward="false" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="3" lean-forward="false" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Config.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
           <caret line="7" column="53" lean-forward="true" selection-start-line="7" selection-start-column="53" selection-end-line="7" selection-end-column="53" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/untitled/src/asd/asd.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/untitled/src/asd/asd.java" />
     <entry file="file://$PROJECT_DIR$/TextTwist.iml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="11" column="9" lean-forward="false" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1332,7 +1197,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="10" column="47" lean-forward="false" selection-start-line="10" selection-start-column="47" selection-end-line="10" selection-end-column="47" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1340,7 +1204,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
           <caret line="7" column="33" lean-forward="false" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1348,47 +1211,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="11" column="9" lean-forward="false" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/models/TTResponse.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="60" column="18" lean-forward="false" selection-start-line="60" selection-start-column="18" selection-end-line="60" selection-end-column="18" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="23" column="22" lean-forward="false" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1400,30 +1222,130 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="34" column="46" lean-forward="false" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="21">
+          <caret line="1" column="4" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="4" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/TTServer.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="29" column="32" lean-forward="false" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="126">
+          <caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/utilities/TTLogger.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="30" column="32" lean-forward="false" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
+        <state relative-caret-position="231">
+          <caret line="15" column="30" lean-forward="false" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTGameBox.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="24" column="55" lean-forward="true" selection-start-line="24" selection-start-column="55" selection-end-line="24" selection-end-column="55" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="156">
+          <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="22" column="20" lean-forward="false" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="25" column="1" lean-forward="true" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-420">
+          <caret line="17" column="20" lean-forward="false" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="21" column="45" lean-forward="true" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="23" column="33" lean-forward="false" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="18" column="49" lean-forward="true" selection-start-line="18" selection-start-column="49" selection-end-line="18" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/App.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="25" column="46" lean-forward="false" selection-start-line="25" selection-start-column="46" selection-end-line="25" selection-end-column="46" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1432,20 +1354,170 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/log">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="-897">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="4" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="4" />
+        <state relative-caret-position="334">
+          <caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="90" column="37" lean-forward="true" selection-start-line="83" selection-start-column="0" selection-end-line="90" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Commons/src/models/TTAccount.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="10" column="32" lean-forward="true" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/TTServer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="366">
+          <caret line="22" column="75" lean-forward="true" selection-start-line="22" selection-start-column="75" selection-end-line="22" selection-end-column="75" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/SessionService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AuthService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="366">
+          <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="25" lean-forward="true" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-147">
+          <caret line="53" column="21" lean-forward="true" selection-start-line="53" selection-start-column="21" selection-end-line="53" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="60" column="13" lean-forward="true" selection-start-line="60" selection-start-column="13" selection-end-line="60" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTDialog.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-432">
+          <caret line="87" column="48" lean-forward="true" selection-start-line="87" selection-start-column="48" selection-end-line="87" selection-end-column="48" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Commons/src/models/TTResponse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="48" lean-forward="true" selection-start-line="7" selection-start-column="48" selection-end-line="7" selection-end-column="48" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Commons/src/utilities/TTLogger.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="32" column="30" lean-forward="true" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="66" column="32" lean-forward="true" selection-start-line="66" selection-start-column="32" selection-end-line="66" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="334">
+          <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-420">
+          <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/Client/src/com/texttwist/client/Main.java b/Client/src/com/texttwist/client/Main.java
index 5857630..ccbb290 100644
--- a/Client/src/com/texttwist/client/Main.java
+++ b/Client/src/com/texttwist/client/Main.java
@@ -20,6 +20,6 @@ public class Main {
             System.out.println("Font non caricato correttamente");
         }
 
-        Entrypoint entrypoint = new Entrypoint();
+        App entrypoint = new App();
     }
 }
diff --git a/Client/src/com/texttwist/client/constants/Palette.java b/Client/src/com/texttwist/client/constants/Palette.java
index 843f287..b73bc42 100644
--- a/Client/src/com/texttwist/client/constants/Palette.java
+++ b/Client/src/com/texttwist/client/constants/Palette.java
@@ -16,6 +16,9 @@ public class Palette {
     public static Color registerLblBtn_onmouseover_color = new Color(95,0,0, 127);
     public static Color registerLblBtn_onmouseclick_color = new Color(53,66,32);
     public static Color scrollPanel_backgroundColor = new Color(220,229,207);
+    public static Color dialog_alert = Color.red;
+    public static Color dialog_success = new Color(53,66,32);
+
 
     public static Font button_font = new Font("DK Trained Monkey", Font.BOLD, 30);
 
diff --git a/Client/src/com/texttwist/client/pages/Entrypoint.java b/Client/src/com/texttwist/client/pages/App.java
similarity index 61%
rename from Client/src/com/texttwist/client/pages/Entrypoint.java
rename to Client/src/com/texttwist/client/pages/App.java
index a788b31..975c4b4 100644
--- a/Client/src/com/texttwist/client/pages/Entrypoint.java
+++ b/Client/src/com/texttwist/client/pages/App.java
@@ -8,17 +8,23 @@ import java.awt.*;
 /**
  * Created by loke on 13/06/2017.
  */
-public class Entrypoint extends JFrame {
+public class App extends JFrame {
 
     protected TTContainer root;
+    public static AuthService authService;
+    public static SessionService sessionService;
 
-    public Entrypoint(){
+    public App(){
         setPreferredSize( new Dimension( 640, 480 ));
         setSize(new Dimension(640,480));
         setLocation(100,100);
         setResizable( false );
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
+        //Init services
+        authService = new AuthService();
+        sessionService = new SessionService();
+
         Home home = new Home(this);
     }
 }
diff --git a/Client/src/com/texttwist/client/pages/HomeManager.java b/Client/src/com/texttwist/client/pages/AuthService.java
similarity index 65%
rename from Client/src/com/texttwist/client/pages/HomeManager.java
rename to Client/src/com/texttwist/client/pages/AuthService.java
index 6bbe756..bdf947a 100644
--- a/Client/src/com/texttwist/client/pages/HomeManager.java
+++ b/Client/src/com/texttwist/client/pages/AuthService.java
@@ -1,4 +1,5 @@
 package com.texttwist.client.pages;
+
 import com.texttwist.client.constants.Config;
 import interfaces.ITTAuth;
 import models.TTResponse;
@@ -11,21 +12,25 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
- * Created by loke on 15/06/2017.
+ * Created by loke on 17/06/2017.
  */
-public class HomeManager {
-    ExecutorService executor = Executors.newSingleThreadExecutor();
-    String baseUrl = Config.getRMIServerAddress().concat("/auth");
+public class AuthService {
 
-    public HomeManager(){
+    protected String baseUrl = Config.getRMIServerAddress().concat("/auth");
+
+    public AuthService(){
     }
 
     public TTResponse login(String userName, String password) throws RemoteException, NotBoundException, MalformedURLException {
-        System.out.print(password);
         ITTAuth auth = (ITTAuth) Naming.lookup(baseUrl);
         return auth.login(userName, password);
     }
 
+    public TTResponse register(String userName, String password) throws RemoteException, NotBoundException, MalformedURLException {
+        ITTAuth auth = (ITTAuth) Naming.lookup(baseUrl);
+        return auth.register(userName, password);
+    }
+
     public TTResponse logout(String userName, String token) throws RemoteException, NotBoundException, MalformedURLException {
         ITTAuth auth = (ITTAuth) Naming.lookup(baseUrl);
         return auth.logout(userName, token);
diff --git a/Client/src/com/texttwist/client/pages/Home.java b/Client/src/com/texttwist/client/pages/Home.java
index 3eb77cc..0ae0b8c 100644
--- a/Client/src/com/texttwist/client/pages/Home.java
+++ b/Client/src/com/texttwist/client/pages/Home.java
@@ -1,6 +1,7 @@
 package com.texttwist.client.pages;
 import com.texttwist.client.constants.Palette;
 import com.texttwist.client.ui.*;
+import com.texttwist.client.ui.TTDialog;
 import models.TTResponse;
 
 import javax.swing.*;
@@ -10,12 +11,12 @@ import java.util.concurrent.Callable;
 public class Home extends Page {
 
     private TTContainer loginDataContainer;
-    private HomeManager homeManager;
+    private HomeController homeController;
     private TTContainer logoContainer;
 
     public Home(JFrame window) {
         super(window);
-        homeManager = new HomeManager();
+        homeController = new HomeController();
         createUIComponents();
         window.setVisible(true);
     }
@@ -49,13 +50,18 @@ public class Home extends Page {
                     @Override
                     public Object call() throws Exception {
                         //TODO CHIAMA API PER LOGIN E SE TUTTO OKEY MANDA A PAGINA DEL MENU
-                        TTResponse res = homeManager.login(usernameField.getText(), String.valueOf(passwordField.getPassword()));
+                        TTResponse res = homeController.login(usernameField.getText(), String.valueOf(passwordField.getPassword()));
                         if (res.code == 200){
                             //OK, go to next page and show popup
                             return new Menu(window);
                         } else {
-                            JOptionPane.showMessageDialog(null, "Login Failes");
-                            return null;
+                            return new TTDialog("alert", res.message,
+                                new Callable() {
+                                @Override
+                                public Object call() throws Exception {
+                                    return new Home(window);
+                                }
+                            },null);
                         }
                     }
                 },
diff --git a/Client/src/com/texttwist/client/pages/HomeController.java b/Client/src/com/texttwist/client/pages/HomeController.java
new file mode 100644
index 0000000..dfa0c55
--- /dev/null
+++ b/Client/src/com/texttwist/client/pages/HomeController.java
@@ -0,0 +1,28 @@
+package com.texttwist.client.pages;
+import com.texttwist.client.constants.Config;
+import interfaces.ITTAuth;
+import models.TTResponse;
+
+import java.net.MalformedURLException;
+import java.rmi.Naming;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Created by loke on 15/06/2017.
+ */
+public class HomeController {
+
+    public HomeController(){
+    }
+
+    public TTResponse login(String userName, String password) throws RemoteException, NotBoundException, MalformedURLException {
+        TTResponse res = App.authService.login(userName,password);
+        if (res.code == 200){
+            App.sessionService.create(userName, password);
+        }
+        return res;
+    }
+}
diff --git a/Client/src/com/texttwist/client/pages/Menu.java b/Client/src/com/texttwist/client/pages/Menu.java
index 26fdd6d..3821fe4 100644
--- a/Client/src/com/texttwist/client/pages/Menu.java
+++ b/Client/src/com/texttwist/client/pages/Menu.java
@@ -13,10 +13,12 @@ import java.util.concurrent.Callable;
 public class Menu extends Page{
 
     private TTContainer menuBar;
+    private MenuController menuController;
 
     public Menu(JFrame window) throws IOException {
         super(window);
         createUIComponents();
+        menuController = new MenuController();
         window.setVisible(true);
 
     }
@@ -24,27 +26,36 @@ public class Menu extends Page{
     @Override
     public void createUIComponents() throws IOException {
         addLogo(root);
+
         menuBar = new TTContainer(
                 null,
-                new Dimension(1150,220),
+                new Dimension(1150,280),
                 Palette.root_backgroundColor,
                 -1,
                 root);
+
+        TTLabel playerToSendInvite_flavourText = new TTLabel(
+                new Point(25,15),
+                new Dimension(350,20),
+                "Welcome back, " + App.sessionService.account.userName + "!",
+                new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 24),
+                null,
+                menuBar);
+
         TTButton newMatch = new TTButton(
-                new Point(25,30),
+                new Point(25,70),
                 new Dimension(250,75),
                 "New Match!",
                 new Callable<Object>() {
                     @Override
                     public Object call() throws Exception {
-
                         //TODO CHIAMA API PER REGISTRAZIONE E SE TUTTO OKEY MANDA A PAGINA LOGIN
                         return new MatchSetup(window);
                     }
                 },
                 menuBar);
         TTButton matchRequests = new TTButton(
-                new Point(290,30),
+                new Point(290,70),
                 new Dimension(250,75),
                 "In pending",
                 new Callable<Object>() {
@@ -56,13 +67,13 @@ public class Menu extends Page{
                 },
                 menuBar);
         TTCircleCounter circleCounter = new TTCircleCounter(
-                new Point(290,30),
+                new Point(290,70),
                 new Dimension(25,25),
                 menuBar.getGraphics(),
                 menuBar);
 
         TTButton highscores = new TTButton(
-                new Point(25, 115),
+                new Point(25, 155),
                 new Dimension(250, 75),
                 "Highscores",
                 new Callable<Object>() {
@@ -74,25 +85,17 @@ public class Menu extends Page{
                 menuBar);
 
         TTButton logout = new TTButton(
-                new Point(290, 115),
+                new Point(290, 155),
                 new Dimension(250, 75),
                 "Logout",
                 new Callable<Object>() {
                     @Override
                     public Object call() throws Exception {
+                        menuController.logout("","");
                         return new Home(Page.window);
                     }
                 },
                 menuBar);
 
-        addFooter(root);
-        addBack(footer,
-                new Callable<Object>() {
-                @Override
-                public Object call() throws Exception {
-                    return new Home(Page.window);
-                }
-            });
-
     }
 }
diff --git a/Client/src/com/texttwist/client/pages/MenuController.java b/Client/src/com/texttwist/client/pages/MenuController.java
new file mode 100644
index 0000000..150edff
--- /dev/null
+++ b/Client/src/com/texttwist/client/pages/MenuController.java
@@ -0,0 +1,27 @@
+package com.texttwist.client.pages;
+
+import com.texttwist.client.constants.Config;
+import interfaces.ITTAuth;
+import models.TTResponse;
+
+import java.net.MalformedURLException;
+import java.rmi.Naming;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+
+/**
+ * Created by loke on 17/06/2017.
+ */
+public class MenuController {
+
+    public MenuController(){
+    }
+
+    public TTResponse logout(String userName, String token) throws RemoteException, NotBoundException, MalformedURLException {
+        TTResponse res =  App.authService.logout(userName,token);
+        if (res.code == 200){
+            App.sessionService.remove();
+        }
+        return res;
+    }
+}
diff --git a/Client/src/com/texttwist/client/pages/Register.java b/Client/src/com/texttwist/client/pages/Register.java
index 937de45..9e0ea40 100644
--- a/Client/src/com/texttwist/client/pages/Register.java
+++ b/Client/src/com/texttwist/client/pages/Register.java
@@ -2,6 +2,7 @@ package com.texttwist.client.pages;
 
 import com.texttwist.client.constants.Palette;
 import com.texttwist.client.ui.*;
+import models.TTResponse;
 
 import javax.swing.*;
 import java.awt.*;
@@ -13,9 +14,11 @@ import java.util.concurrent.Callable;
 public class Register extends Page {
 
     private TTContainer registerDataContainer;
+    private RegisterController registerController;
     public Register(JFrame window) {
         super(window);
         createUIComponents();
+        registerController = new RegisterController();
         window.setVisible(true);
     }
 
@@ -51,9 +54,25 @@ public class Register extends Page {
                 new Callable<Object>() {
                     @Override
                     public Object call() throws Exception {
-
-                        //TODO CHIAMA API PER REGISTRAZIONE E SE TUTTO OKEY MANDA A PAGINA LOGIN
-                        return new Home(window);
+                        //TODO CHIAMA API PER LOGIN E SE TUTTO OKEY MANDA A PAGINA DEL MENU
+                        TTResponse res = registerController.register(usernameField.getText(), String.valueOf(passwordField.getPassword()));
+                        if (res.code == 200){
+                            return new TTDialog("success", res.message,
+                            new Callable() {
+                                @Override
+                                public Object call() throws Exception {
+                                    return new Home(window);
+                                }
+                            },null);
+                        } else {
+                            return new TTDialog("alert", res.message,
+                                new Callable() {
+                                @Override
+                                public Object call() throws Exception {
+                                    return null;
+                                }
+                            },null);
+                        }
                     }
                 },
                 registerDataContainer);
diff --git a/Client/src/com/texttwist/client/pages/RegisterController.java b/Client/src/com/texttwist/client/pages/RegisterController.java
new file mode 100644
index 0000000..1c8829d
--- /dev/null
+++ b/Client/src/com/texttwist/client/pages/RegisterController.java
@@ -0,0 +1,23 @@
+package com.texttwist.client.pages;
+
+import com.texttwist.client.constants.Config;
+import interfaces.ITTAuth;
+import models.TTResponse;
+
+import java.net.MalformedURLException;
+import java.rmi.Naming;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+
+/**
+ * Created by loke on 17/06/2017.
+ */
+public class RegisterController {
+
+    public RegisterController(){
+    }
+
+    public TTResponse register(String userName, String password) throws RemoteException, NotBoundException, MalformedURLException {
+        return App.authService.register(userName,password);
+    }
+}
diff --git a/Client/src/com/texttwist/client/pages/SessionService.java b/Client/src/com/texttwist/client/pages/SessionService.java
new file mode 100644
index 0000000..24c11f3
--- /dev/null
+++ b/Client/src/com/texttwist/client/pages/SessionService.java
@@ -0,0 +1,28 @@
+package com.texttwist.client.pages;
+
+import interfaces.ITTAuth;
+import models.TTAccount;
+import models.TTResponse;
+
+import java.net.MalformedURLException;
+import java.rmi.Naming;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+
+/**
+ * Created by loke on 17/06/2017.
+ */
+public class SessionService {
+
+    protected TTAccount account;
+
+    public SessionService(){}
+
+    public void create(String userName, String token) {
+        account = new TTAccount(userName, token);
+    }
+
+    public void remove(){
+        account = null;
+    }
+}
diff --git a/Client/src/com/texttwist/client/ui/TTButton.java b/Client/src/com/texttwist/client/ui/TTButton.java
index 8d2729a..8b61496 100644
--- a/Client/src/com/texttwist/client/ui/TTButton.java
+++ b/Client/src/com/texttwist/client/ui/TTButton.java
@@ -7,6 +7,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.IOException;
 import java.util.concurrent.Callable;
 
 /**
diff --git a/Client/src/com/texttwist/client/ui/TTDialog.java b/Client/src/com/texttwist/client/ui/TTDialog.java
new file mode 100644
index 0000000..703cf98
--- /dev/null
+++ b/Client/src/com/texttwist/client/ui/TTDialog.java
@@ -0,0 +1,142 @@
+package com.texttwist.client.ui;
+
+import com.texttwist.client.constants.Palette;
+import com.texttwist.client.pages.Home;
+import com.texttwist.client.ui.TTContainer;
+import com.texttwist.client.ui.TTLabel;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.io.IOException;
+import java.util.concurrent.Callable;
+
+/**
+ * Created by loke on 17/06/2017.
+ */
+public class TTDialog extends JFrame {
+
+    TTContainer root;
+    public TTDialog(String type, String message, Callable okHandler, Callable cancelHandler) {
+        setPreferredSize( new Dimension( 450, 200 ));
+        setSize(new Dimension(450,200));
+        setLocation(200,300);
+        setResizable(false);
+        setAlwaysOnTop(true);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setUndecorated(true);
+        setContentPane(new ShadowPane());
+
+        root = new TTContainer(
+                new Point(40,20),
+                new Dimension(0,0),
+                Palette.root_backgroundColor,
+                -1,
+                null);
+        switch (type){
+            case "alert":{
+                root.setBorder(BorderFactory.createLineBorder(Palette.dialog_alert));
+
+            }
+            case "success": {
+                root.setBorder(BorderFactory.createLineBorder(Palette.dialog_success));
+            }
+        }
+        add(root);
+
+        TTLabel msg = new TTLabel(
+                new Point(60,20),
+                new Dimension(350,50),
+                message,
+                new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 38),
+                null,
+                root);
+
+        if(okHandler != null && cancelHandler != null){
+            TTButton okBtn = new TTButton(
+                    new Point(60,100),
+                    new Dimension(150,50),
+                    "Ok",
+                    new Callable<Object>() {
+                        @Override
+                        public Object call() throws Exception {
+                            okHandler.call();
+                            dispose();
+                            return null;
+                        }
+                    },
+                    root);
+            TTButton cancelBtn = new TTButton(
+                    new Point(250,100),
+                    new Dimension(150,50),
+                    "Cancel",
+                    new Callable<Object>() {
+                        @Override
+                        public Object call() throws Exception {
+                            cancelHandler.call();
+                            dispose();
+                            return null;
+                        }
+                    },
+                    root);
+        } else {
+            if(cancelHandler != null) {
+                TTButton cancelBtn = new TTButton(
+                        new Point(150, 100),
+                        new Dimension(150, 50),
+                        "Cancel",
+                        new Callable<Object>() {
+                            @Override
+                            public Object call() throws Exception {
+                                cancelHandler.call();
+                                dispose();
+                                return null;
+                            }
+                        },
+                        root);
+            }
+            if(okHandler != null) {
+                TTButton okBtn = new TTButton(
+                        new Point(150,100),
+                        new Dimension(150,50),
+                        "Ok",
+                        new Callable<Object>() {
+                            @Override
+                            public Object call() throws Exception {
+                                okHandler.call();
+                                dispose();
+                                return null;
+                            }
+                        },
+                        root);
+            }
+        }
+
+        setVisible(true);
+    }
+
+    public class ShadowPane extends JPanel {
+
+        public ShadowPane() {
+            setLayout(new BorderLayout());
+            setOpaque(false);
+            setBackground(Color.BLACK);
+            setBorder(new EmptyBorder(0, 0, 5, 5));
+        }
+
+        @Override
+        public Dimension getPreferredSize() {
+            return new Dimension(200, 200);
+        }
+
+        @Override
+        protected void paintComponent(Graphics g) {
+            super.paintComponent(g);
+            Graphics2D g2d = (Graphics2D) g.create();
+            g2d.setComposite(AlphaComposite.SrcOver.derive(0.5f));
+            g2d.fillRect(5, 5, getWidth(), getHeight());
+            g2d.dispose();
+        }
+    }
+
+}
diff --git a/Client/src/com/texttwist/client/ui/TTLabelBtn.java b/Client/src/com/texttwist/client/ui/TTLabelBtn.java
index e2120ae..1393467 100644
--- a/Client/src/com/texttwist/client/ui/TTLabelBtn.java
+++ b/Client/src/com/texttwist/client/ui/TTLabelBtn.java
@@ -1,8 +1,6 @@
 package com.texttwist.client.ui;
 
 import com.texttwist.client.constants.Palette;
-import com.texttwist.client.pages.Entrypoint;
-import com.texttwist.client.pages.Page;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/Commons/src/interfaces/ITTAuth.java b/Commons/src/interfaces/ITTAuth.java
index f0ea5aa..c75ce9d 100644
--- a/Commons/src/interfaces/ITTAuth.java
+++ b/Commons/src/interfaces/ITTAuth.java
@@ -9,5 +9,7 @@ import java.rmi.RemoteException;
  */
 public interface ITTAuth extends Remote {
     TTResponse login(String userName, String password) throws RemoteException;
+    TTResponse register(String userName, String password) throws RemoteException;
     TTResponse logout(String userName, String token) throws RemoteException;
+
 }
diff --git a/Commons/src/models/TTAccount.java b/Commons/src/models/TTAccount.java
new file mode 100644
index 0000000..8d9c441
--- /dev/null
+++ b/Commons/src/models/TTAccount.java
@@ -0,0 +1,14 @@
+package models;
+
+/**
+ * Created by loke on 17/06/2017.
+ */
+public class TTAccount {
+    public String userName;
+    public String token;
+
+    public TTAccount(String userName, String token){
+        this.userName = userName;
+        this.token = token;
+    }
+}
diff --git a/Server/src/com/texttwist/server/components/auth/TTAuth.java b/Server/src/com/texttwist/server/components/auth/TTAuth.java
index 846beab..7e64391 100644
--- a/Server/src/com/texttwist/server/components/auth/TTAuth.java
+++ b/Server/src/com/texttwist/server/components/auth/TTAuth.java
@@ -16,37 +16,59 @@ public class TTAuth extends UnicastRemoteObject implements ITTAuth {
 
     private SecureRandom random = new SecureRandom();
 
-    public String nextSessionId() {
-        return new BigInteger(130, random).toString(32);
-    }
+
     public TTAuth() throws RemoteException{
     }
 
+    @Override
+    public TTResponse register(String userName, String password) throws RemoteException {
+        TTLogger.write("LOGGER: Invoked register with username=" + userName + " AND " + " password=" + password);
+        if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
+            boolean res = true;//TODO Inserisci nel db e verifica se c'è un utente con lo stesso nome
+
+                if(userName.equals("ciro")){ //TODO rimuovere
+                    res = false;
+                }
+            if(res) {
+                TTLogger.write("LOGGER: Registration successfull");
+                return new TTResponse("Registration successfull", 200, null);
+            } else {
+                TTLogger.write("LOGGER: Registration unsuccessfull");
+                return new TTResponse("Registration unsuccessfull: Username exist!", 400, null);
+            }
+        }
+        return new TTResponse("Registration unsuccessfull! All fields are mandatories", 400, null);
+
+    }
+
     @Override
     public TTResponse login(String userName, String password) throws RemoteException {
         TTLogger.write("LOGGER: Invoked login with username=" + userName + " AND " + " password=" + password);
-        if ((userName != null && !userName.isEmpty())
-                && (password != null && !password.equals(""))) {
+        if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
 
             if((userName.equalsIgnoreCase("admin"))
                     && (password.equals("admin"))) {
                 JsonObject data = new JsonObject();
                 data.put("token", nextSessionId());
-                System.out.println("LOGGER: Login successfull");
+                TTLogger.write("LOGGER: Login successfull");
                 return new TTResponse("Login successfull", 200, data);
             }
         }
-        System.out.println("LOGGER: Login unsuccessfull");
         return new TTResponse("Login unsuccessfull", 400, null);
     }
 
+
     @Override
     public TTResponse logout(String userName, String token) throws RemoteException {
-        System.out.println("LOGGER: Invoked logout with username=" + userName + " AND " + " token=" + token);
-        if ((userName != null && !userName.isEmpty())
-                && (token != null && !token.isEmpty())) {
+        TTLogger.write("LOGGER: Invoked logout with username=" + userName + " AND " + " token=" + token);
+        if ((userName != null && !userName.isEmpty()) && (token != null && !token.isEmpty())) {
             return new TTResponse("Logout successfull", 200, null);
         }
-        return new TTResponse("Logout successfull (but something go wrong)", 200, null);
+        return new TTResponse("Logout successfull (but something gone wrong)", 200, null);
     }
+
+    public String nextSessionId() {
+        return new BigInteger(130, random).toString(32);
+    }
+
 }