diff --git a/Client/Client.cs b/Client/Client.cs
index ed71b84..d2b5cff 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -221,6 +221,18 @@ namespace Client
                             int lobbyElapsedID = JSONConvert.GetLobbyID(payload);
                             
                             //todo set next round
+                            break;
+
+                        case JSONConvert.GameCommand.INITIALIZE:
+                            int lobbyID = JSONConvert.GetLobbyID(payload);
+                            string userName = JSONConvert.GetUsernameLogin(payload);
+                            if (lobbyID == clientData.Lobby.ID)
+                                if (userName == clientData.User.Username)
+                                {
+                                    clientData.User.TurnToDraw = true;
+                                    Debug.WriteLine("[CLIENT] Setting a player's turnToDraw to true");
+                                }
+                                   
                             break;
                         
                     }
diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs
index 2f6e03e..a33e7ba 100644
--- a/Client/ViewModels/ViewModelGame.cs
+++ b/Client/ViewModels/ViewModelGame.cs
@@ -27,6 +27,8 @@ namespace Client.ViewModels
         public Queue<double[][]> linesQueue;
         private Timer queueTimer;
 
+        private bool wordGuessed = false;
+
         public static ObservableCollection<string> Messages { get; } = new ObservableCollection<string>();
         public ObservableCollection<string> Players { get; } = new ObservableCollection<string>();
 
@@ -50,7 +52,23 @@ namespace Client.ViewModels
         private string _randomWord;
         public string RandomWord
         {
-            get { return _randomWord; }
+            get {
+                if (data.User.TurnToDraw)
+                    return _randomWord;
+
+                if (!wordGuessed)
+                {
+                    string hiddenWord = "";
+                    for (int i = 0; i < _randomWord.Length; i++)
+                    {
+                        hiddenWord += "_ ";
+                    }
+                    return hiddenWord;
+                }
+                else
+                    return _randomWord;
+            }
+
             set { _randomWord = value; }
         }
 
@@ -59,10 +77,15 @@ namespace Client.ViewModels
             get { return data.User.Host; }
         }
 
+        public bool UserTurnToDraw
+        {
+            get { return data.User.TurnToDraw; }
+        }
+
         public ViewModelGame(GameWindow window)
         {
             this.window = window;
-
+            _randomWord = "";
             buffer = new double[maxLines][];
             linesQueue = new Queue<double[][]>();
             OnKeyDown = new RelayCommand(ChatBox_KeyDown);
@@ -99,7 +122,7 @@ namespace Client.ViewModels
 
         public void Canvas_MouseDown(MouseButtonEventArgs e, GameWindow window)
         {
-            if (e.ButtonState == MouseButtonState.Pressed)
+            if (e.ButtonState == MouseButtonState.Pressed && data.User.TurnToDraw)
             {
                 currentPoint = e.GetPosition(window.CanvasForPaint);
             }
@@ -107,7 +130,7 @@ namespace Client.ViewModels
 
         public void Canvas_MouseMove(MouseEventArgs e, GameWindow window)
         {
-            if (e.LeftButton == MouseButtonState.Pressed)
+            if (e.LeftButton == MouseButtonState.Pressed && data.User.TurnToDraw)
             {
                 double[] coordinates = new double[4];
                 Line line = new Line();
@@ -144,7 +167,9 @@ namespace Client.ViewModels
 
         public void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            sendArrayFromQueue(sender, null);
+            if (data.User.TurnToDraw)
+                sendArrayFromQueue(sender, null);
+
         }
 
         private void sendArrayFromQueue(object sender, ElapsedEventArgs e)
diff --git a/Client/Views/GameWindow.xaml b/Client/Views/GameWindow.xaml
index eaf5391..02968ed 100644
--- a/Client/Views/GameWindow.xaml
+++ b/Client/Views/GameWindow.xaml
@@ -35,12 +35,12 @@
                 <ColumnDefinition Width="100"/>
             </Grid.ColumnDefinitions>
             <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" FontSize="20" Content="Pick a color -->"/>
-            <xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Height="22" Width="100"/>
+            <xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Height="22" Width="100" IsEnabled="{Binding UserTurnToDraw}"/>
 
 
             <Label Name="GuessWord" Grid.Row="0" Grid.Column="2" Content="{Binding Path=RandomWord, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20"/>
 
-            <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="3" Content="RESET"/>
+            <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="3" Content="RESET" IsEnabled="{Binding UserTurnToDraw}"/>
         </Grid>
 
         <Button Name="StartGame" Grid.Row="0" Grid.Column="2" Content="Start Game" FontSize="20" Command="{Binding ButtonStartGame}" IsEnabled="{Binding IsHost}"/>
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index eb607d6..cd37a42 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -208,12 +208,14 @@ namespace Server.Models
                             lobbyTimer.Elapsed += LobbyTimer_Elapsed;
                             lobbyTimer.Start();
                             ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
+                            serverCom.SendToLobby(lobbyID, JSONConvert.ConstructGameInitializeData( serverCom.FindUserNameInLobby(lobbyID),lobbyID));
                             break;
                         case GameCommand.TIMER_ELAPSED:
                             
                             break;
                         case GameCommand.NEXT_ROUND:
                             // The next round has been started, so we can start the timer again
+
                             lobbyID = JSONConvert.GetLobbyID(payload);
                             foreach (System.Timers.Timer timer in lobbyTimers.Keys)
                             {
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 3dbdb8e..8822dba 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -298,8 +298,24 @@ namespace Server.Models
                 if (lobby.ID == lobbyID)
                 {
                     lobby.LobbyJoinable = false;
+                    break;
                 }
             }
         }
+
+        public string FindUserNameInLobby(int lobbyID)
+        {
+            Lobby lobbyFound = null;
+            foreach (Lobby lobby in lobbies)
+            {
+                if (lobby.ID == lobbyID)
+                {
+                    lobbyFound = lobby;
+                    break;
+                }
+            }
+
+            return lobbyFound?.Users[lobbyFound.UserDrawing]?.Username;
+        }
     }
 }
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index 1f11b5a..4349efd 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -38,6 +38,7 @@ namespace SharedClientServer
         public enum GameCommand
         {
             START_GAME,
+            INITIALIZE,
             TIMER_ELAPSED,
             NEXT_ROUND
         }
@@ -220,6 +221,17 @@ namespace SharedClientServer
             }); ;
         }
 
+        public static byte[] ConstructGameInitializeData(string userName, int lobbyID)
+        {
+            dynamic payload = new
+            {
+                id = lobbyID,
+                command = GameCommand.INITIALIZE,
+                username = userName
+            };
+            return GetMessageToSend(GAME, payload);
+        }
+
         public static byte[] ConstructGameTimerElapsedMessage(int lobbyID)
         {
             return GetMessageToSend(GAME, new
diff --git a/SharedClientServer/Lobby.cs b/SharedClientServer/Lobby.cs
index fa4f2c6..369ce7d 100644
--- a/SharedClientServer/Lobby.cs
+++ b/SharedClientServer/Lobby.cs
@@ -17,6 +17,7 @@ namespace Client
         private bool _lobbyJoinable;
         //private List<string> _usernames;
         private List<User> _users;
+        private int _userDrawing;
 
         //public void AddUsername(string username, out bool success)
         //{
@@ -36,6 +37,7 @@ namespace Client
             //_usernames = new List<string>();
             _users = new List<User>();
             _lobbyJoinable = true;
+            _userDrawing = 0;
         }
 
         public void AddUser(string username, out bool succes)
@@ -95,5 +97,11 @@ namespace Client
             set { _lobbyJoinable = value; }
         }
 
+        public int UserDrawing
+        {
+            get { return _userDrawing; }
+            set { _userDrawing = value; }
+        }
+
     }
 }