diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 4400e35..18431c5 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -245,6 +245,9 @@
     <Compile Include="Views\Converters\ListConverter.cs" />
     <Compile Include="MultiTextWriter.cs" />
     <Compile Include="RichTextBoxWriter.cs" />
+    <Compile Include="Views\Entities\CharacterView.xaml.cs">
+      <DependentUpon>CharacterView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ValidationRules\ListConverterValidationRule.cs" />
     <Compile Include="Views\Entities\EntityControlHost.xaml.cs">
       <DependentUpon>EntityControlHost.xaml</DependentUpon>
@@ -378,6 +381,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Entities\CharacterView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\Entities\GridView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Torch.Server/ViewModels/Entities/CharacterViewModel.cs b/Torch.Server/ViewModels/Entities/CharacterViewModel.cs
index d54b005..e111666 100644
--- a/Torch.Server/ViewModels/Entities/CharacterViewModel.cs
+++ b/Torch.Server/ViewModels/Entities/CharacterViewModel.cs
@@ -6,7 +6,12 @@ namespace Torch.Server.ViewModels.Entities
     {
         public CharacterViewModel(MyCharacter character, EntityTreeViewModel tree) : base(character, tree)
         {
-            
+            character.ControllerInfo.ControlAcquired += (x) => { OnPropertyChanged(nameof(Name)); };
+            character.ControllerInfo.ControlReleased += (x) => { OnPropertyChanged(nameof(Name)); };
+        }
+
+        public CharacterViewModel()
+        {
         }
     }
 }
diff --git a/Torch.Server/ViewModels/Entities/EntityViewModel.cs b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
index f4ce39c..c3502d6 100644
--- a/Torch.Server/ViewModels/Entities/EntityViewModel.cs
+++ b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
@@ -1,7 +1,9 @@
 using System.Windows.Controls;
+using Sandbox.Game.World;
 using Torch.API.Managers;
 using Torch.Collections;
 using Torch.Server.Managers;
+using VRage.Game.Entity;
 using VRage.Game.ModAPI;
 using VRage.ModAPI;
 using VRageMath;
@@ -32,10 +34,11 @@ namespace Torch.Server.ViewModels.Entities
 
         public virtual string Name
         {
-            get => Entity?.DisplayName;
+            get => Entity?.DisplayName ?? (Entity != null ? $"eid:{Entity.EntityId}" : "nil");
             set
             {
-                TorchBase.Instance.InvokeBlocking(() => Entity.DisplayName = value);
+                if (Entity!=null)
+                    TorchBase.Instance.InvokeBlocking(() => Entity.DisplayName = value);
                 OnPropertyChanged();
             }
         }
@@ -48,7 +51,8 @@ namespace Torch.Server.ViewModels.Entities
                 if (!Vector3D.TryParse(value, out Vector3D v))
                     return;
 
-                TorchBase.Instance.InvokeBlocking(() => Entity.SetPosition(v));
+                if (Entity != null)
+                    TorchBase.Instance.InvokeBlocking(() => Entity.SetPosition(v));
                 OnPropertyChanged();
             }
         }
diff --git a/Torch.Server/Views/Entities/CharacterView.xaml b/Torch.Server/Views/Entities/CharacterView.xaml
new file mode 100644
index 0000000..cf50c3d
--- /dev/null
+++ b/Torch.Server/Views/Entities/CharacterView.xaml
@@ -0,0 +1,30 @@
+<UserControl x:Class="Torch.Server.Views.Entities.CharacterView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:entities="clr-namespace:Torch.Server.ViewModels.Entities"
+             xmlns:local="clr-namespace:Torch.Server.Views.Entities"
+             mc:Ignorable="d">
+    <UserControl.DataContext>
+        <entities:CharacterViewModel />
+    </UserControl.DataContext>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Orientation="Horizontal">
+            <Label Content="Name" Width="100"/>
+            <TextBox Text="{Binding Name}" Margin="3"/>
+        </StackPanel>
+        <StackPanel Grid.Row="1" Orientation="Horizontal">
+            <Label Content="Position" Width="100"/>
+            <TextBox Text="{Binding Position}" Margin="3" />
+        </StackPanel>
+        <ScrollViewer Grid.Row="2" Margin="3" VerticalScrollBarVisibility="Auto">
+            <local:EntityControlsView DataContext="{Binding}"/>
+        </ScrollViewer>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Torch.Server/Views/Entities/CharacterView.xaml.cs b/Torch.Server/Views/Entities/CharacterView.xaml.cs
new file mode 100644
index 0000000..a79f437
--- /dev/null
+++ b/Torch.Server/Views/Entities/CharacterView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Torch.Server.Views.Entities
+{
+    /// <summary>
+    /// Interaction logic for GridView.xaml
+    /// </summary>
+    public partial class CharacterView : UserControl
+    {
+        public CharacterView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Torch.Server/Views/EntitiesControl.xaml b/Torch.Server/Views/EntitiesControl.xaml
index 39c508f..9e3e342 100644
--- a/Torch.Server/Views/EntitiesControl.xaml
+++ b/Torch.Server/Views/EntitiesControl.xaml
@@ -54,7 +54,7 @@
                         <TextBlock Text="{Binding Grids.Count, StringFormat=Grids ({0})}" />
                     </TreeViewItem.Header>
                 </TreeViewItem>
-                <TreeViewItem ItemsSource="{Binding Characters}">
+                <TreeViewItem ItemsSource="{Binding Characters.Values}">
                     <TreeViewItem.Header>
                         <TextBlock Text="{Binding Characters.Count, StringFormat=Characters ({0})}" />
                     </TreeViewItem.Header>
diff --git a/Torch.Server/Views/EntitiesControl.xaml.cs b/Torch.Server/Views/EntitiesControl.xaml.cs
index 1ba3541..1095912 100644
--- a/Torch.Server/Views/EntitiesControl.xaml.cs
+++ b/Torch.Server/Views/EntitiesControl.xaml.cs
@@ -48,6 +48,8 @@ namespace Torch.Server.Views
                     EditorFrame.Content = new BlockView {DataContext = bvm};
                 if (e.NewValue is VoxelMapViewModel vvm)
                     EditorFrame.Content = new VoxelMapView {DataContext = vvm};
+                if (e.NewValue is CharacterViewModel cvm)
+                    EditorFrame.Content = new CharacterView {DataContext = cvm};
             }
             else
             {