diff --git a/PDGServer_WPF/App.xaml b/PDGServer_WPF/App.xaml
index 7124177..f4328e6 100644
--- a/PDGServer_WPF/App.xaml
+++ b/PDGServer_WPF/App.xaml
@@ -2,5 +2,5 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:RBG_Server"
-             StartupUri="MainWindow.xaml">
+             StartupUri="ConnectionPage.xaml">
 </Application>
diff --git a/PDGServer_WPF/App.xaml.cs b/PDGServer_WPF/App.xaml.cs
index 8d26332..3ad354f 100644
--- a/PDGServer_WPF/App.xaml.cs
+++ b/PDGServer_WPF/App.xaml.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
 
 namespace RBG_Server
 {
@@ -31,6 +32,13 @@ namespace RBG_Server
         public const string MIP_HIGH = "_mip_high";
         public const string MIP_RAW = "_mip_raw";
 
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            base.OnStartup(e);
+            Context = this;
+            GameCommunicationHandler = new CommunicationHandler();
+        }
+
         /// <summary>
         /// Loads the specified files from disk, creating mip maps as appropriate
         /// </summary>
@@ -121,7 +129,8 @@ namespace RBG_Server
                 BitmapImage bitmapImage = new();
                 bitmapImage.BeginInit();
                 bitmapImage.StreamSource = source;
-                bitmapImage.CacheOption = BitmapCacheOption.None;
+                bitmapImage.CreateOptions = BitmapCreateOptions.IgnoreColorProfile | BitmapCreateOptions.PreservePixelFormat;
+                bitmapImage.CacheOption = BitmapCacheOption.Default;
                 bitmapImage.EndInit();
                 int height = bitmapImage.PixelHeight;
                 int width = bitmapImage.PixelWidth;
@@ -194,15 +203,28 @@ namespace RBG_Server
                         GameCommunicationHandler.ImageCollection.Remove(GameCommunicationHandler.BoardName, out CachedByteArray val);
                         val.Dispose();
                     }
-                    GameCommunicationHandler.BoardName = path;
+                    GameCommunicationHandler.BoardName = Path.GetFileNameWithoutExtension(path);
                 }
-                GameCommunicationHandler.ImageList.Add(path);
+                GameCommunicationHandler.ImageList.Add(Path.GetFileNameWithoutExtension(path));
             }
         }
 
-        MemoryStream ScaleImage(BitmapSource source, double scaleRate)
+        static MemoryStream ScaleImage(BitmapSource source, double scaleRate)
         {
-            TransformedBitmap modified = new(source, new ScaleTransform(source.PixelWidth * scaleRate, source.PixelHeight * scaleRate));
+            TransformedBitmap modified = new();
+            try
+            {
+                ScaleTransform transform = new ScaleTransform(scaleRate, scaleRate);
+                modified.BeginInit();
+                modified.Source = source;
+                modified.Transform = transform;
+                modified.EndInit();
+                //modified = new(source, );
+            }
+            catch (Exception ex)
+            {
+                int op = 0;
+            }
             PngBitmapEncoder encoder = new();
             encoder.Frames.Add(BitmapFrame.Create(modified));
             MemoryStream ms = new();
@@ -210,7 +232,7 @@ namespace RBG_Server
             return ms;
         }
 
-        MemoryStream ScaleAnimatedImage(BitmapFrame[] frames, double scaleRate)
+        static MemoryStream ScaleAnimatedImage(BitmapFrame[] frames, double scaleRate)
         {
             PngBitmapEncoder encoder = new();
             foreach (BitmapFrame frame in frames)
diff --git a/PDGServer_WPF/ConnectionPage.xaml b/PDGServer_WPF/ConnectionPage.xaml
index e25e0ca..8cdcc8b 100644
--- a/PDGServer_WPF/ConnectionPage.xaml
+++ b/PDGServer_WPF/ConnectionPage.xaml
@@ -1,19 +1,17 @@
-<Page x:Class="RBG_Server_WPF.ConnectionPage"
+<Window x:Class="RBG_Server_WPF.ConnectionPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:RBG_Server_WPF"
-      mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
-      Title="ConnectionPage" MinWidth="1024" MinHeight="762">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="PDG Server" Height="768" Width="1024" Background="#FF4B4B4B">
 
-    <Grid x:Name="RootGrid" IsEnabled="False">
-        <StackPanel x:Name="ServerSelectPanel" HorizontalAlignment="Center" VerticalAlignment="Center" d:IsHidden="True" >
+    <Grid x:Name="RootGrid">
+        <StackPanel x:Name="ServerSelectPanel" HorizontalAlignment="Center" VerticalAlignment="Center" >
             <Button x:Name="HostButton" Content="Host a Game" Margin="0,0,0,5" Click="HostButton_Click"/>
             <Button x:Name="ConnectButton" Content="Connect to Server" Margin="0,5,0,0" Click="ConnectButton_Click"/>
         </StackPanel>
-        <Grid x:Name="ServerGrid">
+        <Grid x:Name="ServerGrid" d:IsHidden="True" Visibility="Collapsed">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition MaxWidth="400"/>
                 <ColumnDefinition/>
@@ -50,7 +48,7 @@
                 <Grid x:Name="PreviewImageOverlay" HorizontalAlignment="Center" VerticalAlignment="Center" Width="{Binding ActualWidth, ElementName=PreviewImage}" Height="{Binding ActualHeight, ElementName=PreviewImage}"/>
             </Grid>
         </Grid>
-        <Grid x:Name="ClientGrid" d:IsHidden="True">
+        <Grid x:Name="ClientGrid" d:IsHidden="True" Visibility="Collapsed">
             <StackPanel>
                 <Button x:Name="ClientBackButton" Content="Back" Margin="0,5,0,0" HorizontalAlignment="Center" Click="ClientBackButton_Click"/>
                 <TextBlock Text="Server Address:" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" HorizontalAlignment="Center"/>
@@ -70,4 +68,4 @@
 
 
     </Grid>
-</Page>
+</Window>
diff --git a/PDGServer_WPF/ConnectionPage.xaml.cs b/PDGServer_WPF/ConnectionPage.xaml.cs
index f337a10..a55ef65 100644
--- a/PDGServer_WPF/ConnectionPage.xaml.cs
+++ b/PDGServer_WPF/ConnectionPage.xaml.cs
@@ -24,7 +24,7 @@ namespace RBG_Server_WPF
     /// <summary>
     /// Interaction logic for ConnectionPage.xaml
     /// </summary>
-    public partial class ConnectionPage : Page
+    public partial class ConnectionPage : Window
     {
         public ConnectionPage()
         {
@@ -260,7 +260,9 @@ namespace RBG_Server_WPF
             if (ofd.ShowDialog() == true)
             {
                 ImageSourceTextBox.Text = ofd.FileName;
-                UpdateImage().Start();
+                
+                Task.Run(() => UpdateImage(ofd.FileName));
+                
             }
         }
         /// <summary>
@@ -270,34 +272,38 @@ namespace RBG_Server_WPF
         /// <param name="e"></param>
         private void ImageSourceTextBox_LostFocus(object sender, RoutedEventArgs e)
         {
-            UpdateImage().Start();
+            //UpdateImage().Start();
         }
 
-        private Task UpdateImage()
+        private void UpdateImage(string sourceFile)
         {
             try
             {
                 CommunicationHandler host = App.Context.GameCommunicationHandler;
-                using FileStream fs = File.OpenRead(ImageSourceTextBox.Text);
+                using FileStream fs = File.OpenRead(sourceFile);
                 using MemoryStream ms = new();
              
                 fs.CopyTo(ms);
                 // Calc mips
                 ms.Position = 0;
-                App.Context.LoadStream(ms, Name, false);
+                App.Context.LoadStream(ms, sourceFile, false);
                 ms.Position = 0;
-                BitmapImage gameBoardImage = new();
-                gameBoardImage.BeginInit();
-                gameBoardImage.StreamSource = ms;
-                gameBoardImage.EndInit();
-                PreviewImage.Source = gameBoardImage;
-                RedrawGrid();
+                
+                this.Dispatcher.Invoke(() => {
+                    BitmapImage gameBoardImage = new();
+                    gameBoardImage.BeginInit();
+                    gameBoardImage.StreamSource = ms;
+                    gameBoardImage.CacheOption = BitmapCacheOption.OnLoad;
+                    gameBoardImage.EndInit();
+                    PreviewImage.Source = gameBoardImage;
+                    RedrawGrid();
+                }, System.Windows.Threading.DispatcherPriority.Render);
+                
             }
             catch (Exception e)
             {
                 Console.WriteLine(e);
             }
-            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -371,10 +377,44 @@ namespace RBG_Server_WPF
                 }
             }
         }
+        private void GridVisibilityToggleButton_Click(object sender, RoutedEventArgs e)
+        {
+            PreviewImageOverlay.Visibility = PreviewImageOverlay.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        /// <summary>
+        /// Performs the logic required to start the server
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void StartServerButton_Click(object sender, RoutedEventArgs e)
+        {
+            CommunicationHandler host = App.Context.GameCommunicationHandler;
+            host.InitialiseServer((int)NumberOfRows.Value, (int)NumberOfColumns.Value, (int)ZoomBoxStartRow.Value, (int)ZoomBoxStartColumn.Value, (int)ZoomBoxSpan.Value, (int)ZoomBoxSpan.Value, (int)StartingRow.Value, (int)StartingColumn.Value);
+        }
+
 
 
         #endregion
 
+        private void Sliders_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
 
+        }
+
+        private void NumberOfRows_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+
+        }
+
+        private void DrawRandomizedPlayers_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void NumberOfColumns_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+
+        }
     }
 }
diff --git a/PDGServer_WPF/MainWindow.xaml b/PDGServer_WPF/MainWindow.xaml
index 2f568ef..be94ddc 100644
--- a/PDGServer_WPF/MainWindow.xaml
+++ b/PDGServer_WPF/MainWindow.xaml
@@ -11,36 +11,6 @@
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition MaxWidth="300"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <StackPanel>
-                <TextBlock Text="Game Board File Path" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,5,2,0"/>
-                <TextBox x:Name="ImageSourceTextBox" TextWrapping="Wrap" LostFocus="ImageSourceTextBox_LostFocus" Margin="2,5,2,0"/>
-                <Button x:Name="BrowseButton" Content="Browse" Click="BrowseButton_Click" Margin="10,5,10,0"/>
-                <TextBlock Text="Game Sprites Files" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <TextBox x:Name="ImageSourceTextBox_Copy" TextWrapping="Wrap" LostFocus="ImageSourceTextBox_LostFocus" Margin="2,5,2,0"/>
-                <Button x:Name="GameSpritesBrowser" Content="Browse" Click="GameSpritesBrowser_Click" Margin="10,5,10,0"/>
-                <TextBlock Text="Number of Rows" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <Slider x:Name="NumberOfRows" IsSnapToTickEnabled="True" Minimum="1" TickPlacement="BottomRight" AutoToolTipPlacement="BottomRight" ValueChanged="NumberOfRows_ValueChanged" Value="9" Margin="2,0,2,0"/>
-                <TextBlock Text="Number of Columns:" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <Slider x:Name="NumberOfColumns" IsSnapToTickEnabled="True" Minimum="1" TickPlacement="BottomRight" AutoToolTipPlacement="BottomRight" ValueChanged="NumberOfColumns_ValueChanged" Value="9" Margin="2,0,2,0"/>
-                <TextBlock Text="Starting Row" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <Slider x:Name="StartingRow" IsSnapToTickEnabled="True" Value="8" AutoToolTipPlacement="BottomRight" TickPlacement="BottomRight" ValueChanged="Sliders_ValueChanged" Maximum="9" Margin="2,0,2,0"/>
-                <TextBlock Text="Starting Column" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <Slider x:Name="StartingColumn" IsSnapToTickEnabled="True" AutoToolTipPlacement="BottomRight" TickPlacement="BottomRight" ValueChanged="Sliders_ValueChanged" Maximum="9" Margin="2,0,2,0"/>
-                <TextBlock Text="Zoom Box Starting Row" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <Slider x:Name="ZoomBoxStartRow" IsSnapToTickEnabled="True" AutoToolTipPlacement="BottomRight" TickPlacement="BottomRight" Value="3" ValueChanged="Sliders_ValueChanged" Maximum="9" Margin="2,0,2,0"/>
-                <TextBlock Text="Zoom Box Starting Column" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <Slider x:Name="ZoomBoxStartColumn" IsSnapToTickEnabled="True" AutoToolTipPlacement="BottomRight" TickPlacement="BottomRight" Value="3" ValueChanged="Sliders_ValueChanged" Maximum="9" Margin="2,0,2,0"/>
-                <TextBlock Text="Zoom Box Span" TextWrapping="Wrap" Padding="0,10,0,0" Foreground="White" Margin="2,0,2,0"/>
-                <Slider x:Name="ZoomBoxSpan" IsSnapToTickEnabled="True" AutoToolTipPlacement="BottomRight" TickPlacement="BottomRight" Value="3" ValueChanged="Sliders_ValueChanged" Minimum="1" Maximum="6" Margin="2,0,2,0"/>
-                <Button x:Name="GridVisibilityToggleButton" Content="Show/Hide Grid" Click="GridVisibilityToggleButton_Click" Margin="10,10,10,0"/>
-                <Button x:Name="StartServerButton" Content="Start Server" HorizontalAlignment="Stretch" Margin="10,25,10,0" Click="StartServerButton_Click" Background="#955FF17A" Foreground="White"/>
-                <Button x:Name="DrawRandomizedPlayers" Content="Draw Random Players" Margin="10,25,10,0" Click="DrawRandomizedPlayers_Click"/>
-                <UniformGrid x:Name="LoadedSprites" Columns="6" Margin="2,0,2,0" Rows="6" MinHeight="120" />
-            </StackPanel>
             <Border Grid.Column="1" BorderThickness="1,1,1,1" BorderBrush="DarkGray" Background="#19000000">
                 <Grid>
                     <Grid.RowDefinitions>
diff --git a/PDGServer_WPF/MainWindow.xaml.cs b/PDGServer_WPF/MainWindow.xaml.cs
index 7c274ae..60172ff 100644
--- a/PDGServer_WPF/MainWindow.xaml.cs
+++ b/PDGServer_WPF/MainWindow.xaml.cs
@@ -35,131 +35,51 @@ namespace RBG_Server.WPF
             InitializeComponent();
         }
 
-        /// <summary>
-        /// Browse for game board file button
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BrowseButton_Click(object sender, RoutedEventArgs e)
-        {
-            OpenFileDialog ofd = new();
-            ofd.Filter = "Image Files|*.png;*.jpg";
-            if (ofd.ShowDialog() == true)
-            {
-                ImageSourceTextBox.Text = ofd.FileName;
-                UpdateImage();
-            }
-        }
-
-        /// <summary>
-        /// Update the image when the text box looses focus
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ImageSourceTextBox_LostFocus(object sender, RoutedEventArgs e)
-        {
-            UpdateImage();
-        }
-
-        private void UpdateImage()
-        {
-            try
-            {
-                using FileStream fs = File.OpenRead(ImageSourceTextBox.Text);
-                using MemoryStream ms = new();
-                fs.CopyTo(ms); // Load into memory, so the server can also utilise the stream
-                gameBoard = ms.ToArray();
-
-                BitmapImage gameBoardImage = new();
-                gameBoardImage.BeginInit();
-                gameBoardImage.StreamSource = new MemoryStream(gameBoard, false);
-                //gameBoardImage.CacheOption = BitmapCacheOption.OnLoad; // Must preload the image into memory, before it is unloaded
-                gameBoardImage.EndInit();
-                PreviewImage.Source = gameBoardImage;
-                RedrawGrid();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
-        }
-        /// <summary>
-        /// Creates and starts the game server
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void StartServerButton_Click(object sender, RoutedEventArgs e)
-        {
-            gameServer = new((byte)StartingRow.Value, (byte)StartingColumn.Value, (byte)NumberOfRows.Value, (byte)NumberOfColumns.Value, (byte)ZoomBoxStartRow.Value, (byte)ZoomBoxStartColumn.Value, (byte)ZoomBoxSpan.Value, (byte)ZoomBoxSpan.Value, gameBoard);
-        }
-
-
-        private void NumberOfRows_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            if (IsInitialized)
-            {
-                StartingRow.Maximum = NumberOfRows.Value;
-                ZoomBoxStartRow.Maximum = NumberOfRows.Value;
-                ZoomBoxSpan.Maximum = Math.Min(NumberOfRows.Value - ZoomBoxStartRow.Value, NumberOfColumns.Value - ZoomBoxStartColumn.Value);
-                RedrawGrid();
-            }
-        }
-
-        private void NumberOfColumns_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            if (IsInitialized)
-            {
-                StartingColumn.Maximum = NumberOfColumns.Value;
-                ZoomBoxStartColumn.Maximum = NumberOfColumns.Value;
-                ZoomBoxSpan.Maximum = Math.Min(NumberOfRows.Value - ZoomBoxStartRow.Value, NumberOfColumns.Value - ZoomBoxStartColumn.Value);
-                RedrawGrid();
-            }
-        }
         /// <summary>
         /// Draws the overlay grid, clearing existing elements if necessary
         /// </summary>
-        private void RedrawGrid()
-        {
+        //private void RedrawGrid()
+        //{
             
-            PreviewImageOverlay.RowDefinitions.Clear();
-            PreviewImageOverlay.ColumnDefinitions.Clear();
-            PreviewImageOverlay.Children.Clear();
-            for (int i = 0; i < NumberOfColumns.Value; i++)
-            {
-                PreviewImageOverlay.ColumnDefinitions.Add(new ColumnDefinition());
-            }
-            for (int i = 0; i < NumberOfRows.Value; i++)
-            {
-                PreviewImageOverlay.RowDefinitions.Add(new RowDefinition());
-            }
-            // Draw the overlay
-            Rectangle overlay = new();
-            overlay.Fill = new SolidColorBrush(Color.FromArgb(128, 0, 128, 255));
-            _ = PreviewImageOverlay.Children.Add(overlay);
-            Grid.SetRow(overlay, (int)ZoomBoxStartRow.Value);
-            Grid.SetColumn(overlay, (int)ZoomBoxStartColumn.Value);
-            Grid.SetRowSpan(overlay, (int)ZoomBoxSpan.Value);
-            Grid.SetColumnSpan(overlay, (int)ZoomBoxSpan.Value);
-            // Draw the starting position
-            overlay = new();
-            overlay.Fill = new SolidColorBrush(Color.FromArgb(64, 0, 255, 128));
-            _ = PreviewImageOverlay.Children.Add(overlay);
-            Grid.SetRow(overlay, (int)StartingRow.Value);
-            Grid.SetColumn(overlay, (int)StartingColumn.Value);
-            // Draw grids onto the preview image
-            for (int v = 0; v < PreviewImageOverlay.RowDefinitions.Count; v++)
-            {
-                for (int u = 0; u < PreviewImageOverlay.ColumnDefinitions.Count; u++)
-                {
-                    Border border = new();
-                    border.BorderBrush = borderBrush;
-                    border.BorderThickness = new Thickness(2);
-                    _ = PreviewImageOverlay.Children.Add(border);
-                    Grid.SetRow(border, v);
-                    Grid.SetColumn(border, u);
-                }
-            }
-        }
+        //    PreviewImageOverlay.RowDefinitions.Clear();
+        //    PreviewImageOverlay.ColumnDefinitions.Clear();
+        //    PreviewImageOverlay.Children.Clear();
+        //    for (int i = 0; i < NumberOfColumns.Value; i++)
+        //    {
+        //        PreviewImageOverlay.ColumnDefinitions.Add(new ColumnDefinition());
+        //    }
+        //    for (int i = 0; i < NumberOfRows.Value; i++)
+        //    {
+        //        PreviewImageOverlay.RowDefinitions.Add(new RowDefinition());
+        //    }
+        //    // Draw the overlay
+        //    Rectangle overlay = new();
+        //    overlay.Fill = new SolidColorBrush(Color.FromArgb(128, 0, 128, 255));
+        //    _ = PreviewImageOverlay.Children.Add(overlay);
+        //    Grid.SetRow(overlay, (int)ZoomBoxStartRow.Value);
+        //    Grid.SetColumn(overlay, (int)ZoomBoxStartColumn.Value);
+        //    Grid.SetRowSpan(overlay, (int)ZoomBoxSpan.Value);
+        //    Grid.SetColumnSpan(overlay, (int)ZoomBoxSpan.Value);
+        //    // Draw the starting position
+        //    overlay = new();
+        //    overlay.Fill = new SolidColorBrush(Color.FromArgb(64, 0, 255, 128));
+        //    _ = PreviewImageOverlay.Children.Add(overlay);
+        //    Grid.SetRow(overlay, (int)StartingRow.Value);
+        //    Grid.SetColumn(overlay, (int)StartingColumn.Value);
+        //    // Draw grids onto the preview image
+        //    for (int v = 0; v < PreviewImageOverlay.RowDefinitions.Count; v++)
+        //    {
+        //        for (int u = 0; u < PreviewImageOverlay.ColumnDefinitions.Count; u++)
+        //        {
+        //            Border border = new();
+        //            border.BorderBrush = borderBrush;
+        //            border.BorderThickness = new Thickness(2);
+        //            _ = PreviewImageOverlay.Children.Add(border);
+        //            Grid.SetRow(border, v);
+        //            Grid.SetColumn(border, u);
+        //        }
+        //    }
+        //}
 
         /// <summary>
         /// Generates the game board overlay grid
@@ -246,182 +166,7 @@ namespace RBG_Server.WPF
             {
                 //throw new NotImplementedException();
             }
-        }        
-
-        private void Sliders_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            if (IsInitialized)
-            {
-                RedrawGrid();
-            }
-        }
-
-        private void GridVisibilityToggleButton_Click(object sender, RoutedEventArgs e)
-        {
-            PreviewImageOverlay.Visibility = PreviewImageOverlay.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
-        }
-
-        private static readonly string[] sprites = new string[]
-        {
-            "01.png",
-            "02.png",
-            "03.png",
-            "04.png",
-        };
-        private void DrawRandomizedPlayers_Click(object sender, RoutedEventArgs e)
-        {
-            List<Player> randPlayers = new();
-            Random rand = new();
-            int count = rand.Next(1, 10);
-            for (int i = 0; i < count; i++)
-            {
-                // Create a new player at a random location
-                Player p = new("Player " + i, rand.Next(0, PreviewImageOverlay.RowDefinitions.Count), rand.Next(PreviewImageOverlay.ColumnDefinitions.Count));
-                // Load the sprite
-                string[] keys = new string[loadedSprites.Count];
-                loadedSprites.Keys.CopyTo(keys, 0);
-                string key = keys[rand.Next(keys.Length)];
-                if (key.ToLower().EndsWith(".gif"))
-                {
-                    try
-                    {
-                        AnimatedBitmapImage animatedBitmap = new(new MemoryStream(loadedSprites[key], false), p.PlayerSprite, Application.Current.Dispatcher);
-                    }
-                    catch
-                    {
-                        BitmapSource pSprite;
-                        {
-                            // Scope & create the base data for pSprite
-                            BitmapImage src = new();
-                            src.BeginInit();
-                            
-                            src.StreamSource = new MemoryStream(loadedSprites[key],false);
-                            src.EndInit();
-                            pSprite = src;
-                        }
-                        // Recolour:
-                        if (rand.Next(1, 4) == 1)
-                        {
-                            pSprite = ImageProcessing.UpdatePixelColours(pSprite, 0.0, 0.0, 1.0);
-                        }
-                        p.PlayerSprite.Source = pSprite;
-
-                    }
-                }
-                else
-                {
-                    BitmapSource pSprite;
-                    {
-                        // Scope & create the base data for pSprite
-                        BitmapImage src = new();
-                        src.BeginInit();
-                        src.StreamSource = new MemoryStream(loadedSprites[key], false);
-                        src.EndInit();
-                        pSprite = src;
-                    }
-                    // Recolour:
-                    if (rand.Next(1, 4) == 1)
-                    {
-                        pSprite = ImageProcessing.UpdatePixelColours(pSprite, 0.0, 0.0, 1.0);
-                    }
-                    p.PlayerSprite.Source = pSprite;
-                }
-                
-                randPlayers.Add(p);
-            }
-
-            GenerateGameBoard(randPlayers);
-        }
-
-        ConcurrentDictionary<string, byte[]> loadedSprites = new();
-        Task loadingFiles;
-
-        private void GameSpritesBrowser_Click(object sender, RoutedEventArgs e)
-        {
-            OpenFileDialog ofd = new();
-            ofd.Filter = "Image Files|*.png;*.jpg;*.gif";
-            ofd.Multiselect = true;
-            if (ofd.ShowDialog() == true)
-            {
-                string[] resultFiles = ofd.FileNames;
-                loadedSprites.Clear();
-                // Run the following work in a separate thread
-                loadingFiles = Task.Run(() =>
-                {
-                    // Continue in parallel
-                    _ = Parallel.ForEach(resultFiles, (file) =>
-                    {
-                        MemoryStream ms = new();
-                        using FileStream fs = File.OpenRead(file);
-
-                        if (new FileInfo(file).Length > 512e6) // greater than 512 kB; resize the sprite to something more reasonable
-                        {
-                            BitmapImage gameBoardImage = new();
-                            gameBoardImage.BeginInit();
-                            gameBoardImage.StreamSource = fs;
-                            gameBoardImage.CacheOption = BitmapCacheOption.Default;
-                            gameBoardImage.EndInit();
-                            double vRate = 128 / (double)gameBoardImage.PixelHeight; // Resize so the largest dimension is 128 px
-                            double hRate = 128 / (double)gameBoardImage.PixelWidth;
-                            TransformedBitmap modified = new(gameBoardImage, new ScaleTransform(gameBoardImage.PixelWidth * Math.Min(vRate, hRate), gameBoardImage.PixelHeight * Math.Min(vRate, hRate)));
-                            PngBitmapEncoder encoder = new();
-                            encoder.Frames.Add(BitmapFrame.Create(modified));
-                            encoder.Save(ms);
-                        }
-                        else
-                        {
-                            fs.CopyTo(ms);
-                        }
-                        _ = loadedSprites.TryAdd(file, ms.ToArray());
-                    });
-                    // Invoke the dispatcher to add all of the sprites to the loaded sprites list
-                    _ = Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Render, new Action(() =>
-                     {
-                         LoadedSprites.Children.Clear();
-                         foreach (KeyValuePair<string, byte[]> item in loadedSprites)
-                         {
-                             if (item.Key.ToLower().EndsWith(".gif"))
-                             {
-                                 try
-                                 {
-                                     Image spriteImage = new();
-                                     // Generate the animatedBitmap
-                                     RBG.Helpers.AnimatedBitmapImage animatedBitmap = new(new MemoryStream(item.Value, false), spriteImage, Application.Current.Dispatcher);
-                                     _ = LoadedSprites.Children.Add(spriteImage);
-                                 }
-                                 catch
-                                 {
-                                     // On failed, use the cached data
-                                     BitmapImage image = new();
-                                     image.BeginInit();
-                                     image.StreamSource = new MemoryStream(item.Value, false);
-                                     image.EndInit();
-                                     Image spriteImage = new()
-                                     {
-                                         Source = image
-                                     };
-                                     _ = LoadedSprites.Children.Add(spriteImage);
-
-                                 }
-                             }
-                             else
-                             {
-                                 
-                                 BitmapImage image = new();
-                                 image.BeginInit();
-                                 image.StreamSource = new MemoryStream(item.Value, false);
-                                 image.EndInit();
-                                 Image spriteImage = new()
-                                 {
-                                     Source = image
-                                 };
-                                 _ = LoadedSprites.Children.Add(spriteImage);
-                             }
-                         }
-                     }));
-                });
-            }
-        }
+        }                
     }
 
 }
diff --git a/RBG_Server.Core/CachedByteArray.cs b/RBG_Server.Core/CachedByteArray.cs
index ca9090d..fbd7304 100644
--- a/RBG_Server.Core/CachedByteArray.cs
+++ b/RBG_Server.Core/CachedByteArray.cs
@@ -25,6 +25,14 @@ namespace RBG_Server
         private static int memoryLimit = 1024 * 1024 * 1; // Start with a memory limit of 1 MB
 
         private static readonly string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Remote Board Game\\Cache Objects");
+
+        /// <summary>
+        /// Ensure the folder path exists
+        /// </summary>
+        static CachedByteArray()
+        {
+            Directory.CreateDirectory(folderPath);
+        }
         // static properties
         public static long MemoryAllocationRAM { get { return memoryAllocationRAM; } }
         public static long MemoryAllocationTotal { get { return memoryAllocationTotal; } }
diff --git a/RBG_Server.Core/CommunicationHandler.cs b/RBG_Server.Core/CommunicationHandler.cs
index a8963b1..5191933 100644
--- a/RBG_Server.Core/CommunicationHandler.cs
+++ b/RBG_Server.Core/CommunicationHandler.cs
@@ -61,7 +61,7 @@ namespace RBG_Server
 
         public int StartingRow { get;private set; }
 
-        public void InitialiseServer()
+        public void InitialiseServer(int rowCount, int colCount, int zoomRowStart, int zoomColStart, int zoomRowSpan, int zoomColSpan, int startingRow, int startingColumn)
         {
             // Find the server's active (reliable) network adapter, by creating a remote connection and retrieving our IP from it:
             using (Socket s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp))
diff --git a/RBG_Server.Core/GameServer.cs b/RBG_Server.Core/GameServer.cs
index 991dd3b..f32b88b 100644
--- a/RBG_Server.Core/GameServer.cs
+++ b/RBG_Server.Core/GameServer.cs
@@ -208,7 +208,7 @@ namespace RBG_Server
                 {
                     // TODO:
                     // Check that the player isn't reconnecting
-                    Player newPlayer = new("<loading>", startRow, startColumn);
+                    Player newPlayer = new("<loading>", "", Array.Empty<byte>(), startRow, startColumn);
                     Players.Add(newPlayer);
                     clients.Add(poppedClient, newPlayer);
                     Console.WriteLine("New player added.");