diff --git a/Shogi.Api/Controllers/SessionsController.cs b/Shogi.Api/Controllers/SessionsController.cs
index ac6b453..75614aa 100644
--- a/Shogi.Api/Controllers/SessionsController.cs
+++ b/Shogi.Api/Controllers/SessionsController.cs
@@ -77,6 +77,11 @@ public class SessionsController : ControllerBase
         return Ok(await this.queryRespository.ReadSessionPlayerCount(this.User.GetShogiUserId()));
     }
 
+    /// <summary>
+    /// Fetch the session and latest board state. Also subscribe the user to socket events for this session.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
     [HttpGet("{name}")]
     public async Task<ActionResult<ReadSessionResponse>> GetSession(string name)
     {
@@ -113,6 +118,7 @@ public class SessionsController : ControllerBase
             session.AddPlayer2(User.GetShogiUserId());
 
             await sessionRepository.SetPlayer2(name, User.GetShogiUserId());
+            await communicationManager.BroadcastToAll(new SessionJoinedByPlayerSocketMessage());
             return this.Ok();
         }
         return this.Conflict("This game already has two players.");
@@ -144,6 +150,8 @@ public class SessionsController : ControllerBase
             return this.Conflict(e.Message);
         }
         await sessionRepository.CreateMove(sessionName, command);
+
+        // Send socket message to both players so their clients know that new board state is available.
         await communicationManager.BroadcastToPlayers(
           new PlayerHasMovedMessage
           {
diff --git a/Shogi.Api/Controllers/UserController.cs b/Shogi.Api/Controllers/UserController.cs
index a552b4b..c147960 100644
--- a/Shogi.Api/Controllers/UserController.cs
+++ b/Shogi.Api/Controllers/UserController.cs
@@ -14,60 +14,68 @@ namespace Shogi.Api.Controllers;
 [Authorize]
 public class UserController : ControllerBase
 {
-	private readonly ISocketTokenCache tokenCache;
-	private readonly ISocketConnectionManager connectionManager;
-	private readonly IUserRepository userRepository;
-	private readonly IShogiUserClaimsTransformer claimsTransformation;
-	private readonly AuthenticationProperties authenticationProps;
+    private readonly ISocketTokenCache tokenCache;
+    private readonly ISocketConnectionManager connectionManager;
+    private readonly IUserRepository userRepository;
+    private readonly IShogiUserClaimsTransformer claimsTransformation;
+    private readonly AuthenticationProperties authenticationProps;
 
-	public UserController(
-		ILogger<UserController> logger,
-		ISocketTokenCache tokenCache,
-		ISocketConnectionManager connectionManager,
-		IUserRepository userRepository,
-		IShogiUserClaimsTransformer claimsTransformation)
-	{
-		this.tokenCache = tokenCache;
-		this.connectionManager = connectionManager;
-		this.userRepository = userRepository;
-		this.claimsTransformation = claimsTransformation;
-		authenticationProps = new AuthenticationProperties
-		{
-			AllowRefresh = true,
-			IsPersistent = true
-		};
-	}
+    public UserController(
+        ILogger<UserController> logger,
+        ISocketTokenCache tokenCache,
+        ISocketConnectionManager connectionManager,
+        IUserRepository userRepository,
+        IShogiUserClaimsTransformer claimsTransformation)
+    {
+        this.tokenCache = tokenCache;
+        this.connectionManager = connectionManager;
+        this.userRepository = userRepository;
+        this.claimsTransformation = claimsTransformation;
+        authenticationProps = new AuthenticationProperties
+        {
+            AllowRefresh = true,
+            IsPersistent = true
+        };
+    }
 
-	[HttpGet("Token")]
-	public ActionResult<CreateTokenResponse> GetWebSocketToken()
-	{
-		var userId = User.GetShogiUserId();
-		var displayName = User.GetShogiUserDisplayname();
+    [HttpGet("Token")]
+    public ActionResult<CreateTokenResponse> GetWebSocketToken()
+    {
+        var userId = User.GetShogiUserId();
+        var displayName = User.GetShogiUserDisplayname();
 
-		var token = tokenCache.GenerateToken(userId);
-		return new CreateTokenResponse
-		{
-			DisplayName = displayName,
-			OneTimeToken = token,
-			UserId = userId
-		};
-	}
+        var token = tokenCache.GenerateToken(userId);
+        return new CreateTokenResponse
+        {
+            DisplayName = displayName,
+            OneTimeToken = token,
+            UserId = userId
+        };
+    }
 
-	[AllowAnonymous]
-	[HttpGet("LoginAsGuest")]
-	public async Task<IActionResult> GuestLogin()
-	{
-		var principal = await this.claimsTransformation.CreateClaimsFromGuestPrincipal(User);
-		if (principal != null)
-		{
-			await HttpContext.SignInAsync(
-				CookieAuthenticationDefaults.AuthenticationScheme,
-				principal,
-				authenticationProps
-			);
-		}
-		return Ok();
-	}
+    /// <summary>
+    /// </summary>
+    /// <param name="returnUrl">Used by cookie authentication.</param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpGet("LoginAsGuest")]
+    public async Task<IActionResult> GuestLogin([FromQuery] string returnUrl)
+    {
+        var principal = await this.claimsTransformation.CreateClaimsFromGuestPrincipal(User);
+        if (principal != null)
+        {
+            await HttpContext.SignInAsync(
+                CookieAuthenticationDefaults.AuthenticationScheme,
+                principal,
+                authenticationProps
+            );
+        }
+        if (!string.IsNullOrWhiteSpace(returnUrl))
+        {
+            return Redirect(returnUrl);
+        }
+        return Ok();
+    }
 
     [HttpPut("GuestLogout")]
     public async Task<IActionResult> GuestLogout()
diff --git a/Shogi.Api/Services/SocketService.cs b/Shogi.Api/Services/SocketService.cs
index 8c7666a..c3bf257 100644
--- a/Shogi.Api/Services/SocketService.cs
+++ b/Shogi.Api/Services/SocketService.cs
@@ -9,91 +9,96 @@ using System.Text.Json;
 
 namespace Shogi.Api.Services
 {
-  public interface ISocketService
-  {
-    Task HandleSocketRequest(HttpContext context);
-  }
-
-  /// <summary>
-  /// Services a single websocket connection. Authenticates the socket connection, accepts messages, and sends messages.
-  /// </summary>
-  public class SocketService : ISocketService
-  {
-    private readonly ILogger<SocketService> logger;
-    private readonly ISocketConnectionManager communicationManager;
-    private readonly ISocketTokenCache tokenManager;
-
-    public SocketService(
-      ILogger<SocketService> logger,
-      ISocketConnectionManager communicationManager,
-      ISocketTokenCache tokenManager) : base()
+    public interface ISocketService
     {
-      this.logger = logger;
-      this.communicationManager = communicationManager;
-      this.tokenManager = tokenManager;
+        Task HandleSocketRequest(HttpContext context);
     }
 
-    public async Task HandleSocketRequest(HttpContext context)
+    /// <summary>
+    /// Services a single websocket connection. Authenticates the socket connection, accepts messages, and sends messages.
+    /// </summary>
+    public class SocketService : ISocketService
     {
-      if (!context.Request.Query.Keys.Contains("token"))
-      {
-        context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
-        return;
-      }
-      var token = Guid.Parse(context.Request.Query["token"][0]);
-      var userName = tokenManager.GetUsername(token);
+        private readonly ILogger<SocketService> logger;
+        private readonly ISocketConnectionManager communicationManager;
+        private readonly ISocketTokenCache tokenManager;
 
-      if (string.IsNullOrEmpty(userName))
-      {
-        context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
-        return;
-      }
-      var socket = await context.WebSockets.AcceptWebSocketAsync();
+        public SocketService(
+          ILogger<SocketService> logger,
+          ISocketConnectionManager communicationManager,
+          ISocketTokenCache tokenManager) : base()
+        {
+            this.logger = logger;
+            this.communicationManager = communicationManager;
+            this.tokenManager = tokenManager;
+        }
 
-      communicationManager.Subscribe(socket, userName);
-      while (socket.State == WebSocketState.Open)
-      {
-        try
+        public async Task HandleSocketRequest(HttpContext context)
         {
-          var message = await socket.ReceiveTextAsync();
-          if (string.IsNullOrWhiteSpace(message)) continue;
-          logger.LogInformation("Request \n{0}\n", message);
-          var request = JsonSerializer.Deserialize<ISocketRequest>(message);
-          if (request == null || !Enum.IsDefined(typeof(SocketAction), request.Action))
-          {
-            await socket.SendTextAsync("Error: Action not recognized.");
-            continue;
-          }
-          switch (request.Action)
-          {
-            default:
-              await socket.SendTextAsync($"Received your message with action {request.Action}, but did no work.");
-              break;
-          }
+            if (!context.Request.Query.Keys.Contains("token"))
+            {
+                context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+                return;
+            }
+            var token = Guid.Parse(context.Request.Query["token"][0] ?? throw new InvalidOperationException("Token expected during socket connection request, but was not sent."));
+            var userName = tokenManager.GetUsername(token);
+
+            if (string.IsNullOrEmpty(userName))
+            {
+                context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+                return;
+            }
+            var socket = await context.WebSockets.AcceptWebSocketAsync();
+
+            communicationManager.Subscribe(socket, userName);
+            // TODO: I probably don't need this while-loop anymore? Perhaps unsubscribe when a disconnect is detected instead.
+            while (socket.State.HasFlag(WebSocketState.Open))
+            {
+                try
+                {
+                    var message = await socket.ReceiveTextAsync();
+                    if (string.IsNullOrWhiteSpace(message)) continue;
+                    logger.LogInformation("Request \n{0}\n", message);
+                    var request = JsonSerializer.Deserialize<ISocketRequest>(message);
+                    if (request == null || !Enum.IsDefined(typeof(SocketAction), request.Action))
+                    {
+                        await socket.SendTextAsync("Error: Action not recognized.");
+                        continue;
+                    }
+                    switch (request.Action)
+                    {
+                        default:
+                            await socket.SendTextAsync($"Received your message with action {request.Action}, but did no work.");
+                            break;
+                    }
+                }
+                catch (OperationCanceledException ex)
+                {
+                    logger.LogError(ex.Message);
+                }
+                catch (WebSocketException ex)
+                {
+                    logger.LogInformation($"{nameof(WebSocketException)} in {nameof(SocketConnectionManager)}.");
+                    logger.LogInformation("Probably tried writing to a closed socket.");
+                    logger.LogError(ex.Message);
+                }
+                communicationManager.Unsubscribe(userName);
+
+                if (!socket.State.HasFlag(WebSocketState.Closed) && !socket.State.HasFlag(WebSocketState.Aborted))
+                {
+                    try
+                    {
+                        await socket.CloseAsync(WebSocketCloseStatus.NormalClosure,
+                            "Socket closed",
+                            CancellationToken.None);
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"Ignored exception during socket closing. {ex.Message}");
+                    }
+                }
+
+            }
         }
-        catch (OperationCanceledException ex)
-        {
-          logger.LogError(ex.Message);
-        }
-        catch (WebSocketException ex)
-        {
-          logger.LogInformation($"{nameof(WebSocketException)} in {nameof(SocketConnectionManager)}.");
-          logger.LogInformation("Probably tried writing to a closed socket.");
-          logger.LogError(ex.Message);
-        }
-        communicationManager.Unsubscribe(userName);
-      }
     }
-
-    public async Task<bool> ValidateRequestAndReplyIfInvalid<TRequest>(WebSocket socket, IValidator<TRequest> validator, TRequest request)
-    {
-      var results = validator.Validate(request);
-      if (!results.IsValid)
-      {
-        var errors = string.Join('\n', results.Errors.Select(_ => _.ErrorMessage));
-        await socket.SendTextAsync(errors);
-      }
-      return results.IsValid;
-    }
-  }
 }
diff --git a/Shogi.Contracts/Socket/PlayerHasMovedMessage.cs b/Shogi.Contracts/Socket/PlayerHasMovedMessage.cs
index c55ccdd..4309246 100644
--- a/Shogi.Contracts/Socket/PlayerHasMovedMessage.cs
+++ b/Shogi.Contracts/Socket/PlayerHasMovedMessage.cs
@@ -4,15 +4,17 @@ namespace Shogi.Contracts.Socket;
 
 public class PlayerHasMovedMessage : ISocketResponse
 {
-  public SocketAction Action { get; }
-  public string SessionName { get; set; }
-  /// <summary>
-  /// The player that made the move.
-  /// </summary>
-  public string PlayerName { get; set; }
+    public SocketAction Action { get; }
+    public string SessionName { get; set; }
+    /// <summary>
+    /// The player that made the move.
+    /// </summary>
+    public string PlayerName { get; set; }
 
-  public PlayerHasMovedMessage()
-  {
-    Action = SocketAction.PieceMoved;
-  }
+    public PlayerHasMovedMessage()
+    {
+        Action = SocketAction.PieceMoved;
+        SessionName = string.Empty;
+        PlayerName = string.Empty;
+    }
 }
diff --git a/Shogi.Contracts/Socket/SessionCreatedSocketMessage.cs b/Shogi.Contracts/Socket/SessionCreatedSocketMessage.cs
index e447852..0dd8b3f 100644
--- a/Shogi.Contracts/Socket/SessionCreatedSocketMessage.cs
+++ b/Shogi.Contracts/Socket/SessionCreatedSocketMessage.cs
@@ -4,10 +4,5 @@ namespace Shogi.Contracts.Socket;
 
 public class SessionCreatedSocketMessage : ISocketResponse
 {
-  public SocketAction Action { get; }
-  
-  public SessionCreatedSocketMessage()
-  {
-    Action = SocketAction.SessionCreated;
-  }
+    public SocketAction Action => SocketAction.SessionCreated;
 }
diff --git a/Shogi.Contracts/Socket/SessionJoinedByPlayerSocketMessage.cs b/Shogi.Contracts/Socket/SessionJoinedByPlayerSocketMessage.cs
new file mode 100644
index 0000000..70fc4bf
--- /dev/null
+++ b/Shogi.Contracts/Socket/SessionJoinedByPlayerSocketMessage.cs
@@ -0,0 +1,9 @@
+using Shogi.Contracts.Types;
+
+namespace Shogi.Contracts.Socket
+{
+    public class SessionJoinedByPlayerSocketMessage : ISocketResponse
+    {
+        public SocketAction Action => SocketAction.SessionJoined;
+    }
+}
diff --git a/Shogi.UI/App.razor b/Shogi.UI/App.razor
index 38fe056..efa8cea 100644
--- a/Shogi.UI/App.razor
+++ b/Shogi.UI/App.razor
@@ -3,22 +3,6 @@
     <Router AppAssembly="@typeof(App).Assembly">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-            @*<AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
-                <Authorizing>
-                    Authorizing!!
-                </Authorizing>
-                <NotAuthorized>
-                    @if (context.User.Identity?.IsAuthenticated != true)
-                    {
-                        <RedirectToLogin />
-                    }
-                    else
-                    {
-                        <p role="alert">You are not authorized to access this resource.</p>
-                    }
-                </NotAuthorized>
-            </AuthorizeRouteView>*@
-            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
         </Found>
         <NotFound>
             <PageTitle>Not found</PageTitle>
diff --git a/Shogi.UI/Pages/Home/Account/AccountManager.cs b/Shogi.UI/Pages/Home/Account/AccountManager.cs
index c94083d..ec98ea3 100644
--- a/Shogi.UI/Pages/Home/Account/AccountManager.cs
+++ b/Shogi.UI/Pages/Home/Account/AccountManager.cs
@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Shogi.UI.Pages.Home.Api;
 using Shogi.UI.Shared;
-using System.Text.Json;
 
 namespace Shogi.UI.Pages.Home.Account;
 
@@ -35,21 +34,23 @@ public class AccountManager
         this.shogiSocket = shogiSocket;
     }
 
-    private User? MyUser { get => accountState.User; set => accountState.User = value; }
+    private User? MyUser => accountState.User;
+
+    private Task SetUser(User user) => accountState.SetUser(user);
+
 
     public async Task LoginWithGuestAccount()
     {
         var response = await shogiApi.GetToken(WhichAccountPlatform.Guest);
         if (response != null)
         {
-            MyUser = new User
+            await SetUser(new User
             {
                 DisplayName = response.DisplayName,
                 Id = response.UserId,
-                OneTimeSocketToken = response.OneTimeToken,
                 WhichAccountPlatform = WhichAccountPlatform.Guest
-            };
-            await shogiSocket.OpenAsync(MyUser.Value.OneTimeSocketToken.ToString());
+            });
+            await shogiSocket.OpenAsync(response.OneTimeToken.ToString());
             await localStorage.SetAccountPlatform(WhichAccountPlatform.Guest);
         }
     }
@@ -80,11 +81,12 @@ public class AccountManager
             var response = await shogiApi.GetToken(WhichAccountPlatform.Guest);
             if (response != null)
             {
-                MyUser = new User(
+                await accountState.SetUser(new User(
                     Id: response.UserId,
                     DisplayName: response.DisplayName,
-                    WhichAccountPlatform: WhichAccountPlatform.Guest,
-                    OneTimeSocketToken: response.OneTimeToken);
+                    WhichAccountPlatform: WhichAccountPlatform.Guest));
+                await shogiSocket.OpenAsync(response.OneTimeToken.ToString());
+                return true;
             }
         }
         else if (platform == WhichAccountPlatform.Microsoft)
@@ -101,26 +103,21 @@ public class AccountManager
                 }
                 var id = state.User.Claims.Single(claim => claim.Type == "oid").Value;
                 var displayName = state.User.Identity.Name;
-                MyUser = new User(
+                await accountState.SetUser(new User(
                     Id: id,
                     DisplayName: displayName,
-                    WhichAccountPlatform: WhichAccountPlatform.Microsoft,
-                    OneTimeSocketToken: response.OneTimeToken);
+                    WhichAccountPlatform: WhichAccountPlatform.Microsoft));
+                await shogiSocket.OpenAsync(response.OneTimeToken.ToString());
+                return true;
             }
         }
 
-        if (MyUser != null)
-        {
-            await shogiSocket.OpenAsync(MyUser.Value.OneTimeSocketToken.ToString());
-            return true;
-        }
-
         return false;
     }
 
     public async Task LogoutAsync()
     {
-        MyUser = null;
+        await accountState.SetUser(null);
         var platform = await localStorage.GetAccountPlatform();
         await localStorage.DeleteAccountPlatform();
 
diff --git a/Shogi.UI/Pages/Home/Account/AccountState.cs b/Shogi.UI/Pages/Home/Account/AccountState.cs
index c5b7e85..9b8f43f 100644
--- a/Shogi.UI/Pages/Home/Account/AccountState.cs
+++ b/Shogi.UI/Pages/Home/Account/AccountState.cs
@@ -1,28 +1,27 @@
-namespace Shogi.UI.Pages.Home.Account;
+using static Shogi.UI.Shared.Events;
+
+namespace Shogi.UI.Pages.Home.Account;
 
 public class AccountState
 {
-    public event EventHandler<LoginEventArgs>? LoginChangedEvent;
+    public event AsyncEventHandler<LoginEventArgs>? LoginChangedEvent;
 
-    private User? user;
-    public User? User
+    public User? User { get; private set; }
+
+    public Task SetUser(User? user)
     {
-        get => user;
-        set
+        User = user;
+        return EmitLoginChangedEvent();
+    }
+
+    private async Task EmitLoginChangedEvent()
+    {
+        if (LoginChangedEvent is not null)
         {
-            if (user != value)
+            await LoginChangedEvent.Invoke(new LoginEventArgs
             {
-                user = value;
-                EmitLoginChangedEvent();
-            }
+                User = User
+            });
         }
     }
-
-    private void EmitLoginChangedEvent()
-    {
-        LoginChangedEvent?.Invoke(this, new LoginEventArgs
-        {
-            User = User
-        });
-    }
 }
diff --git a/Shogi.UI/Pages/Home/Account/User.cs b/Shogi.UI/Pages/Home/Account/User.cs
index caada77..308d425 100644
--- a/Shogi.UI/Pages/Home/Account/User.cs
+++ b/Shogi.UI/Pages/Home/Account/User.cs
@@ -3,8 +3,7 @@
     public readonly record struct User(
         string Id,
         string DisplayName,
-        WhichAccountPlatform WhichAccountPlatform,
-        Guid OneTimeSocketToken)
+        WhichAccountPlatform WhichAccountPlatform)
     {
     }
 }
diff --git a/Shogi.UI/Pages/Home/Api/IShogiApi.cs b/Shogi.UI/Pages/Home/Api/IShogiApi.cs
index 1510035..8f5d384 100644
--- a/Shogi.UI/Pages/Home/Api/IShogiApi.cs
+++ b/Shogi.UI/Pages/Home/Api/IShogiApi.cs
@@ -12,6 +12,6 @@ public interface IShogiApi
 	Task<CreateTokenResponse?> GetToken(WhichAccountPlatform whichAccountPlatform);
 	Task GuestLogout();
 	Task Move(string sessionName, MovePieceCommand move);
-    Task<HttpStatusCode> PatchJoinGame(string name);
+    Task<HttpResponseMessage> PatchJoinGame(string name);
     Task<HttpStatusCode> PostSession(string name, bool isPrivate);
 }
\ No newline at end of file
diff --git a/Shogi.UI/Pages/Home/Api/ShogiApi.cs b/Shogi.UI/Pages/Home/Api/ShogiApi.cs
index a9562a2..90b52ee 100644
--- a/Shogi.UI/Pages/Home/Api/ShogiApi.cs
+++ b/Shogi.UI/Pages/Home/Api/ShogiApi.cs
@@ -65,8 +65,16 @@ namespace Shogi.UI.Pages.Home.Api
             var httpClient = whichAccountPlatform == WhichAccountPlatform.Microsoft
                 ? clientFactory.CreateClient(MsalClientName)
                 : clientFactory.CreateClient(GuestClientName);
-            var response = await httpClient.GetFromJsonAsync<CreateTokenResponse>(RelativeUri("User/Token"), serializerOptions);
-            return response;
+            var response = await httpClient.GetAsync(RelativeUri("User/Token"));
+            if (response.IsSuccessStatusCode)
+            {
+                var content = await response.Content.ReadAsStringAsync();
+                if (!string.IsNullOrEmpty(content))
+                {
+                    return await response.Content.ReadFromJsonAsync<CreateTokenResponse>(serializerOptions);
+                }
+            }
+            return null;
         }
 
         public async Task Move(string sessionName, MovePieceCommand command)
@@ -83,10 +91,9 @@ namespace Shogi.UI.Pages.Home.Api
             return response.StatusCode;
         }
 
-        public async Task<HttpStatusCode> PatchJoinGame(string name)
+        public Task<HttpResponseMessage> PatchJoinGame(string name)
         {
-            var response = await HttpClient.PatchAsync(RelativeUri($"Sessions/{name}/Join"), null);
-            return response.StatusCode;
+            return HttpClient.PatchAsync(RelativeUri($"Sessions/{name}/Join"), null);
         }
 
         private static Uri RelativeUri(string path) => new Uri(path, UriKind.Relative);
diff --git a/Shogi.UI/Pages/Home/GameBoard/EmptyGameBoard.razor b/Shogi.UI/Pages/Home/GameBoard/EmptyGameBoard.razor
index b18b89f..0473868 100644
--- a/Shogi.UI/Pages/Home/GameBoard/EmptyGameBoard.razor
+++ b/Shogi.UI/Pages/Home/GameBoard/EmptyGameBoard.razor
@@ -3,9 +3,4 @@
 <GameBoardPresentation Perspective="WhichPlayer.Player1" />
 
 @code {
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-        Console.WriteLine("Empty Game Board.");
-    }
 }
diff --git a/Shogi.UI/Pages/Home/GameBoard/GameBoard.razor b/Shogi.UI/Pages/Home/GameBoard/GameBoard.razor
index c74d924..def4991 100644
--- a/Shogi.UI/Pages/Home/GameBoard/GameBoard.razor
+++ b/Shogi.UI/Pages/Home/GameBoard/GameBoard.razor
@@ -1,9 +1,11 @@
 @using Shogi.Contracts.Api
+@using Shogi.Contracts.Socket;
 @using Shogi.Contracts.Types;
 @using System.Text.RegularExpressions;
 @inject IShogiApi ShogiApi
 @inject AccountState Account;
 @inject PromotePrompt PromotePrompt;
+@inject ShogiSocket ShogiSocket;
 
 @if (session == null)
 {
@@ -11,11 +13,11 @@
 }
 else if (isSpectating)
 {
-    <SpectatorGameBoard Session="session" />
+    <SpectatorGameBoard Session="session" OnRefetchSession="RefetchSession" />
 }
 else
 {
-    <SeatedGameBoard Perspective="perspective" Session="session" OnRefetchSession="RefetchSession" />
+    <SeatedGameBoard Perspective="perspective" Session="session" />
 }
 
 
@@ -27,6 +29,13 @@ else
     private WhichPlayer perspective;
     private bool isSpectating;
 
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+        ShogiSocket.OnPlayerMoved += OnPlayerMoved_RefetchSession;
+        ShogiSocket.OnSessionJoined += 
+    }
+
     protected override async Task OnParametersSetAsync()
     {
         await RefetchSession();
@@ -34,7 +43,7 @@ else
 
     async Task RefetchSession()
     {
-         if (!string.IsNullOrWhiteSpace(SessionName))
+        if (!string.IsNullOrWhiteSpace(SessionName))
         {
             this.session = await ShogiApi.GetSession(SessionName);
             if (this.session != null)
@@ -44,9 +53,18 @@ else
                 this.perspective = accountId == session.Player2 ? WhichPlayer.Player2 : WhichPlayer.Player1;
                 this.isSpectating = !(accountId == this.session.Player1 || accountId == this.session.Player2);
                 Console.WriteLine($"IsSpectating - {isSpectating}. AccountId - {accountId}. Player1 - {this.session.Player1}. Player2 - {this.session.Player2}");
+
             }
+            StateHasChanged();
         }
     }
 
-
+    Task OnPlayerMoved_RefetchSession(PlayerHasMovedMessage args)
+    {
+        if (args.SessionName == SessionName)
+        {
+            return RefetchSession();
+        }
+        return Task.CompletedTask;
+    }
 }
diff --git a/Shogi.UI/Pages/Home/GameBoard/GameBoardPresentation.razor b/Shogi.UI/Pages/Home/GameBoard/GameBoardPresentation.razor
index c961965..6759e45 100644
--- a/Shogi.UI/Pages/Home/GameBoard/GameBoardPresentation.razor
+++ b/Shogi.UI/Pages/Home/GameBoard/GameBoardPresentation.razor
@@ -68,10 +68,10 @@
         <aside class="side-board">
             <div class="player-area">
                 <div class="hand">
-                    @if (OpponentHand.Any())
+                    @if (opponentHand.Any())
                     {
 
-                        @foreach (var piece in OpponentHand)
+                        @foreach (var piece in opponentHand)
                         {
                             <div class="tile">
                                 <GamePiece Piece="piece" Perspective="Perspective" />
@@ -86,6 +86,8 @@
             </div>
 
             <div class="spacer place-self-center">
+                <p>@opponentName</p>
+                <p>@userName</p>
             </div>
 
             <div class="player-area">
@@ -93,15 +95,15 @@
                 {
                     <div class="place-self-center">
                         <p>Seat is Empty</p>
-                        <button @onclick="OnClickJoinGameInternal()">Join Game</button>
+                        <button @onclick="OnClickJoinGameInternal">Join Game</button>
                     </div>
                 }
                 else
                 {
                     <div class="hand">
-                        @if (UserHand.Any())
+                        @if (userHand.Any())
                         {
-                            @foreach (var piece in UserHand)
+                            @foreach (var piece in userHand)
                             {
                                 <div class="title" @onclick="OnClickHandInternal(piece)">
                                     <GamePiece Piece="piece" Perspective="Perspective" />
@@ -121,6 +123,11 @@
 </article>
 
 @code {
+    static readonly string[] Files = new[] { "A", "B", "C", "D", "E", "F", "G", "H", "I" };
+
+    /// <summary>
+    /// When true, an icon is displayed indicating that the user is spectating.
+    /// </summary>
     [Parameter] public bool IsSpectating { get; set; } = false;
     [Parameter] public WhichPlayer Perspective { get; set; }
     [Parameter] public Session? Session { get; set; }
@@ -130,32 +137,48 @@
     [Parameter] public Func<Piece, Task>? OnClickHand { get; set; }
     [Parameter] public Func<Task>? OnClickJoinGame { get; set; }
 
-    static readonly string[] Files = new[] { "A", "B", "C", "D", "E", "F", "G", "H", "I" };
+    private IReadOnlyCollection<Piece> opponentHand;
+    private IReadOnlyCollection<Piece> userHand;
+    private string? userName;
+    private string? opponentName;
 
-    private IReadOnlyCollection<Piece> OpponentHand
+    public GameBoardPresentation()
     {
-        get
-        {
-            if (this.Session == null) return Array.Empty<Piece>();
-
-            return Perspective == WhichPlayer.Player1
-                ? this.Session.BoardState.Player1Hand
-                : this.Session.BoardState.Player2Hand;
-        }
+        opponentHand = Array.Empty<Piece>();
+        userHand = Array.Empty<Piece>();
+        userName = string.Empty;
+        opponentName = string.Empty;
     }
-    IReadOnlyCollection<Piece> UserHand
-    {
-        get
-        {
-            if (this.Session == null) return Array.Empty<Piece>();
 
-            return Perspective == WhichPlayer.Player1
+    protected override void OnParametersSet()
+    {
+        Console.WriteLine("Params changed. SelectedPosition = {0}", SelectedPosition);
+        base.OnParametersSet();
+        if (Session == null)
+        {
+            opponentHand = Array.Empty<Piece>();
+            userHand = Array.Empty<Piece>();
+            userName = string.Empty;
+            opponentName = string.Empty;
+        }
+        else
+        {
+            opponentHand = Perspective == WhichPlayer.Player1
+                ? this.Session.BoardState.Player2Hand
+                : this.Session.BoardState.Player1Hand;
+            userHand = Perspective == WhichPlayer.Player1
                 ? this.Session.BoardState.Player1Hand
                 : this.Session.BoardState.Player2Hand;
+            userName = Perspective == WhichPlayer.Player1
+                ? this.Session.Player1
+                : this.Session.Player2;
+            opponentName = Perspective == WhichPlayer.Player1
+                ? this.Session.Player2
+                : this.Session.Player1;
         }
     }
 
     private Action OnClickTileInternal(Piece? piece, string position) => () => OnClickTile?.Invoke(piece, position);
     private Action OnClickHandInternal(Piece piece) => () => OnClickHand?.Invoke(piece);
-    private Action OnClickJoinGameInternal() => () => OnClickJoinGame?.Invoke();
+    private void OnClickJoinGameInternal() => OnClickJoinGame?.Invoke();
 }
diff --git a/Shogi.UI/Pages/Home/GameBoard/SeatedGameBoard.razor b/Shogi.UI/Pages/Home/GameBoard/SeatedGameBoard.razor
index af5bdc2..4bb7fd1 100644
--- a/Shogi.UI/Pages/Home/GameBoard/SeatedGameBoard.razor
+++ b/Shogi.UI/Pages/Home/GameBoard/SeatedGameBoard.razor
@@ -9,18 +9,26 @@
                        Perspective="Perspective"
                        OnClickHand="OnClickHand"
                        OnClickTile="OnClickTile"
-                       OnClickJoinGame="OnClickJoinGame" />
+                       SelectedPosition="@selectedBoardPosition" />
 
 @code {
     [Parameter, EditorRequired]
     public WhichPlayer Perspective { get; set; }
     [Parameter, EditorRequired]
     public Session Session { get; set; }
-    [Parameter] public Func<Task>? OnRefetchSession { get; set; }
     private bool IsMyTurn => Session?.BoardState.WhoseTurn == Perspective;
     private string? selectedBoardPosition;
     private WhichPiece? selectedPieceFromHand;
 
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+        if (Session == null)
+        {
+            throw new ArgumentException($"{nameof(Session)} cannot be null.", nameof(Session));
+        }
+    }
+
     bool ShouldPromptForPromotion(string position)
     {
         if (Perspective == WhichPlayer.Player1 && Regex.IsMatch(position, ".[7-9]"))
@@ -36,12 +44,16 @@
 
     async Task OnClickTile(Piece? piece, string position)
     {
+        Console.WriteLine("Is my turn?");
+        Console.WriteLine(true);
         if (!IsMyTurn) return;
 
         if (selectedBoardPosition == null || piece?.Owner == Perspective)
         {
             // Select a position.
+            Console.WriteLine("Position {0}", position);
             selectedBoardPosition = position;
+            StateHasChanged();
             return;
         }
         if (selectedBoardPosition == position)
@@ -77,16 +89,4 @@
         selectedPieceFromHand = piece.WhichPiece;
         await Task.CompletedTask;
     }
-
-    async Task OnClickJoinGame()
-    {
-        if (Session != null && OnRefetchSession != null)
-        {
-            var status = await ShogiApi.PatchJoinGame(Session.SessionName);
-            if (status == HttpStatusCode.OK)
-            {
-                await OnRefetchSession.Invoke();
-            }
-        }
-    }
 }
diff --git a/Shogi.UI/Pages/Home/GameBoard/SpectatorGameBoard.razor b/Shogi.UI/Pages/Home/GameBoard/SpectatorGameBoard.razor
index 4c2f5df..8a5f386 100644
--- a/Shogi.UI/Pages/Home/GameBoard/SpectatorGameBoard.razor
+++ b/Shogi.UI/Pages/Home/GameBoard/SpectatorGameBoard.razor
@@ -1,7 +1,27 @@
 @using Contracts.Types;
+@using System.Net;
+@inject IShogiApi ShogiApi;
 
-<GameBoardPresentation IsSpectating="true" Perspective="WhichPlayer.Player1" Session="Session" />
+<GameBoardPresentation IsSpectating="true"
+                       Perspective="WhichPlayer.Player1"
+                       Session="Session"
+                       OnClickJoinGame="OnClickJoinGame" />
 
 @code {
     [Parameter] public Session Session { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+        if (Session == null)
+        {
+            throw new ArgumentException($"{nameof(Session)} cannot be null.", nameof(Session));
+        }
+    }
+
+    async Task OnClickJoinGame()
+    {
+        var response = await ShogiApi.PatchJoinGame(Session.SessionName);
+        response.EnsureSuccessStatusCode();
+    }
 }
diff --git a/Shogi.UI/Pages/Home/GameBrowser.razor b/Shogi.UI/Pages/Home/GameBrowser.razor
index a00a961..886d39e 100644
--- a/Shogi.UI/Pages/Home/GameBrowser.razor
+++ b/Shogi.UI/Pages/Home/GameBrowser.razor
@@ -1,7 +1,10 @@
-@using Shogi.Contracts.Types;
+@implements IDisposable;
+
+@using Shogi.Contracts.Types;
 @using System.ComponentModel.DataAnnotations;
 @using System.Net;
 @using System.Text.Json;
+
 @inject IShogiApi ShogiApi;
 @inject ShogiSocket ShogiSocket;
 @inject AccountState Account;
@@ -76,7 +79,6 @@
                         The name you chose is taken; choose another.
                     </div>
                 }
-
             </EditForm>
         </div>
     </div>
@@ -92,17 +94,12 @@
     private SessionMetadata? activeSession;
     private HttpStatusCode? createSessionStatusCode;
 
-    protected override async Task OnInitializedAsync()
+    protected override void OnInitialized()
     {
-        ShogiSocket.OnCreateGameMessage += async (sender, message) => await FetchSessions();
-        Account.LoginChangedEvent += async (sender, message) =>
-        {
-            Console.WriteLine($"LoginEvent. Message={JsonSerializer.Serialize(message)}.");
-            if (message.User != null)
-            {
-                await FetchSessions();
-            }
-        };
+        base.OnInitialized();
+        ShogiSocket.OnSessionCreated += FetchSessions;
+        ShogiSocket.OnSessionJoined += FetchSessions;
+        Account.LoginChangedEvent += LoginChangedEvent_FetchSessions;
     }
 
     string ActiveCss(SessionMetadata s) => s == activeSession ? "active" : string.Empty;
@@ -112,6 +109,14 @@
         activeSession = s;
         ActiveSessionChanged?.Invoke(s);
     }
+    Task LoginChangedEvent_FetchSessions(LoginEventArgs args)
+    {
+        if (args.User != null)
+        {
+            return FetchSessions();
+        }
+        return Task.CompletedTask;
+    }
 
     async Task FetchSessions()
     {
@@ -129,6 +134,13 @@
         createSessionStatusCode = await ShogiApi.PostSession(createForm.Name, createForm.IsPrivate);
     }
 
+    public void Dispose()
+    {
+        ShogiSocket.OnSessionCreated -= FetchSessions;
+        ShogiSocket.OnSessionJoined -= FetchSessions;
+        Account.LoginChangedEvent -= LoginChangedEvent_FetchSessions;
+    }
+
     private class CreateForm
     {
         [Required]
diff --git a/Shogi.UI/Pages/Home/Home.razor b/Shogi.UI/Pages/Home/Home.razor
index 1ecf90e..f600e12 100644
--- a/Shogi.UI/Pages/Home/Home.razor
+++ b/Shogi.UI/Pages/Home/Home.razor
@@ -26,9 +26,16 @@
 </main>
 
 @code {
-    bool welcomeModalIsVisible = false;
-    string activeSessionName = string.Empty;
-    ClientWebSocket socket = new ClientWebSocket();
+    private bool welcomeModalIsVisible;
+    private string activeSessionName;
+    private ClientWebSocket socket;
+    
+    public Home()
+    {
+        welcomeModalIsVisible = false;
+        activeSessionName = string.Empty;
+        socket = new ClientWebSocket();
+    }
 
     protected override async Task OnInitializedAsync()
     {
@@ -40,10 +47,11 @@
         }
     }
 
-    private void OnLoginChanged(object? sender, LoginEventArgs args)
+    private Task OnLoginChanged(LoginEventArgs args)
     {
         welcomeModalIsVisible = args.User == null;
         StateHasChanged();
+        return Task.CompletedTask;
     }
     private void OnChangeSession(SessionMetadata s)
     {
diff --git a/Shogi.UI/Pages/Home/PageHeader.razor b/Shogi.UI/Pages/Home/PageHeader.razor
index 1b57f9d..7aac75b 100644
--- a/Shogi.UI/Pages/Home/PageHeader.razor
+++ b/Shogi.UI/Pages/Home/PageHeader.razor
@@ -5,10 +5,10 @@
     <h1>Shogi</h1>
     @if (user != null)
     {
-        <div class="user">
-            <div>@user.Value.DisplayName</div>
-            <button type="button" class="logout" @onclick="AccountManager.LogoutAsync">Logout</button>
-        </div>
+            <div class="user">
+                <div>@user.Value.DisplayName</div>
+                <button type="button" class="logout" @onclick="AccountManager.LogoutAsync">Logout</button>
+            </div>
     }
     @*<LoginDisplay />*@
 </div>
@@ -21,11 +21,12 @@
         Account.LoginChangedEvent += OnLoginChange;
     }
 
-    private void OnLoginChange(object? sender, LoginEventArgs args)
+    private Task OnLoginChange(LoginEventArgs args)
     {
         if (args == null)
             throw new ArgumentException(nameof(args));
         user = args.User;
         StateHasChanged();
+        return Task.CompletedTask;
     }
 }
diff --git a/Shogi.UI/Program.cs b/Shogi.UI/Program.cs
index 8c3f8c9..6a5d3a2 100644
--- a/Shogi.UI/Program.cs
+++ b/Shogi.UI/Program.cs
@@ -17,49 +17,55 @@ await builder.Build().RunAsync();
 
 static void ConfigureDependencies(IServiceCollection services, IConfiguration configuration)
 {
-	/**
+    /**
 	 * Why two HTTP clients?
 	 * See qhttps://docs.microsoft.com/en-us/aspnet/core/blazor/security/webassembly/additional-scenarios?source=recommendations&view=aspnetcore-6.0#unauthenticated-or-unauthorized-web-api-requests-in-an-app-with-a-secure-default-client
 	 */
-	var shogiApiUrl = new Uri(configuration["ShogiApiUrl"], UriKind.Absolute);
-	services
-		.AddHttpClient(ShogiApi.MsalClientName, client => client.BaseAddress = shogiApiUrl)
-		.AddHttpMessageHandler<MsalMessageHandler>();
-	services
-		.AddHttpClient(ShogiApi.GuestClientName, client => client.BaseAddress = shogiApiUrl)
-		.AddHttpMessageHandler<CookieCredentialsMessageHandler>();
+    var baseUrl = configuration["ShogiApiUrl"];
+    if (string.IsNullOrWhiteSpace(baseUrl))
+    {
+        throw new InvalidOperationException("ShogiApiUrl configuration is missing.");
+    }
 
-	// Authorization
-	services.AddMsalAuthentication(options =>
-	{
-		configuration.Bind("AzureAd", options.ProviderOptions.Authentication);
-		options.ProviderOptions.LoginMode = "redirect";
-	});
-	services.AddOidcAuthentication(options =>
-	{
-		// Configure your authentication provider options here.
-		// For more information, see https://aka.ms/blazor-standalone-auth
-		configuration.Bind("AzureAd", options.ProviderOptions);
-		options.ProviderOptions.ResponseType = "code";
-	});
+    var shogiApiUrl = new Uri(baseUrl, UriKind.Absolute);
+    services
+        .AddHttpClient(ShogiApi.MsalClientName, client => client.BaseAddress = shogiApiUrl)
+        .AddHttpMessageHandler<MsalMessageHandler>();
+    services
+        .AddHttpClient(ShogiApi.GuestClientName, client => client.BaseAddress = shogiApiUrl)
+        .AddHttpMessageHandler<CookieCredentialsMessageHandler>();
 
-	// https://docs.microsoft.com/en-us/aspnet/core/blazor/fundamentals/dependency-injection?view=aspnetcore-6.0#service-lifetime
-	services.AddScoped<ClientWebSocket>();
-	services.AddScoped<AccountManager>();
-	services.AddScoped<AccountState>();
-	services.AddScoped<ShogiSocket>();
-	services.AddScoped<ModalService>();
-	services.AddScoped<ILocalStorage, LocalStorage>();
-	services.AddScoped<MsalMessageHandler>();
-	services.AddScoped<CookieCredentialsMessageHandler>();
-	services.AddScoped<IShogiApi, ShogiApi>();
-	services.AddScoped<PromotePrompt>();
+    // Authorization
+    services.AddMsalAuthentication(options =>
+    {
+        configuration.Bind("AzureAd", options.ProviderOptions.Authentication);
+        options.ProviderOptions.LoginMode = "redirect";
+    });
+    services.AddOidcAuthentication(options =>
+    {
+        // Configure your authentication provider options here.
+        // For more information, see https://aka.ms/blazor-standalone-auth
+        configuration.Bind("AzureAd", options.ProviderOptions);
+        options.ProviderOptions.ResponseType = "code";
+    });
 
-	var serializerOptions = new JsonSerializerOptions
-	{
-		DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
-		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-		WriteIndented = true
-	};
-	services.AddScoped((sp) => serializerOptions);
+    // https://docs.microsoft.com/en-us/aspnet/core/blazor/fundamentals/dependency-injection?view=aspnetcore-6.0#service-lifetime
+    services.AddScoped<ClientWebSocket>();
+    services.AddScoped<AccountManager>();
+    services.AddScoped<AccountState>();
+    services.AddScoped<ShogiSocket>();
+    services.AddScoped<ModalService>();
+    services.AddScoped<ILocalStorage, LocalStorage>();
+    services.AddScoped<MsalMessageHandler>();
+    services.AddScoped<CookieCredentialsMessageHandler>();
+    services.AddScoped<IShogiApi, ShogiApi>();
+    services.AddScoped<PromotePrompt>();
+
+    var serializerOptions = new JsonSerializerOptions
+    {
+        DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        WriteIndented = true
+    };
+    services.AddScoped((sp) => serializerOptions);
 }
\ No newline at end of file
diff --git a/Shogi.UI/Shared/Events.cs b/Shogi.UI/Shared/Events.cs
new file mode 100644
index 0000000..1f1b93a
--- /dev/null
+++ b/Shogi.UI/Shared/Events.cs
@@ -0,0 +1,8 @@
+namespace Shogi.UI.Shared
+{
+    public static class Events
+    {
+        public delegate Task AsyncEventHandler();
+        public delegate Task AsyncEventHandler<TArgs>(TArgs args);
+    }
+}
diff --git a/Shogi.UI/Shared/LoginDisplay.razor b/Shogi.UI/Shared/LoginDisplay.razor
deleted file mode 100644
index 1f0d155..0000000
--- a/Shogi.UI/Shared/LoginDisplay.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@*@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.WebAssembly.Authentication*@
-
-@*@inject NavigationManager Navigation
-@inject SignOutSessionStateManager SignOutManager*@
-
-@*<AuthorizeView>
-    <Authorized>
-        Hello, @context.User.Identity?.Name!
-        <button class="nav-link btn btn-link" @onclick="BeginSignOut">Log out</button>
-    </Authorized>
-    <NotAuthorized>
-        <a href="authentication/login">Log in</a>
-    </NotAuthorized>
-</AuthorizeView>*@
-
-@code{
-    // https://docs.microsoft.com/en-us/aspnet/core/blazor/security/webassembly/additional-scenarios?view=aspnetcore-6.0#customize-the-authentication-user-interface
-    //private async Task BeginSignOut(MouseEventArgs args)
-    //{
-    //    await SignOutManager.SetSignOutState();
-    //    Navigation.NavigateTo("authentication/logout");
-    //}
-}
diff --git a/Shogi.UI/Shared/MyNotAuthorized.razor b/Shogi.UI/Shared/MyNotAuthorized.razor
deleted file mode 100644
index fe34ce9..0000000
--- a/Shogi.UI/Shared/MyNotAuthorized.razor
+++ /dev/null
@@ -1,5 +0,0 @@
-<h3>MyNotAuthorized</h3>
-
-@code {
-
-}
diff --git a/Shogi.UI/Shared/RedirectToLogin.razor b/Shogi.UI/Shared/RedirectToLogin.razor
deleted file mode 100644
index 8a7fa95..0000000
--- a/Shogi.UI/Shared/RedirectToLogin.razor
+++ /dev/null
@@ -1,14 +0,0 @@
-@inject NavigationManager Navigation
-@inject ModalService ModalService
-@inject AccountManager ShogiService
-
-@*<button @onclick="() => ShogiService.ConnectAsync(asGuest: true)">Guest Login</button>*@
-<div>Not implemented!</div>
-
-@code {
-    protected override void OnInitialized()
-    {
-        //ModalService.ShowLoginModal();
-        Navigation.NavigateTo($"authentication/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
-    }
-}
diff --git a/Shogi.UI/Shared/ShogiSocket.cs b/Shogi.UI/Shared/ShogiSocket.cs
index 4d1e911..ea01560 100644
--- a/Shogi.UI/Shared/ShogiSocket.cs
+++ b/Shogi.UI/Shared/ShogiSocket.cs
@@ -4,12 +4,15 @@ using Shogi.Contracts.Types;
 using System.Buffers;
 using System.Net.WebSockets;
 using System.Text.Json;
+using static Shogi.UI.Shared.Events;
 
 namespace Shogi.UI.Shared;
 
 public class ShogiSocket : IDisposable
 {
-    public event EventHandler<SessionCreatedSocketMessage>? OnCreateGameMessage;
+    public event AsyncEventHandler? OnSessionCreated;
+    public event AsyncEventHandler? OnSessionJoined;
+    public event AsyncEventHandler<PlayerHasMovedMessage>? OnPlayerMoved;
 
     private readonly ClientWebSocket socket;
     private readonly JsonSerializerOptions serializerOptions;
@@ -37,8 +40,11 @@ public class ShogiSocket : IDisposable
         await socket.ConnectAsync(this.uriBuilder.Uri, cancelToken.Token);
         Console.WriteLine("Socket Connected");
         // Fire and forget! I'm way too lazy to write my own javascript interop to a web worker. Nooo thanks.
-        var listening = Listen().ContinueWith(antecedent =>
+        _ = Listen().ContinueWith(async antecedent =>
         {
+            Console.WriteLine($"Socket fault. {antecedent.Exception}");
+            this.cancelToken.Cancel();
+            await this.socket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Page was probably closed or refresh.", CancellationToken.None);
             if (antecedent.Exception != null)
             {
                 throw antecedent.Exception;
@@ -58,16 +64,33 @@ public class ShogiSocket : IDisposable
               .GetProperty(nameof(ISocketResponse.Action))
               .Deserialize<SocketAction>();
 
+            Console.WriteLine($"Socket action: {action}");
             switch (action)
             {
                 case SocketAction.SessionCreated:
-                    Console.WriteLine("Session created event.");
-                    this.OnCreateGameMessage?.Invoke(this, JsonSerializer.Deserialize<SessionCreatedSocketMessage>(memory, this.serializerOptions)!);
+                    if (this.OnSessionCreated is not null)
+                    {
+                        await this.OnSessionCreated();
+                    }
+                    break;
+                case SocketAction.SessionJoined:
+                    if (this.OnSessionJoined is not null)
+                    {
+                        await this.OnSessionJoined();
+                    }
+                    break;
+                case SocketAction.PieceMoved:
+                    if (this.OnPlayerMoved is not null)
+                    {
+                        var args = JsonSerializer.Deserialize<PlayerHasMovedMessage>(memory[..result.Count], serializerOptions);
+                        await this.OnPlayerMoved(args!);
+                    }
                     break;
                 default:
-                    break;
+                    throw new NotImplementedException($"Socket message for action:{action} is not implemented.");
             }
         }
+        await socket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Socket closed because cancellation token was cancelled.", CancellationToken.None);
         if (!cancelToken.IsCancellationRequested)
         {
             throw new InvalidOperationException("Stopped socket listening without cancelling.");