diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index 5498197..d55ba75 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -5,6 +5,7 @@ using System.ComponentModel;
 using System.Text;
 using System.Windows.Input;
 using SharedClientServer;
+using System.Diagnostics;
 
 namespace Client
 {
@@ -58,5 +59,10 @@ namespace Client
             get { return _lobbies; }
             set { _lobbies = value; }
         }
+
+        public void OnHostButtonClick()
+        {
+            Debug.WriteLine("Click host button");
+        }
     }
 }
diff --git a/Client/Views/MainWindow.xaml b/Client/Views/MainWindow.xaml
index 64a1fb1..b3221df 100644
--- a/Client/Views/MainWindow.xaml
+++ b/Client/Views/MainWindow.xaml
@@ -45,7 +45,9 @@
                 <ComboBoxItem Content="ORANGE"/>
                 <ComboBoxItem Content="PURPLE"/>
             </ComboBox>
-            <Label Content="{Binding Username}" Grid.Column="1" HorizontalAlignment="Center" Margin="0,12,0,0" VerticalAlignment="Top" Grid.Row="1"/>
+
+            <Label Grid.Row="3" Name="testLabel" FontSize="15" VerticalAlignment="Center"/>
+            <Label Content="place username here" Grid.Column="1" HorizontalAlignment="Center" Margin="0,12,0,0" VerticalAlignment="Top" Grid.Row="1"/>
 
         </Grid>
 
@@ -66,7 +68,7 @@
                 <RowDefinition Height="50"/>
             </Grid.RowDefinitions>
             <Button Name="joinButton" Grid.Row="0" Content="join a selected lobby" Click="Button_Click" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
-            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding ...}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
+            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding Path=OnHostButtonClick}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
         </Grid>
 
     </Grid>
diff --git a/Client/Views/MainWindow.xaml.cs b/Client/Views/MainWindow.xaml.cs
index 70bb34a..ae75d9f 100644
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -33,7 +33,6 @@ namespace Client
             if(lobbySelected != null)
             {
                 testLabel.Content = lobbySelected.ID;
-                usernameTextbox.IsEnabled = false;
                 colorSelection.IsEnabled = false;
                 joinButton.IsEnabled = false;
                 hostButton.IsEnabled = false;
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index ab8af5b..eb07ade 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -16,6 +16,7 @@ namespace Server.Models
         private byte[] buffer = new byte[1024];
         private byte[] totalBuffer = new byte[1024];
         private int totalBufferReceived = 0;
+        public User user;
         
 
         /// <summary>
diff --git a/SharedClientServer/User.cs b/SharedClientServer/User.cs
index f25efbf..6e95f64 100644
--- a/SharedClientServer/User.cs
+++ b/SharedClientServer/User.cs
@@ -17,6 +17,13 @@ namespace SharedClientServer
             _host = host;
         }
 
+        public User(string username)
+        {
+            _username = username;
+            _score = 0;
+            _host = false;
+        }
+
         public string Username
         {
             get { return _username; }