diff --git a/scene/EscapeMenu.tscn b/scene/EscapeMenu.tscn
index ed00518..14059b6 100644
--- a/scene/EscapeMenu.tscn
+++ b/scene/EscapeMenu.tscn
@@ -7,6 +7,7 @@
 [ext_resource path="res://src/EscapeMenuAppearance.cs" type="Script" id=5]
 
 [node name="EscapeMenu" type="Control"]
+pause_mode = 2
 anchor_right = 1.0
 anchor_bottom = 1.0
 theme = ExtResource( 1 )
@@ -29,10 +30,10 @@ __meta__ = {
 }
 
 [node name="PanelContainer" type="PanelContainer" parent="CenterContainer"]
-margin_left = 198.0
-margin_top = 78.0
-margin_right = 441.0
-margin_bottom = 281.0
+margin_left = 518.0
+margin_top = 258.0
+margin_right = 761.0
+margin_bottom = 461.0
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer"]
 margin_left = 7.0
@@ -73,9 +74,9 @@ margin_top = 27.0
 margin_right = -4.0
 margin_bottom = -4.0
 script = ExtResource( 5 )
-PlayerNamePath = NodePath("VBoxContainer/ContainerName/Name")
+DisplayNamePath = NodePath("VBoxContainer/ContainerName/DisplayName")
 ColorPreviewPath = NodePath("VBoxContainer/ContainerColor/Preview")
-ColorSliderPath = NodePath("VBoxContainer/ContainerColor/HSlider")
+ColorSliderPath = NodePath("VBoxContainer/ContainerColor/Hue")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance"]
 margin_left = 19.0
@@ -95,7 +96,7 @@ rect_min_size = Vector2( 36, 0 )
 text = "Name:"
 align = 2
 
-[node name="Name" type="LineEdit" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerName"]
+[node name="DisplayName" type="LineEdit" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerName"]
 margin_left = 40.0
 margin_right = 182.0
 margin_bottom = 19.0
@@ -124,7 +125,7 @@ margin_right = 56.0
 margin_bottom = 16.0
 texture = ExtResource( 3 )
 
-[node name="HSlider" type="HSlider" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerColor"]
+[node name="Hue" type="HSlider" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerColor"]
 margin_left = 60.0
 margin_right = 182.0
 margin_bottom = 16.0
@@ -318,8 +319,8 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 [connection signal="visibility_changed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance" method="_on_Appearance_visibility_changed"]
-[connection signal="text_changed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerName/Name" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance" method="_on_Name_text_changed"]
-[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerColor/HSlider" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance" method="_on_HSlider_value_changed"]
+[connection signal="text_changed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerName/DisplayName" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance" method="_on_DisplayName_text_changed"]
+[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance/VBoxContainer/ContainerColor/Hue" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Appearance" method="_on_Hue_value_changed"]
 [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Multiplayer/ContainerServer/ServerStartStop" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Multiplayer" method="_on_ServerStartStop_pressed"]
 [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Multiplayer/ContainerClient/ClientDisConnect" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Multiplayer" method="_on_ClientDisConnect_pressed"]
 [connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Multiplayer/ContainerHideAddress/HideAddress" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Multiplayer" method="_on_HideAddress_toggled"]
diff --git a/scene/GameScene.tscn b/scene/GameScene.tscn
index 5d372c3..ae291b7 100644
--- a/scene/GameScene.tscn
+++ b/scene/GameScene.tscn
@@ -12,16 +12,21 @@
 
 [node name="Game" type="Node"]
 script = ExtResource( 3 )
-Player = ExtResource( 5 )
-Block = ExtResource( 6 )
+LocalPlayerPath = NodePath("Players/LocalPlayer")
+BlockScene = ExtResource( 6 )
 
 [node name="Viewport" type="Node" parent="."]
 script = ExtResource( 7 )
 
 [node name="Network" type="Node" parent="."]
 script = ExtResource( 8 )
-PlayerContainerPath = NodePath("..")
-OtherPlayer = ExtResource( 9 )
+PlayerContainerPath = NodePath("../Players")
+OtherPlayerScene = ExtResource( 9 )
+
+[node name="Players" type="Node" parent="."]
+
+[node name="LocalPlayer" parent="Players" instance=ExtResource( 5 )]
+position = Vector2( 0, -2 )
 
 [node name="HUD" type="CanvasLayer" parent="."]
 
@@ -34,5 +39,4 @@ script = ExtResource( 2 )
 texture = ExtResource( 4 )
 
 [node name="EscapeMenu" parent="HUD" instance=ExtResource( 1 )]
-pause_mode = 2
 visible = false
diff --git a/scene/LocalPlayer.tscn b/scene/LocalPlayer.tscn
index 5f5c487..381385c 100644
--- a/scene/LocalPlayer.tscn
+++ b/scene/LocalPlayer.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://scene/Player.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/Player.cs" type="Script" id=3]
+[ext_resource path="res://src/LocalPlayer.cs" type="Script" id=3]
 
 [node name="LocalPlayer" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
diff --git a/scene/Player.tscn b/scene/Player.tscn
index ab016dd..211dac1 100644
--- a/scene/Player.tscn
+++ b/scene/Player.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://ui_theme.tres" type="Theme" id=1]
 [ext_resource path="res://gfx/player.png" type="Texture" id=2]
+[ext_resource path="res://src/Player.cs" type="Script" id=3]
 
 [sub_resource type="CircleShape2D" id=1]
 radius = 8.0
@@ -9,6 +10,9 @@ radius = 8.0
 [node name="Player" type="KinematicBody2D"]
 z_index = 10
 collision_layer = 0
+script = ExtResource( 3 )
+DisplayNamePath = NodePath("DisplayName")
+SpritePath = NodePath("Sprite")
 
 [node name="CircleShape" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )
@@ -17,7 +21,7 @@ shape = SubResource( 1 )
 z_index = -5
 texture = ExtResource( 2 )
 
-[node name="Name" type="Label" parent="."]
+[node name="DisplayName" type="Label" parent="."]
 modulate = Color( 1, 1, 1, 0.501961 )
 anchor_left = 0.5
 anchor_right = 0.5
diff --git a/src/Camera.cs b/src/Camera.cs
deleted file mode 100644
index bd3b53e..0000000
--- a/src/Camera.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Godot;
-
-public class Camera : Camera2D
-{
-    public Cursor Cursor { get; private set; }
-
-    public override void _EnterTree()
-    {
-        // Cursor = GetViewport().GetNode<Cursor>("Cursor");
-    }
-
-    public override void _Process(float delta)
-    {
-        // TODO: Implement some kind of "zoom" mechanic?
-        // var mousePos  = GetTree().Root.GetMousePosition();
-        // var centerPos = OS.WindowSize / 2;
-        // var scale     = ((Viewport)GetViewport()).Scale;
-        // Position      = !Cursor.Visible ? Vector2.Zero
-        //     : ((mousePos - centerPos) / scale).Clamped(MaxDistance) / 2;
-    }
-}
diff --git a/src/EscapeMenu.cs b/src/EscapeMenu.cs
index 8f5fdb5..25aa41c 100644
--- a/src/EscapeMenu.cs
+++ b/src/EscapeMenu.cs
@@ -5,7 +5,7 @@ public class EscapeMenu : Control
     [Export] public NodePath ReturnPath { get; set; }
     public Button Return { get; private set; }
 
-    public override void _EnterTree()
+    public override void _Ready()
     {
         Return = GetNode<Button>(ReturnPath);
     }
diff --git a/src/EscapeMenuAppearance.cs b/src/EscapeMenuAppearance.cs
index 86cf1a9..3c73ccb 100644
--- a/src/EscapeMenuAppearance.cs
+++ b/src/EscapeMenuAppearance.cs
@@ -3,73 +3,25 @@ using Godot;
 
 public class EscapeMenuAppearance : CenterContainer
 {
-    [Export] public NodePath PlayerNamePath { get; set; }
+    [Export] public NodePath DisplayNamePath { get; set; }
     [Export] public NodePath ColorPreviewPath { get; set; }
     [Export] public NodePath ColorSliderPath { get; set; }
 
-    public LineEdit PlayerName { get; private set; }
+    public Game Game { get; private set; }
+    public LineEdit DisplayName { get; private set; }
     public TextureRect ColorPreview { get; private set; }
     public Slider ColorSlider { get; private set; }
 
-    public Network Network { get; private set; }
-    public Player LocalPlayer { get; private set; }
-
-    public override void _EnterTree()
+    public override void _Ready()
     {
-        PlayerName   = GetNode<LineEdit>(PlayerNamePath);
+        Game         = GetNode<Game>("/root/Game");
+        DisplayName  = GetNode<LineEdit>(DisplayNamePath);
         ColorPreview = GetNode<TextureRect>(ColorPreviewPath);
         ColorSlider  = GetNode<Slider>(ColorSliderPath);
 
-        CallDeferred(nameof(Initialize));
-    }
-
-    private void Initialize()
-    {
-        Network     = GetNode<Network>("/root/Game/Network");
-        LocalPlayer = GetNode<Player>("/root/Game/LocalPlayer");
-
         ColorSlider.Value = GD.RandRange(0.0, 1.0);
         var color = Color.FromHsv((float)ColorSlider.Value, 1.0F, 1.0F);
-        LocalPlayer.GetNode<Sprite>("Sprite").Modulate = color;
-        ColorPreview.Modulate = color;
-
-        Network.Connect(nameof(Network.StatusChanged), this, nameof(OnNetworkStatusChanged));
-        GetTree().Connect("network_peer_connected", this, nameof(OnPeerConnected));
-    }
-
-
-    private void OnNetworkStatusChanged(Network.Status status)
-    {
-        if (status == Network.Status.ConnectedToServer)
-            SendAppearance();
-    }
-
-    private void OnPeerConnected(int id)
-    {
-        // TODO: See if we can do something with syncing these directly?
-        var name = LocalPlayer.GetNode<Label>("Name").Text;
-        var hue  = LocalPlayer.GetNode<Sprite>("Sprite").Modulate.h;
-        RpcId(id, nameof(AppearanceChanged), name, hue);
-    }
-
-    private void SendAppearance()
-    {
-        // TODO: See if we can do something with syncing these directly?
-        var name = LocalPlayer.GetNode<Label>("Name").Text;
-        var hue  = LocalPlayer.GetNode<Sprite>("Sprite").Modulate.h;
-        Rpc(nameof(AppearanceChanged), name, hue);
-    }
-
-    [Remote]
-    private void AppearanceChanged(string name, float hue)
-    {
-        // TODO: Clear out invalid characters from name.
-        hue = Mathf.Clamp(hue, 0.0F, 1.0F);
-
-        var id     = GetTree().GetRpcSenderId();
-        var player = Network.GetOrCreatePlayerWithId(id);
-        player.GetNode<Label>("Name").Text = name;
-        player.GetNode<Sprite>("Sprite").Modulate = Color.FromHsv(hue, 1.0F, 1.0F);
+        Game.LocalPlayer.Color = ColorPreview.Modulate = color;
     }
 
 
@@ -77,17 +29,17 @@ public class EscapeMenuAppearance : CenterContainer
     #pragma warning disable IDE1006
 
     private static readonly Regex INVALID_CHARS = new Regex(@"\s");
-    private void _on_Name_text_changed(string text)
+    private void _on_DisplayName_text_changed(string text)
     {
         var validText = INVALID_CHARS.Replace(text, "");
         if (validText != text) {
-            var previousCaretPos = PlayerName.CaretPosition;
-            PlayerName.Text = validText;
-            PlayerName.CaretPosition = previousCaretPos - (text.Length - validText.Length);
+            var previousCaretPos = DisplayName.CaretPosition;
+            DisplayName.Text = validText;
+            DisplayName.CaretPosition = previousCaretPos - (text.Length - validText.Length);
         }
     }
 
-    private void _on_HSlider_value_changed(float value)
+    private void _on_Hue_value_changed(float value)
     {
         var color = Color.FromHsv(value, 1.0F, 1.0F);
         ColorPreview.Modulate = color;
@@ -96,8 +48,7 @@ public class EscapeMenuAppearance : CenterContainer
     private void _on_Appearance_visibility_changed()
     {
         if (IsVisibleInTree()) return;
-        LocalPlayer.GetNode<Label>("Name").Text = PlayerName.Text;
-        LocalPlayer.GetNode<Sprite>("Sprite").Modulate = ColorPreview.Modulate;
-        if (GetTree().NetworkPeer != null) SendAppearance();
+        Game.LocalPlayer.DisplayName = DisplayName.Text;
+        Game.LocalPlayer.Color       = ColorPreview.Modulate;
     }
 }
diff --git a/src/EscapeMenuMultiplayer.cs b/src/EscapeMenuMultiplayer.cs
index 7bb56c4..bc609d2 100644
--- a/src/EscapeMenuMultiplayer.cs
+++ b/src/EscapeMenuMultiplayer.cs
@@ -16,7 +16,7 @@ public class EscapeMenuMultiplayer : Container
 
     public Network Network { get; private set; }
 
-    public override void _EnterTree()
+    public override void _Ready()
     {
         Status           = GetNode<Label>(StatusPath);
         ServerStartStop  = GetNode<Button>(ServerStartStopPath);
@@ -31,33 +31,39 @@ public class EscapeMenuMultiplayer : Container
     }
 
 
-    private void OnNetworkStatusChanged(Network.Status status)
+    private void OnNetworkStatusChanged(NetworkStatus status)
     {
         switch (status) {
-            case Network.Status.NoConnection:
+            case NetworkStatus.NoConnection:
                 Status.Text     = "No Connection";
                 Status.Modulate = Colors.Red;
                 break;
-            case Network.Status.ServerRunning:
+            case NetworkStatus.ServerRunning:
                 Status.Text     = "Server Running";
                 Status.Modulate = Colors.Green;
                 break;
-            case Network.Status.Connecting:
+            case NetworkStatus.Connecting:
                 Status.Text     = "Connecting ...";
                 Status.Modulate = Colors.Yellow;
                 break;
-            case Network.Status.ConnectedToServer:
+            case NetworkStatus.Authenticating:
+                Status.Text     = "Authenticating ...";
+                Status.Modulate = Colors.YellowGreen;
+                break;
+            case NetworkStatus.ConnectedToServer:
                 Status.Text     = "Connected to Server";
                 Status.Modulate = Colors.Green;
                 break;
         }
 
-        ServerPort.Editable = status == Network.Status.NoConnection;
-        ServerStartStop.Text = (status == Network.Status.ServerRunning) ? "Stop Server" : "Start Server";
-        ClientAddress.Editable = status == Network.Status.NoConnection;
-        ClientDisConnect.Text     = (status < Network.Status.Connecting) ? "Connect" : "Disconnect";
-        ClientDisConnect.Disabled = status == Network.Status.ServerRunning;
-        if (Visible) GetTree().Paused = status == Network.Status.NoConnection;
+        var noConnection = status == NetworkStatus.NoConnection;
+        ServerPort.Editable      = noConnection;
+        ServerStartStop.Disabled = noConnection;
+        ClientAddress.Editable   = noConnection;
+        ServerStartStop.Text      = (status == NetworkStatus.ServerRunning) ? "Stop Server" : "Start Server";
+        ClientDisConnect.Text     = (status < NetworkStatus.Connecting) ? "Connect" : "Disconnect";
+        ClientDisConnect.Disabled = status == NetworkStatus.ServerRunning;
+        if (Visible) GetTree().Paused = noConnection;
     }
 
 
diff --git a/src/Extensions.cs b/src/Extensions.cs
index 465f8e3..c79f347 100644
--- a/src/Extensions.cs
+++ b/src/Extensions.cs
@@ -2,6 +2,38 @@ using Godot;
 
 public static class Extensions
 {
-    public static void RemoveFromParent(this Node node)
-        => node.GetParent().RemoveChild(node);
+    public static void RemoveFromParent(this Node @this)
+        => @this.GetParent().RemoveChild(@this);
+
+    public static T Init<T>(this PackedScene @this)
+        where T : Node
+    {
+        var instance = (T)@this.Instance();
+        (instance as IInitializer)?.Initialize();
+        return instance;
+    }
+
+
+    public static void RpcExcept(this Node @this, int except, string method, params object[] args)
+    {
+        foreach (var peer in @this.GetTree().GetNetworkConnectedPeers())
+            if (peer != except) @this.RpcId(peer, method, args);
+    }
+
+    public static void RsetUnreliableExcept(this Node @this, int except, string property, object value)
+    {
+        foreach (var peer in @this.GetTree().GetNetworkConnectedPeers())
+            if (peer != except) @this.RsetUnreliableId(peer, property, value);
+    }
+
+    public static void RsetExcept(this Node @this, int except, string property, object value)
+    {
+        foreach (var peer in @this.GetTree().GetNetworkConnectedPeers())
+            if (peer != except) @this.RsetId(peer, property, value);
+    }
+}
+
+public interface IInitializer
+{
+    void Initialize();
 }
diff --git a/src/Game.cs b/src/Game.cs
index 51088c1..2b70cab 100644
--- a/src/Game.cs
+++ b/src/Game.cs
@@ -3,28 +3,28 @@ using Godot;
 public class Game : Node
 {
     [Export] public Vector2 RoomSize { get; set; } = new Vector2(32, 18) * 16;
+    [Export] public NodePath LocalPlayerPath { get; set; }
+    [Export] public PackedScene BlockScene { get; set; }
 
-    [Export] public PackedScene Player { get; set; }
-    [Export] public PackedScene Block { get; set; }
+    public LocalPlayer LocalPlayer { get; private set; }
 
-    public override void _Ready()
+    // Using _EnterTree to make sure this code runs before any other.
+    public override void _EnterTree()
     {
         GD.Randomize();
-        SpawnPlayer();
-        SpawnBlocks();
+        LocalPlayer = GetNode<LocalPlayer>(LocalPlayerPath);
     }
 
-    private void SpawnPlayer()
+    public override void _Ready()
     {
-        var player = (Player)Player.Instance();
-        AddChild(player);
+        SpawnBlocks();
     }
 
     private void SpawnBlocks()
     {
         void SpawnBlockAt(int x, int y)
         {
-            var block = (Node2D)Block.Instance();
+            var block = BlockScene.Init<Node2D>();
             block.Position = new Vector2(x, y);
             AddChild(block);
         }
diff --git a/src/LocalPlayer.cs b/src/LocalPlayer.cs
new file mode 100644
index 0000000..7d98bff
--- /dev/null
+++ b/src/LocalPlayer.cs
@@ -0,0 +1,42 @@
+using Godot;
+using System;
+
+public class LocalPlayer : Player
+{
+    public TimeSpan JumpEarlyTime { get; } = TimeSpan.FromSeconds(0.2F);
+    public TimeSpan JumpCoyoteTime { get; } = TimeSpan.FromSeconds(0.2F);
+
+    [Export] public float Speed { get; set; } = 120;
+    [Export] public float JumpSpeed { get; set; } = 180;
+    [Export] public float Gravity { get; set; } = 400;
+
+    [Export(PropertyHint.Range, "0,1")]
+    public float Friction { get; set; } = 0.1F;
+    [Export(PropertyHint.Range, "0,1")]
+    public float Acceleration { get; set; } = 0.25F;
+
+    private Vector2 _velocity = Vector2.Zero;
+    private DateTime? _jumpPressed = null;
+    private DateTime? _lastOnFloor = null;
+
+    public override void _PhysicsProcess(float delta)
+    {
+        var moveDir = Input.GetActionStrength("move_right") - Input.GetActionStrength("move_left");
+        _velocity.x = (moveDir != 0) ? Mathf.Lerp(_velocity.x, moveDir * Speed, Acceleration)
+                                     : Mathf.Lerp(_velocity.x, 0, Friction);
+        _velocity.y += Gravity * delta;
+        _velocity = MoveAndSlide(_velocity, Vector2.Up);
+
+        if (Input.IsActionJustPressed("move_jump"))
+            _jumpPressed = DateTime.Now;
+        if (IsOnFloor())
+            _lastOnFloor = DateTime.Now;
+
+        if (((DateTime.Now - _jumpPressed) <= JumpEarlyTime) &&
+            ((DateTime.Now - _lastOnFloor) <= JumpCoyoteTime)) {
+            _velocity.y  = -JumpSpeed;
+            _jumpPressed = null;
+            _lastOnFloor = null;
+        }
+    }
+}
diff --git a/src/Network.cs b/src/Network.cs
index b713444..75c8e4a 100644
--- a/src/Network.cs
+++ b/src/Network.cs
@@ -1,32 +1,35 @@
 using Godot;
 using System;
 using System.Collections.Generic;
-using System.Linq;
+
+public enum NetworkStatus
+{
+    NoConnection,
+    ServerRunning,
+    Connecting,
+    Authenticating,
+    ConnectedToServer,
+}
 
 public class Network : Node
 {
-    public enum Status
-    {
-        NoConnection,
-        ServerRunning,
-        Connecting,
-        ConnectedToServer,
-    }
+    private readonly Dictionary<int, Player> _playersById = new Dictionary<int, Player>();
 
     [Export] public ushort DefaultPort { get; set; } = 42005;
     [Export] public string DefaultAddress { get; set; } = "localhost";
 
     [Export] public NodePath PlayerContainerPath { get; set; }
-    [Export] public PackedScene OtherPlayer { get; set; }
+    [Export] public PackedScene OtherPlayerScene { get; set; }
 
+    public Game Game { get; private set; }
     public Node PlayerContainer { get; private set; }
 
-    public Player LocalPlayer { get; private set; }
-    public Status CurrentStatus { get; private set; } = Status.NoConnection;
-    [Signal] public delegate void StatusChanged(Status status);
+    public NetworkStatus Status { get; private set; } = NetworkStatus.NoConnection;
+    [Signal] public delegate void StatusChanged(NetworkStatus status);
 
     public override void _Ready()
     {
+        Game            = GetNode<Game>("/root/Game");
         PlayerContainer = GetNode(PlayerContainerPath);
 
         GetTree().Connect("connected_to_server", this, nameof(OnClientConnected));
@@ -37,10 +40,17 @@ public class Network : Node
         GetTree().Connect("network_peer_disconnected", this, nameof(OnPeerDisconnected));
     }
 
-    public override void _Process(float delta)
+
+    public Player GetPlayer(int id)
+        => _playersById.TryGetValue(id, out var value) ? value : null;
+
+    public void ClearPlayers()
     {
-        if (LocalPlayer == null) return;
-        RpcUnreliable(nameof(OnPlayerMoved), LocalPlayer.Position);
+        Game.LocalPlayer.NetworkId = -1;
+        foreach (var player in _playersById.Values)
+            if (!player.IsLocal)
+                player.RemoveFromParent();
+        _playersById.Clear();
     }
 
 
@@ -49,14 +59,15 @@ public class Network : Node
         if (GetTree().NetworkPeer != null) throw new InvalidOperationException();
 
         var peer = new NetworkedMultiplayerENet();
-        // TODO: Somehow show there was an error.
         var error = peer.CreateServer(port);
         if (error != Error.Ok) return error;
         GetTree().NetworkPeer = peer;
-        LocalPlayer = FindLocalPlayer();
 
-        CurrentStatus = Status.ServerRunning;
-        EmitSignal(nameof(StatusChanged), CurrentStatus);
+        Status = NetworkStatus.ServerRunning;
+        EmitSignal(nameof(StatusChanged), Status);
+
+        Game.LocalPlayer.NetworkId = 1;
+        _playersById.Add(1, Game.LocalPlayer);
 
         return Error.Ok;
     }
@@ -65,16 +76,13 @@ public class Network : Node
     {
         if ((GetTree().NetworkPeer == null) || !GetTree().IsNetworkServer()) throw new InvalidOperationException();
 
-        // TODO: Disconnect players gracefully.
         ((NetworkedMultiplayerENet)GetTree().NetworkPeer).CloseConnection();
         GetTree().NetworkPeer = null;
 
-        LocalPlayer = null;
-        foreach (var player in GetOtherPlayers())
-            player.RemoveFromParent();
+        Status = NetworkStatus.NoConnection;
+        EmitSignal(nameof(StatusChanged), Status);
 
-        CurrentStatus = Status.NoConnection;
-        EmitSignal(nameof(StatusChanged), CurrentStatus);
+        ClearPlayers();
     }
 
     public Error ConnectToServer(string address, ushort port)
@@ -82,13 +90,12 @@ public class Network : Node
         if (GetTree().NetworkPeer != null) throw new InvalidOperationException();
 
         var peer = new NetworkedMultiplayerENet();
-        // TODO: Somehow show there was an error.
         var error = peer.CreateClient(address, port);
         if (error != Error.Ok) return error;
         GetTree().NetworkPeer = peer;
 
-        CurrentStatus = Status.Connecting;
-        EmitSignal(nameof(StatusChanged), CurrentStatus);
+        Status = NetworkStatus.Connecting;
+        EmitSignal(nameof(StatusChanged), Status);
 
         return Error.Ok;
     }
@@ -97,64 +104,86 @@ public class Network : Node
     {
         if ((GetTree().NetworkPeer == null) || GetTree().IsNetworkServer()) throw new InvalidOperationException();
 
-        // TODO: Disconnect from server gracefully.
         ((NetworkedMultiplayerENet)GetTree().NetworkPeer).CloseConnection();
         GetTree().NetworkPeer = null;
 
-        LocalPlayer = null;
-        foreach (var player in GetOtherPlayers())
-            player.RemoveFromParent();
+        Status = NetworkStatus.NoConnection;
+        EmitSignal(nameof(StatusChanged), Status);
 
-        CurrentStatus = Status.NoConnection;
-        EmitSignal(nameof(StatusChanged), CurrentStatus);
+        ClearPlayers();
     }
 
-    public Player FindLocalPlayer()
-        => GetNode<Player>("/root/Game/LocalPlayer");
 
-    public Node2D GetPlayerWithId(int id)
-        => PlayerContainer.GetNodeOrNull<Node2D>(id.ToString());
-    public Node2D GetOrCreatePlayerWithId(int id)
+    private void OnClientConnected()
     {
-        var player = GetPlayerWithId(id);
-        if (player == null) {
-            player = (Node2D)OtherPlayer.Instance();
-            // TODO: Use "set_network_master".
-            player.Name = id.ToString();
-            PlayerContainer.AddChild(player);
-        }
-        return player;
+        Status = NetworkStatus.Authenticating;
+        EmitSignal(nameof(StatusChanged), Status);
+
+        var id = GetTree().GetNetworkUniqueId();
+        Game.LocalPlayer.NetworkId = id;
+        _playersById.Add(id, Game.LocalPlayer);
+
+        Rpc(nameof(OnClientAuthenticate), Game.LocalPlayer.DisplayName, Game.LocalPlayer.Color);
     }
 
-    // TODO: This assumes that any node whose name starts with a digit is a player.
-    public IEnumerable<Node2D> GetOtherPlayers()
-        => PlayerContainer.GetChildren().OfType<Node2D>()
-            .Where(node => char.IsDigit(node.Name[0]));
+    [Master]
+    private void OnClientAuthenticate(string displayName, Color color)
+    {
+        var id = GetTree().GetRpcSenderId();
+
+        // Authentication message is only sent once, so once the Player object exists, ignore this message.
+        if (GetPlayer(id) != null) return;
 
+        var newPlayer = SpawnOtherPlayerInternal(id, Vector2.Zero, displayName, color);
+        RpcId(id, nameof(SpawnLocalPlayer), newPlayer.Position);
 
-    private void OnClientConnected()
+        foreach (var player in _playersById.Values) {
+            if (player == newPlayer) continue;
+
+            // Spawn existing players for the new player.
+            RpcId(id, nameof(SpawnOtherPlayer), player.NetworkId, player.Position, player.DisplayName, player.Color);
+
+            // Spawn new player for existing players.
+            if (!player.IsLocal) // Don't spawn the player for the host, it already called SpawnOtherPlayer itself.
+                RpcId(player.NetworkId, nameof(SpawnOtherPlayer), newPlayer.NetworkId, newPlayer.Position, newPlayer.DisplayName, newPlayer.Color);
+        }
+    }
+
+    [Puppet]
+    private Player SpawnLocalPlayer(Vector2 position)
     {
-        LocalPlayer = FindLocalPlayer();
+        Status = NetworkStatus.ConnectedToServer;
+        EmitSignal(nameof(StatusChanged), Status);
 
-        CurrentStatus = Status.ConnectedToServer;
-        EmitSignal(nameof(StatusChanged), CurrentStatus);
+        Game.LocalPlayer.Position = position;
+        return Game.LocalPlayer;
     }
 
+    private Player SpawnOtherPlayerInternal(int id, Vector2 position, string displayName, Color color)
+    {
+        var player = OtherPlayerScene.Init<Player>();
+        player.NetworkId = id;
+        // TODO: We need to find a way to sync these property automatically.
+        player.Position    = position;
+        player.DisplayName = displayName;
+        player.Color       = color;
+        _playersById.Add(id, player);
+        PlayerContainer.AddChild(player);
+        return player;
+    }
+    [Puppet]
+    private void SpawnOtherPlayer(int id, Vector2 position, string displayName, Color color)
+        => SpawnOtherPlayerInternal(id, position, displayName, color);
+
 
     private void OnPeerConnected(int id)
     {
-
+        // Currently unused.
     }
 
     private void OnPeerDisconnected(int id)
-        => GetPlayerWithId(id)?.RemoveFromParent();
-
-
-    [Remote]
-    private void OnPlayerMoved(Vector2 position)
     {
-        var id     = GetTree().GetRpcSenderId();
-        var player = GetOrCreatePlayerWithId(id);
-        player.Position = position;
+        GetPlayer(id)?.RemoveFromParent();
+        _playersById.Remove(id);
     }
 }
diff --git a/src/Player.cs b/src/Player.cs
index 609e527..886b75d 100644
--- a/src/Player.cs
+++ b/src/Player.cs
@@ -1,42 +1,93 @@
 using Godot;
-using System;
 
-public class Player : KinematicBody2D
+// FIXME: Player name should not be stored in "Name".
+public class Player : KinematicBody2D, IInitializer
 {
-    public TimeSpan JumpEarlyTime { get; } = TimeSpan.FromSeconds(0.2F);
-    public TimeSpan JumpCoyoteTime { get; } = TimeSpan.FromSeconds(0.2F);
+    [Export] public NodePath DisplayNamePath { get; set; }
+    [Export] public NodePath SpritePath { get; set; }
 
-    [Export] public float Speed { get; set; } = 120;
-    [Export] public float JumpSpeed { get; set; } = 180;
-    [Export] public float Gravity { get; set; } = 400;
+    public Label DisplayNameLabel { get; private set; }
+    public Sprite Sprite { get; private set; }
+    public Network Network { get; private set; }
 
-    [Export(PropertyHint.Range, "0,1")]
-    public float Friction { get; set; } = 0.1F;
-    [Export(PropertyHint.Range, "0,1")]
-    public float Acceleration { get; set; } = 0.25F;
+    public bool IsLocal => this is LocalPlayer;
 
-    private Vector2 _velocity = Vector2.Zero;
-    private DateTime? _jumpPressed = null;
-    private DateTime? _lastOnFloor = null;
+    private int _networkId = -1;
+    public int NetworkId {
+        get => _networkId;
+        set => SetNetworkId(value);
+    }
+
+    public Color Color {
+        get => Sprite.Modulate;
+        set => SetColor(value);
+    }
+
+    public string DisplayName {
+        get => DisplayNameLabel.Text;
+        set => SetDisplayName(value);
+    }
+
+
+    public void Initialize()
+    {
+        DisplayNameLabel = GetNode<Label>(DisplayNamePath);
+        Sprite           = GetNode<Sprite>(SpritePath);
+    }
+
+    public override void _Ready()
+    {
+        Initialize();
+        Network = GetNode<Network>("/root/Game/Network");
+
+        RsetConfig("position", MultiplayerAPI.RPCMode.Puppetsync);
+        Sprite.RsetConfig("modulate", MultiplayerAPI.RPCMode.Puppetsync);
+        DisplayNameLabel.RsetConfig("text", MultiplayerAPI.RPCMode.Puppetsync);
+    }
+
+    public override void _Process(float delta)
+    {
+        if (GetTree().NetworkPeer != null) {
+            // TODO: Only send position if it changed.
+            // Send unreliable messages while moving, and a reliable once the player stopped.
+            if (GetTree().IsNetworkServer())
+                this.RsetUnreliableExcept(NetworkId, "position", Position);
+            else if (Network.Status == NetworkStatus.ConnectedToServer)
+                RpcUnreliable(nameof(OnPositionChanged), Position);
+        }
+    }
+    [Master]
+    private void OnPositionChanged(Vector2 value)
+        { if (GetTree().GetRpcSenderId() == NetworkId) Position = value; }
+
+
+    private void SetNetworkId(int value)
+    {
+        _networkId = value;
+        Name = (_networkId > 0) ? value.ToString() : "LocalPlayer";
+    }
+
+    private void SetColor(Color value)
+    {
+        Sprite.Modulate = value;
+        if (IsInsideTree() && GetTree().NetworkPeer != null) {
+            if (GetTree().IsNetworkServer()) Sprite.RsetExcept(NetworkId, "modulate", value);
+            else Rpc(nameof(OnColorChanged), value);
+        }
+    }
+    [Master]
+    private void OnColorChanged(Color value)
+        { if (GetTree().GetRpcSenderId() == NetworkId) Color = value; }
 
-    public override void _PhysicsProcess(float delta)
+    private void SetDisplayName(string value)
     {
-        var moveDir = Input.GetActionStrength("move_right") - Input.GetActionStrength("move_left");
-        _velocity.x = (moveDir != 0) ? Mathf.Lerp(_velocity.x, moveDir * Speed, Acceleration)
-                                     : Mathf.Lerp(_velocity.x, 0, Friction);
-        _velocity.y += Gravity * delta;
-        _velocity = MoveAndSlide(_velocity, Vector2.Up);
-
-        if (Input.IsActionJustPressed("move_jump"))
-            _jumpPressed = DateTime.Now;
-        if (IsOnFloor())
-            _lastOnFloor = DateTime.Now;
-
-        if (((DateTime.Now - _jumpPressed) <= JumpEarlyTime) &&
-            ((DateTime.Now - _lastOnFloor) <= JumpCoyoteTime)) {
-            _velocity.y  = -JumpSpeed;
-            _jumpPressed = null;
-            _lastOnFloor = null;
+        DisplayNameLabel.Text = value;
+        if (IsInsideTree() && GetTree().NetworkPeer != null) {
+            if (GetTree().IsNetworkServer()) DisplayNameLabel.RsetExcept(NetworkId, "text", value);
+            else Rpc(nameof(OnDisplayNameChanged), value);
         }
     }
+    [Master]
+    private void OnDisplayNameChanged(string value)
+        { if (GetTree().GetRpcSenderId() == NetworkId) DisplayName = value; }
 }
diff --git a/src/Viewport.cs b/src/Viewport.cs
index e4f0cb5..9c6b785 100644
--- a/src/Viewport.cs
+++ b/src/Viewport.cs
@@ -8,7 +8,7 @@ public class Viewport : Node
 
     public override void _Ready()
     {
-        GetTree().Connect("screen_resized", this, "OnWindowResized");
+        GetTree().Connect("screen_resized", this, nameof(OnWindowResized));
         OnWindowResized();
     }