diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ddac45e..603379e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -36,6 +36,7 @@
     </JSCodeStyleSettings>
     <TypeScriptCodeStyleSettings>
       <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="FIELD_PREFIX" value="" />
       <option name="USE_DOUBLE_QUOTES" value="false" />
       <option name="FORCE_QUOTE_STYlE" value="true" />
       <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
diff --git a/.idea/dataSources/aed30302-8027-43f4-9489-10a083876dd4.xml b/.idea/dataSources/aed30302-8027-43f4-9489-10a083876dd4.xml
index cdb1a2a..9e81f7c 100644
--- a/.idea/dataSources/aed30302-8027-43f4-9489-10a083876dd4.xml
+++ b/.idea/dataSources/aed30302-8027-43f4-9489-10a083876dd4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="collab.io-db">
-  <database-model serializer="dbm" rdbms="MYSQL" format-version="4.8">
+  <database-model serializer="dbm" rdbms="MYSQL" format-version="4.9">
     <root id="1">
       <ServerVersion>8.0.3</ServerVersion>
       <DefaultEngine>InnoDB</DefaultEngine>
@@ -1097,86 +1097,70 @@
     </collation>
     <table id="274" parent="2" name="room"/>
     <table id="275" parent="2" name="user"/>
-    <column id="276" parent="274" name="id">
+    <column id="276" parent="274" name="name">
       <Position>1</Position>
-      <DataType>int(11)|0s</DataType>
-      <NotNull>1</NotNull>
-      <SequenceIdentity>1</SequenceIdentity>
-      <ColumnKind>normal</ColumnKind>
-    </column>
-    <column id="277" parent="274" name="name">
-      <Position>2</Position>
       <DataType>varchar(255)|0s</DataType>
       <NotNull>1</NotNull>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="278" parent="274" name="uuid">
-      <Position>3</Position>
+    <column id="277" parent="274" name="uuid">
+      <Position>2</Position>
       <DataType>varchar(255)|0s</DataType>
       <NotNull>1</NotNull>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="279" parent="274" name="userId">
-      <Position>4</Position>
-      <DataType>int(11)|0s</DataType>
-      <ColumnKind>normal</ColumnKind>
-    </column>
-    <index id="280" parent="274" name="IDX_535c742a3606d2e3122f441b26">
-      <ColNames>name</ColNames>
-      <Unique>1</Unique>
-      <Type>btree</Type>
-    </index>
-    <index id="281" parent="274" name="FK_0468c843ad48d3455e48d40ddd4">
-      <ColNames>userId</ColNames>
-      <Type>btree</Type>
-    </index>
-    <key id="282" parent="274" name="PRIMARY">
+    <key id="278" parent="274" name="PRIMARY">
       <NameSurrogate>1</NameSurrogate>
-      <ColNames>id</ColNames>
+      <ColNames>uuid</ColNames>
       <Primary>1</Primary>
     </key>
-    <key id="283" parent="274" name="IDX_535c742a3606d2e3122f441b26">
-      <ColNames>name</ColNames>
-      <UnderlyingIndexName>IDX_535c742a3606d2e3122f441b26</UnderlyingIndexName>
-    </key>
-    <foreign-key id="284" parent="274" name="FK_0468c843ad48d3455e48d40ddd4">
-      <ColNames>userId</ColNames>
-      <RefSchemaName>collabio</RefSchemaName>
-      <RefTableName>user</RefTableName>
-      <RefColNames>id</RefColNames>
-    </foreign-key>
-    <column id="285" parent="275" name="id">
+    <column id="279" parent="275" name="id">
       <Position>1</Position>
       <DataType>int(11)|0s</DataType>
       <NotNull>1</NotNull>
       <SequenceIdentity>1</SequenceIdentity>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="286" parent="275" name="name">
+    <column id="280" parent="275" name="name">
       <Position>2</Position>
       <DataType>varchar(255)|0s</DataType>
       <NotNull>1</NotNull>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="287" parent="275" name="pwHash">
+    <column id="281" parent="275" name="pwHash">
       <Position>3</Position>
       <DataType>varchar(255)|0s</DataType>
       <NotNull>1</NotNull>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <index id="288" parent="275" name="IDX_065d4d8f3b5adb4a08841eae3c">
+    <column id="282" parent="275" name="roomUuid">
+      <Position>4</Position>
+      <DataType>varchar(255)|0s</DataType>
+      <ColumnKind>normal</ColumnKind>
+    </column>
+    <index id="283" parent="275" name="IDX_065d4d8f3b5adb4a08841eae3c">
       <ColNames>name</ColNames>
       <Unique>1</Unique>
       <Type>btree</Type>
     </index>
-    <key id="289" parent="275" name="PRIMARY">
+    <index id="284" parent="275" name="FK_b04c26416d0b6ccef4fc46bfcae">
+      <ColNames>roomUuid</ColNames>
+      <Type>btree</Type>
+    </index>
+    <key id="285" parent="275" name="PRIMARY">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <key id="290" parent="275" name="IDX_065d4d8f3b5adb4a08841eae3c">
+    <key id="286" parent="275" name="IDX_065d4d8f3b5adb4a08841eae3c">
       <ColNames>name</ColNames>
       <UnderlyingIndexName>IDX_065d4d8f3b5adb4a08841eae3c</UnderlyingIndexName>
     </key>
+    <foreign-key id="287" parent="275" name="FK_b04c26416d0b6ccef4fc46bfcae">
+      <ColNames>roomUuid</ColNames>
+      <RefSchemaName>collabio</RefSchemaName>
+      <RefTableName>room</RefTableName>
+      <RefColNames>uuid</RefColNames>
+    </foreign-key>
   </database-model>
 </dataSource>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7cd5ccd..07cb17a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="45594cfb-1705-4b19-998f-96b3ab064601" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -23,63 +22,105 @@
     <option name="HIDDEN_KINDS">
       <set />
     </option>
-    <expand />
+    <expand>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="collab.io-db" type="feb32156:DbDataSourceImpl" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="collab.io-db" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="collab.io-db" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="collabio: schema" type="c314c289:MysqlImplModel$Schema" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="collab.io-db" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="collabio: schema" type="c314c289:MysqlImplModel$Schema" />
+        <item name="room: table" type="98d5ac3d:MysqlImplModel$Table" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="collab.io-db" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="collabio: schema" type="c314c289:MysqlImplModel$Schema" />
+        <item name="user: table" type="98d5ac3d:MysqlImplModel$Table" />
+      </path>
+    </expand>
     <select />
   </component>
+  <component name="FavoritesManager">
+    <favorites_list name="collab.io-server" />
+  </component>
   <component name="FileEditorManager">
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="RoomController.ts" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/controllers/RoomController.ts">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/models/entities/Room.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="768">
-                  <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
+                <state relative-caret-position="128">
+                  <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ExpressServerImpl.ts" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/services/ExpressServerImpl.ts">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/models/entities/User.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1006">
-                  <caret line="79" column="15" selection-start-line="79" selection-start-column="15" selection-end-line="79" selection-end-column="15" />
+                <state>
+                  <caret column="36" selection-start-column="36" selection-end-column="36" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="SocketIoService.ts" pinned="false" current-in-tab="true">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/services/SocketIoService.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="542">
-                  <caret line="46" column="22" lean-forward="true" selection-start-line="46" selection-start-column="22" selection-end-line="46" selection-end-column="22" />
+                <state relative-caret-position="642">
+                  <caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/package.json">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="32">
+                  <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Application.ts" pinned="false" current-in-tab="false">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/config/Application.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="208">
-                  <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+                <state relative-caret-position="304">
+                  <caret line="19" column="18" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="AuthService.ts" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/services/AuthService.ts">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/interfaces/IRoomService.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="272">
-                  <caret line="17" column="47" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
+                <state relative-caret-position="288">
+                  <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="UserRepository.ts" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/repositories/UserRepository.ts">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/controllers/RoomController.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="208">
-                  <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+                <state relative-caret-position="752">
+                  <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
                 </state>
               </provider>
             </entry>
@@ -88,47 +129,29 @@
       </split-first>
       <split-second>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="User.ts" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/models/entities/User.ts">
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/services/controllers/RoomServiceImpl.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="160">
-                  <caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
+                <state relative-caret-position="674">
+                  <caret line="64" column="47" selection-start-line="64" selection-start-column="47" selection-end-line="64" selection-end-column="47" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="UserServiceImpl.ts" pinned="false" current-in-tab="false">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/services/controllers/UserServiceImpl.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="496">
-                  <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
+                <state relative-caret-position="336">
+                  <caret line="21" column="75" lean-forward="true" selection-start-line="21" selection-start-column="75" selection-end-line="21" selection-end-column="75" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Room.ts" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/models/entities/Room.ts">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="272">
-                  <caret line="17" selection-start-line="17" selection-end-line="17" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="RoomServiceImpl.ts" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/services/controllers/RoomServiceImpl.ts">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="368">
-                  <caret line="23" column="74" lean-forward="true" selection-start-line="23" selection-start-column="74" selection-end-line="23" selection-end-column="74" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="IRoomService.ts" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/interfaces/IRoomService.ts">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/services/AuthService.ts">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="80">
-                  <caret line="5" column="35" lean-forward="true" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
+                <state relative-caret-position="288">
+                  <caret line="18" selection-start-line="18" selection-end-line="19" />
                 </state>
               </provider>
             </entry>
@@ -151,6 +174,9 @@
       <find>remove</find>
       <find>verifyToken</find>
       <find>connection</find>
+      <find>RegisterUser</find>
+      <find>CurrentUser</find>
+      <find>@CurrentUser()</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -168,28 +194,35 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/package (2).json" />
-        <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/services/controllers/UserController.ts" />
-        <option value="$PROJECT_DIR$/src/models/Token.ts" />
-        <option value="$PROJECT_DIR$/src/interfaces/IUserService.ts" />
-        <option value="$PROJECT_DIR$/src/controllers/UserController.ts" />
         <option value="$PROJECT_DIR$/src/services/EnvService.ts" />
         <option value="$PROJECT_DIR$/src/services/DefaultDataService.ts" />
-        <option value="$PROJECT_DIR$/src/services/controllers/UserServiceImpl.ts" />
         <option value="$PROJECT_DIR$/src/config/Application.ts" />
         <option value="$PROJECT_DIR$/src/interfaces/IServer.ts" />
         <option value="$PROJECT_DIR$/src/services/MysqlDbServiceImpl.ts" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/src/models/entities/Room.ts" />
         <option value="$PROJECT_DIR$/tsconfig.json" />
+        <option value="$PROJECT_DIR$/src/repositories/UserRepository.ts" />
+        <option value="$PROJECT_DIR$/src/services/ExpressServerImpl.ts" />
+        <option value="$PROJECT_DIR$/src/models/IToken.ts" />
+        <option value="$PROJECT_DIR$/src/models/Token.ts" />
+        <option value="$PROJECT_DIR$/src/models/RegisterUser.ts" />
+        <option value="$PROJECT_DIR$/src/models/LoginUser.ts" />
+        <option value="$PROJECT_DIR$/src/interfaces/IUserService.ts" />
+        <option value="$PROJECT_DIR$/tslint.json" />
         <option value="$PROJECT_DIR$/src/services/AuthService.ts" />
+        <option value="$PROJECT_DIR$/src/services/controllers/UserServiceImpl.ts" />
+        <option value="$PROJECT_DIR$/src/models/RoomData.ts" />
+        <option value="$PROJECT_DIR$/docker-compose.yml" />
+        <option value="$PROJECT_DIR$/src/models/JoinRoomData.ts" />
         <option value="$PROJECT_DIR$/src/models/entities/User.ts" />
-        <option value="$PROJECT_DIR$/src/repositories/UserRepository.ts" />
+        <option value="$PROJECT_DIR$/src/controllers/UserController.ts" />
+        <option value="$PROJECT_DIR$/src/models/entities/Room.ts" />
         <option value="$PROJECT_DIR$/src/interfaces/IRoomService.ts" />
-        <option value="$PROJECT_DIR$/src/services/controllers/RoomServiceImpl.ts" />
         <option value="$PROJECT_DIR$/src/controllers/RoomController.ts" />
-        <option value="$PROJECT_DIR$/src/services/ExpressServerImpl.ts" />
+        <option value="$PROJECT_DIR$/src/services/controllers/RoomServiceImpl.ts" />
         <option value="$PROJECT_DIR$/src/services/SocketIoService.ts" />
+        <option value="$PROJECT_DIR$/package.json" />
       </list>
     </option>
   </component>
@@ -216,11 +249,65 @@
     <option name="width" value="2576" />
     <option name="height" value="1416" />
   </component>
+  <component name="ProjectUserFactors">
+    <factor id="binaryFeature:liftShorter" />
+    <factor id="binaryFeature:liftShorterClasses" />
+    <factor id="binaryFeature:middleMatching" />
+    <factor id="binaryFeature:nonGeneric" />
+    <factor id="binaryFeature:prox_inResolveScope" />
+    <factor id="binaryFeature:prox_openedInEditor" />
+    <factor id="binaryFeature:prox_sameDirectory" />
+    <factor id="binaryFeature:prox_sameLogicalRoot" />
+    <factor id="binaryFeature:prox_sdkOrLibrary" />
+    <factor id="binaryFeature:templates" />
+    <factor id="categoricalFeature:accessible" />
+    <factor id="categoricalFeature:expectedType" />
+    <factor id="categoricalFeature:kind" />
+    <factor id="categoricalFeature:prox_groovyReferenceListWeigher" />
+    <factor id="categoricalFeature:prox_javaInheritance" />
+    <factor id="categoricalFeature:prox_referenceList" />
+    <factor id="categoricalFeature:recursion" />
+    <factor id="completionFinishedType">
+      <dailyData date="3-6-2018">
+        <observation name="cancelled" value="1,0" />
+      </dailyData>
+    </factor>
+    <factor id="completionType" />
+    <factor id="completionUsage">
+      <dailyData date="3-6-2018">
+        <observation name="count" value="1,0" />
+      </dailyData>
+    </factor>
+    <factor id="doubleFeature:explicitProximity" />
+    <factor id="doubleFeature:grouping" />
+    <factor id="doubleFeature:mostUsed" />
+    <factor id="doubleFeature:nameEnd" />
+    <factor id="doubleFeature:position" />
+    <factor id="doubleFeature:prefix" />
+    <factor id="doubleFeature:priority" />
+    <factor id="doubleFeature:prox_explicitlyImported" />
+    <factor id="doubleFeature:prox_knownElement" />
+    <factor id="doubleFeature:prox_sameModule" />
+    <factor id="doubleFeature:prox_samePsiMember" />
+    <factor id="doubleFeature:query_length" />
+    <factor id="doubleFeature:result_length" />
+    <factor id="doubleFeature:sameWords" />
+    <factor id="doubleFeature:shorter" />
+    <factor id="doubleFeature:simple" />
+    <factor id="doubleFeature:sorter" />
+    <factor id="doubleFeature:statics" />
+    <factor id="doubleFeature:stats" />
+    <factor id="itemPosition" />
+    <factor id="mnemonicsUsage" />
+    <factor id="prefixLength" />
+    <factor id="timeBetweenTyping" />
+  </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -293,7 +380,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -372,7 +458,8 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="database.console.LAST_STATE" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/docker-compose.yml" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.tslint" value="C:\Users\zaune\Documents\_DEV\collab.io-server\node_modules\tslint" />
@@ -380,7 +467,7 @@
     <property name="project.structure.last.edited" value="Problems" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.TypeScript" />
     <property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
     <property name="typescript-compiler-editor-notification" value="false" />
   </component>
@@ -402,48 +489,52 @@
       </list>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="npm.start-dev">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <patterns />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="TestNG" factoryName="TestNG">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
       <properties />
       <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
+    <configuration name="collab-db" type="docker-deploy" factoryName="docker-compose.yml" singleton="true" server-name="Docker">
+      <deployment type="docker-compose.yml">
+        <settings>
+          <option name="sourceFilePath" value="docker-compose.yml" />
+          <option name="startBrowserSettings">
+            <browser url="http://127.0.0.1" />
+          </option>
+        </settings>
+      </deployment>
+      <method v="2" />
+    </configuration>
+    <configuration name="start-dev" type="js.build_tools.npm" factoryName="npm">
+      <package-json value="$PROJECT_DIR$/package.json" />
+      <command value="run" />
+      <scripts>
+        <script value="dev" />
+      </scripts>
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
+    <list>
+      <item itemvalue="Docker.collab-db" />
+      <item itemvalue="npm.start-dev" />
+    </list>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -475,7 +566,18 @@
       <workItem from="1525914059716" duration="237000" />
       <workItem from="1525914305673" duration="1186000" />
       <workItem from="1525940422304" duration="33000" />
-      <workItem from="1525940479656" duration="12527000" />
+      <workItem from="1525940479656" duration="12786000" />
+      <workItem from="1525976299679" duration="176000" />
+      <workItem from="1526939024724" duration="2128000" />
+      <workItem from="1527000962042" duration="616000" />
+      <workItem from="1527512381169" duration="1144000" />
+      <workItem from="1527869419700" duration="3585000" />
+      <workItem from="1527932691739" duration="10666000" />
+      <workItem from="1527948138074" duration="1217000" />
+      <workItem from="1527963383049" duration="7032000" />
+      <workItem from="1528019077485" duration="4236000" />
+      <workItem from="1528031100717" duration="3395000" />
+      <workItem from="1528037550696" duration="496000" />
     </task>
     <task id="LOCAL-00001" summary="feat(src): adding files for server rewrite">
       <created>1524879050746</created>
@@ -533,45 +635,120 @@
       <option name="project" value="LOCAL" />
       <updated>1525974075685</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="refactor(server): removed old server code">
+      <created>1525976001948</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1525976001948</updated>
+    </task>
+    <task id="LOCAL-00010" summary="chore(version): version bump to 2.0.0">
+      <created>1525976020891</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1525976020891</updated>
+    </task>
+    <task id="LOCAL-00011" summary="feat(rooms): adjust room logic">
+      <created>1527973438605</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1527973438606</updated>
+    </task>
+    <task id="LOCAL-00012" summary="feat(rooms): implemented room switching">
+      <created>1528034302757</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1528034302757</updated>
+    </task>
+    <task id="LOCAL-00013" summary="refactor(todo): removed unnecessary todo items">
+      <created>1528034480555</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1528034480555</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="40249000" />
+    <option name="totallyTimeSpent" value="75199000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
     <editor active="true" />
     <layout>
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49921995" visible="true" weight="0.09300477" />
+      <window_info id="Structure" order="1" sideWeight="0.50078005" side_tool="true" weight="0.10691574" />
+      <window_info id="Favorites" order="2" sideWeight="0.50078005" side_tool="true" weight="0.10691574" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32917318" />
+      <window_info anchor="bottom" x="-558" y="391" width="557" height="1008" id="Run" order="2" type="WINDOWED" weight="0.3299532" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3299532" />
+      <window_info anchor="bottom" id="Docker" order="7" weight="0.32917318" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.32917318" />
+      <window_info anchor="bottom" id="DB Execution Console" order="9" />
+      <window_info anchor="bottom" id="Database Changes" order="10" weight="0.3299532" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.32917318" />
+      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="13" weight="0.32917318" />
+      <window_info anchor="bottom" id="TypeScript" order="14" weight="0.32942098" />
+      <window_info anchor="bottom" id="Database Console" order="15" weight="0.35101405" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Database" order="1" weight="0.13354531" />
+      <window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
       <window_info anchor="right" id="Palette" order="4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.32942098" />
       <window_info anchor="right" id="Palette&#9;" order="5" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="6" />
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32942098" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32942098" />
-      <window_info anchor="bottom" id="TypeScript" order="8" weight="0.32942098" />
+      <window_info anchor="right" id="DB Browser" order="7" weight="0.26868045" />
+    </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49921995" visible="true" weight="0.11009539" />
+      <window_info id="Structure" order="1" sideWeight="0.50078005" side_tool="true" weight="0.10691574" />
+      <window_info id="Favorites" order="2" sideWeight="0.50078005" side_tool="true" weight="0.10691574" />
       <window_info id="Designer" order="3" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.105325915" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" weight="0.32942098" />
-      <window_info anchor="right" id="Database" order="1" weight="0.13354531" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32942098" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
       <window_info id="UI Designer" order="4" />
-      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32942098" />
+      <window_info active="true" anchor="bottom" x="-662" y="391" width="661" height="1008" id="Run" order="2" type="WINDOWED" visible="true" weight="0.3299532" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="DB Execution Console" order="7" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3299532" />
+      <window_info anchor="bottom" id="Docker" order="7" weight="0.32917318" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.32917318" />
+      <window_info anchor="bottom" id="DB Execution Console" order="9" />
+      <window_info anchor="bottom" id="Database Changes" order="10" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.32917318" />
+      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="13" weight="0.32942098" />
+      <window_info anchor="bottom" id="TypeScript" order="14" weight="0.32942098" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Database" order="1" weight="0.13354531" />
+      <window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="4" />
+      <window_info anchor="right" id="Palette&#9;" order="5" />
+      <window_info anchor="right" id="Maven Projects" order="6" />
       <window_info anchor="right" id="DB Browser" order="7" weight="0.26868045" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-    </layout>
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -614,54 +791,21 @@
     <MESSAGE value="feat(room): implemented room functionality" />
     <MESSAGE value="feat(rooms): added list rooms" />
     <MESSAGE value="feat(socket.io): added socket room functionality" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat(socket.io): added socket room functionality" />
+    <MESSAGE value="refactor(server): removed old server code" />
+    <MESSAGE value="chore(version): version bump to 2.0.0" />
+    <MESSAGE value="feat(rooms): adjust room logic" />
+    <MESSAGE value="feat(rooms): implemented room switching" />
+    <MESSAGE value="refactor(todo): removed unnecessary todo items" />
+    <option name="LAST_COMMIT_MESSAGE" value="refactor(todo): removed unnecessary todo items" />
+  </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/services/controllers/UserServiceImpl.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/controllers/StatsController.ts" />
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="22" column="28" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/controllers/UserController.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="29" lean-forward="true" selection-start-line="3" selection-start-column="29" selection-end-line="3" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package (2).json" />
-    <entry file="file://$PROJECT_DIR$/yarn.lock">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/interfaces/IDbConfig.ts">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/index.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/models/User.ts">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/typeorm/repository/RemoveOptions.d.ts">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -724,28 +868,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/interfaces/IUserService.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/controllers/StatsController.ts" />
-    <entry file="file://$PROJECT_DIR$/src/models/Token.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="9" column="21" lean-forward="true" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/services/MysqlDbServiceImpl.ts">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="384">
@@ -760,20 +883,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/models/entities/Room.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="17" selection-start-line="17" selection-end-line="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/controllers/UserController.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="19" column="17" lean-forward="true" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/build/interfaces/IRoomService.d.ts">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -793,114 +902,201 @@
         <state relative-caret-position="-12192" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/services/AuthService.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="17" column="47" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/dataSources.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/aed30302-8027-43f4-9489-10a083876dd4/console.sql">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/repositories/UserRepository.ts">
+    <entry file="file://$PROJECT_DIR$/.idea/dataSources/aed30302-8027-43f4-9489-10a083876dd4.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="26" column="30" lean-forward="true" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/IServer.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+        <state relative-caret-position="64">
+          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/models/entities/User.ts">
+    <entry file="file://$PROJECT_DIR$/src/interfaces/ILogger.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
+        <state relative-caret-position="112">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/services/controllers/UserServiceImpl.ts">
+    <entry file="file://$PROJECT_DIR$/src/services/WinstonLoggerImpl.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
+        <state>
+          <caret column="33" lean-forward="true" selection-start-column="33" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/interfaces/IRoomService.ts">
+    <entry file="file://$PROJECT_DIR$/server.js" />
+    <entry file="file://$PROJECT_DIR$/src/models/RegisterUser.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="5" column="35" lean-forward="true" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
+        <state relative-caret-position="48">
+          <caret line="3" column="25" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/dataSources/aed30302-8027-43f4-9489-10a083876dd4.xml">
+    <entry file="file://$PROJECT_DIR$/src/models/Token.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="26" column="30" lean-forward="true" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
+        <state relative-caret-position="48">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/controllers/RoomController.ts">
+    <entry file="file://$PROJECT_DIR$/src/models/LoginUser.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="768">
-          <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
+        <state relative-caret-position="128">
+          <caret line="8" column="19" lean-forward="true" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/interfaces/IServer.ts">
+    <entry file="file://$PROJECT_DIR$/node_modules/routing-controllers/decorator/CurrentUser.d.ts">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="64">
-          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
+          <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/config/Application.ts">
+    <entry file="file://$PROJECT_DIR$/src/repositories/UserRepository.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+        <state relative-caret-position="144">
+          <caret line="9" column="2" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/interfaces/ILogger.ts">
+    <entry file="file://$PROJECT_DIR$/tslint.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        <state relative-caret-position="400">
+          <caret line="25" column="28" lean-forward="true" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/services/WinstonLoggerImpl.ts">
+    <entry file="file://$PROJECT_DIR$/docker-compose.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="33" lean-forward="true" selection-start-column="33" selection-end-column="33" />
+        <state relative-caret-position="192">
+          <caret line="12" column="12" lean-forward="true" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/IUserService.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="5" column="51" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/models/JoinRoomData.ts" />
+    <entry file="file://$PROJECT_DIR$/src/models/RoomData.ts" />
+    <entry file="file://$PROJECT_DIR$/src/controllers/UserController.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="656">
+          <caret line="41" column="3" lean-forward="true" selection-start-line="41" selection-start-column="3" selection-end-line="41" selection-end-column="3" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/services/ExpressServerImpl.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1006">
-          <caret line="79" column="15" selection-start-line="79" selection-start-column="15" selection-end-line="79" selection-end-column="15" />
+        <state relative-caret-position="562">
+          <caret line="39" column="55" selection-start-line="39" selection-start-column="55" selection-end-line="39" selection-end-column="55" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/build/services/controllers/RoomServiceImpl.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="44" column="22" lean-forward="true" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
+        <state relative-caret-position="795">
+          <caret line="69" column="19" selection-start-line="69" selection-start-column="19" selection-end-line="69" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://aed30302-8027-43f4-9489-10a083876dd4/schema/collabio/table/user">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://aed30302-8027-43f4-9489-10a083876dd4/schema/collabio/table/room">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/models/entities/Room.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/models/entities/User.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="36" selection-start-column="36" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/config/Application.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="19" column="18" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/IRoomService.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/controllers/RoomController.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="752">
+          <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/services/controllers/RoomServiceImpl.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="23" column="74" lean-forward="true" selection-start-line="23" selection-start-column="74" selection-end-line="23" selection-end-column="74" />
+        <state relative-caret-position="674">
+          <caret line="64" column="47" selection-start-line="64" selection-start-column="47" selection-end-line="64" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/services/controllers/UserServiceImpl.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="21" column="75" lean-forward="true" selection-start-line="21" selection-start-column="75" selection-end-line="21" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/services/AuthService.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="18" selection-start-line="18" selection-end-line="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/services/SocketIoService.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="542">
-          <caret line="46" column="22" lean-forward="true" selection-start-line="46" selection-start-column="22" selection-end-line="46" selection-end-column="22" />
+        <state relative-caret-position="642">
+          <caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/package.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
         </state>
       </provider>
     </entry>
diff --git a/docker-compose.yml b/docker-compose.yml
index 874b058..1322b2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  dcs-db-dev:
+  collab.io-db-dev:
     image: mysql:8.0
     ports:
       - 3306:3306
diff --git a/package.json b/package.json
index d53b1bf..128b1f2 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "collab.io-server",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "main": "index.js",
   "author": "Max Zauner",
   "license": "MIT",
   "dependencies": {
     "aws-sdk": "^2.229.1",
     "bcryptjs": "^2.4.3",
+    "class-validator": "^0.8.5",
     "cors": "^2.8.4",
     "express": "^4.16.3",
     "express-winston": "^2.5.1",
diff --git a/src/controllers/RoomController.ts b/src/controllers/RoomController.ts
index f4ec3c6..ad8c449 100644
--- a/src/controllers/RoomController.ts
+++ b/src/controllers/RoomController.ts
@@ -1,4 +1,4 @@
-import { Authorized, BodyParam, CurrentUser, Delete, Get, JsonController, Post, QueryParam } from 'routing-controllers';
+import { Authorized, BodyParam, CurrentUser, Get, JsonController, Post, QueryParam } from 'routing-controllers';
 import { Logger } from '../decorators/Logger';
 import { ILogger } from '../interfaces/ILogger';
 import { User } from '../models/entities/User';
@@ -33,18 +33,15 @@ export class RoomController {
   }
 
   @Authorized()
-  @Get()
+  @Get('/id')
   public getRoomId(@QueryParam('name') roomName: string): Promise<string> {
     return this.roomService.getRoomId(roomName);
   }
 
   @Authorized()
-  @Delete()
-  public removeRoom(
-    @CurrentUser() user: User,
-    @BodyParam('name') roomName: string
-  ): Promise<void> {
-    return this.roomService.removeRoom(roomName, user);
+  @Get('/users')
+  public getRoomUsers(@QueryParam('roomId') roomId: string): Promise<User[]> {
+    return this.roomService.getUsersFromRoom(roomId);
   }
 
 }
diff --git a/src/controllers/UserController.ts b/src/controllers/UserController.ts
index 30b1796..9f6cd0a 100644
--- a/src/controllers/UserController.ts
+++ b/src/controllers/UserController.ts
@@ -4,8 +4,9 @@ import { ILogger } from '../interfaces/ILogger';
 import { Inject } from 'typedi';
 import { UserServiceImpl } from '../services/controllers/UserServiceImpl';
 import { IUserService } from '../interfaces/IUserService';
-import { LoginUser, RegisterUser } from '../models/User';
+import { LoginUser } from '../models/LoginUser';
 import { User } from '../models/entities/User';
+import { RegisterUser } from '../models/RegisterUser';
 
 @JsonController('/user')
 export class UserController {
@@ -45,4 +46,4 @@ export class UserController {
   public updateUserPassword(@Param('userId') userId: number, @BodyParam('password') password: string) {
     return this.userService.updateUserPassword(userId, password);
   }
-}
\ No newline at end of file
+}
diff --git a/src/interfaces/IRoomService.ts b/src/interfaces/IRoomService.ts
index acbb10c..e912821 100644
--- a/src/interfaces/IRoomService.ts
+++ b/src/interfaces/IRoomService.ts
@@ -2,8 +2,17 @@ import { User } from '../models/entities/User';
 import { Room } from '../models/entities/Room';
 
 export interface IRoomService {
+
+  /* Rest only methods */
+
   createRoom: (roomName: string, currUser: User) => Promise<string>;
   listRooms: () => Promise<Room[]>;
   getRoomId: (roomName: string) => Promise<string>;
-  removeRoom: (roomName: string, currUser: User) => Promise<void>;
+  getUsersFromRoom: (roomId: string) => Promise<User[]>;
+
+  /* Other service methods */
+
+  addUserToRoom: (roomId: string, userId: number) => Promise<void>;
+  removeUserFromRoom: (roomId: string, userId: number) => Promise<void>;
+  getRoomFromUser: (userId: number) => Promise<Room>;
 }
diff --git a/src/interfaces/IUserService.ts b/src/interfaces/IUserService.ts
index 4fd946c..f081493 100644
--- a/src/interfaces/IUserService.ts
+++ b/src/interfaces/IUserService.ts
@@ -1,5 +1,6 @@
 import { User } from '../models/entities/User';
-import { LoginUser, RegisterUser } from '../models/User';
+import { LoginUser } from '../models/LoginUser';
+import { RegisterUser } from '../models/RegisterUser';
 
 export interface IUserService {
   login: (loginUser: LoginUser) => Promise<string>;
@@ -7,4 +8,4 @@ export interface IUserService {
   addUser: (loginUser: RegisterUser) => Promise<User>;
   removeUser: (userId: number) => Promise<void>;
   updateUserPassword: (userId: number, password: string) => Promise<User>;
-}
\ No newline at end of file
+}
diff --git a/src/models/LoginUser.ts b/src/models/LoginUser.ts
new file mode 100644
index 0000000..da0d161
--- /dev/null
+++ b/src/models/LoginUser.ts
@@ -0,0 +1,10 @@
+import { IsString } from 'class-validator';
+
+export class LoginUser {
+
+  @IsString()
+  username: string;
+
+  @IsString()
+  password: string;
+}
diff --git a/src/models/RegisterUser.ts b/src/models/RegisterUser.ts
new file mode 100644
index 0000000..fb2b86f
--- /dev/null
+++ b/src/models/RegisterUser.ts
@@ -0,0 +1,11 @@
+import { IsInt, IsOptional, Max, Min } from 'class-validator';
+import { LoginUser } from './LoginUser';
+
+export class RegisterUser extends LoginUser {
+
+  @IsInt()
+  @Max(1000)
+  @Min(0)
+  @IsOptional()
+  role: number;
+}
diff --git a/src/models/Token.ts b/src/models/Token.ts
index da4f8b7..9d1e10c 100644
--- a/src/models/Token.ts
+++ b/src/models/Token.ts
@@ -1,3 +1,3 @@
-export interface Token {
+export interface IToken {
   name: string;
 }
diff --git a/src/models/User.ts b/src/models/User.ts
deleted file mode 100644
index 4a39e88..0000000
--- a/src/models/User.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
-
-export class LoginUser {
-
-  @IsString()
-  username: string;
-
-  @IsString()
-  password: string;
-}
-
-export class RegisterUser extends LoginUser {
-
-  @IsInt()
-  @Max(1000)
-  @Min(0)
-  @IsOptional()
-  role: number;
-}
diff --git a/src/models/entities/Room.ts b/src/models/entities/Room.ts
index 39235eb..e23f4da 100644
--- a/src/models/entities/Room.ts
+++ b/src/models/entities/Room.ts
@@ -1,18 +1,21 @@
-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, OneToMany, PrimaryColumn } from 'typeorm';
 import { User } from './User';
+import { v4 as uuid } from 'uuid';
 
 @Entity()
 export class Room {
 
-  @PrimaryGeneratedColumn()
-  id: number;
+  @PrimaryColumn()
+  uuid: string;
 
-  @Column({ unique: true })
+  @Column()
   name: string;
 
-  @Column()
-  uuid: string;
+  @OneToMany(() => User, (user) => user.room)
+  users: User[];
 
-  @ManyToOne(() => User, (user) => user.rooms)
-  user: User;
+  constructor(name: string) {
+    this.name = name;
+    this.uuid = uuid();
+  }
 }
diff --git a/src/models/entities/User.ts b/src/models/entities/User.ts
index 6114ec2..118c8af 100644
--- a/src/models/entities/User.ts
+++ b/src/models/entities/User.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { Room } from './Room';
 
 @Entity()
@@ -13,6 +13,6 @@ export class User {
   @Column()
   pwHash: string;
 
-  @OneToMany(() => Room, (room) => room.user)
-  rooms: Room[];
+  @ManyToOne(() => Room, (room) => room.users)
+  room: Room;
 }
diff --git a/src/repositories/UserRepository.ts b/src/repositories/UserRepository.ts
index 2d43fa3..b4039d7 100644
--- a/src/repositories/UserRepository.ts
+++ b/src/repositories/UserRepository.ts
@@ -1,13 +1,13 @@
 import { EntityRepository, Repository } from 'typeorm';
 import { User } from '../models/entities/User';
-import { Token } from '../models/Token';
+import { IToken } from '../models/Token';
 import { Service } from 'typedi';
 
 @Service()
 @EntityRepository(User)
 export class UserRepository extends Repository<User> {
 
-  findByToken(token: Token) {
+  findByToken(token: IToken) {
     return this.findOne({ name: token.name });
   }
 }
diff --git a/src/services/AuthService.ts b/src/services/AuthService.ts
index 826ec5d..d4bb5a1 100644
--- a/src/services/AuthService.ts
+++ b/src/services/AuthService.ts
@@ -1,9 +1,9 @@
 import * as jwt from 'jsonwebtoken';
 import * as bcrypt from 'bcryptjs';
 
-import { Action, UnauthorizedError } from 'routing-controllers';
+import { Action, NotFoundError, UnauthorizedError } from 'routing-controllers';
 import { User } from '../models/entities/User';
-import { Token } from '../models/Token';
+import { IToken } from '../models/Token';
 import { Service } from 'typedi';
 import { ILogger } from '../interfaces/ILogger';
 import { Logger } from '../decorators/Logger';
@@ -22,7 +22,7 @@ export class AuthService {
 
   public createToken(user: User): Promise<string> {
     return new Promise((resolve) => {
-      const payload: Token = {
+      const payload: IToken = {
         name: user.name
       };
       jwt.sign(payload, this.envService.JwtSecret, { expiresIn: '1d' }, (err, token) => {
@@ -32,7 +32,7 @@ export class AuthService {
     });
   }
 
-  public verifyToken(token: string): Promise<Token> {
+  public verifyToken(token: string): Promise<IToken> {
     return new Promise((resolve) => {
       jwt.verify(token, this.envService.JwtSecret, (err, decoded) => {
         if (err || !decoded) resolve(null);
@@ -70,7 +70,11 @@ export class AuthService {
 
     this.logger.verbose('Fetching current user', payload);
 
-    return payload ? this.userRepository.findByToken(payload) : null;
+    const user = payload ? await this.userRepository.findByToken(payload) : null;
+
+    if (!user) throw new NotFoundError('User not found');
+
+    return user;
   }
 
 }
diff --git a/src/services/SocketIoService.ts b/src/services/SocketIoService.ts
index 9872cf0..d5b262a 100644
--- a/src/services/SocketIoService.ts
+++ b/src/services/SocketIoService.ts
@@ -1,22 +1,29 @@
 import * as socketIo from 'socket.io';
 import * as http from 'http';
 
-import { Service } from 'typedi';
+import { Inject, Service } from 'typedi';
 import { Logger } from '../decorators/Logger';
 import { ILogger } from '../interfaces/ILogger';
 import { AuthService } from './AuthService';
 import { UnauthorizedError } from 'routing-controllers';
+import { RoomServiceImpl } from './controllers/RoomServiceImpl';
+import { IRoomService } from '../interfaces/IRoomService';
+
+interface IJoinRoomInfo {
+  roomId: string;
+  userId: number;
+}
 
 @Service()
 export class SocketIoService {
 
   private initialized: boolean = false;
   private io: socketIo.Server;
-  private clientMap: Map<string, string> = new Map<string, string>();
 
   constructor(
     @Logger() private readonly logger: ILogger,
-    private readonly authService: AuthService,
+    @Inject(RoomServiceImpl) private readonly roomService: IRoomService,
+    private readonly authService: AuthService
   ) { }
 
   private socketIoLog(message: string, ...args: any[]): void {
@@ -32,52 +39,73 @@ export class SocketIoService {
     this.initialized = true;
   }
 
-  private readonly handleJoinRoom = (socket: socketIo.Socket) => (room: string) => {
+  /* Authorization middleware */
 
-    const currentRoom: string = this.clientMap.get(socket.id);
+  private readonly authorizeSocketConnection = async (socket: socketIo.Socket, next) => {
 
-    if (currentRoom && currentRoom !== room) {
-      this.socketIoLog(`Client ${socket.id} leaves current room ${currentRoom}`);
-      socket.leave(currentRoom);
-    }
+    this.socketIoLog('Authorizing incomming connection');
 
-    this.socketIoLog(`Client ${socket.id} joins room ${room}`);
+    const token = socket.handshake.query.auth;
+    const data = await this.authService.verifyToken(token);
 
-    this.clientMap.set(socket.id, room);
-    socket.join(room);
-  };
+    this.logger.debug('token', token);
 
-  private readonly handleClientMessage = (socket: socketIo.Socket) => (message: any) => {
-    const currentRoom: string = this.clientMap.get(socket.id);
-    if (currentRoom) socket.to(currentRoom).emit('message', message);
+    if (!data) {
+      this.socketIoLog('Client not authorized');
+      next(new UnauthorizedError());
+    } else {
+      this.socketIoLog('Client successfully authorized');
+      next();
+    }
   };
 
+  /* Connection handlers
+   * These functions handle the connections and disconnections of the clients
+   * */
+
   private readonly connectionHandler = (socket: socketIo.Socket) => {
     this.socketIoLog(`Client ${socket.id} with ip ${socket.handshake.address} connected.`);
     socket.on('room', this.handleJoinRoom(socket));
-    socket.on('message', this.handleClientMessage(socket));
   };
 
   private readonly disconnectHandler = (socket: socketIo.Socket) => {
     this.socketIoLog(`Client ${socket.id} with ip ${socket.handshake.address} disconnected.`);
   };
 
-  private readonly authorizeSocketConnection = async (socket: socketIo.Socket, next) => {
+  /* Socket handlers
+   * These functions handle the individual socket communication
+   */
 
-    this.socketIoLog('Authorizing incomming connection');
+  // TODO: emit errors on socket
+  private readonly handleJoinRoom = (socket: socketIo.Socket) => async (jsonInfo: string) => {
 
-    const token = socket.handshake.query.auth;
-    const data = await this.authService.verifyToken(token);
+    const info: IJoinRoomInfo = JSON.parse(jsonInfo);
 
-    this.logger.debug('token', token);
+    const userRoom = await this.roomService.getRoomFromUser(info.userId);
 
-    if (!data) {
-      this.socketIoLog('Client not authorized');
-      next(new UnauthorizedError());
-    } else {
-      this.socketIoLog('Client successfully authorized');
-      next();
+    if (!!userRoom) {
+
+      if (userRoom.uuid !== info.roomId) {
+        this.socketIoLog(`Removing user with id ${info.userId} from room ${info.roomId}`);
+        await this.roomService.removeUserFromRoom(userRoom.uuid, info.userId);
+      }
+
+      this.socketIoLog('Removing all listeners, leaving all rooms');
+      socket.removeAllListeners('message');
+      socket.leaveAll();
     }
+
+    await this.roomService.addUserToRoom(info.roomId, info.userId);
+
+    this.socketIoLog(`Joining room ${info.roomId}, registering message handler`);
+
+    socket.join(info.roomId);
+    socket.on('message', this.handleClientMessage(socket, info.roomId));
+  };
+
+  private readonly handleClientMessage = (socket: socketIo.Socket, roomId: string) => (message: any) => {
+    this.socketIoLog(`Sending message ${message} to room ${roomId}`);
+    socket.to(roomId).emit('message', message);
   };
 
 }
diff --git a/src/services/controllers/RoomServiceImpl.ts b/src/services/controllers/RoomServiceImpl.ts
index fdad60a..0ca6e1f 100644
--- a/src/services/controllers/RoomServiceImpl.ts
+++ b/src/services/controllers/RoomServiceImpl.ts
@@ -1,13 +1,13 @@
 import { Service, Token } from 'typedi';
 import { Logger } from '../../decorators/Logger';
 import { ILogger } from '../../interfaces/ILogger';
-import { OrmRepository } from 'typeorm-typedi-extensions';
+import { InjectRepository, OrmRepository } from 'typeorm-typedi-extensions';
 import { Room } from '../../models/entities/Room';
-import { v4 as uuid } from 'uuid';
 import { IRoomService } from '../../interfaces/IRoomService';
 import { User } from '../../models/entities/User';
-import { NotFoundError, UnauthorizedError } from 'routing-controllers';
+import { NotFoundError } from 'routing-controllers';
 import { Repository } from 'typeorm';
+import { UserRepository } from '../../repositories/UserRepository';
 
 export const RoomServiceImpl = new Token<RoomService>();
 
@@ -16,30 +16,37 @@ export class RoomService implements IRoomService {
 
   constructor(
     @Logger() private readonly logger: ILogger,
-    @OrmRepository(Room) private readonly roomRepository: Repository<Room>
+    @OrmRepository(Room) private readonly roomRepository: Repository<Room>,
+    @InjectRepository() private readonly userRepository: UserRepository
   ) {
     this.logger.verbose('Initializing Room service');
   }
 
-  public async createRoom(roomName: string, user: User): Promise<string> {
-
-    this.logger.verbose(`Creating room with name ${roomName}`);
+  private async fetchRoom(roomId: string): Promise<Room> {
+    const room = await this.roomRepository.findOne(roomId, { relations: ['users'] });
+    if (!room) throw new NotFoundError(`Room with id ${roomId} not found`);
+    return room;
+  }
 
-    if (!user) throw new NotFoundError('User not found');
+  private async fetchUser(userId: number): Promise<User> {
+    const user = await this.userRepository.findOne(userId, { relations: ['room'] });
+    if (!user) throw new NotFoundError(`User with id ${userId} not found`);
+    return user;
+  }
 
-    const newRoom = new Room();
-    newRoom.name = roomName;
-    newRoom.uuid = uuid();
-    newRoom.user = user;
+  /* Rest only methods */
 
+  public async createRoom(roomName: string, user: User): Promise<string> {
+    this.logger.verbose(`Creating room with name ${roomName}`);
+    if (!user) throw new NotFoundError('User not found');
+    const newRoom = new Room(roomName);
     await this.roomRepository.save(newRoom);
-
     return newRoom.uuid;
   }
 
   public async listRooms(): Promise<Room[]> {
     this.logger.verbose('Fetching all available rooms');
-    return this.roomRepository.find();
+    return this.roomRepository.find({ relations: ['users'] });
   }
 
   public async getRoomId(roomName: string): Promise<string> {
@@ -48,14 +55,39 @@ export class RoomService implements IRoomService {
     return room.uuid;
   }
 
-  public async removeRoom(roomName: string, currUser: User): Promise<void> {
+  public async getUsersFromRoom(roomId: string): Promise<User[]> {
+    const room = await this.roomRepository.findOne(roomId, { relations: ['users'] });
+    return room.users;
+  }
 
-    const room = await this.roomRepository.findOne({ name: roomName }, { relations: ['user'] });
+  /* Other service methods */
 
-    if (!room) throw new NotFoundError(`Room with name '${roomName}' not found.`);
-    if (room.user.id !== currUser.id) throw new UnauthorizedError('You can only remove your own rooms.');
+  public async addUserToRoom(roomId: string, userId: number): Promise<void> {
+    const user = await this.fetchUser(userId);
+    const room = await this.fetchRoom(roomId);
+    const userExistsInRoom = !!room.users.find((u) => u.id === userId);
+    if (!userExistsInRoom) {
+      room.users.push(user);
+      await this.roomRepository.save(room);
+    }
+  }
 
-    await this.roomRepository.remove(room);
+  public async removeUserFromRoom(roomId: string, userId: number): Promise<void> {
+    const user = await this.fetchUser(userId);
+    const room = await this.fetchRoom(roomId);
+    room.users = room.users.filter((actUser) => actUser.id !== user.id);
+    if (room.users.length > 0) {
+      await this.roomRepository.save(room);
+    } else {
+      user.room = null;
+      await this.userRepository.save(user);
+      await this.roomRepository.delete(room);
+    }
   }
 
+  public async getRoomFromUser(userId: number): Promise<Room> {
+    this.logger.verbose(`Getting room from user with id ${userId}`);
+    const user = await this.fetchUser(userId);
+    return user ? user.room : null;
+  }
 }
diff --git a/src/services/controllers/UserServiceImpl.ts b/src/services/controllers/UserServiceImpl.ts
index fde7b2f..8fca2d0 100644
--- a/src/services/controllers/UserServiceImpl.ts
+++ b/src/services/controllers/UserServiceImpl.ts
@@ -6,20 +6,21 @@ import { Logger } from '../../decorators/Logger';
 import { ILogger } from '../../interfaces/ILogger';
 import { User } from '../../models/entities/User';
 import { Repository } from 'typeorm';
-import { LoginUser, RegisterUser } from '../../models/User';
+import { LoginUser } from '../../models/LoginUser';
 import { NotFoundError, UnauthorizedError } from 'routing-controllers';
 import { OrmRepository } from 'typeorm-typedi-extensions';
 import { AuthService } from '../AuthService';
+import { RegisterUser } from '../../models/RegisterUser';
 
 export const UserServiceImpl = new Token<UserService>();
 
 @Service(UserServiceImpl)
-export class UserService implements IUserService{
+export class UserService implements IUserService {
 
   constructor(
     @Logger() private readonly logger: ILogger,
     @OrmRepository(User) private readonly userRepository: Repository<User>,
-    private readonly authService: AuthService,
+    private readonly authService: AuthService
   ) {
     this.logger.verbose('Initializing User service');
   }
@@ -40,7 +41,7 @@ export class UserService implements IUserService{
         if (!pwDoesMatch) throw new UnauthorizedError('Passwords do not match');
         const token: string = await this.authService.createToken(user);
         if (!token) throw new UnauthorizedError('Could not authorize user');
-        return token
+        return token;
       })
       .catch(() => {
         this.logger.verbose('Could not verify user');
@@ -92,4 +93,4 @@ export class UserService implements IUserService{
     delete savedUser.pwHash;
     return savedUser;
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index de8d96c..038b47b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -463,7 +463,7 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-class-validator@^0.8.1:
+class-validator@^0.8.1, class-validator@^0.8.5:
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.8.5.tgz#484785acda98f68549c3a84dc1bb2f77b736dc58"
   dependencies: