diff --git a/AMQPserver.cs b/AMQPserver.cs
index ee83a3e..5bd439b 100644
--- a/AMQPserver.cs
+++ b/AMQPserver.cs
@@ -7,7 +7,7 @@
 using ProtoBuf;
 using redhatgamedev.srt.v1;
 
-public class AMQPserver : Node
+public partial class AMQPserver : Node
 {
   public Serilog.Core.Logger _serilogger;
 
diff --git a/Assets/Fonts/RedHatDisplay-Bold.ttf.import b/Assets/Fonts/RedHatDisplay-Bold.ttf.import
new file mode 100644
index 0000000..76fb01c
--- /dev/null
+++ b/Assets/Fonts/RedHatDisplay-Bold.ttf.import
@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://ddlj3n66imcl8"
+path="res://.godot/imported/RedHatDisplay-Bold.ttf-e1dcbec6b90d2c43121204c0d1c08eca.fontdata"
+
+[deps]
+
+source_file="res://Assets/Fonts/RedHatDisplay-Bold.ttf"
+dest_files=["res://.godot/imported/RedHatDisplay-Bold.ttf-e1dcbec6b90d2c43121204c0d1c08eca.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}
diff --git a/Assets/Fonts/RedHatText-Italic.ttf.import b/Assets/Fonts/RedHatText-Italic.ttf.import
new file mode 100644
index 0000000..0df7536
--- /dev/null
+++ b/Assets/Fonts/RedHatText-Italic.ttf.import
@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://bjs422uhj0nlv"
+path="res://.godot/imported/RedHatText-Italic.ttf-5442a7b92e90f81dfa98b0f90cbbf3fd.fontdata"
+
+[deps]
+
+source_file="res://Assets/Fonts/RedHatText-Italic.ttf"
+dest_files=["res://.godot/imported/RedHatText-Italic.ttf-5442a7b92e90f81dfa98b0f90cbbf3fd.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}
diff --git a/Assets/Fonts/RedHatText-Regular.ttf.import b/Assets/Fonts/RedHatText-Regular.ttf.import
new file mode 100644
index 0000000..1e2c7de
--- /dev/null
+++ b/Assets/Fonts/RedHatText-Regular.ttf.import
@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://c4x2m5t0ax0nk"
+path="res://.godot/imported/RedHatText-Regular.ttf-26d51c6f384dae5a588f82cd577f5d85.fontdata"
+
+[deps]
+
+source_file="res://Assets/Fonts/RedHatText-Regular.ttf"
+dest_files=["res://.godot/imported/RedHatText-Regular.ttf-26d51c6f384dae5a588f82cd577f5d85.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}
diff --git a/CSLogger.cs b/CSLogger.cs
index 8117a6c..f76495e 100644
--- a/CSLogger.cs
+++ b/CSLogger.cs
@@ -2,7 +2,7 @@
 using Godot;
 using System;
 
-public class CSLogger : Node
+public partial class CSLogger : Node
 {
   Node gdlogger;
   
diff --git a/Player.tscn b/Player.tscn
index c2f6c4c..a96285e 100644
--- a/Player.tscn
+++ b/Player.tscn
@@ -1,95 +1,71 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://vmssqp0t7y7w"]
 
-[ext_resource path="res://images/ship.png" type="Texture" id=1]
-[ext_resource path="res://PlayerShip.cs" type="Script" id=2]
+[ext_resource type="Texture2D" uid="uid://dttvdirodvjq7" path="res://images/ship.png" id="1"]
+[ext_resource type="Script" path="res://PlayerShip.cs" id="2"]
 
-[sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 39.5, 41.5 )
+[sub_resource type="RectangleShape2D" id="1"]
+size = Vector2(39.5, 41.5)
 
 [node name="ShipThings" type="Area2D"]
 
 [node name="ClickBox" type="CollisionShape2D" parent="."]
-position = Vector2( -0.5, 6.5 )
-shape = SubResource( 1 )
+position = Vector2(-0.5, 6.5)
+shape = SubResource("1")
 
 [node name="Stat" type="Node2D" parent="."]
 
 [node name="IDLabel" type="Label" parent="Stat"]
-margin_left = -35.0
-margin_top = 28.0
-margin_right = 35.0
-margin_bottom = 42.0
+offset_left = -35.0
+offset_top = 28.0
+offset_right = 35.0
+offset_bottom = 42.0
 grow_horizontal = 2
 text = "UUIDUUID"
-align = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="LinearVelocity" type="Label" parent="Stat"]
-margin_left = -33.0
-margin_top = 41.0
-margin_right = 33.0
-margin_bottom = 55.0
+offset_left = -33.0
+offset_top = 41.0
+offset_right = 33.0
+offset_bottom = 55.0
 text = "LinVel"
-align = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="AngularVelocity" type="Label" parent="Stat"]
-margin_left = -33.0
-margin_top = 53.0
-margin_right = 33.0
-margin_bottom = 67.0
+offset_left = -33.0
+offset_top = 53.0
+offset_right = 33.0
+offset_bottom = 67.0
 text = "AngVel"
-align = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="HitPoints" type="Label" parent="Stat"]
-margin_left = -33.0
-margin_top = 68.0
-margin_right = 33.0
-margin_bottom = 82.0
+offset_left = -33.0
+offset_top = 68.0
+offset_right = 33.0
+offset_bottom = 82.0
 text = "HP"
-align = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Position" type="Label" parent="Stat"]
-margin_left = -33.0
-margin_top = 81.0
-margin_right = 33.0
-margin_bottom = 95.0
+offset_left = -33.0
+offset_top = 81.0
+offset_right = 33.0
+offset_bottom = 95.0
 text = "Position"
-align = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Hex" type="Label" parent="Stat"]
-margin_left = -33.0
-margin_top = 93.0
-margin_right = 33.0
-margin_bottom = 107.0
+offset_left = -33.0
+offset_top = 93.0
+offset_right = 33.0
+offset_bottom = 107.0
 text = "MyHex"
-align = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
-[node name="PlayerShip" type="KinematicBody2D" parent="."]
-script = ExtResource( 2 )
+[node name="PlayerShip" type="CharacterBody2D" parent="."]
+script = ExtResource("2")
 
-[node name="Sprite" type="Sprite" parent="PlayerShip"]
-scale = Vector2( 0.25, 0.25 )
-texture = ExtResource( 1 )
+[node name="Sprite2D" type="Sprite2D" parent="PlayerShip"]
+scale = Vector2(0.25, 0.25)
+texture = ExtResource("1")
 
 [node name="ShipHitBox" type="CollisionPolygon2D" parent="PlayerShip"]
-polygon = PoolVector2Array( -5, -31, 5, -31, 11, -10, 16, 5, 26, 10, 29, 28, -17, 28, -28, 28, -28, 15, -25, 10, -16, 4 )
+polygon = PackedVector2Array(-5, -31, 5, -31, 11, -10, 16, 5, 26, 10, 29, 28, -17, 28, -28, 28, -28, 15, -25, 10, -16, 4)
 
 [node name="RemoteTransform2D" type="RemoteTransform2D" parent="PlayerShip"]
 remote_path = NodePath("../../Stat")
diff --git a/PlayerShip.cs b/PlayerShip.cs
index f903b1a..28de11d 100644
--- a/PlayerShip.cs
+++ b/PlayerShip.cs
@@ -1,29 +1,31 @@
 using Godot;
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using redhatgamedev.srt.v1;
 
-public class PlayerShip : KinematicBody2D
+public partial class PlayerShip : CharacterBody2D
 {
   public Serilog.Core.Logger _serilogger;
 
-  public float Thrust = 1f; // effective acceleration
+  public double Thrust = 1f; // effective acceleration
 
-  public float MaxSpeed = 5;
+  public double MaxSpeed = 5;
 
-  public float StopThreshold = 10f;
+  public double StopThreshold = 10f;
 
-  public float GoThreshold = 90f;
+  public double GoThreshold = 90f;
   
-  public float CurrentVelocity = 0;
+  public double CurrentVelocity = 0;
 
-  public float RotationThrust = 1.5f;
+  public double RotationThrust = 1.5f;
 
-  public float CurrentRotation = 0;
+  public double CurrentRotation = 0;
 
   public int HitPoints = 100;
 
-  public Queue MovementQueue = new Queue();
+  public ConcurrentQueue<Vector2> MovementQueue = new ConcurrentQueue<Vector2>();
 
   public String uuid;
 
@@ -41,16 +43,18 @@ public class PlayerShip : KinematicBody2D
   // relevant when two players are very close to one another and
   // prevents missile spamming
   float MissileReloadTime = 2;
-  float MissileReloadCountdown;
+  double MissileReloadCountdown;
   bool MissileReady = true;
 
   public int MissileDamage = 25;
 
   Node2D shipThing = null;
 
+  CollisionShape2D clickBox = null;
+
   Layout theLayout;
 
-  PackedScene MissileScene = (PackedScene)ResourceLoader.Load("res://SpaceMissile.tscn");
+  PackedScene MissilePackedScene = (PackedScene)ResourceLoader.Load("res://SpaceMissile.tscn");
 
   bool QueuedForRemoval = false; // used when this player is about to be removed from play
 
@@ -65,7 +69,7 @@ public class PlayerShip : KinematicBody2D
 
   // used by the debug UI to show which player has the camera focus
   public bool isFocused = false;
-  Sprite shipSprite;
+  Sprite2D shipSprite;
 
   public GameEvent.GameObject CreatePlayerGameObjectBuffer()
   {
@@ -76,14 +80,14 @@ public GameEvent.GameObject CreatePlayerGameObjectBuffer()
     gameObject.Uuid = uuid;
 
     // TODO: only send if changed?
-    gameObject.PositionX = (int)GlobalPosition.x;
-    gameObject.PositionY = (int)GlobalPosition.y;
+    gameObject.PositionX = (int)GlobalPosition.X;
+    gameObject.PositionY = (int)GlobalPosition.Y;
 
     // TODO: only send if changed?
     gameObject.Angle = RotationDegrees;
 
     // need to send the velocity because that's how the client shows the speedometer
-    gameObject.AbsoluteVelocity = CurrentVelocity;
+    gameObject.AbsoluteVelocity = (float)CurrentVelocity;
     
     // TODO: only send this if it's a change from previous?
     gameObject.HitPoints = HitPoints;
@@ -114,7 +118,8 @@ public void FireMissile(string missileUUID = null)
       return;
     }
 
-    MyMissile = (SpaceMissile)MissileScene.Instance();
+    Node missileNode = MissilePackedScene.Instantiate();
+    MyMissile = (SpaceMissile)missileNode;
 
     // TODO: need to check for UUID collision
     _serilogger.Debug($"PlayerShip.cs: Supplied UUID is {missileUUID}");
@@ -169,11 +174,13 @@ public override void _Ready()
     Node2D shipThing = (Node2D)GetParent();
     Label playerIDLabel = (Label)shipThing.GetNode("Stat/IDLabel");
 
+    clickBox = shipThing.GetNode<CollisionShape2D>("ClickBox");
+
     // TODO: deal with really long UUIDs
     playerIDLabel.Text = uuid;
 
     myCamera = GetNode<Camera2D>("Camera2D");
-    shipSprite = GetNode<Sprite>("Sprite");
+    shipSprite = GetNode<Sprite2D>("Sprite2D");
 
     // TODO: we are doing instant rotation so probably should rename this
     angularVelocityLabel = (Label)shipThing.GetNode("Stat/AngularVelocity");
@@ -205,7 +212,7 @@ void RemovePlayer()
     MyServer.PlayerRemoveQueue.Enqueue(uuid);
   }
 
-  void CheckMissileReload(float delta)
+  void CheckMissileReload(double delta)
   {
     // nothing to check if we are already reloaded
     if (MissileReady == true) { return; }
@@ -224,7 +231,7 @@ public void UpdateFocused()
     else shipSprite.Modulate = new Color(1,1,1,1);
   }
 
-  public override void _Process(float delta)
+  public override void _Process(double delta)
   {
 
     if (QueuedForRemoval) return;
@@ -232,33 +239,36 @@ public override void _Process(float delta)
     if (shipThing == null) shipThing = (Node2D)GetParent();
 
     // figure out the hex from the pixel position
-    FractionalHex theHex = theLayout.PixelToHex(new Point(GlobalPosition.x, GlobalPosition.y));
+    FractionalHex theHex = theLayout.PixelToHex(new Point(GlobalPosition.X, GlobalPosition.Y));
     hexLabel.Text = $"q: {theHex.HexRound().q}, r: {theHex.HexRound().r}, s: {theHex.HexRound().s}";
 
     angularVelocityLabel.Text = $"Rot: {RotationDegrees}";
     linearVelocityLabel.Text = $"Vel: {CurrentVelocity}";
     hitPointsLabel.Text = $"HP: {HitPoints}";
-    positionLabel.Text = $"X: {GlobalPosition.x} Y: {GlobalPosition.y}";
+    positionLabel.Text = $"X: {GlobalPosition.X} Y: {GlobalPosition.Y}";
+
+    // reposition the click box to be located where the ship thing is
+    clickBox.Position = GlobalPosition;
 
     CheckMissileReload(delta);
     UpdateFocused();
   }
-  public override void _PhysicsProcess(float delta)
+  public override void _PhysicsProcess(double delta)
   {
     if (shipThing == null) shipThing = (Node2D)GetParent();
 
     // somewhat based on: https://kidscancode.org/godot_recipes/2d/topdown_movement/
     // "rotate and move" / asteroids-style-ish
 
-    float rotation_dir = 0; // in case we need it
+    double rotation_dir = 0; // in case we need it
 
     _serilogger.Verbose($"{uuid}: handling physics");
-    if (MovementQueue.Count > 0)
+    Vector2 thisMovement = Vector2.Zero;
+    if (MovementQueue.TryDequeue(out thisMovement))
     {
-      Vector2 thisMovement = (Vector2)MovementQueue.Dequeue();
-      _serilogger.Verbose($"UUID: {uuid} X: {thisMovement.x} Y: {thisMovement.y}");
+      _serilogger.Verbose($"UUID: {uuid} X: {thisMovement.X} Y: {thisMovement.Y}");
 
-      if (thisMovement.y > 0)
+      if (thisMovement.Y > 0)
       {
         CurrentVelocity = Mathf.Lerp(CurrentVelocity, MaxSpeed, Thrust * delta);
 
@@ -266,7 +276,7 @@ public override void _PhysicsProcess(float delta)
         if (CurrentVelocity > MaxSpeed * (GoThreshold/100)) { CurrentVelocity = MaxSpeed; }
       }
 
-      if (thisMovement.y < 0)
+      if (thisMovement.Y < 0)
       {
         CurrentVelocity = Mathf.Lerp(CurrentVelocity, 0, Thrust * delta);
 
@@ -275,17 +285,17 @@ public override void _PhysicsProcess(float delta)
         if (CurrentVelocity < MaxSpeed * (StopThreshold/100)) { CurrentVelocity = 0; }
       }
 
-      if (thisMovement.x != 0)
+      if (thisMovement.X != 0)
       {
-        rotation_dir = thisMovement.x;
+        rotation_dir = thisMovement.X;
       }
 
       _serilogger.Verbose($"UUID: {uuid} Velocity: {CurrentVelocity}");
-
     }
-    Vector2 velocity =  -(Transform.y * CurrentVelocity);
-    _serilogger.Verbose($"UUID: {uuid} Vector X: {velocity.x} Y: {velocity.y} ");
-    Rotation += rotation_dir * RotationThrust * delta;
+    
+    Vector2 velocity =  -(Transform.Y * (float)CurrentVelocity);
+    _serilogger.Verbose($"UUID: {uuid} Vector X: {velocity.X} Y: {velocity.Y} ");
+    Rotation += (float)(rotation_dir * RotationThrust * delta);
 
     // TODO: implement collision mechanics
     MoveAndCollide(velocity);
diff --git a/Sector.cs b/Sector.cs
index bb0ae3b..14ca064 100644
--- a/Sector.cs
+++ b/Sector.cs
@@ -1,14 +1,14 @@
 using Godot;
 using System;
 
-public class Sector : Node2D
+public partial class Sector : Node2D
 {
   public string SectorLabel = "x,x";
 
   // Called when the node enters the scene tree for the first time.
   public override void _Ready()
   {
-    GetNode<Label>("SectorLabel").Text = SectorLabel;
+      
   }
 
   //  // Called every frame. 'delta' is the elapsed time since the previous frame.
diff --git a/Sector.tscn b/Sector.tscn
index 6cdf2c7..0344978 100644
--- a/Sector.tscn
+++ b/Sector.tscn
@@ -1,22 +1,20 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3 uid="uid://dr6845m2q6sei"]
 
-[ext_resource path="res://Sector.cs" type="Script" id=1]
-[ext_resource path="res://sector.tres" type="Theme" id=2]
+[ext_resource type="Script" path="res://Sector.cs" id="1"]
+[ext_resource type="Theme" uid="uid://bm4b06d4ipm51" path="res://sector.tres" id="2"]
 
 [node name="Sector" type="Node2D"]
-script = ExtResource( 1 )
+script = ExtResource("1")
 
 [node name="SectorPolygon" type="Polygon2D" parent="."]
-color = Color( 1, 1, 1, 0.27451 )
-polygon = PoolVector2Array( -12.5, 21.6506, 12.5, 21.6506, 25, 0, 12.5, -21.6506, -12.5, -21.6506, -25, 0 )
+color = Color(1, 1, 1, 0.27451)
+polygon = PackedVector2Array(-12.5, 21.6506, 12.5, 21.6506, 25, 0, 12.5, -21.6506, -12.5, -21.6506, -25, 0)
 
 [node name="SectorLabel" type="Label" parent="."]
-margin_left = -16.0
-margin_top = -18.0
-margin_right = 64.0
-margin_bottom = 63.0
-rect_scale = Vector2( 0.4, 0.4 )
-theme = ExtResource( 2 )
-text = "x,x"
-align = 1
-valign = 1
+offset_left = -16.0
+offset_top = -18.0
+offset_right = 64.0
+offset_bottom = 63.0
+scale = Vector2(12, 12)
+theme = ExtResource("2")
+text = "0,0"
diff --git a/Server.cs b/Server.cs
index 6163be1..28d36be 100644
--- a/Server.cs
+++ b/Server.cs
@@ -6,10 +6,10 @@
 using redhatgamedev.srt.v1;
 using Serilog;
 
-public class Server : Node
+public partial class Server : Node
 {
   int DebugUIRefreshTime = 1; // 1000ms = 1sec
-  float DebugUIRefreshTimer = 0;
+  double DebugUIRefreshTimer = 0.0f;
 
   Random rnd = new Random();
 
@@ -20,7 +20,7 @@ public class Server : Node
   AMQPserver MessageInterface;
 
   [Export]
-  Dictionary<String, Node2D> playerObjects = new Dictionary<string, Node2D>();
+  Godot.Collections.Dictionary<String, Node2D> playerObjects = new Godot.Collections.Dictionary<string, Node2D>();
 
   // the "width" of a hex is 2 * size
   [Export]
@@ -37,13 +37,15 @@ public class Server : Node
   // the sector map will only store the number of players in each sector
   // it only gets updated when a new player joins
   [Export]
-  Dictionary<String, int> sectorMap = new Dictionary<string, int>();
+  Godot.Collections.Dictionary<String, int> sectorMap = new Godot.Collections.Dictionary<string, int>();
 
   [Export]
-  Dictionary<String, Node2D> sectorNodes = new Dictionary<String, Node2D>();
+  Godot.Collections.Dictionary<String, Node2D> sectorNodes = new Godot.Collections.Dictionary<String, Node2D>();
 
   [Export]
   public Int32 StarFieldRadiusPixels;
+  public Int32 PreviousStarFieldRadiusPixels = 1600;
+  private float NewStarFieldRadiusRatio = 1.0f;
 
   // The starfield's center may shift during play at small ring sizes due to the
   // way that sectors are added
@@ -83,8 +85,8 @@ public class Server : Node
   /* END PLAYER DEFAULTS AND CONFIG */
 
   // SCENE PRELOADS
-  PackedScene PlayerShipThing = (PackedScene)ResourceLoader.Load("res://Player.tscn");
-  PackedScene aSector = (PackedScene)ResourceLoader.Load("res://Sector.tscn");
+  PackedScene PlayerPackedScene = (PackedScene)ResourceLoader.Load("res://Player.tscn");
+  PackedScene SectorPackedScene = (PackedScene)ResourceLoader.Load("res://Sector.tscn");
 
   // END SCENE PRELOADS
 
@@ -143,8 +145,8 @@ void SendGameUpdates()
     updateEvent.Sequence = sequenceNumber;
     updateEvent.game_event_type = GameEvent.GameEventType.GameEventTypeUpdate;
 
-    Godot.Collections.Array players = _GetNodesFromGroup("player_ships");
-    Godot.Collections.Array missiles = GetTree().GetNodesInGroup("missiles");
+    Godot.Collections.Array<Node> players = _GetNodesFromGroup("player_ships");
+    Godot.Collections.Array<Node> missiles = GetTree().GetNodesInGroup("missiles");
 
     if (players.Count == 0 && missiles.Count == 0)
     {
@@ -195,7 +197,8 @@ public void RemovePlayer(String UUID)
   {
     _serilogger.Debug($"Server.cs: Removing player: {UUID}");
     Node2D thePlayerToRemove = playerObjects[UUID];
-    PlayerShip thePlayer = thePlayerToRemove.GetNode<PlayerShip>("PlayerShip");
+    PlayerShip thePlayer = (PlayerShip)thePlayerToRemove;
+    Node thePlayerParent = thePlayer.GetParent();
 
     // create the buffer for the specific player and send it
     GameEvent gameEvent = new GameEvent();
@@ -206,7 +209,7 @@ public void RemovePlayer(String UUID)
 
     // TODO: should this get wrapped with a try or something?
     playerObjects.Remove(UUID);
-    thePlayerToRemove.QueueFree();
+    thePlayerParent.QueueFree();
 
     // send the player create event message
     MessageInterface.SendGameEvent(gameEvent);
@@ -298,7 +301,7 @@ void UpdateSectorMap()
     _serilogger.Debug($"Server.cs: Updating sector map");
 
     // delete all of the drawn sectors unless there's no players
-    Godot.Collections.Array players = _GetNodesFromGroup("player_ships");
+    Godot.Collections.Array<Node> players = _GetNodesFromGroup("player_ships");
     if (players.Count != 0) {
       _serilogger.Debug($"Server.cs: There are players in the player_ships group, so clearing the sector nodes");
       sectorNodes.Clear();
@@ -312,7 +315,7 @@ void UpdateSectorMap()
     foreach (PlayerShip player in players)
     {
       _serilogger.Debug($"Server.cs: Checking where {player.uuid} is in sector map");
-      FractionalHex theHex = HexLayout.PixelToHex(new Point(player.GlobalPosition.x, player.GlobalPosition.y));
+      FractionalHex theHex = HexLayout.PixelToHex(new Point(player.GlobalPosition.X, player.GlobalPosition.Y));
       Hex theRoundedHex = theHex.HexRound();
 
       // the key can be axial coordinates
@@ -334,7 +337,6 @@ void UpdateSectorMap()
         _serilogger.Debug($"Server.cs: {theSectorKey}: {sectorMap[theSectorKey]}");
       }
     }
-
   }
 
   void DrawSectorMap()
@@ -352,13 +354,17 @@ void DrawSectorMap()
       int s = 0 - q - r;
       _CreateSector(new Hex(q,r,s));
     }
-
   }
 
   void DrawStarFieldRing()
   {
     StarFieldRing.radius = StarFieldRadiusPixels;
-    StarFieldRing.Update();
+    if (StarFieldRadiusPixels != PreviousStarFieldRadiusPixels)
+    {
+      _serilogger.Debug($"Server.cs: StarFieldRing applying scale {StarFieldRing.Scale}");
+      StarFieldRing.ApplyScale(new Vector2(NewStarFieldRadiusRatio, NewStarFieldRadiusRatio));
+      PreviousStarFieldRadiusPixels = StarFieldRadiusPixels;
+    }
   }
 
   public void InstantiateMissile(SpaceMissile missile)
@@ -390,8 +396,10 @@ void InstantiatePlayer(String UUID)
     // start with the center
     Hex theSector = new Hex(0, 0, 0);
 
-    Area2D playerShipThingInstance = (Area2D)PlayerShipThing.Instance();
+    // C# has no preload, so you have to always use ResourceLoader.Load<PackedScene>().
+    Area2D playerShipThingInstance = (Area2D)PlayerPackedScene.Instantiate();
     PlayerShip newPlayer = playerShipThingInstance.GetNode<PlayerShip>("PlayerShip");
+
     newPlayer.uuid = UUID;
 
     // assign the configured values
@@ -476,12 +484,11 @@ void InstantiatePlayer(String UUID)
     int finalX = (Int32)theSectorCenter.x + xOffset;
     int finalY = (Int32)theSectorCenter.y + yOffset;
     _serilogger.Debug($"Server.cs: Placing player at {finalX},{finalY}");
-
-    playerShipThingInstance.GlobalPosition = new Vector2(x: (Int32)theSectorCenter.x + xOffset,
-                                y: (Int32)theSectorCenter.y + yOffset);
-
+    
+    newPlayer.GlobalPosition = new Vector2(x: (Int32)theSectorCenter.x + xOffset, y: (Int32)theSectorCenter.y + yOffset);
+    
     // connect the ship thing input signal so that we can catch when a ship was clicked in the debug UI
-    playerShipThingInstance.Connect("input_event", this, "_on_ShipThings_input_event", new Godot.Collections.Array {newPlayer});
+    playerShipThingInstance.InputEvent += (viewport, theEvent, shapeIdx) => _on_ShipThings_input_event(viewport, theEvent, shapeIdx, newPlayer); // there is a closure around newPlayer now
 
     Players.AddChild(playerShipThingInstance);
     _serilogger.Information($"Server.cs: Added player {UUID} instance!");
@@ -493,7 +500,6 @@ void InstantiatePlayer(String UUID)
 
     // send the player create event message
     MessageInterface.SendGameEvent(egeb);
-
     DrawSectorMap();
   }
 
@@ -501,19 +507,19 @@ void ProcessMoveCommand(Command cb)
   {
     _serilogger.Verbose("Server.cs: Processing move command!");
 
-    String uuid = cb.Uuid;
+    String playerUUID = cb.Uuid;
     Node2D playerRoot;
-    if (playerObjects.TryGetValue(uuid, out playerRoot))
+    if (false == playerObjects.TryGetValue(playerUUID, out playerRoot))
     {
-      // find the PlayerShip
-      PlayerShip movePlayer = playerRoot.GetNode<PlayerShip>("PlayerShip");
-
-      // process thrust and rotation
-      Vector2 thrust = new Vector2(cb.InputX, cb.InputY);
-
-      // push the thrust input onto the player's array
-      movePlayer.MovementQueue.Enqueue(thrust);
+        _serilogger.Debug($"Server.cs: ProcessMoveCommand failed to get playerRoot from playerObjects! uuid specified: {playerUUID}");
+        return;
     }
+    PlayerShip movePlayer = playerRoot.GetNode<PlayerShip>("PlayerShip");
+    // process thrust and rotation
+    Vector2 thrust = new Vector2(cb.InputX, cb.InputY);
+    // push the thrust input onto the player's array
+    movePlayer.MovementQueue.Enqueue(thrust);
+    _serilogger.Verbose("Server.cs: ProcessMoveCommand movePlayer.MovementQueue.Count is " + movePlayer.MovementQueue.Count);
   }
 
   void ProcessShootCommand(Command cb)
@@ -522,7 +528,13 @@ void ProcessShootCommand(Command cb)
 
     // find the PlayerShip
     String playerUUID = cb.Uuid;
-    Node2D playerRoot = playerObjects[playerUUID];
+    Node2D playerRoot;
+    if (false == playerObjects.TryGetValue(playerUUID, out playerRoot))
+    {
+        _serilogger.Debug($"Server.cs: ProcessShootCommand failed to get playerRoot from playerObjects! uuid specified: {playerUUID}");
+        return;
+    }
+
     PlayerShip movePlayer = playerRoot.GetNode<PlayerShip>("PlayerShip");
     // TODO: should we perform a check here to see if we should bother firing
     // the missile, or leave that to the playership.firemissile method alone?
@@ -555,7 +567,6 @@ void ProcessPlayerLeave(Security securityBuffer)
       // TODO: should this be a specific leave instead of destroying a player?
       RemovePlayer(securityBuffer.Uuid);
     }
-
   }
 
   void ProcessPlayerJoins()
@@ -578,7 +589,8 @@ void ProcessPlayerRemoval()
   void ProcessGameEvents()
   {
     while (GameEventQueue.Count > 0)
-    {
+    { 
+      _serilogger.Verbose($"Server.cs: ProcessGameEvents::GameEventQueue.Count > 0 and is {GameEventQueue.Count}");
       Command commandBuffer = GameEventQueue.Dequeue();
       switch (commandBuffer.command_type)
       {
@@ -599,8 +611,9 @@ void ProcessGameEvents()
   
   void ProcessSecurityEvents()
   {
-    while (SecurityEventQueue.Count >0)
-    {
+    while (SecurityEventQueue.Count > 0)
+    { 
+      _serilogger.Debug($"Server.cs: ProcessSecurityEvents::SecurityEventQueue.Count > 0 and is {SecurityEventQueue.Count}");
       Security securityBuffer = SecurityEventQueue.Dequeue();
       switch (securityBuffer.security_type)
       {
@@ -650,8 +663,8 @@ void ProcessInputEvent(Vector2 velocity, Vector2 shoot)
       cb.command_type = Command.CommandType.CommandTypeMove;
       cb.Uuid = playerID.Text;
 
-      cb.InputX = (int)velocity.x;
-      cb.InputY = (int)velocity.y;
+      cb.InputX = (int)velocity.X;
+      cb.InputY = (int)velocity.Y;
       MessageInterface.SendCommand(cb);
     }
 
@@ -662,11 +675,10 @@ void ProcessInputEvent(Vector2 velocity, Vector2 shoot)
       cb.command_type = Command.CommandType.CommandTypeShoot;
       cb.Uuid = playerID.Text;
 
-      cb.InputX = (int)shoot.x;
-      cb.InputY = (int)shoot.y;
+      cb.InputX = (int)shoot.X;
+      cb.InputY = (int)shoot.Y;
       MessageInterface.SendCommand(cb);
     }
-
   }
 
   // Configuration and Related
@@ -706,12 +718,12 @@ public void LoadConfig()
       SectorSize = (Int32)serverConfig.GetValue("game", "sector_size");
       // player settings
       // https://stackoverflow.com/questions/24447387/cast-object-containing-int-to-float-results-in-invalidcastexception
-      PlayerDefaultThrust = Convert.ToSingle(serverConfig.GetValue("player", "thrust"));
-      PlayerDefaultMaxSpeed = Convert.ToSingle(serverConfig.GetValue("player", "max_speed"));
-      PlayerDefaultRotationThrust = Convert.ToSingle(serverConfig.GetValue("player", "rotation_thrust"));
+      PlayerDefaultThrust = (float)serverConfig.GetValue("player", "thrust");
+      PlayerDefaultMaxSpeed = (float)serverConfig.GetValue("player", "max_speed");
+      PlayerDefaultRotationThrust = (float)serverConfig.GetValue("player", "rotation_thrust");
       PlayerDefaultHitPoints = (int)serverConfig.GetValue("player", "hit_points");
       PlayerDefaultMissileSpeed = (int)serverConfig.GetValue("player", "missile_speed");
-      PlayerDefaultMissileLife = Convert.ToSingle(serverConfig.GetValue("player", "missile_life"));
+      PlayerDefaultMissileLife = (float)serverConfig.GetValue("player", "missile_life");
       PlayerDefaultMissileDamage = (int)serverConfig.GetValue("player", "missile_damage");
       PlayerDefaultMissileReloadTime = (int)serverConfig.GetValue("player", "missile_reload");
       DesiredLogLevel = (int)serverConfig.GetValue("game", "log_level");
@@ -791,7 +803,7 @@ void UpdateDebugUI()
     uiPlayerTree.Clear();
     TreeItem UIPlayerTreeRoot = uiPlayerTree.CreateItem();
 
-    Godot.Collections.Array players = _GetNodesFromGroup("player_ships");
+    Godot.Collections.Array<Node> players = _GetNodesFromGroup("player_ships");
     foreach (PlayerShip player in players)
     {
       TreeItem playerTreeItem = uiPlayerTree.CreateItem(UIPlayerTreeRoot);
@@ -808,9 +820,7 @@ void UpdateDebugUI()
   public override void _Ready()
   {
     levelSwitch.MinimumLevel = Serilog.Events.LogEventLevel.Information;
-    _serilogger = new LoggerConfiguration().MinimumLevel
-      .ControlledBy(levelSwitch).WriteTo
-      .Console(outputTemplate: "[{Timestamp:HH:mm:ss.fff} {Level:u3}] {Message:lj}{NewLine}{Exception}").CreateLogger();
+    _serilogger = new LoggerConfiguration().MinimumLevel.ControlledBy(levelSwitch).WriteTo.Console().CreateLogger();
     _serilogger.Information("Server.cs: Space Ring Things (SRT) Game Server");
     _serilogger.Information("Server.cs: Attempting AMQP initialization");
 
@@ -825,6 +835,7 @@ public override void _Ready()
     // initialize the starfield size to the initial sector size
     // the play area is clamped 
     StarFieldRadiusPixels = SectorSize;
+    PreviousStarFieldRadiusPixels = SectorSize;
 
     // initialize the hexboard layout
     HexLayout = new Layout(Layout.flat, new Point(SectorSize, SectorSize), new Point(0, 0));
@@ -840,30 +851,12 @@ public override void _Ready()
     Players = GetNode("Players");
     StarFieldRing = GetNode<StarFieldRadius>("StarFieldRadius");
     DrawStarFieldRing();
-
-    // initialize the message byte debug stuff
-    messageByteTimer = 0;
-    messageByteTotals = 0;
-    frameCounter = 0;
-    framePortion = 0;
   }
 
   // Called every frame. 'delta' is the elapsed time since the previous frame.
-  public override void _Process(float delta)
+  public override void _Process(double delta)
   {
 
-    // calculate message byte stuff
-    messageByteTimer += delta;
-    framePortion += 1;
-    if (messageByteTimer >= messageByteTimerTimeMax)
-    {
-      _serilogger.Debug($"Server.cs: Total message bytes sent last second is {messageByteTotals}");
-      frameCounter += 1;
-      messageByteTimer = 0;
-      messageByteTotals = 0;
-      framePortion = 0;
-    }
-
     ProcessSecurityEvents();
     ProcessGameEvents();
     ProcessPlayerRemoval();
@@ -874,27 +867,27 @@ public override void _Process(float delta)
 
     if (Input.IsActionPressed("rotate_right"))
     {
-      velocity.x += 1;
+      velocity.X += 1;
     }
 
     if (Input.IsActionPressed("rotate_left"))
     {
-      velocity.x -= 1;
+      velocity.X -= 1;
     }
 
     if (Input.IsActionPressed("thrust_forward"))
     {
-      velocity.y += 1;
+      velocity.Y += 1;
     }
 
     if (Input.IsActionPressed("thrust_reverse"))
     {
-      velocity.y -= 1;
+      velocity.Y -= 1;
     }
 
     if (Input.IsActionPressed("fire"))
     {
-      shoot.y = 1;
+      shoot.Y = 1;
     }
 
     if ((velocity.Length() > 0) || (shoot.Length() > 0))
@@ -931,10 +924,10 @@ void _on_FocusAPlayer_pressed()
     {
       Node2D playerForCamera = playerObjects[playerID.Text];
       Camera2D playerCamera = playerForCamera.GetNode<Camera2D>("PlayerShip/Camera2D");
-      if (!playerCamera.Current) 
+      if (!playerCamera.IsCurrent()) 
       { 
         // clear the RTS camera's current
-        rtsCamera.ClearCurrent();
+        // rtsCamera.ClearCurrent();
         playerCamera.MakeCurrent(); 
         playerCamera.GetParent<PlayerShip>().isFocused = true;
         currentCamera = playerCamera;
@@ -944,7 +937,7 @@ void _on_FocusAPlayer_pressed()
   
   void _on_UnFocusAPlayer_pressed()
   {
-    currentCamera.ClearCurrent();
+    // currentCamera.ClearCurrent();
     currentCamera.GetParent<PlayerShip>().isFocused = false;
     currentCamera = null;
     rtsCamera.MakeCurrent();
@@ -1015,13 +1008,14 @@ void _on_AddRandomPlayer_pressed()
     MessageInterface.SendSecurityDebug(scb);
   }
 
-  void _on_ShipThings_input_event(Node viewport, InputEvent theEvent, int shape_idx, PlayerShip theClickedPlayer)
+  void _on_ShipThings_input_event(Node viewport, InputEvent theEvent, long shape_idx, PlayerShip theClickedPlayer)
   {
+    _serilogger.Debug($"Server.cs: input event for player {theClickedPlayer.uuid}");
     if (theEvent.IsActionPressed("left_click"))
     {
       _serilogger.Debug($"Server.cs: player {theClickedPlayer.uuid} clicked - making current");
       Camera2D playerCamera = theClickedPlayer.GetNode<Camera2D>("Camera2D");
-      if (playerCamera.Current)
+      if (playerCamera.IsCurrent())
       {
         _serilogger.Debug($"Server.cs: player {theClickedPlayer.uuid} camera already current, skipping");
         return;
@@ -1029,7 +1023,7 @@ void _on_ShipThings_input_event(Node viewport, InputEvent theEvent, int shape_id
       else
       {
         // remove the current rts camera
-        rtsCamera.ClearCurrent();
+        // rtsCamera.ClearCurrent();
 
         // make the player's camera current
         playerCamera.MakeCurrent();
@@ -1046,61 +1040,34 @@ void _on_ShipThings_input_event(Node viewport, InputEvent theEvent, int shape_id
     }
   }
 
-  public override void _UnhandledInput(InputEvent @event)
-  {
-
-    //// hop out if we don't have a player to zoom in on
-    //CanvasLayer theCanvas = GetNode<CanvasLayer>("DebugUI");
-    //LineEdit textField = theCanvas.GetNode<LineEdit>("PlayerID");
-    //if (!playerObjects.ContainsKey(textField.Text)) { return; }
-
-    //// grab the camera and zoom it by zoom factor
-    //Node2D playerForCamera = playerObjects[textField.Text];
-    //Camera2D playerCamera = playerForCamera.GetNode<Camera2D>("PlayerShip/Camera2D");
-
-    //if (@event.IsActionPressed("zoom_in"))
-    //{
-    //  _serilogger.Verbose("Server.cs: zoom viewport in!");
-    //  float zoomN = CameraCurrentZoom.x - CameraZoomStepSize;
-    //  zoomN = Mathf.Clamp(zoomN, CameraMaxZoom, CameraMinZoom);
-    //  CameraCurrentZoom.x = zoomN;
-    //  CameraCurrentZoom.y = zoomN;
-    //  playerCamera.Zoom = CameraCurrentZoom;
-    //  _serilogger.Verbose($"Server.cs: Zoom Level: {CameraCurrentZoom.x}, {CameraCurrentZoom.y}");
-    //}
-
-    //if (@event.IsActionPressed("zoom_out"))
-    //{
-    //  _serilogger.Verbose("Server.cs zoom viewport out!");
-    //  float zoomN = CameraCurrentZoom.x + CameraZoomStepSize;
-    //  zoomN = Mathf.Clamp(zoomN, CameraMaxZoom, CameraMinZoom);
-    //  CameraCurrentZoom.x = zoomN;
-    //  CameraCurrentZoom.y = zoomN;
-    //  playerCamera.Zoom = CameraCurrentZoom;
-    //  _serilogger.Verbose($"Server.cs: Zoom Level: {CameraCurrentZoom.x}, {CameraCurrentZoom.y}");
-    //}
-  }
-
   // helper functions
-  Godot.Collections.Array _GetNodesFromGroup(string groupName)
+  Godot.Collections.Array<Node> _GetNodesFromGroup(string groupName)
   {
-    return GetTree().GetNodesInGroup(groupName);
+    //return GetTree().GetNodesInGroup(groupName);
+    Godot.Collections.Array<Node> gca = GetTree().GetNodesInGroup(groupName);
+    return gca;
   }
 
   void _CreateSector(Hex theSectorHex)
   {
     _serilogger.Debug($"Server.cs: Creating sector node at {theSectorHex.q},{theSectorHex.r}");
 
-    Sector newSector = aSector.Instance<Sector>();
+    // Sector newSector = aSector.Instance<Sector>();
+    Node sectorNode = SectorPackedScene.Instantiate();
+    Polygon2D newSector = sectorNode.GetNode<Polygon2D>("SectorPolygon");
+    
 
     // scale by the sector size given the width of the hex polygon is 50px
     HexRatio = (SectorSize / 50) * 2;
     newSector.ApplyScale(new Vector2(HexRatio, HexRatio));
-    newSector.SectorLabel = theSectorHex.q.ToString() + "," + theSectorHex.r.ToString();
+    Label sectorLabel = sectorNode.GetNode<Label>("SectorLabel");
+    var sectorLabelText = theSectorHex.q.ToString() + "," + theSectorHex.r.ToString();
+    sectorLabel.Text = sectorLabelText;
     Point sector_center = HexLayout.HexToPixel(theSectorHex);
     newSector.Position = new Vector2((float)sector_center.x, (float)sector_center.y);
+    sectorLabel.Position = newSector.Position;
     newSector.AddToGroup("sectors");
-    SectorMap.AddChild(newSector);
+    SectorMap.AddChild(sectorNode);
   }
 
   void _CalcStarFieldRadius()
@@ -1111,10 +1078,16 @@ void _CalcStarFieldRadius()
     if (RingRadius == 0)
     {
       StarFieldRadiusPixels = SectorSize;
+      PreviousStarFieldRadiusPixels = SectorSize;
     }
     else
     {
+      PreviousStarFieldRadiusPixels = StarFieldRadiusPixels;
       StarFieldRadiusPixels = (Int32) ((SectorSize / 2) * Mathf.Sqrt(3) * (RingRadius * 2 + 1));
+      if (PreviousStarFieldRadiusPixels != StarFieldRadiusPixels)
+      {
+        NewStarFieldRadiusRatio = (float)StarFieldRadiusPixels / (float)PreviousStarFieldRadiusPixels;
+      }
     }
     _serilogger.Debug($"Server.cs: New starfield radius is: {StarFieldRadiusPixels}");
   }
diff --git a/Server.tscn b/Server.tscn
index da271e0..955ea0d 100644
--- a/Server.tscn
+++ b/Server.tscn
@@ -1,108 +1,84 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=5 format=3 uid="uid://dsk0pg2y4ebn2"]
 
-[ext_resource path="res://Server.cs" type="Script" id=1]
-[ext_resource path="res://StarFieldRadius.cs" type="Script" id=2]
-[ext_resource path="res://addons/carmel4a97.RTS_Camera2D/RTS-Camera2D.gd" type="Script" id=3]
-[ext_resource path="res://debug_stack.tres" type="Theme" id=4]
+[ext_resource type="Script" path="res://Server.cs" id="1"]
+[ext_resource type="Script" path="res://StarFieldRadius.cs" id="2"]
+[ext_resource type="Script" path="res://addons/carmel4a97.RTS_Camera2D/RTS-Camera2D.gd" id="3"]
+[ext_resource type="Theme" uid="uid://6sdo4bnlj0ik" path="res://debug_stack.tres" id="4"]
 
 [node name="Server" type="Node"]
-script = ExtResource( 1 )
+script = ExtResource("1")
 
 [node name="RTS-Camera2D" type="Camera2D" parent="."]
-offset = Vector2( 960, 540 )
-current = true
-script = ExtResource( 3 )
-camera_zoom_speed = Vector2( 0.2, 0.2 )
+offset = Vector2(960, 540)
+script = ExtResource("3")
+camera_zoom_speed = Vector2(0.2, 0.2)
 
 [node name="DebugUI" type="CanvasLayer" parent="."]
 
 [node name="DebugStack" type="VBoxContainer" parent="DebugUI"]
-margin_left = 13.0
-margin_top = 9.0
-margin_right = 111.0
-margin_bottom = 345.0
-theme = ExtResource( 4 )
-custom_constants/separation = 12
+offset_left = 13.0
+offset_top = 9.0
+offset_right = 111.0
+offset_bottom = 345.0
+theme = ExtResource("4")
+theme_override_constants/separation = 12
 
 [node name="PlayerID" type="LineEdit" parent="DebugUI/DebugStack"]
-margin_right = 136.0
-margin_bottom = 38.0
+layout_mode = 2
 
 [node name="JoinAPlayer" type="Button" parent="DebugUI/DebugStack"]
-margin_top = 50.0
-margin_right = 136.0
-margin_bottom = 84.0
+layout_mode = 2
 text = "Player Join"
 
 [node name="DeleteAPlayer" type="Button" parent="DebugUI/DebugStack"]
-margin_top = 96.0
-margin_right = 136.0
-margin_bottom = 130.0
+layout_mode = 2
 text = "Player Delete"
 
 [node name="FocusAPlayer" type="Button" parent="DebugUI/DebugStack"]
-margin_top = 142.0
-margin_right = 136.0
-margin_bottom = 176.0
+layout_mode = 2
 text = "Focus Player"
 
 [node name="UnFocusAPlayer" type="Button" parent="DebugUI/DebugStack"]
-margin_top = 188.0
-margin_right = 136.0
-margin_bottom = 222.0
+layout_mode = 2
 text = "UnFocus"
 
 [node name="AddRandomPlayer" type="Button" parent="DebugUI/DebugStack"]
-margin_top = 234.0
-margin_right = 136.0
-margin_bottom = 268.0
+layout_mode = 2
 text = "Add Random"
 
 [node name="RingSizeContainer" type="HBoxContainer" parent="DebugUI/DebugStack"]
-margin_top = 280.0
-margin_right = 136.0
-margin_bottom = 308.0
+layout_mode = 2
 
 [node name="RingSizePrompt" type="Label" parent="DebugUI/DebugStack/RingSizeContainer"]
-margin_right = 90.0
-margin_bottom = 28.0
+layout_mode = 2
 text = "Ring Size: "
 
 [node name="RingSize" type="Label" parent="DebugUI/DebugStack/RingSizeContainer"]
-margin_left = 94.0
-margin_right = 133.0
-margin_bottom = 28.0
+layout_mode = 2
 text = "XXX"
 
 [node name="StarfieldSizeContainer" type="HBoxContainer" parent="DebugUI/DebugStack"]
-margin_top = 320.0
-margin_right = 136.0
-margin_bottom = 348.0
+layout_mode = 2
 
 [node name="StarfieldRadiusPrompt" type="Label" parent="DebugUI/DebugStack/StarfieldSizeContainer"]
-margin_right = 93.0
-margin_bottom = 28.0
+layout_mode = 2
 text = "Field Size: "
 
 [node name="StarfieldRadiusSize" type="Label" parent="DebugUI/DebugStack/StarfieldSizeContainer"]
-margin_left = 97.0
-margin_right = 136.0
-margin_bottom = 28.0
+layout_mode = 2
 text = "XXX"
 
 [node name="CurrentPlayerTree" type="Tree" parent="DebugUI/DebugStack"]
-margin_top = 360.0
-margin_right = 136.0
-margin_bottom = 560.0
-rect_min_size = Vector2( 0, 200 )
+custom_minimum_size = Vector2(0, 200)
+layout_mode = 2
 focus_mode = 0
 hide_folding = true
 
 [node name="SectorMap" type="Node" parent="."]
 
 [node name="StarFieldRadius" type="Node2D" parent="."]
-position = Vector2( 0, -1 )
-script = ExtResource( 2 )
+position = Vector2(0, -1)
+script = ExtResource("2")
 
 [node name="Players" type="Node" parent="."]
 
diff --git a/SpaceMissile.cs b/SpaceMissile.cs
index 574a27a..a9ef8d6 100644
--- a/SpaceMissile.cs
+++ b/SpaceMissile.cs
@@ -2,7 +2,7 @@
 using System;
 using redhatgamedev.srt.v1;
 
-public class SpaceMissile : Area2D
+public partial class SpaceMissile : Area2D
 {
   // for the server we're interfaced with
   Server MyServer;
@@ -20,7 +20,7 @@ public class SpaceMissile : Area2D
   public String uuid;
 
   [Signal]
-  public delegate void Hit(PlayerShip HitPlayer);
+  public delegate void HitEventHandler(PlayerShip HitPlayer);
 
   public GameEvent.GameObject CreateMissileGameObjectBuffer(String OwnerUUID)
   {
@@ -30,8 +30,8 @@ public GameEvent.GameObject CreateMissileGameObjectBuffer(String OwnerUUID)
 
     gameObject.Uuid = uuid;
 
-    gameObject.PositionX = (int)GlobalPosition.x;
-    gameObject.PositionY = (int)GlobalPosition.y;
+    gameObject.PositionX = (int)GlobalPosition.X;
+    gameObject.PositionY = (int)GlobalPosition.Y;
 
     gameObject.Angle = RotationDegrees;
 
@@ -50,14 +50,14 @@ public override void _Ready()
     _serilogger = MyServer._serilogger;
 
     // connect the hit signal to handling the hit
-    Connect(nameof(Hit), this, "_HandleHit");
+    //Connect(nameof(Hit), this, "_HandleHit");
 
     // add the missile to the missiles group so that we can iterate over
     // the entire group and send updates later
     AddToGroup("missiles");
   }
 
-  public override void _PhysicsProcess(float delta)
+  public override void _PhysicsProcess(double delta)
   {
     // TODO disable the collision shape until the missile is "away" from the ship
 
@@ -65,12 +65,12 @@ public override void _PhysicsProcess(float delta)
     // then move the missile in the direction of that vector
     Vector2 velocity = new Vector2(0, -1);
     velocity = velocity.Rotated(Rotation);
-    velocity = velocity * MissileSpeed * delta;
+    velocity = velocity * (float)MissileSpeed * (float)delta;
     Position += velocity;
 
     // once the life reaches zero, remove the missile and don't forget
     // to expire it from the parent's perspective
-    MissileLife -= delta;
+    MissileLife -= (float)delta;
     if (MissileLife <= 0) { 
       QueueFree(); 
 
@@ -93,7 +93,8 @@ void _onSpaceMissileBodyEntered(Node body)
     }
 
     // We hit another Player, so proceed
-    EmitSignal("Hit", (PlayerShip)body);
+    // EmitSignal("Hit", (PlayerShip)body);
+    _HandleHit((PlayerShip)body);
 
     // Must be deferred as we can't change physics properties on a physics callback.
     GetNode<CollisionShape2D>("CollisionShape2D").SetDeferred("disabled", true);
diff --git a/SpaceMissile.tscn b/SpaceMissile.tscn
index 5bc4e12..033db1b 100644
--- a/SpaceMissile.tscn
+++ b/SpaceMissile.tscn
@@ -1,24 +1,21 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://cg1i5jv6ab8w3"]
 
-[ext_resource path="res://images/missle.png" type="Texture" id=1]
-[ext_resource path="res://SpaceMissile.cs" type="Script" id=2]
+[ext_resource type="Texture2D" uid="uid://bjhnpmo8ofbo2" path="res://images/missle.png" id="1"]
+[ext_resource type="Script" path="res://SpaceMissile.cs" id="2"]
 
-[sub_resource type="CapsuleShape2D" id=1]
+[sub_resource type="CapsuleShape2D" id="1"]
 radius = 40.0
 height = 80.0
 
 [node name="Area2D" type="Area2D"]
-script = ExtResource( 2 )
-__meta__ = {
-"_edit_horizontal_guides_": [  ]
-}
+script = ExtResource("2")
 
-[node name="Sprite" type="Sprite" parent="."]
-scale = Vector2( 0.1, 0.1 )
-texture = ExtResource( 1 )
+[node name="Sprite2D" type="Sprite2D" parent="."]
+scale = Vector2(0.1, 0.1)
+texture = ExtResource("1")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-scale = Vector2( 0.25, 0.25 )
-shape = SubResource( 1 )
+scale = Vector2(0.25, 0.25)
+shape = SubResource("1")
 
 [connection signal="body_entered" from="." to="." method="_onSpaceMissileBodyEntered"]
diff --git a/StarFieldRadius.cs b/StarFieldRadius.cs
index c00071d..e538a3d 100644
--- a/StarFieldRadius.cs
+++ b/StarFieldRadius.cs
@@ -1,7 +1,7 @@
 using Godot;
 using System;
 
-public class StarFieldRadius : Node2D
+public partial class StarFieldRadius : Node2D
 {
 
   public Int32 radius;
diff --git a/addons/carmel4a97.RTS_Camera2D/Plugin.gd b/addons/carmel4a97.RTS_Camera2D/Plugin.gd
index 5db29b5..d94786e 100644
--- a/addons/carmel4a97.RTS_Camera2D/Plugin.gd
+++ b/addons/carmel4a97.RTS_Camera2D/Plugin.gd
@@ -1,3 +1,4 @@
+@tool
 # Copyright 2017 Kamil Lewan <carmel4a97@gmail.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,12 +19,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-tool
 
 extends EditorPlugin
 
 func _enter_tree():
-	 add_custom_type("RTS-Camera2D", "Camera2D", preload("RTS-Camera2D.gd"), preload("node_icon.png"))
+	add_custom_type("RTS-Camera2D", "Camera2D", preload("RTS-Camera2D.gd"), preload("node_icon.png"))
 
 func _exit_tree():
 	remove_custom_type("RTS-Camera2D")
diff --git a/addons/carmel4a97.RTS_Camera2D/RTS-Camera2D.gd b/addons/carmel4a97.RTS_Camera2D/RTS-Camera2D.gd
index 315a4b7..7deff35 100644
--- a/addons/carmel4a97.RTS_Camera2D/RTS-Camera2D.gd
+++ b/addons/carmel4a97.RTS_Camera2D/RTS-Camera2D.gd
@@ -25,26 +25,34 @@ extends Camera2D
 # drag - by clicking mouse button, right mouse button by default;
 # edge - by moving mouse to the window edge
 # wheel - zoom in/out by mouse wheel
-export (bool) var key = true
-export (bool) var drag = true
-export (bool) var edge = false
-export (bool) var wheel = true
+#@export (bool) var key = true
+#@export (bool) var drag = true
+#@export (bool) var edge = false
+#@export (bool) var wheel = true
+@export var key = true
+@export var drag = true
+@export var edge = false
+@export var wheel = true
 
-export (int) var zoom_out_limit = 100
+
+#@export (int) var zoom_out_limit = 100
+@export var zoom_out_limit = 100
 
 # Camera speed in px/s.
-export (int) var camera_speed = 450 
+#@export (int) var camera_speed = 450 
+@export var camera_speed = 450 
 
 # Initial zoom value taken from Editor.
 var camera_zoom = get_zoom()
 
 # Value meaning how near to the window edge (in px) the mouse must be,
 # to move a view.
-export (int) var camera_margin = 50
+#@export (int) var camera_margin = 50
+@export var camera_margin = 50
 
 # It changes a camera zoom value in units... (?, but it works... it probably
 # multiplies camera size by 1+camera_zoom_speed)
-export var camera_zoom_speed = Vector2(0.5, 0.5)
+@export var camera_zoom_speed = Vector2(0.5, 0.5)
 
 # Vector of camera's movement / second.
 var camera_movement = Vector2()
@@ -60,10 +68,10 @@ var __rmbk = false
 var __keys = [false, false, false, false]
 
 func _ready():
-	set_h_drag_enabled(false)
-	set_v_drag_enabled(false)
-	set_enable_follow_smoothing(true)
-	set_follow_smoothing(4)
+	set_drag_horizontal_enabled(false)
+	set_drag_vertical_enabled(false)
+	set_position_smoothing_enabled(true)
+	set_position_smoothing_speed(4)
 
 func _physics_process(delta):
 	
@@ -105,7 +113,7 @@ func _physics_process(delta):
 func _unhandled_input( event ):
 	if event is InputEventMouseButton:
 		if drag and\
-		   event.button_index == BUTTON_RIGHT:
+			event.button_index == MOUSE_BUTTON_RIGHT:
 			# Control by right mouse button.
 			if event.pressed: __rmbk = true
 			else: __rmbk = false
@@ -113,7 +121,7 @@ func _unhandled_input( event ):
 		if wheel:
 			# Checking if future zoom won't be under 0.
 			# In that cause engine will flip screen.
-			if event.button_index == BUTTON_WHEEL_UP and\
+			if event.button_index == MOUSE_BUTTON_WHEEL_UP and\
 			camera_zoom.x - camera_zoom_speed.x > 0 and\
 			camera_zoom.y - camera_zoom_speed.y > 0:
 				camera_zoom -= camera_zoom_speed
@@ -121,7 +129,7 @@ func _unhandled_input( event ):
 					camera_zoom = Vector2(0.001,0.001)
 				set_zoom(camera_zoom)
 				# Checking if future zoom won't be above zoom_out_limit.
-			if event.button_index == BUTTON_WHEEL_DOWN and\
+			if event.button_index == MOUSE_BUTTON_WHEEL_DOWN and\
 			camera_zoom.x + camera_zoom_speed.x < zoom_out_limit and\
 			camera_zoom.y + camera_zoom_speed.y < zoom_out_limit:
 				camera_zoom += camera_zoom_speed
diff --git a/addons/carmel4a97.RTS_Camera2D/node_icon.png.import b/addons/carmel4a97.RTS_Camera2D/node_icon.png.import
index f96a304..803321f 100644
--- a/addons/carmel4a97.RTS_Camera2D/node_icon.png.import
+++ b/addons/carmel4a97.RTS_Camera2D/node_icon.png.import
@@ -1,8 +1,9 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path="res://.import/node_icon.png-a210030b965ef684de9f9bd1dec75374.stex"
+type="CompressedTexture2D"
+uid="uid://bdoexsvvof53h"
+path="res://.godot/imported/node_icon.png-a210030b965ef684de9f9bd1dec75374.ctex"
 metadata={
 "vram_texture": false
 }
@@ -10,26 +11,24 @@ metadata={
 [deps]
 
 source_file="res://addons/carmel4a97.RTS_Camera2D/node_icon.png"
-dest_files=[ "res://.import/node_icon.png-a210030b965ef684de9f9bd1dec75374.stex" ]
+dest_files=["res://.godot/imported/node_icon.png-a210030b965ef684de9f9bd1dec75374.ctex"]
 
 [params]
 
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
+compress/hdr_compression=1
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/debug_stack.tres b/debug_stack.tres
index f693fcb..39d897c 100644
--- a/debug_stack.tres
+++ b/debug_stack.tres
@@ -1,10 +1,18 @@
-[gd_resource type="Theme" load_steps=3 format=2]
+[gd_resource type="Theme" load_steps=3 format=3 uid="uid://6sdo4bnlj0ik"]
 
-[ext_resource path="res://Assets/Fonts/RedHatText-Regular.ttf" type="DynamicFontData" id=1]
+[ext_resource type="FontFile" uid="uid://c4x2m5t0ax0nk" path="res://Assets/Fonts/RedHatText-Regular.ttf" id="1"]
 
-[sub_resource type="DynamicFont" id=1]
-size = 20
-font_data = ExtResource( 1 )
+[sub_resource type="FontFile" id="1"]
+fallbacks = Array[Font]([ExtResource("1")])
+face_index = null
+embolden = null
+transform = null
+cache/0/16/0/ascent = 0.0
+cache/0/16/0/descent = 0.0
+cache/0/16/0/underline_position = 0.0
+cache/0/16/0/underline_thickness = 0.0
+cache/0/16/0/scale = 1.0
+cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0)
 
 [resource]
-default_font = SubResource( 1 )
+default_font = SubResource("1")
diff --git a/default_env.tres b/default_env.tres
index 20207a4..52f07a9 100644
--- a/default_env.tres
+++ b/default_env.tres
@@ -1,7 +1,7 @@
-[gd_resource type="Environment" load_steps=2 format=2]
+[gd_resource type="Environment" load_steps=2 format=3 uid="uid://d1jrws6lu07a2"]
 
-[sub_resource type="ProceduralSky" id=1]
+[sub_resource type="Sky" id="1"]
 
 [resource]
 background_mode = 2
-background_sky = SubResource( 1 )
+sky = SubResource("1")
diff --git a/icon.svg.import b/icon.svg.import
new file mode 100644
index 0000000..64d66fc
--- /dev/null
+++ b/icon.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://doev0i5ti6bv2"
+path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://icon.svg"
+dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false
diff --git a/images/missle.png.import b/images/missle.png.import
index f29fa9c..814e585 100644
--- a/images/missle.png.import
+++ b/images/missle.png.import
@@ -1,8 +1,9 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path="res://.import/missle.png-5d72dbfd11af4b43a5e2073ff3fc3e48.stex"
+type="CompressedTexture2D"
+uid="uid://bjhnpmo8ofbo2"
+path="res://.godot/imported/missle.png-5d72dbfd11af4b43a5e2073ff3fc3e48.ctex"
 metadata={
 "vram_texture": false
 }
@@ -10,26 +11,24 @@ metadata={
 [deps]
 
 source_file="res://images/missle.png"
-dest_files=[ "res://.import/missle.png-5d72dbfd11af4b43a5e2073ff3fc3e48.stex" ]
+dest_files=["res://.godot/imported/missle.png-5d72dbfd11af4b43a5e2073ff3fc3e48.ctex"]
 
 [params]
 
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
+compress/hdr_compression=1
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/images/ship.png.import b/images/ship.png.import
index c4a6942..395b2c5 100644
--- a/images/ship.png.import
+++ b/images/ship.png.import
@@ -1,8 +1,9 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path="res://.import/ship.png-bdfa380415ea3570e3f79c68c987aded.stex"
+type="CompressedTexture2D"
+uid="uid://dttvdirodvjq7"
+path="res://.godot/imported/ship.png-bdfa380415ea3570e3f79c68c987aded.ctex"
 metadata={
 "vram_texture": false
 }
@@ -10,26 +11,24 @@ metadata={
 [deps]
 
 source_file="res://images/ship.png"
-dest_files=[ "res://.import/ship.png-bdfa380415ea3570e3f79c68c987aded.stex" ]
+dest_files=["res://.godot/imported/ship.png-bdfa380415ea3570e3f79c68c987aded.ctex"]
 
 [params]
 
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
+compress/hdr_compression=1
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/project.godot b/project.godot
index eaf12e7..e82e003 100644
--- a/project.godot
+++ b/project.godot
@@ -6,93 +6,90 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=4
+config_version=5
 
 [application]
 
 config/name="srt-godot-test"
 run/main_scene="res://Server.tscn"
+config/features=PackedStringArray("4.0", "C#", "Forward Plus")
+config/icon="res://icon.svg"
 
 [display]
 
-window/size/width=1920
-window/size/height=1080
+window/size/viewport_width=1920
+window/size/viewport_height=1080
 
-[editor_plugins]
+[dotnet]
 
-enabled=PoolStringArray( "res://addons/carmel4a97.RTS_Camera2D/plugin.cfg" )
-
-[global]
-
-script=false
-edit=false
+project/assembly_name="srt-godot-test"
 
 [input]
 
 ui_select={
 "deadzone": 0.5,
-"events": [  ]
+"events": []
 }
 ui_left={
 "deadzone": 0.5,
-"events": [  ]
+"events": []
 }
 ui_right={
 "deadzone": 0.5,
-"events": [  ]
+"events": []
 }
 ui_up={
 "deadzone": 0.5,
-"events": [  ]
+"events": []
 }
 ui_down={
 "deadzone": 0.5,
-"events": [  ]
+"events": []
 }
 rotate_left={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
 }
 rotate_right={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
 }
 thrust_forward={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
 }
 thrust_reverse={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
 }
 fire={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777238,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194326,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
 }
 zoom_in={
 "deadzone": 0.5,
-"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":4,"pressed":false,"doubleclick":false,"script":null)
- ]
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"pressed":false,"double_click":false,"script":null)
+]
 }
 zoom_out={
 "deadzone": 0.5,
-"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":5,"pressed":false,"doubleclick":false,"script":null)
- ]
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"pressed":false,"double_click":false,"script":null)
+]
 }
 left_click={
 "deadzone": 0.5,
-"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
- ]
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"pressed":false,"double_click":false,"script":null)
+]
 }
 right_click={
 "deadzone": 0.5,
-"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"pressed":false,"doubleclick":false,"script":null)
- ]
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"pressed":false,"double_click":false,"script":null)
+]
 }
 
 [mono]
@@ -102,10 +99,11 @@ export/export_assemblies_inside_pck=false
 
 [physics]
 
-common/enable_pause_aware_picking=true
 2d/default_gravity=0
-2d/default_gravity_vector=Vector2( 0, 0 )
+2d/default_gravity_vector=Vector2(0, 0)
+common/enable_pause_aware_picking=true
 
 [rendering]
 
-environment/default_environment="res://default_env.tres"
+renderer/rendering_method="gl_compatibility"
+environment/defaults/default_environment="res://default_env.tres"
diff --git a/sector.tres b/sector.tres
index 729c044..b70deec 100644
--- a/sector.tres
+++ b/sector.tres
@@ -1,10 +1,18 @@
-[gd_resource type="Theme" load_steps=3 format=2]
+[gd_resource type="Theme" load_steps=3 format=3 uid="uid://bm4b06d4ipm51"]
 
-[ext_resource path="res://Assets/Fonts/RedHatDisplay-Bold.ttf" type="DynamicFontData" id=1]
+[ext_resource type="FontFile" uid="uid://ddlj3n66imcl8" path="res://Assets/Fonts/RedHatDisplay-Bold.ttf" id="1"]
 
-[sub_resource type="DynamicFont" id=1]
-size = 60
-font_data = ExtResource( 1 )
+[sub_resource type="FontFile" id="1"]
+fallbacks = Array[Font]([ExtResource("1")])
+face_index = null
+embolden = null
+transform = null
+cache/0/16/0/ascent = 0.0
+cache/0/16/0/descent = 0.0
+cache/0/16/0/underline_position = 0.0
+cache/0/16/0/underline_thickness = 0.0
+cache/0/16/0/scale = 1.0
+cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0)
 
 [resource]
-default_font = SubResource( 1 )
+default_font = SubResource("1")
diff --git a/srt-godot-test.csproj b/srt-godot-test.csproj
index b956b81..8cb4aac 100644
--- a/srt-godot-test.csproj
+++ b/srt-godot-test.csproj
@@ -1,6 +1,7 @@
-<Project Sdk="Godot.NET.Sdk/3.3.0">
+<Project Sdk="Godot.NET.Sdk/4.0.2">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>srtgodottest</RootNamespace>
   </PropertyGroup>
   <ItemGroup>