diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
index 52216bab2..885dda6c0 100644
--- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
+++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
@@ -1507,6 +1507,7 @@
             <e p="DatabaseEntry.cs" t="Include" />
             <e p="Economy.Shared.Unity.asmdef" t="Include" />
             <e p="Entity.cs" t="Include" />
+            <e p="EntitySerializer.cs" t="Include" />
             <e p="Enums.cs" t="Include" />
             <e p="ExponentialCurve.cs" t="Include" />
             <e p="Extensions.cs" t="Include" />
diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs
index 34a86dc3e..a8a4d8d81 100644
--- a/Assets/Scripts/ServerShared/Entity.cs
+++ b/Assets/Scripts/ServerShared/Entity.cs
@@ -50,7 +50,7 @@ public abstract class Entity
     public readonly Dictionary<string, float> Messages = new Dictionary<string, float>();
     public readonly Dictionary<object, float> VisibilitySources = new Dictionary<object, float>();
     public readonly Dictionary<HardpointData, (float3 position, float3 direction)> HardpointTransforms = 
-        new Dictionary<HardpointData, (float3 position, float3 direction)>(); 
+        new Dictionary<HardpointData, (float3 position, float3 direction)>();
     public Dictionary<HardpointData, float> HardpointArmor;
     
     public readonly List<EquippedItem>[] TriggerGroups;
@@ -78,7 +78,6 @@ public abstract class Entity
     public UniRx.IObservable<EquippedItem> ItemDestroyed;
     public UniRx.IObservable<int2> HullArmorDepleted;
     public UniRx.IObservable<HardpointData> HardpointArmorDepleted;
-    
 
     public bool Active
     {
diff --git a/Assets/Scripts/ServerShared/EntitySerializer.cs b/Assets/Scripts/ServerShared/EntitySerializer.cs
new file mode 100644
index 000000000..cd5c21aa1
--- /dev/null
+++ b/Assets/Scripts/ServerShared/EntitySerializer.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using MessagePack;
+using RethinkDb.Driver.Ast;
+using Unity.Mathematics;
+
+[MessagePackObject]
+public class EntityPack
+{
+    [Key(0)]
+    public EquippableItem Hull;
+    
+    [Key(1)]
+    public (int2 position, EquippableItem item)[] Equipment;
+    public (int2 position, EquippableItem item)[] CargoBays;
+    public (int2 position, EquippableItem item)[] DockingBays;
+
+    public Dictionary<int2, PersistentBehaviorData[]> PersistedBehaviors;
+
+    public float[,] Temperature;
+    public float[,] Armor;
+    public Dictionary<int, float> HardpointArmor;
+    public int[] DockingBayAssignments;
+    public (int2 position, ItemInstance item)[][] CargoContents;
+    public (int2 position, ItemInstance item)[][] DockingBayContents;
+
+    public EntityPack[] Children;
+
+    public static EntityPack Serialize(Entity entity)
+    {
+        var pack = new EntityPack();
+        
+        // Filter item behavior collections by those with any persistent behaviors
+        // For each item create an object containing the item position and a list of persistent behaviors
+        // Then turn that into a dictionary mapping from item position to an array of every behaviors persistent data
+        pack.PersistedBehaviors = entity.Equipment
+            .Where(item => item.Behaviors.Any(b=>b is IPersistentBehavior))
+            .Select(item => new {equippable=item, behaviors = item.Behaviors
+                .Where(b=>b is IPersistentBehavior)
+                .Cast<IPersistentBehavior>()})
+            .ToDictionary(x=> x.equippable.Position, x=>x.behaviors.Select(b => b.Store()).ToArray());
+        
+        pack.Equipment = entity.Equipment.Select(e => (e.Position, e.EquippableItem)).ToArray();
+        pack.CargoBays = entity.CargoBays.Select(e => (e.Position, e.EquippableItem)).ToArray();
+        pack.DockingBays = entity.DockingBays.Select(e => (e.Position, e.EquippableItem)).ToArray();
+        pack.DockingBayAssignments = entity.DockingBays.Select(x => entity.Children.IndexOf(x.DockedShip)).ToArray();
+        pack.CargoContents = entity.CargoBays.Select(b => b.Cargo.Select(i => (i.Value, i.Key)).ToArray()).ToArray();
+        pack.DockingBayContents = entity.DockingBays.Select(b => b.Cargo.Select(i => (i.Value, i.Key)).ToArray()).ToArray();
+        pack.Armor = entity.Armor;
+        pack.Temperature = entity.Temperature;
+        var hullData = entity.ItemManager.GetData(entity.Hull) as HullData;
+        pack.HardpointArmor = entity.HardpointArmor.ToDictionary(x => hullData.Hardpoints.IndexOf(x.Key), x => x.Value);
+        pack.Children = entity.Children.Select(Serialize).ToArray();
+        return pack;
+    }
+
+    public static Ship Deserialize(ItemManager itemManager, Zone zone, EntityPack pack)
+    {
+        var entity = new Ship(itemManager, zone, pack.Hull);
+        Restore(itemManager, zone, pack, entity);
+        return entity;
+    }
+
+    public static OrbitalEntity Deserialize(ItemManager itemManager, Zone zone, EntityPack pack, Guid orbit)
+    {
+        var entity = new OrbitalEntity(itemManager, zone, pack.Hull, orbit);
+        Restore(itemManager, zone, pack, entity);
+        return entity;
+    }
+
+    public static void Restore(ItemManager itemManager, Zone zone, EntityPack pack, Entity entity)
+    {
+        entity.Children = pack.Children.Select(c =>
+        {
+            var child = Deserialize(itemManager, zone, c);
+            child.Parent = entity;
+            return (Entity) child;
+        }).ToList();
+        foreach (var (position, item) in pack.Equipment) entity.TryEquip(item, position);
+        foreach (var (position, item) in pack.CargoBays) entity.TryEquip(item, position);
+        foreach (var (position, item) in pack.DockingBays) entity.TryEquip(item, position);
+
+        for (var i = 0; i < pack.DockingBayAssignments.Length; i++)
+        {
+            if (pack.DockingBayAssignments[i] != -1)
+                entity.DockingBays[i].DockedShip = entity.Children[pack.DockingBayAssignments[i]] as Ship;
+        }
+
+        for (var bayIndex = 0; bayIndex < pack.CargoContents.Length; bayIndex++)
+            foreach (var (position, item) in pack.CargoContents[bayIndex])
+                entity.CargoBays[bayIndex].TryStore(item, position);
+
+        for (var bayIndex = 0; bayIndex < pack.DockingBayContents.Length; bayIndex++)
+            foreach (var (position, item) in pack.DockingBayContents[bayIndex])
+                entity.DockingBays[bayIndex].TryStore(item, position);
+
+        // Iterate only over the behaviors of items which contain persistent data
+        // Filter the behaviors for each item to get the persistent ones, then cast them and combine with the persisted data array for that item
+        foreach (var persistentBehaviorData in entity.Equipment
+            .Where(item => pack.PersistedBehaviors.ContainsKey(item.Position))
+            .SelectMany(item => item.Behaviors
+                .Where(b=> b is IPersistentBehavior)
+                .Cast<IPersistentBehavior>()
+                .Zip(pack.PersistedBehaviors[item.Position], (behavior, data) => new{behavior, data})))
+            persistentBehaviorData.behavior.Restore(persistentBehaviorData.data);
+
+        entity.Temperature = pack.Temperature;
+        entity.Armor = pack.Armor;
+        var hullData = entity.ItemManager.GetData(entity.Hull) as HullData;
+        entity.HardpointArmor = pack.HardpointArmor.ToDictionary(x => hullData.Hardpoints[x.Key], x => x.Value);
+    }
+}
diff --git a/Assets/Scripts/ServerShared/EntitySerializer.cs.meta b/Assets/Scripts/ServerShared/EntitySerializer.cs.meta
new file mode 100644
index 000000000..7aca4a02b
--- /dev/null
+++ b/Assets/Scripts/ServerShared/EntitySerializer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 89f2dbd0304cf8f4387c71aa9c3d2646
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Economy.Shared.Unity.csproj b/Economy.Shared.Unity.csproj
index f408c4e9b..5d74a50a0 100644
--- a/Economy.Shared.Unity.csproj
+++ b/Economy.Shared.Unity.csproj
@@ -518,6 +518,7 @@
      <Compile Include="Assets\Scripts\ServerShared\ItemManager.cs" />
      <Compile Include="Assets\Scripts\ServerShared\Noise1D.cs" />
      <Compile Include="Assets\Scripts\ServerShared\Behaviors\TargetLock.cs" />
+     <Compile Include="Assets\Scripts\ServerShared\EntitySerializer.cs" />
      <None Include="Assets\Scripts\ServerShared\NIH\LinqFaster\readme.txt" />
      <None Include="Assets\Scripts\ServerShared\Economy.Shared.Unity.asmdef" />
  <Reference Include="Remotion.Linq">